Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 5582d1b0 f556fdf5

+14 -26
+2 -9
pkgs/applications/audio/easyeffects/default.nix
··· 23 23 , nlohmann_json 24 24 , pipewire 25 25 , pkg-config 26 - , python3 27 26 , rnnoise 28 27 , rubberband 29 28 , speexdsp ··· 35 34 36 35 stdenv.mkDerivation rec { 37 36 pname = "easyeffects"; 38 - version = "6.2.8"; 37 + version = "6.3.0"; 39 38 40 39 src = fetchFromGitHub { 41 40 owner = "wwmm"; 42 41 repo = "easyeffects"; 43 42 rev = "v${version}"; 44 - sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo="; 43 + sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM="; 45 44 }; 46 45 47 46 nativeBuildInputs = [ ··· 50 49 meson 51 50 ninja 52 51 pkg-config 53 - python3 54 52 wrapGAppsHook4 55 53 ]; 56 54 ··· 75 73 tbb 76 74 zita-convolver 77 75 ]; 78 - 79 - postPatch = '' 80 - chmod +x meson_post_install.py 81 - patchShebangs meson_post_install.py 82 - ''; 83 76 84 77 preFixup = 85 78 let
+4 -9
pkgs/applications/editors/emacs/generic.nix
··· 30 30 , withAthena ? false 31 31 , withToolkitScrollBars ? true 32 32 , withPgtk ? false 33 - , withXinput2 ? false 33 + , withXinput2 ? withX && lib.versionAtLeast version "29" 34 34 , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) 35 35 , toolkit ? ( 36 36 if withGTK2 then "gtk2" ··· 204 204 -f batch-native-compile $out/share/emacs/site-lisp/site-start.el 205 205 ''; 206 206 207 - postFixup = lib.concatStringsSep "\n" [ 208 - 209 - (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' 210 - patchelf --set-rpath \ 211 - "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \ 212 - "$out/bin/emacs" 207 + postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' 208 + patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs 213 209 patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" 214 - '') 215 - ]; 210 + ''; 216 211 217 212 passthru = { 218 213 inherit nativeComp;
+3 -3
pkgs/development/tools/go-swagger/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "go-swagger"; 5 - version = "0.30.0"; 5 + version = "0.30.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "go-swagger"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-Hc3b1r8Wr8cXAWoqINneBRU1Mdv4RkAeOOCK7O9Vp9g="; 11 + sha256 = "sha256-RV+oXcu74lyc3v3i3aQvKqrm6KrKwvPwED4JAwXgjqw="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-g/0OjAqT+0P0VtB0i0o2QfMqU8YDnoRtwA5isNJlSBE="; 14 + vendorSha256 = "sha256-F20/EQjlrwYzejLPcnuzb7K9RmbbrqU+MwzBO1MvhL4="; 15 15 16 16 doCheck = false; 17 17
+3 -3
pkgs/tools/admin/eksctl/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "eksctl"; 5 - version = "0.109.0"; 5 + version = "0.110.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "weaveworks"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-C4BeQoNYAcY5nKqjXlYimJGpsrQfhaNHmgjz9FjZZiM="; 11 + sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-M6vwwS7JdK9sYltXxz/fScqny2qYoESJtmLWjBZnKLM="; 14 + vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4="; 15 15 16 16 doCheck = false; 17 17
+2 -2
pkgs/tools/typesetting/sile/default.nix
··· 43 43 44 44 stdenv.mkDerivation rec { 45 45 pname = "sile"; 46 - version = "0.14.2"; 46 + version = "0.14.3"; 47 47 48 48 src = fetchurl { 49 49 url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; 50 - sha256 = "1q32a1ps66am6sbi3al528175kscq1fqc47gkdpb58r1kiyj9pm3"; 50 + sha256 = "1n7nlrvhdp6ilpx6agb5w6flss5vbflbldv0495h19fy5fxkb5vz"; 51 51 }; 52 52 53 53 configureFlags = [