From 875e6ad20a4f62d1b2c6c9e395f74f07b105e7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Tue, 2 Jul 2024 08:58:41 +0200 Subject: [PATCH 1/8] nixos/systemd-boot: Fix regression in builder script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid running Python scripts in the root of the package, as this triggers `os.listdir` on the Nix store directory during import. This operation can be time-consuming on large store directories (see issue #283795 for more details). The issue was initially fixed in #284153 but was reverted in #306339. Co-authored-by: Sönke Hahn (cherry picked from commit 251b0c958fe97380fdbca35f329de2419c9bb010) --- .../system/boot/loader/systemd-boot/systemd-boot.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index f66501431df2..5dfea5b615a3 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,6 +22,10 @@ let ''; systemdBootBuilder = pkgs.substituteAll rec { + name = "systemd-boot"; + + dir = "bin"; + src = checkedSource; isExecutable = true; @@ -82,7 +86,7 @@ let finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' #!${pkgs.runtimeShell} - ${systemdBootBuilder} "$@" + ${systemdBootBuilder}/bin/systemd-boot "$@" ${cfg.extraInstallCommands} ''; in { From 6d9130241b8da16ac3e50f99579cdfc365fcc417 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 18 Sep 2024 21:14:13 +0300 Subject: [PATCH 2/8] linux_6_10: 6.10.10 -> 6.10.11 (cherry picked from commit ccdb30bc27cd2dc222fa00e81af660e6b817162e) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ce729e618e43..0edfc58a0084 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,8 +36,8 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.10", - "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6" + "version": "6.10.11", + "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" }, "6.11": { "version": "6.11", From c223f30f166c963b696e924c86622c0a4fbf76ee Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 18 Sep 2024 21:14:48 +0300 Subject: [PATCH 3/8] linux_6_6: 6.6.51 -> 6.6.52 (cherry picked from commit 9bb5c9ae1b0b1906e3e3764736c221063dcc2165) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 0edfc58a0084..5e91cf70e1ae 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { - "version": "6.6.51", - "hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w" + "version": "6.6.52", + "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m" }, "6.8": { "version": "6.8.12", From d4f1570582ebf7d4eb71beac09e217dd312656de Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 18 Sep 2024 21:14:57 +0300 Subject: [PATCH 4/8] linux_6_1: 6.1.110 -> 6.1.111 (cherry picked from commit a2787576bb8dc31ef608d542d83ec01aca35744b) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5e91cf70e1ae..ba862f9551c7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy" }, "6.1": { - "version": "6.1.110", - "hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly" + "version": "6.1.111", + "hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4" }, "5.15": { "version": "5.15.167", From f92d957a4103d1b160d2b79a0058bfbbcc36c5e5 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:33:15 +0530 Subject: [PATCH 5/8] linuxPackages_latest.nct6687d: 0-unstable-2024-02-23 -> 0-unstable-2024-09-02 (cherry picked from commit f8a752fa37f0d89a93bd527d44e9f3ed3667622a) --- pkgs/os-specific/linux/nct6687d/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 35e77c7922df..7a3700d4c318 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "nct6687d"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-09-02"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "0ee35ed9541bde22fe219305d1647b51ed010c5e"; - hash = "sha256-g81U+ngnsOslBDCQP51uDDyHPpCv9T/j+KmFUAQfz/M="; + rev = "f45b72a6ca335e20f8a2df5ee5d4e130916150d0"; + hash = "sha256-2sAL6aXUafmm2DKIhqEoTSPZVmzu/lnTkpPznJndX3o="; }; setSourceRoot = '' From 33e19693663cc26f3ec11623985f0616973ddb15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 10:13:58 +0000 Subject: [PATCH 6/8] discord-ptb: 0.0.103 -> 0.0.105 (cherry picked from commit a597aac695658848ae043c8beb68651fc1089d05) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 891bc2423b98..b62be88b132c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.67"; - ptb = "0.0.103"; + ptb = "0.0.105"; canary = "0.0.483"; development = "0.0.28"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-BYzISVHSlKqVN0Egkw5su1wJnrGjQYbxYV840bDCakM="; + hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From b768cf74944b22ae798c0c2552f2eee6c431a417 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 19 Sep 2024 16:24:49 +0300 Subject: [PATCH 7/8] gnome.sushi: use actual upstream url as homepage (cherry picked from commit 9f3c106bf1beeed3b5cffd8530a35e3fb8d63019) --- pkgs/desktops/gnome/core/sushi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index c6165869a34e..d0007a8492ed 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; + homepage = "https://gitlab.gnome.org/GNOME/sushi"; description = "A quick previewer for Nautilus"; mainProgram = "sushi"; maintainers = teams.gnome.members; From 85eeb641b1cb30a16ad77fb66c4f56c16c1183b4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 19 Sep 2024 12:25:55 -0400 Subject: [PATCH 8/8] patroni: 3.3.2 -> 3.3.3 https://github.com/patroni/patroni/blob/v3.3.3/docs/releases.rst#version-333 --- pkgs/servers/sql/patroni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 844fbafec65c..369b3cc836b6 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7Tq7i6AH6tt9Uyx276rVBwvbxxETRyVKnhhTijW02sU="; + sha256 = "sha256-LIdW62LLEmsQZJMbInb1vbKaKgEEBBU1HGyLLNitjjg="; }; propagatedBuildInputs = with pythonPackages; [