Unverified Commit c173b99c authored by Theodore Ni's avatar Theodore Ni
Browse files

Merge branch 'master' into staging-next 

Resolve correctly the three-way merge between https://github.com/NixOS/nixpkgs/pull/251681,
https://github.com/NixOS/nixpkgs/pull/227900, and https://github.com/NixOS/nixpkgs/pull/246022
parents 47ae3f6c d689cbc8

pkgs/applications/audio/airwindows-lv2/default.nix

+6 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }:

{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, lv2 }:



stdenv.mkDerivation rec {

  pname = "airwindows-lv2";

  version = "20.0";

  src = fetchFromGitHub {

    owner = "hannesbraun";

  version = "22.0";

  src = fetchFromSourcehut {

    owner = "~hannes";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU=";

    sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4=";

  };



  nativeBuildInputs = [ meson ninja pkg-config ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 


  meta = with lib; {

    description = "Airwindows plugins (ported to LV2)";

    homepage = "https://github.com/hannesbraun/airwindows-lv2";

    homepage = "https://sr.ht/~hannes/airwindows-lv2";

    license = licenses.mit;

    maintainers = [ maintainers.magnetophon ];

    platforms = platforms.unix;

pkgs/applications/audio/lsp-plugins/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 


stdenv.mkDerivation rec {

  pname = "lsp-plugins";

  version = "1.2.8";

  version = "1.2.10";



  src = fetchurl {

    url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";

    sha256 = "sha256-udVYyR6rDOCAKggpvY58jjpoLmB6wXiivvdzYylkE9c=";

    sha256 = "sha256-2Yf+4TYGWF/AMI1kNvVOx9g6CSIoeZKY63qC/zJNilc=";

  };



  outputs = [ "out" "dev" "doc" ];

pkgs/applications/misc/get_iplayer/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
, perl

, atomicparsley

, ffmpeg

, flvstreamer

, rtmpdump

}:



perlPackages.buildPerlPackage rec {
@@ -25,7 +23,7 @@ perlPackages.buildPerlPackage rec { 
  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;

  buildInputs = [ perl ];

  propagatedBuildInputs = with perlPackages; [

    HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious

    LWP LWPProtocolHttps XMLLibXML Mojolicious

  ];



  preConfigure = "touch Makefile.PL";
@@ -36,7 +34,7 @@ perlPackages.buildPerlPackage rec { 
    runHook preInstall

    mkdir -p $out/bin $out/share/man/man1

    cp get_iplayer $out/bin

    wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB

    wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB

    cp get_iplayer.1 $out/share/man/man1

    runHook postInstall

  '';
@@ -46,9 +44,9 @@ perlPackages.buildPerlPackage rec { 
  '';



  meta = with lib; {

    description = "Downloads TV and radio from BBC iPlayer";

    description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds";

    license = licenses.gpl3Plus;

    homepage = "https://squarepenguin.co.uk/";

    homepage = "https://github.com/get-iplayer/get_iplayer";

    platforms = platforms.all;

    maintainers = with maintainers; [ rika jgarcia ];

  };

pkgs/applications/misc/nwg-dock-hyprland/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


buildGoModule rec {

  pname = "nwg-dock-hyprland";

  version = "0.1.4";

  version = "0.1.5";



  src = fetchFromGitHub {

    owner = "nwg-piotr";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-aPCz9m2Qnge8XhEbvpXb2U/eT5xvJkaSoorkkoY3gp0=";

    sha256 = "sha256-DDHKEGb7ghZwrMKrFtplTz7Hi1CITW6oxa/EJM4JDA8=";

  };



  vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";

  vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0=";



  ldflags = [ "-s" "-w" ];

pkgs/applications/office/morgen/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 


stdenv.mkDerivation rec {

  pname = "morgen";

  version = "2.7.5";

  version = "3.0.0";



  src = fetchurl {

    url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";

    sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k=";

    sha256 = "sha256-6d1KYUlXv+bHPITt2zs++AtyaAT8SSCG9T8ZsgOKDiw=";

  };



  nativeBuildInputs = [