From 368da113fac8e7e1a5a62e4272d9cdaf5a4c4479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 03:59:25 +0000 Subject: [PATCH 1/8] flake-checker: 0.2.5 -> 0.2.6 (cherry picked from commit cc59786aeb63a54a67ff0cf72f8ad6969d222055) --- pkgs/by-name/fl/flake-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index b1dc9d60fd65..c3c75c1444ce 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-Q1nC7U4SG3VHlqbJDs5NDNmsvnYN+MGpMkOH952WaKg="; + hash = "sha256-qEdwtyk5IaYCx67BFnLp4iUN+ewfPMl/wjs9K4hKqGc="; }; - cargoHash = "sha256-6V5w99xplj9hzfdIYXD/+HxfICfr5Ul5pV6H4ywQy8Q="; + cargoHash = "sha256-f0fQqIh/HeTl/B7WrdHtv3/soWSMbIYnEZs6tikBjT4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 9443851335d22cb2eb4291df1fb23ee1c1cad350 Mon Sep 17 00:00:00 2001 From: Katherine Jamison Date: Fri, 30 May 2025 16:08:46 -0600 Subject: [PATCH 2/8] linuxKernel.kernels.linux_zen: 6.14.7-zen1 -> 6.14.9-zen1 (cherry picked from commit 98da4519c9b8b3775c4d987dadc61ceaceeadfb2) --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index de3cf27bfdd3..8182767a78d2 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.14.7"; # zen + version = "6.14.9"; # zen suffix = "zen1"; # zen - sha256 = "04vcy71wjs6n1ahnva55i0czayn96w8qq0b0v0qymcq9lrbms2mr"; # zen + sha256 = "1v28cdv8dyn5181z242f63ns6b472jx8a7wmw77n5wijj8fv5ba1"; # zen isLqx = false; }; # ./update-zen.py lqx From d0ef98e1af4f951cd01977987fde7419cdf8c275 Mon Sep 17 00:00:00 2001 From: Katherine Jamison Date: Fri, 30 May 2025 16:10:25 -0600 Subject: [PATCH 3/8] linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 -> 6.14.9-lqx1 (cherry picked from commit 4bf93b4e31eb2292f47f13131cd42bbafa589966) --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 8182767a78d2..b9ae7d0ed6f9 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -19,9 +19,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.14.7"; # lqx + version = "6.14.9"; # lqx suffix = "lqx1"; # lqx - sha256 = "0in1ymvnac9kic974r5sqkk730fm71d49q0cgzk7lj1ykd9jzxpp"; # lqx + sha256 = "1f8sram3xabv119pznpixpm5igyxf33wkg4v8fm5nh9c9g91q19j"; # lqx isLqx = true; }; }; From 671a72cd607bc6bd10e4a8a29eb8e1fee134e568 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 5 Jun 2025 04:38:43 +0200 Subject: [PATCH 4/8] perlPackages.FileFindRule: patch for CVE-2011-10007 (cherry picked from commit 01885ade5348ff2502e384f2a07c26ff7582230f) --- .../FileFindRule-CVE-2011-10007.patch | 25 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch diff --git a/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch new file mode 100644 index 000000000000..dd8492c60f21 --- /dev/null +++ b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch @@ -0,0 +1,25 @@ +From ca70a73bb147549e62e74751d924b1dbb59d1707 Mon Sep 17 00:00:00 2001 +From: Stig Palmquist +Date: Thu, 5 Jun 2025 03:45:50 +0200 +Subject: [PATCH] Fix CVE-2011-10007 + +--- + lib/File/Find/Rule.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/File/Find/Rule.pm b/lib/File/Find/Rule.pm +index feccc76..d4dc475 100644 +--- a/lib/File/Find/Rule.pm ++++ b/lib/File/Find/Rule.pm +@@ -420,7 +420,7 @@ sub grep { + + $self->exec( sub { + local *FILE; +- open FILE, $_ or return; ++ open FILE, '<', $_ or return; + local ($_, $.); + while () { + for my $p (@pattern) { +-- +2.49.0 + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ed1d7d89973..36da89ac0647 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13318,6 +13318,9 @@ with self; url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz"; hash = "sha256-fm8WzDPrHyn/Jb7lHVE/S4qElHu/oY7bLTzECi1kyv4="; }; + patches = [ + ../development/perl-modules/FileFindRule-CVE-2011-10007.patch + ]; propagatedBuildInputs = [ NumberCompare TextGlob From b6bcf647fdc6b8c48ddf67d4dbfc0b49e88f5ea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 11:35:52 +0000 Subject: [PATCH 5/8] apacheHttpdPackages.php: 8.4.7 -> 8.4.8 (cherry picked from commit fffc35b2bbba8b0a0bf215bf19daa5cabe7da698) --- pkgs/development/interpreters/php/8.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 865b7b37180a..11a74cee28dc 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.7"; - hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg="; + version = "8.4.8"; + hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo="; } ); in From 83294d9a708cb42bf6b43f2dc969ab896cbdf618 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Jun 2025 12:20:08 +0200 Subject: [PATCH 6/8] php83: 8.3.21 -> 8.3.22 ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.22 (cherry picked from commit 3cf7d02c3eb8a375653a94929361d0b278daa46a) --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 61b3554a3489..00325c5ccb63 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.21"; - hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ="; + version = "8.3.22"; + hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs="; } ); in From 724cb2d8d211bd9cac016d928494b29cd71c22ca Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 7 Jun 2025 14:49:39 +0200 Subject: [PATCH 7/8] electron-bin: fix headers --- pkgs/development/tools/electron/binary/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 7d601cb9f71a..b51cc6eaaceb 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -92,7 +92,7 @@ "aarch64-darwin": "56c27f79c298bd21f6a0434b70776633ce9971667edf22783b4b3f0051646248", "aarch64-linux": "2172a9fa02331ba9c645dd6a6c5c6c07235e902c0aebb61b123d2f6c3ea0121f", "armv7l-linux": "03514c1e42d4215972add90eb828221aec29278113ecf6761ec014aee92b3c4e", - "headers": "0qjx7lyndd1wjaa264d9gv5jy4ys282pbcb2d9d8p4fv36biszag", + "headers": "0c4ij2lzamdmqpy5dygji31khj6xw13i2lrc28xrv1pq9lnnj2zd", "x86_64-darwin": "fb13c7bf7f01529e0084433166f6b66b149407d8f950ca176fde20f023ee64b6", "x86_64-linux": "da78b040068b6f0d41b3ccc5e5d26f1130bcdeba83f23ebbdae416c26bcf80e2" }, @@ -103,7 +103,7 @@ "aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108", "aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f", "armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3", - "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", + "headers": "0dbybqn081chrrgws8gxasliidd2k60px2fzdy20vmwz2nz61nn5", "x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847", "x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5" }, @@ -114,7 +114,7 @@ "aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d", "aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c", "armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635", - "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d", + "headers": "1qgy9vg3p0qvg5gd84z730lgbyp1ilrazjb5rwib50kv0z94r8g7", "x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91", "x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c" }, From 1769ae4c718d15bef29b6d9e2303bd55133ccf66 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 7 Jun 2025 14:49:53 +0200 Subject: [PATCH 8/8] electron-chromedriver: fix headers --- pkgs/development/tools/electron/chromedriver/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index cac977899d36..4b060e72a6be 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -59,7 +59,7 @@ "aarch64-darwin": "a3078146762ff67f27dd97470a9d2b4b5a04c182c6fcc5c949303e9a666b8d73", "aarch64-linux": "b0a9aa381fb4b12822408d8ca668b64cbc67c1b18b8a4e5dedd2d0ad7b3513f9", "armv7l-linux": "61a62d8b3d5604a098dc03cac7c89a325ff478d896921e286aabfd22735c64b1", - "headers": "0qjx7lyndd1wjaa264d9gv5jy4ys282pbcb2d9d8p4fv36biszag", + "headers": "0c4ij2lzamdmqpy5dygji31khj6xw13i2lrc28xrv1pq9lnnj2zd", "x86_64-darwin": "aa2ac2aa0dbe410ca152e85ceaf5baeb2cccb28bac7b52b866468edd5e6eb113", "x86_64-linux": "1a6b534f65c47d2e839f5da0efeeb449cebe622e731b624ccc8c91f493eeec4f" }, @@ -70,7 +70,7 @@ "aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4", "aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191", "armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65", - "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", + "headers": "0dbybqn081chrrgws8gxasliidd2k60px2fzdy20vmwz2nz61nn5", "x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862", "x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d" }, @@ -81,7 +81,7 @@ "aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2", "aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e", "armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e", - "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d", + "headers": "1qgy9vg3p0qvg5gd84z730lgbyp1ilrazjb5rwib50kv0z94r8g7", "x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5", "x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca" },