From 73c90badf31492c8cf67745d46de277321b4712a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 22 Aug 2022 21:55:31 +0800 Subject: [PATCH 1/6] emacs: Simplify patchelf invocation when building with lucid --- pkgs/applications/editors/emacs/generic.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 1f49c3c23af0..9c1696e59da0 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -204,15 +204,10 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.concatStringsSep "\n" [ - - (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' - patchelf --set-rpath \ - "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \ - "$out/bin/emacs" + postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" - '') - ]; + ''; passthru = { inherit nativeComp; From ca25a9c7b2025deafaab976912117e1ca31fc061 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 22 Aug 2022 21:56:00 +0800 Subject: [PATCH 2/6] emacs: Enable xinput2 on version 29 and newer --- pkgs/applications/editors/emacs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 9c1696e59da0..209d0ee96b4c 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -30,7 +30,7 @@ , withAthena ? false , withToolkitScrollBars ? true , withPgtk ? false -, withXinput2 ? false +, withXinput2 ? withX && lib.versionAtLeast version "29" , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" From fba34ddaa254b03f2f5d7d5dd58dea3674f4448c Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 2 Sep 2022 00:34:58 +0300 Subject: [PATCH 3/6] =?UTF-8?q?sile:=200.14.2=20=E2=86=92=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/sile-typesetter/sile/releases/tag/v0.14.3 --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 5e1a3333cfbb..e883ac46005a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1q32a1ps66am6sbi3al528175kscq1fqc47gkdpb58r1kiyj9pm3"; + sha256 = "1n7nlrvhdp6ilpx6agb5w6flss5vbflbldv0495h19fy5fxkb5vz"; }; configureFlags = [ From 6c7a02209de4d1fc5850475278fedfc12a285b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 13:36:58 +0000 Subject: [PATCH 4/6] eksctl: 0.109.0 -> 0.110.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 4da2cdb4266e..144524df6949 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.109.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-C4BeQoNYAcY5nKqjXlYimJGpsrQfhaNHmgjz9FjZZiM="; + sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI="; }; - vendorSha256 = "sha256-M6vwwS7JdK9sYltXxz/fScqny2qYoESJtmLWjBZnKLM="; + vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4="; doCheck = false; From e041d60b8146fdf87a6b9b813024c63f7c652fbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 14:41:18 +0000 Subject: [PATCH 5/6] go-swagger: 0.30.0 -> 0.30.2 --- pkgs/development/tools/go-swagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index feae045b68e1..45ca5b0152fa 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hc3b1r8Wr8cXAWoqINneBRU1Mdv4RkAeOOCK7O9Vp9g="; + sha256 = "sha256-RV+oXcu74lyc3v3i3aQvKqrm6KrKwvPwED4JAwXgjqw="; }; - vendorSha256 = "sha256-g/0OjAqT+0P0VtB0i0o2QfMqU8YDnoRtwA5isNJlSBE="; + vendorSha256 = "sha256-F20/EQjlrwYzejLPcnuzb7K9RmbbrqU+MwzBO1MvhL4="; doCheck = false; From a08e6b4902e1e625a8964c64c65edd086b28f9ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Sep 2022 01:36:37 +0200 Subject: [PATCH 6/6] =?UTF-8?q?easyeffects:=206.2.8=20=E2=86=92=206.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/wwmm/easyeffects/compare/v6.2.8...v6.3.0 --- pkgs/applications/audio/easyeffects/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index aa3162df9187..4e65d79ab21a 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -23,7 +23,6 @@ , nlohmann_json , pipewire , pkg-config -, python3 , rnnoise , rubberband , speexdsp @@ -35,13 +34,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.8"; + version = "6.3.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo="; + sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM="; }; nativeBuildInputs = [ @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook4 ]; @@ -76,11 +74,6 @@ stdenv.mkDerivation rec { zita-convolver ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - preFixup = let lv2Plugins = [