From 28ed72af084b1a305f62f65fbfcd5a9cac5b9837 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 21 Sep 2025 16:29:51 -0300 Subject: [PATCH 01/18] keka: 1.4.6 -> 1.6.0 (cherry picked from commit 4196b73abf884e16fddb6173ac874d7c1182377e) --- pkgs/by-name/ke/keka/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index 9a14753cb219..fcea35e15e49 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keka"; - version = "1.4.6"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; - hash = "sha256-IgPnXHVtAaSOsaAYvo0ELRqvXpF2qAnJ/1QZ+FHzqn4="; + hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY="; }; nativeBuildInputs = [ makeWrapper ]; From 5b949385cc31e212afcb9e2737c39db49985e358 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 21 Sep 2025 16:30:56 -0300 Subject: [PATCH 02/18] keka: add maintainer iedame (cherry picked from commit e17e4729771e448162cf770a8a06bb40fdbe1ca9) --- pkgs/by-name/ke/keka/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index fcea35e15e49..82c36600c333 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + iedame + ]; platforms = lib.platforms.darwin; }; }) From 81d74e1200d71814526ed28fbfe59e51e31e424d Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 23 Jun 2025 23:24:22 +0200 Subject: [PATCH 03/18] victoriametrics: 1.119.0 -> 1.120.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.120.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.119.0...v1.120.0 (cherry picked from commit 7891319ca81736c66ebd56d1d95a6941f74c5096) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 5d9cd54783a6..ce2dbc4b2cc1 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.119.0"; + version = "1.120.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gc3B3JmTbINdPJ8PIhcuQhFD+FoxNOskoBEcDoMAUUk="; + hash = "sha256-tU3rRdYpP0uO0SeIuYarHwJu80m/iRVbYtlbON1WeSQ="; }; vendorHash = null; From 3008012afc5ac51bfc40b80bc114a62ab20fc686 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 7 Jul 2025 21:13:50 +0200 Subject: [PATCH 04/18] victoriametrics: 1.120.0 -> 1.121.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.121.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.120.0...v1.121.0 (cherry picked from commit 0a336af7a25f7b0518cff30ab8da516719d48a5a) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index ce2dbc4b2cc1..ad52b77849fa 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.120.0"; + version = "1.121.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-tU3rRdYpP0uO0SeIuYarHwJu80m/iRVbYtlbON1WeSQ="; + hash = "sha256-hCZU6O3synVayg253Cbsonzad3ZBMx1B/yJwBJzU+X0="; }; vendorHash = null; From ef164fa2ae6bc942f84be5159ef33ee5946ed498 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 21 Jul 2025 16:31:21 +0200 Subject: [PATCH 05/18] victoriametrics: 1.121.0 -> 1.122.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.122.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.121.0...v1.122.0 (cherry picked from commit ecf78c8165d1cc5c860e9b9d2b85eba98f6775ae) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index ad52b77849fa..6c43be259cd8 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.121.0"; + version = "1.122.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-hCZU6O3synVayg253Cbsonzad3ZBMx1B/yJwBJzU+X0="; + hash = "sha256-CpxnCW4+hsc3SQZXMI0pkPnKPvh1GTvCmhg5NkSZbk4="; }; vendorHash = null; From 96d88e8d2caca3c2711426f1757ddc34e922a81b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 4 Aug 2025 17:51:10 +0200 Subject: [PATCH 06/18] victoriametrics: 1.122.0 -> 1.123.0 (cherry picked from commit 2e547a5f13af40ac74ff4b66808402c9ff472ee3) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 6c43be259cd8..355e507aa250 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.122.0"; + version = "1.123.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-CpxnCW4+hsc3SQZXMI0pkPnKPvh1GTvCmhg5NkSZbk4="; + hash = "sha256-GUVRMlF94BaZSVfz4Z+IBSpf6WuA5o1WQQmeZAqKZ1g="; }; vendorHash = null; From 872c20ca1dfc6ea1cb78fff34a417cd0080b4aba Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 18 Aug 2025 21:31:44 +0200 Subject: [PATCH 07/18] victoriametrics: 1.123.0 -> 1.124.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.124.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.123.0...v1.124.0 (cherry picked from commit 30db5ac53228dace25ce1a55ca179dc608eabbac) --- pkgs/by-name/vi/victoriametrics/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 355e507aa250..b032274256d8 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.123.0"; + version = "1.124.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-GUVRMlF94BaZSVfz4Z+IBSpf6WuA5o1WQQmeZAqKZ1g="; + hash = "sha256-f0Mf/4cFnJ/3I8z/4UhhNJnSCau9Q7mFfR32lP9/yi0="; }; vendorHash = null; @@ -58,6 +58,10 @@ buildGoModule (finalAttrs: { # This appears to be some kind of test server for development purposes only. rm -f app/vmui/packages/vmui/web/{go.mod,main.go} + # Allow older go versions + substituteInPlace go.mod \ + --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}" + # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ --replace-fail "time.After(10 " "time.After(120 " \ From 9f954abdf8010328bdd2a76baca782ed9a75acef Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 1 Sep 2025 16:25:20 +0200 Subject: [PATCH 08/18] victoriametrics: 1.124.0 -> 1.125.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.125.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.124.0...v1.125.0 (cherry picked from commit 07500b883b4f829e617dbffeb590e41906b32a69) --- pkgs/by-name/vi/victoriametrics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index b032274256d8..73fa52ff79bd 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.124.0"; + version = "1.125.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-f0Mf/4cFnJ/3I8z/4UhhNJnSCau9Q7mFfR32lP9/yi0="; + hash = "sha256-Xhurksf2BMw+v+4PsKm9o+XO2KfYX9wZTlq/kLLxVYc="; }; vendorHash = null; @@ -60,7 +60,7 @@ buildGoModule (finalAttrs: { # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ From 699b2e31e126dcf99f1a354df58fceb2eb195ec2 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 3 Sep 2025 20:32:48 +0200 Subject: [PATCH 09/18] victoriametrics: 1.125.0 -> 1.125.1 (cherry picked from commit 9a38b160a050bca52d0a2c5a717116c1e60ade6f) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 73fa52ff79bd..0740362ad776 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.125.0"; + version = "1.125.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xhurksf2BMw+v+4PsKm9o+XO2KfYX9wZTlq/kLLxVYc="; + hash = "sha256-pRYazo13K5mjdwQD3VJcX9Js4xEG9dgz7MbM8HvxWV0="; }; vendorHash = null; From 5c43e7429741142bfb7ecee57483ca4a76f6b085 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 15 Sep 2025 17:12:54 +0200 Subject: [PATCH 10/18] victoriametrics: 1.125.1 -> 1.126.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.126.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.125.1...v1.126.0 (cherry picked from commit c8a31e68b3b7ca9aac72cde2aceaaec64fc5f056) --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 0740362ad776..d23ec408ec40 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.125.1"; + version = "1.126.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-pRYazo13K5mjdwQD3VJcX9Js4xEG9dgz7MbM8HvxWV0="; + hash = "sha256-QVeg/F7oPPgSRTi5jcfTj15bD/7fQoPopahpUP9b0UA="; }; vendorHash = null; From 5f7a8bdc477f71319244a3e4112a1a1ab9db3151 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 8 Oct 2025 10:48:22 +0200 Subject: [PATCH 11/18] victoriametrics: 1.126.0 -> 1.127.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.127.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.126.0...v1.127.0 (cherry picked from commit 37ca1da7600b7634ea7d715244bcda18340c0ecf) --- pkgs/by-name/vi/victoriametrics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index d23ec408ec40..b1766310f304 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.126.0"; + version = "1.127.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-QVeg/F7oPPgSRTi5jcfTj15bD/7fQoPopahpUP9b0UA="; + hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI="; }; vendorHash = null; @@ -60,7 +60,7 @@ buildGoModule (finalAttrs: { # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ From 28369a4b82d3f484b9917806770bfef689450c1b Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 10 Oct 2025 18:25:18 +0200 Subject: [PATCH 12/18] linuxPackages.nvidiaPackages.production: 570.153.02 -> 570.195.03 https://nvidia.custhelp.com/app/answers/detail/a_id/5703/~/security-bulletin%3A-nvidia-gpu-display-drivers---october-2025 Addresses CVE-2025-23280, CVE-2025-23282, CVE-2025-23300, CVE-2025-23330, CVE-2025-23332, CVE-2025-23345 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 19e411108751..41ed246c4f92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "570.153.02"; - sha256_64bit = "sha256-FIiG5PaVdvqPpnFA5uXdblH5Cy7HSmXxp6czTfpd4bY="; - sha256_aarch64 = "sha256-FKhtEVChfw/1sV5FlFVmia/kE1HbahDJaxTlpNETlrA="; - openSha256 = "sha256-2DpY3rgQjYFuPfTY4U/5TcrvNqsWWnsOSX0f2TfVgTs="; - settingsSha256 = "sha256-5m6caud68Owy4WNqxlIQPXgEmbTe4kZV2vZyTWHWe+M="; - persistencedSha256 = "sha256-OSo4Od7NmezRdGm7BLLzYseWABwNGdsomBCkOsNvOxA="; + version = "570.195.03"; + sha256_64bit = "sha256-1H3oHZpRNJamCtyc+nL+nhYsZfJyL7lgxPUxvXrF3B4="; + sha256_aarch64 = "sha256-o4rgB6vo+Cv90lJywovIyVARRGS3R15zYQUj+f1nzWQ="; + openSha256 = "sha256-vCBB/UJgVKHlSEWdgoF45lODr3YJmR6JwjrwWgWszBw="; + settingsSha256 = "sha256-mjKkMEPV6W69PO8jKAKxAS861B82CtCpwVTeNr5CqUY="; + persistencedSha256 = "sha256-BMpo2PIabhHjZQqUQi/W5DYhgAPmfCdFvXdN6ND2Bfs="; patches = [ gpl_symbols_linux_615_patch ]; }; From 926c2b0ea1ad15ca67af226282a086599b818b5b Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Wed, 8 Oct 2025 10:42:16 +0200 Subject: [PATCH 13/18] pyfa: 2.64.1 -> 2.64.2 (cherry picked from commit b0df84143c66d36e9d6dc917b195db7ff10c107d) --- pkgs/by-name/py/pyfa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 262cc926e074..c505bdb229b2 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.64.1"; + version = "2.64.2"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-qqfJ8nYI1y74sGJDbwrq0mT03em62BmU+y6GPmUUIIo="; + hash = "sha256-82zXMcIQPXTjMnKwhfpkm2apwDXLwKpbyglah6yHz/E="; }; desktopItems = [ From 5b3a0db487b0ef3ba32adea3318bc0e22be73aee Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Mon, 15 Sep 2025 02:24:35 +0700 Subject: [PATCH 14/18] kimai: fix bundled assets missing We were relying on `composerNoScripts = false` to make sure post-install command `assets:install` is run. `assets:install` copies assets from `vendor/` directory into `public/` directory, placing it in appropriate places. However, with commit 80bb9aec24 ("kimai: switch to buildComposerProject2 and tag"), we switched to `buildComposerProject2` which has moved `composer install` step to `composerVendor` derivation. By design, `composerVendor` ignores anything that happens outside `vendor/`, so the assets was not copied into final derivation. So stop relying on `composerNoScripts = false` and run `assets:install` ourselves in `postInstall` step. A side effect of this is that there is another post-install step being skipped (`cache:clear`). However we simply handle caches outside of the derivation (it's handled in the module), so that's not a problem. Fixes: https://github.com/NixOS/nixpkgs/issues/442208 (cherry picked from commit 1422ed88014e9a43d262fa5c3ff5a925d135c030) --- nixos/tests/kimai.nix | 3 +++ pkgs/by-name/ki/kimai/package.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kimai.nix b/nixos/tests/kimai.nix index 967d531f3c54..526aa7faeeb6 100644 --- a/nixos/tests/kimai.nix +++ b/nixos/tests/kimai.nix @@ -17,5 +17,8 @@ machine.wait_for_unit("nginx.service") machine.wait_for_open_port(80) machine.succeed("curl -v --location --fail http://localhost/") + # Make sure bundled assets are served. + # https://github.com/NixOS/nixpkgs/issues/442208 + machine.succeed("curl -v --location --fail http://localhost/bundles/tabler/tabler.css") ''; } diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index a5eb7fd6948b..5588625860bb 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -41,13 +41,16 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ="; composerNoPlugins = false; - composerNoScripts = false; postInstall = '' # Make available the console utility, as Kimai doesn't list this in # composer.json. mkdir -p "$out"/share/php/kimai "$out"/bin ln -s "$out"/share/php/kimai/bin/console "$out"/bin/console + + # Install bundled assets. This is normally done in the `composer install` + # post-install script, but it's being skipped. + (cd "$out"/share/php/kimai && php ./bin/console assets:install) ''; passthru.tests = { From 5b115fd2fc1c4002fba9f9ad7057489c6cbf34e6 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 11 Oct 2025 09:48:22 +0200 Subject: [PATCH 15/18] wordpress_6_7: 6.7.2 -> 6.7.3 Fixes CVE-2025-58246 and CVE-2025-58674. https://wordpress.org/news/2025/09/wordpress-6-8-3-release/ (cherry picked from commit cfdb6c1284f95e29bda18b985ca4b2131dc53a67) --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 744243f19793..56adb31fa006 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress_6_8; wordpress_6_7 = { - version = "6.7.2"; - hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY="; + version = "6.7.3"; + hash = "sha256-zWLpZ/NKla1u4CHh2Bu0P7UmFWvnuTUheRq6Bq5NZjU="; }; wordpress_6_8 = { version = "6.8.3"; From 913afa5dac74017c6b7a515cc3f7f50b4794c747 Mon Sep 17 00:00:00 2001 From: isomo Date: Wed, 1 Oct 2025 17:25:29 +0800 Subject: [PATCH 16/18] vscode: 1.104.1 -> 1.104.2 (cherry picked from commit 06d40e889f6b16d014965d3c803f846975df99ac) --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index cb741ef730fd..25663ca9e60c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-y0Bjrxmp7DYV4iUDnQGC0aIYrQNM3oPicajbeVuEtqc="; - x86_64-darwin = "sha256-6/BiMvVp955PW0hz22+NzdvC+IC+pNYjz25n3Op6V/k="; - aarch64-linux = "sha256-DF8QnqvVFqNyxjrphR6NaUXOKr8Koe34NitRa5mTBYs="; - aarch64-darwin = "sha256-v+m8AMpPph6CztUCjneBKC9txEOAKvcHsAXr/8KjIeA="; - armv7l-linux = "sha256-py1FZYd77YVNloQbXm36ou4HGowmteY8HzOiUioGD8Y="; + x86_64-linux = "sha256-0zgsR0nk9zsOeEcKhrmAFbAhvKKFNsC8fXjCnxFcndE="; + x86_64-darwin = "sha256-4+3T3axXNfePEkevhLwRPeqoxKs2OTL7B7TiV2BxZWc="; + aarch64-linux = "sha256-iGLtuVFA5NphiF1PU9Pus/nZ8PyCNNzDOpcQ+utYE2I="; + aarch64-darwin = "sha256-E4BopxbqH1lg1Q2NlyWjH8jytabiv5y4hG5ZJW4nqzs="; + armv7l-linux = "sha256-YIidKSsqK3DSAfPd7O1pbft1C/ny/iB+CFbR/T9u7L8="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.104.1"; + version = "1.104.2"; # This is used for VS Code - Remote SSH test - rev = "0f0d87fa9e96c856c5212fc86db137ac0d783365"; + rev = "e3a5acfb517a443235981655413d566533107e92"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-o0O/WDH+hr3R9np+WPLJo+/nIVBRjP8H2JVwa8volfg="; + hash = "sha256-Tz1P8eGokG+8thao9dRllAdTxvllhfOEDKH9lC2QwB0="; }; stdenv = stdenvNoCC; }; From 67e772c763a5b4def7f31d667da2526e70c7c1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 25 Apr 2025 21:47:45 +0200 Subject: [PATCH 17/18] python3Packages.python-ldap: enable darwin tests (cherry picked from commit 9f4f753fec3ac31cc019f67a234f349a47b6db85) --- pkgs/development/python-modules/python-ldap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 0178f620c1d3..3ef438678abb 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.hostPlatform.isDarwin; + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Python modules for implementing LDAP clients"; From a753a94bd714125583bb7da397f66a9d79419957 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 10 Oct 2025 22:08:43 +0200 Subject: [PATCH 18/18] python3Packages.python-ldap: 3.4.4 -> 3.4.5 https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-3.4.5 Fixes: CVE-2025-61911, CVE-2025-61912 (cherry picked from commit 8619190cc709019cfcd9d56e341d626e17768bbe) --- .../python-modules/python-ldap/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 3ef438678abb..4ac1ade56c3e 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system distutils, @@ -23,18 +21,21 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.4"; + version = "3.4.5"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "python-ldap"; repo = "python-ldap"; tag = "python-ldap-${version}"; - hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; + hash = "sha256-olRu5HacRKaAcNbQczA+UCbDxhySUOO7qH0KdWlSbT0="; }; + postPatch = '' + # unused in 3.4.5; https://github.com/python-ldap/python-ldap/pull/597 + sed -i "/setuptools-scm/d" pyproject.toml + ''; + build-system = [ distutils setuptools