From 62a50cb6178870af3f3267f913c5ebf7f38d45d0 Mon Sep 17 00:00:00 2001 From: GreatNateDev Date: Tue, 7 Oct 2025 19:58:12 -0500 Subject: [PATCH 01/30] maintainers: add greatnatedev (cherry picked from commit 2f968d9524fa8d2784ad3047061462092e666734) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74e1cac7a5a0..2cca9f9b086e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9309,6 +9309,12 @@ name = "Greaka"; keys = [ { fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; } ]; }; + greatnatedev = { + email = "Nate@pelmel.net"; + github = "GreatNateDev"; + githubId = 99703235; + name = "Nate"; + }; greg = { email = "greg.hellings@gmail.com"; github = "greg-hellings"; From 943fc11803ff8ef69c0674cce5d1948020fca842 Mon Sep 17 00:00:00 2001 From: GreatNateDev Date: Tue, 7 Oct 2025 20:00:35 -0500 Subject: [PATCH 02/30] cruise: init at 1.1.0 (cherry picked from commit 5aabe811772127c7f8bcfa096dde84821777a3cd) --- pkgs/by-name/cr/cruise/package.nix | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/cr/cruise/package.nix diff --git a/pkgs/by-name/cr/cruise/package.nix b/pkgs/by-name/cr/cruise/package.nix new file mode 100644 index 000000000000..087e97b4feef --- /dev/null +++ b/pkgs/by-name/cr/cruise/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "cruise"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "NucleoFusion"; + repo = "cruise"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0xIugbLlKlMODbMvsFzQXjKNNGY61tF4P/0loPlfs6o="; + }; + + vendorHash = "sha256-Zx1rZl5ljlsBNV1eQKPtQ+SgJV9l5rS8hwBe8nX9dYQ="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for managing Docker containers, images, volumes, networks, and more"; + homepage = "https://github.com/NucleoFusion/cruise"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greatnatedev ]; + mainProgram = "cruise"; + platforms = lib.platforms.linux; + }; +}) From df7374e46033801cf412c4bb7eda4d3064011421 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 16 Oct 2025 00:39:38 +0200 Subject: [PATCH 03/30] samba: backport security patches from 4.21.9 https://www.samba.org/samba/security/CVE-2025-10230.html https://www.samba.org/samba/security/CVE-2025-9640.html Fixes: CVE-2025-9640, CVE-2025-10230 --- pkgs/servers/samba/4.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 967fa91ce2d8..1e6776e8191b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -104,6 +104,15 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/raboof/samba/-/commit/9995c5c234ece6888544cdbe6578d47e83dea0b5.patch"; hash = "sha256-TVKK/7wGsfP1pVf8o1NwazobiR8jVJCCMj/FWji3f2A="; }) + (fetchpatch { + name = "CVE-2025-9640_CVE-2025-10230.patch"; + url = "https://www.samba.org/samba/ftp/patches/security/samba-4.21.9-security-2025-10-15.patch"; + hash = "sha256-AFYffcep1EgdkjOkQUki8XCBLgrWeTqVbfXL5gVPcaY="; + excludes = [ + # does not exist in 4.20.x + "selftest/knownfail.d/samba4.nbt.wins.wins_bad_names" + ]; + }) ]; nativeBuildInputs = [ From d2ccc53f795a04368bccf848f0b463609511215d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Sep 2025 05:50:00 +0000 Subject: [PATCH 04/30] badkeys: 0.0.13 -> 0.0.14 (cherry picked from commit 55711c282652553c3fbc959953e58d190cb455dc) --- pkgs/by-name/ba/badkeys/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 4035dc26541a..9e48ffbf4064 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.13"; + version = "0.0.14"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${version}"; - hash = "sha256-xukdaqyQKEnwPmAN4WZqeLo5g2tJxPehabTyDgCv8q4="; + hash = "sha256-+vG0/RO36JPJQ6PB7y6PBAqs4KkMRR21GdTdx/UHHKE="; }; build-system = with python3Packages; [ From 9f9cb78ed6351c352317121e9610bbf374baf75b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Sep 2025 09:58:16 +0000 Subject: [PATCH 05/30] dosage-tracker: 1.9.10 -> 1.9.11 (cherry picked from commit b31a38f35373dcc1baf3154535d882e9f5b48ea7) --- pkgs/by-name/do/dosage-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 192d9017452c..705be1ce8bb4 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI="; + hash = "sha256-TS9niQd3jlALQrFu6H2SucZwwQp0k2BRHqZCYfbz+CI="; }; # https://github.com/NixOS/nixpkgs/issues/318830 From 021ea33e8e7bfe7de14b056aab762c4411326929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Oct 2025 01:37:23 +0000 Subject: [PATCH 06/30] python3Packages.apprise: 1.9.4 -> 1.9.5 (cherry picked from commit 09ac46a0068615a5582bbc6916cea42628f89b29) --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 0491a7bf5a62..4bf5cedaa077 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.9.4"; + version = "1.9.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SDEiruGaiaewdezUjvEa4315dE9660ULz5hammwoyYg="; + hash = "sha256-jzvjGLtCnCAXRw4zkoouMTy/dgD8dLgYR4KjcGDbNmo="; }; nativeBuildInputs = [ installShellFiles ]; From 567159c17bfb079668311431492e8817d96148de Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 15 Sep 2025 14:30:59 +0200 Subject: [PATCH 07/30] komikku: 1.86.0 -> 1.87.0 (cherry picked from commit bc531066ce8eb54bba2559c01bb074cb1dc6b02f) --- pkgs/by-name/ko/komikku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 9feb427dffe7..ab92ca3f4b1e 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.86.0"; + version = "1.87.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-LIiwQVXT0RWCli9twFA+cmf/LzKK9JjbRVA2xVu/XX4="; + hash = "sha256-mFHoQtZJlo412g0ElvpNdLN+Ni2Mr882VC7lvV+EVTs="; }; nativeBuildInputs = [ From 7f56e4dea28edc16f413db245d1ef0e84508c72b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 08:09:52 +0000 Subject: [PATCH 08/30] refine: 0.5.10 -> 0.6.0 (cherry picked from commit e389dca3ef870abf19530565e48d8911f5cf6b0f) --- pkgs/by-name/re/refine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 2a261744fdf5..2b3a2fc3c247 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.5.10"; + version = "0.6.0"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-/CyenSdF0dZR6HLw9FTv+OhJfNg55/dGE9y1A1hbcPA="; + hash = "sha256-EomhAJORgVBwBb6CUAKAW82SoRwN9CBCyI0nLuO9ii0="; }; nativeBuildInputs = [ From 71ca8b2a01aa55215ba8cf5e8e43f22382c64168 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Oct 2025 15:34:01 +0000 Subject: [PATCH 09/30] garnet: 1.0.83 -> 1.0.84 (cherry picked from commit e1be055b2cb08c1c35d4d9bb64dffb8528cb1c8b) --- pkgs/by-name/ga/garnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 70648119f20a..c48da99dbe0b 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.83"; + version = "1.0.84"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-Z1PNgCanrHVyWILwR1HYjJdhoToMU43G9mo1UlRfV8Q="; + hash = "sha256-Bg+WQrGs9HyH3E9Ry4fPrnfDcKL8WuTH798pwHrLIuo="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; From aa301280ae65de5df427390b8361771a5138da9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 22:34:21 +0000 Subject: [PATCH 10/30] google-chrome: 141.0.7390.76 -> 141.0.7390.107 (cherry picked from commit b3b96cb5f1ad0eab49d147a69b6fe57e584f08ff) --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d972845ebe02..fbf2b103a7ec 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.76"; + version = "141.0.7390.107"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-YSvDdI1TjdVn8EgKUpU4cWpFEhBzHE0w4Eq7xZBeBcc="; + hash = "sha256-dNc4pUaqghgMxibOpHn3p2H/85ByqpPDRYpUWXX7ZzU="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.77"; + version = "141.0.7390.108"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/jeyvrtxup7kpaugkbttlwg2vo4_141.0.7390.77/GoogleChrome-141.0.7390.77.dmg"; - hash = "sha256-DjYbV4Zg8gK5pdoyQ+3TT6vNQWRx53xKmIM/pUFCO5Q="; + url = "http://dl.google.com/release2/chrome/mevrk534jr6le7rbu7gatnuxym_141.0.7390.108/GoogleChrome-141.0.7390.108.dmg"; + hash = "sha256-gMWPUPyHV0HvNkMuk10Kii7IrNMaA0etTPhcddDSDGE="; }; dontPatch = true; From 68e8f0ee18627650a89302435fa20871e35d37ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Oct 2025 19:51:45 -0700 Subject: [PATCH 11/30] imagemagick: 7.1.2-6 -> 7.1.2-7 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-6...7.1.2-7 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md (cherry picked from commit c88330079a49acb5542a8908edca65c7514758c1) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 411006cb6e32..5d294fc73a28 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,13 +85,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-6"; + version = "7.1.2-7"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-eJCUryZhGn3LPkmP9JG1iVqZiy8RXARLYDZR++SeYgM="; + hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo="; }; outputs = [ From 96561e87e232c63ed773f56cc150c073dd1685f5 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 13 Oct 2025 11:17:01 +0200 Subject: [PATCH 12/30] linuxPackages.nvidiaPackages.legacy_535: 535.261.03 -> 535.274.02 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 (cherry picked from commit 286019e83d4ae3f5a641bf63e9d76c8bc528aa4a) --- 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 41ed246c4f92..80da94590942 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -153,12 +153,12 @@ rec { # Last one without the bug reported here: # https://bbs.archlinux.org/viewtopic.php?pid=2155426#p2155426 legacy_535 = generic { - version = "535.261.03"; - sha256_64bit = "sha256-10th0R6cm5BS9AQtbsRDfxPR3vMOlk4jLUfl1lnRHWg="; - sha256_aarch64 = "sha256-mkEtOsAcmdLKAhAKcTlZf86IBMUr9TPRG2BDcoaDSpM="; - openSha256 = "sha256-qUn0Kk9t6TZA6ZmUSPzqclOsU6n4Tp4dXkgGa1ZF+OA="; - settingsSha256 = "sha256-E05oCGuMdE3KhVrDl2ZQspaPqPHoVSwdaftoPKItYTE"; - persistencedSha256 = "sha256-pnOq9+6l3BbIEKHboGeTwEcEcYhtESzmroUfCahqn0U="; + version = "535.274.02"; + sha256_64bit = "sha256-O071TwaZHm3/94aN3nl/rZpFH+5o1SZ9+Hyivo5/KTs="; + sha256_aarch64 = "sha256-PgHcrqGf4E+ttnpho+N8SKsMQxnZn29fffHXGbeAxRw="; + openSha256 = "sha256-4KRHuTxlU0GT/cWf/j3aR7VqWpOez1ssS8zj/pYytes="; + settingsSha256 = "sha256-BXQMXKybl9mmsp+Y+ht1RjZqnn/H3hZfyGcKIGurxrI="; + persistencedSha256 = "sha256-/ZvAsvTjjiM/U3gn0DbxUguC3VvHbopyQ3u6+RYkzKk="; }; # Last one supporting Kepler architecture From b642864418d581233225eca3311eeda0891ce72f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 09:58:01 +0000 Subject: [PATCH 13/30] linuxKernel.kernels.linux_zen: 6.17.1 -> 6.17.2 (cherry picked from commit 1b94f25a881380f29e7ac76110e01a68d8133c6f) --- 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 e6762d04939f..a5f668e40c0c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.17.1"; # zen + version = "6.17.2"; # zen suffix = "zen1"; # zen - sha256 = "0610gcmzmvc70nw7n225avf1spahzffc6ajq18ibidra1k5q2msj"; # zen + sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen isLqx = false; }; # ./update-zen.py lqx From 3723b2ad851571ef9b022b0d7a02e807e3ae9795 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 15 Oct 2025 20:39:49 -0400 Subject: [PATCH 14/30] brave: 1.83.112 -> 1.83.118 https://community.brave.app/t/release-channel-1-83-118/644134 (cherry picked from commit 2237beb4d9789f6b374542a93959c9c3aea04678) --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index da7814cc6d12..ab0839301615 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.83.112"; + version = "1.83.118"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-IqPxbt3nCIrrqr3yVS0gDdiYsQ2OXVm3dabY8AH7IK0="; + hash = "sha256-daHMBEGYJBLYu2HP2oY1wYLhVC61DNT6EFlK/PBzqcw="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Q0V5V9JYGAgKAV3L43fy5I8ojIcxyU7C5OnqvatlkPE="; + hash = "sha256-KjcRXDxXAkhgAXgALzCN828+ovp2HURKL+VWT2DIMVI="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-bHePzMfb/FcCkH2aWqi8669mYcfTT/908ZasxOhFDHk="; + hash = "sha256-EnCEuLqYdV3gSwvcT19FUtRbPm79TdjUzL39sKpPTd8="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-DNtEb7stYQ5uG+L7pdXXQZp/6dtx9eUlLgM0MpNLJac="; + hash = "sha256-brj0EvOwX0i82ndPHBS9mqfliq/YnXyxGeiz4nA1qNw="; }; }; From 5cb435148bfee2cf5d5743a2599429e40c74b455 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 16 Oct 2025 12:57:38 +0200 Subject: [PATCH 15/30] frigate: fix arbitrary file read in export api https://github.com/blakeblackshear/frigate/security/advisories/GHSA-8gv4-5jr9-v96j Fixes: CVE-2025-62382 --- pkgs/by-name/fr/frigate/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 1ba1470bdadf..5f6306cf115c 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -4,6 +4,7 @@ callPackage, python312, fetchFromGitHub, + fetchpatch, fetchurl, rocmPackages, sqlite-vec, @@ -62,7 +63,15 @@ python.pkgs.buildPythonApplication rec { inherit src; - patches = [ ./constants.patch ]; + patches = [ + ./constants.patch + + (fetchpatch { + name = "CVE-2025-62382.patch"; + url = "https://github.com/blakeblackshear/frigate/commit/4d582062fba09f69fb40658fbe02b4f527dc46af.patch"; + hash = "sha256-AqIpE3CHI/YADr3wb6bdvZGxrtBy26+dsrMt9CZTA40="; + }) + ]; postPatch = '' echo 'VERSION = "${version}"' > frigate/version.py From 786f07652f0333d1b4df3784ee5046198c264d76 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 15 Oct 2025 14:17:54 -0300 Subject: [PATCH 16/30] godot/update.sh: redirect fetch output to stderr (cherry picked from commit f95dfedb98b7879f259b24096e02d7f72c57e9c3) --- pkgs/development/tools/godot/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/godot/update.sh b/pkgs/development/tools/godot/update.sh index 1cf654b70d87..ac2606c39c12 100755 --- a/pkgs/development/tools/godot/update.sh +++ b/pkgs/development/tools/godot/update.sh @@ -14,7 +14,7 @@ nix-update "$attr".godot \ [[ $(nix eval --raw -f. "$attr".godot) != "$prev_version" ]] || exit 0 fetch_deps=$(nix build -f. "$attr".godot-mono.fetch-deps --print-out-paths --no-link) -"$fetch_deps" +"$fetch_deps" >&2 update-source-version "$attr".godot.export-templates-bin --ignore-same-version --file="$file" update-source-version "$attr".godot-mono.export-templates-bin --ignore-same-version --file="$file" From 660a38c65a1aa0404a80f3bfac1e06108ab767a9 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 13 Oct 2025 07:19:35 +0000 Subject: [PATCH 17/30] linux_xanmod: 6.12.51 -> 6.12.52 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.52-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.51-xanmod1..6.12.52-xanmod1?from_project_id=51590166 (cherry picked from commit 94adf98d32b6e208f42ecc2cdcaddb821c31d655) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e67599ba49fa..3856f7d4d30b 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.51"; - hash = "sha256-7fIOQ7VctDhueoOnZA8/7Dc7gxAl+vKgO/X5Oa4Z8kE="; + version = "6.12.52"; + hash = "sha256-r9FntI8F0ri01lnFH7VYdQj8xR5gT+iInuDWv16oXJA="; isLTS = true; }; # ./update-xanmod.sh main From 0442d14abaad9ac7b0bc01bdec1abd8521153c58 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 13 Oct 2025 07:23:13 +0000 Subject: [PATCH 18/30] linux_xanmod_latest: 6.16.11 -> 6.16.12 - Changelog: https://dl.xanmod.org/changelog/6.16/ChangeLog-6.16.12-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.16.11-xanmod1..6.16.12-xanmod1?from_project_id=51590166 (cherry picked from commit 0e46539b6ca39c605a075168a805db8f9c82da7e) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3856f7d4d30b..b17c0b7ab9c0 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.16.11"; - hash = "sha256-EZjH22q8JvlbFpab4rdrA24kf+r9heneiwy5YM4WfYk="; + version = "6.16.12"; + hash = "sha256-m2aepV++9RwobXOTxiLJaUV8TnPvBkZzNooKQR4nRtA="; }; }; From 33690ebb20066f2314ab9a1b1061e1d756f92edf Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 16 Oct 2025 06:02:25 +0000 Subject: [PATCH 19/30] linux_xanmod: 6.12.52 -> 6.12.53 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.53-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.52-xanmod1..6.12.53-xanmod1?from_project_id=51590166 (cherry picked from commit 2529b8e1a2563b8a401d4cb76388bbfebcafce8c) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b17c0b7ab9c0..33db70a6b10c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.52"; - hash = "sha256-r9FntI8F0ri01lnFH7VYdQj8xR5gT+iInuDWv16oXJA="; + version = "6.12.53"; + hash = "sha256-BhaWUdfCgIvD0LA69I1NVIW0rv6JWQs+7HNLxOkrmGc="; isLTS = true; }; # ./update-xanmod.sh main From 9562d79adc70c8c4a7b57ed43f61756e79a85e74 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 16 Oct 2025 06:05:24 +0000 Subject: [PATCH 20/30] linux_xanmod_latest: 6.16.12 -> 6.17.3 - Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.3-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.16.12-xanmod1..6.17.3-xanmod1?from_project_id=51590166 (cherry picked from commit 185ed21533b6f1a41993bab1a327231f2c8e2563) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 33db70a6b10c..18d249d6e3f4 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.16.12"; - hash = "sha256-m2aepV++9RwobXOTxiLJaUV8TnPvBkZzNooKQR4nRtA="; + version = "6.17.3"; + hash = "sha256-VL1SCMB89P0UcCbtPdkjxcCZqQZpnSTlzzf9e8uzkyA="; }; }; From 23b412a17249c6280864f26e2951a611307e5781 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 15 Oct 2025 17:24:05 +0000 Subject: [PATCH 21/30] godot: 4.5-stable -> 4.5.1-stable (cherry picked from commit b306c675381fb696ab30be19aa88de3c9a4003dd) --- pkgs/development/tools/godot/4.5/default.nix | 8 +++---- pkgs/development/tools/godot/common.nix | 22 +++++++++---------- .../tools/godot/fix-freetype-link-error.patch | 16 -------------- 3 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/tools/godot/fix-freetype-link-error.patch diff --git a/pkgs/development/tools/godot/4.5/default.nix b/pkgs/development/tools/godot/4.5/default.nix index 0db38e4de8b3..ef4e38e5d920 100644 --- a/pkgs/development/tools/godot/4.5/default.nix +++ b/pkgs/development/tools/godot/4.5/default.nix @@ -1,11 +1,11 @@ { - version = "4.5-stable"; - hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8="; + version = "4.5.1-stable"; + hash = "sha256-8iMhn40y7aVL6Xjvo34ZtfygJYWwDmCnTxUJcV3AQCI="; default = { - exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM="; + exportTemplatesHash = "sha256-GZivN/E4doTiwhHNtIPa9JL8ZNxrEglr3c3KJbaRDIY="; }; mono = { - exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs="; + exportTemplatesHash = "sha256-xCVjMGG7SfQ5C9zs4rnOaLOwvjxxCVtAZE2PbxexFG4="; nugetDeps = ./deps.json; }; } diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index c8ba44274a13..07d996bd9143 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -173,18 +173,16 @@ let strictDeps = true; - patches = - lib.optionals (lib.versionOlder version "4.4") [ - (fetchpatch { - name = "wayland-header-fix.patch"; - url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; - hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; - }) - # Fix a crash in the mono test project build. It no longer seems to - # happen in 4.4, but an existing fix couldn't be identified. - ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ] - ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch; + patches = lib.optionals (lib.versionOlder version "4.4") [ + (fetchpatch { + name = "wayland-header-fix.patch"; + url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; + hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; + }) + # Fix a crash in the mono test project build. It no longer seems to + # happen in 4.4, but an existing fix couldn't be identified. + ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch + ]; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE diff --git a/pkgs/development/tools/godot/fix-freetype-link-error.patch b/pkgs/development/tools/godot/fix-freetype-link-error.patch deleted file mode 100644 index 6ae73c6aa68b..000000000000 --- a/pkgs/development/tools/godot/fix-freetype-link-error.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub -index 0a52ef46c5..c932900037 100644 ---- a/modules/freetype/SCsub -+++ b/modules/freetype/SCsub -@@ -62,9 +62,9 @@ if env["builtin_freetype"]: - if env["brotli"]: - env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"]) - -- env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) -+ env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"]) - # Also needed in main env for scene/ -- env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) -+ env.Prepend(CPPPATH=[thirdparty_dir + "/include"]) - - env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"]) - \ No newline at end of file From 38536ce0d03bb7ffe2e799789be87abae7dff617 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 12 Oct 2025 22:13:34 -0700 Subject: [PATCH 22/30] llvmPackages_git: 22.0.0-unstable-2025-10-05 -> 22.0.0-unstable-2025-10-12 (cherry picked from commit baad0182f107bf7cae4c24212e76a90aef98b7bf) --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4e41000a845a..d5ccbf45773a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -34,9 +34,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q="; "22.0.0-git".gitRelease = { - rev = "550b2ef041ba16ee8b5f55b5f2307f501b2c15a0"; - rev-version = "22.0.0-unstable-2025-10-05"; - sha256 = "sha256-K3wjvVFCjFpEDLdLWGWvAoAFGWWAKoD8a6xgXDslC7M="; + rev = "1d0a85a78b7ec7b994b280d30ca125fe58dbbd84"; + rev-version = "22.0.0-unstable-2025-10-12"; + sha256 = "sha256-68GnNkVPQ9NGyowndSpqqVBb/2AF9gmSwm38bjxmErQ="; }; } // llvmVersions; From e719bb7fe6f764c8b922878f353828c4c706b68b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 16 Oct 2025 15:57:17 +0200 Subject: [PATCH 23/30] envoy-bin: 1.34.8 -> 1.34.9 https://github.com/envoyproxy/envoy/releases/tag/v1.34.9 Signed-off-by: Paul Meyer --- pkgs/by-name/en/envoy-bin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index f0909c35431f..54cfdd6d9c9d 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.34.8"; + version = "1.34.9"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-ib7ZvweTo5Phle+P+Zbw0RuYkIV8krSSsQGv4r5wGO0="; - x86_64-linux = "sha256-K4xuLtLMzsq3MPCJl47y2MIAT3i4HAxwgRWTOPkimVk="; + aarch64-linux = "sha256-PsQg9snRRSjOh9z78wKT1Kk5Ye/fgxLYuOmNX9mxrLA="; + x86_64-linux = "sha256-NBSRNabbpzkl5iafMunx8MuqbCznu+28XwXr5jwyelM="; } .${system} or throwSystem; in From a0e44f72f8dccdde4875635cbc2d57504e7d1bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Jun 2025 14:58:42 -0700 Subject: [PATCH 24/30] bitwarden-cli: 2025.4.0 -> 2025.5.0 Diff: https://github.com/bitwarden/clients/compare/refs/tags/cli-v2025.4.0...refs/tags/cli-v2025.5.0 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2025.5.0 (cherry picked from commit 4c3eaa9dae561c84cd124809a3d1ddc80e1b63ab) --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index cefd69f51428..e7340fdd355e 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2025.4.0"; + version = "2025.5.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${version}"; - hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ="; + hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE="; + npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools From 09ccd1dc56df1ae8d78936901d1a6cad7ae09c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Jun 2025 15:15:48 -0700 Subject: [PATCH 25/30] bitwarden-cli: mark broken on Darwin (cherry picked from commit d004e444135eba374cdf723afb623fbd4955a264) --- pkgs/by-name/bi/bitwarden-cli/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index e7340fdd355e..85ee2cb8631f 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -97,6 +97,8 @@ buildNpmPackage rec { }; meta = { + # https://github.com/NixOS/nixpkgs/issues/339576 + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}"; description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; From f0a6fe9e54e13997fa2e26e3bea6be86246643eb Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 5 Oct 2025 00:57:23 +0800 Subject: [PATCH 26/30] bitwarden-cli: add xiaoxiangmoe as maintainer (cherry picked from commit 299202371c1b84c86ac6e57c9bcc5a75b572af1b) --- pkgs/by-name/bi/bitwarden-cli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 85ee2cb8631f..5e3d3a55a717 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -104,6 +104,9 @@ buildNpmPackage rec { homepage = "https://bitwarden.com"; license = lib.licenses.gpl3Only; mainProgram = "bw"; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + dotlambda + ]; }; } From eef4c62a2fe9228cff2274633fac5701a49ea47d Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 5 Oct 2025 00:56:11 +0800 Subject: [PATCH 27/30] bitwarden-cli: 2025.5.0 -> 2025.9.0 (cherry picked from commit 4af05f918e6ca929dbce6d588e722d3045ce2a93) --- .../bi/bitwarden-cli/fix-lockfile.patch | 567 ++++++++++++++++++ pkgs/by-name/bi/bitwarden-cli/package.nix | 43 +- 2 files changed, 592 insertions(+), 18 deletions(-) create mode 100644 pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch diff --git a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch new file mode 100644 index 000000000000..0b65d6552040 --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch @@ -0,0 +1,567 @@ +diff --git a/package-lock.json b/package-lock.json +index 1b4fe5f40e..fe3166797e 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -230,51 +230,6 @@ + "bw": "build/bw.js" + } + }, +- "apps/cli/node_modules/define-lazy-prop": { +- "version": "2.0.0", +- "license": "MIT", +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/is-docker": { +- "version": "2.2.1", +- "license": "MIT", +- "bin": { +- "is-docker": "cli.js" +- }, +- "engines": { +- "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "apps/cli/node_modules/is-wsl": { +- "version": "2.2.0", +- "license": "MIT", +- "dependencies": { +- "is-docker": "^2.0.0" +- }, +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/open": { +- "version": "8.4.2", +- "license": "MIT", +- "dependencies": { +- "define-lazy-prop": "^2.0.0", +- "is-docker": "^2.1.1", +- "is-wsl": "^2.2.0" +- }, +- "engines": { +- "node": ">=12" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, + "apps/desktop": { + "name": "@bitwarden/desktop", + "version": "2025.9.0", +@@ -4913,33 +4868,6 @@ + } + } + }, +- "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", +- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "anymatch": "~3.1.2", +- "braces": "~3.0.2", +- "glob-parent": "~5.1.2", +- "is-binary-path": "~2.1.0", +- "is-glob": "~4.0.1", +- "normalize-path": "~3.0.0", +- "readdirp": "~3.6.0" +- }, +- "engines": { +- "node": ">= 8.10.0" +- }, +- "funding": { +- "url": "https://paulmillr.com/funding/" +- }, +- "optionalDependencies": { +- "fsevents": "~2.3.2" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/@babel/core": { + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", +@@ -5122,21 +5050,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/@compodoc/compodoc/node_modules/glob-parent": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", +- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", +- "dev": true, +- "license": "ISC", +- "optional": true, +- "peer": true, +- "dependencies": { +- "is-glob": "^4.0.1" +- }, +- "engines": { +- "node": ">= 6" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/magic-string": { + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", +@@ -5147,36 +5060,6 @@ + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", +- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "picomatch": "^2.2.1" +- }, +- "engines": { +- "node": ">=8.10.0" +- } +- }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": { +- "version": "2.3.1", +- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", +- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": ">=8.6" +- }, +- "funding": { +- "url": "https://github.com/sponsors/jonschlinkert" +- } +- }, + "node_modules/@compodoc/live-server": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz", +@@ -5908,28 +5791,6 @@ + "node": ">=16.4" + } + }, +- "node_modules/@electron/windows-sign": { +- "version": "1.2.2", +- "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz", +- "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==", +- "dev": true, +- "license": "BSD-2-Clause", +- "optional": true, +- "peer": true, +- "dependencies": { +- "cross-dirname": "^0.1.0", +- "debug": "^4.3.4", +- "fs-extra": "^11.1.1", +- "minimist": "^1.2.8", +- "postject": "^1.0.0-alpha.6" +- }, +- "bin": { +- "electron-windows-sign": "bin/electron-windows-sign.js" +- }, +- "engines": { +- "node": ">=14.14" +- } +- }, + "node_modules/@emnapi/core": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", +@@ -8285,21 +8146,6 @@ + "@msgpack/msgpack": "^2.7.0" + } + }, +- "node_modules/@microsoft/signalr/node_modules/utf-8-validate": { +- "version": "5.0.10", +- "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", +- "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "node-gyp-build": "^4.3.0" +- }, +- "engines": { +- "node": ">=6.14.2" +- } +- }, + "node_modules/@microsoft/signalr/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", +@@ -11310,21 +11156,6 @@ + "linux" + ] + }, +- "node_modules/@rollup/rollup-linux-riscv64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz", +- "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", +@@ -18997,15 +18828,6 @@ + "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==", + "license": "MIT" + }, +- "node_modules/cross-dirname": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz", +- "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true +- }, + "node_modules/cross-env": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz", +@@ -33661,36 +33483,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/postject": { +- "version": "1.0.0-alpha.6", +- "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz", +- "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "commander": "^9.4.0" +- }, +- "bin": { +- "postject": "dist/cli.js" +- }, +- "engines": { +- "node": ">=14.0.0" +- } +- }, +- "node_modules/postject/node_modules/commander": { +- "version": "9.5.0", +- "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", +- "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": "^12.20.0 || >=14" +- } +- }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", +@@ -39330,291 +39122,6 @@ + } + } + }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz", +- "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz", +- "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz", +- "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz", +- "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz", +- "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz", +- "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz", +- "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz", +- "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz", +- "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz", +- "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz", +- "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==", +- "cpu": [ +- "loong64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz", +- "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==", +- "cpu": [ +- "ppc64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz", +- "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz", +- "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==", +- "cpu": [ +- "s390x" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz", +- "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz", +- "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz", +- "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz", +- "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==", +- "cpu": [ +- "ia32" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz", +- "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, + "node_modules/vite/node_modules/rollup": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz", diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 5e3d3a55a717..99fe107c25f7 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -2,37 +2,41 @@ lib, stdenv, buildNpmPackage, - nodejs_20, fetchFromGitHub, - cctools, - nix-update-script, - nixosTests, + nodejs_22, perl, xcbuild, + writableTmpDirAsHomeHook, + versionCheckHook, + nixosTests, + nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "bitwarden-cli"; - version = "2025.5.0"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - tag = "cli-v${version}"; - hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY="; + tag = "cli-v${finalAttrs.version}"; + hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to="; }; + patches = [ + ./fix-lockfile.patch + ]; + postPatch = '' # remove code under unfree license rm -r bitwarden_license ''; - nodejs = nodejs_20; + nodejs = nodejs_22; - npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls="; + npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - cctools perl xcbuild.xcrun ]; @@ -61,9 +65,6 @@ buildNpmPackage rec { rm -r node_modules/**/prebuilds shopt -u globstar - # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 - rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild - npm rebuild --verbose ''; @@ -84,6 +85,14 @@ buildNpmPackage rec { installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + passthru = { tests = { vaultwarden = nixosTests.vaultwarden.sqlite; @@ -97,9 +106,7 @@ buildNpmPackage rec { }; meta = { - # https://github.com/NixOS/nixpkgs/issues/339576 - broken = stdenv.hostPlatform.isDarwin; - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}"; + changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}"; description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3Only; @@ -109,4 +116,4 @@ buildNpmPackage rec { dotlambda ]; }; -} +}) From ac29b02d674306d17558b812443683c39a64c93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 16 Oct 2025 12:12:26 -0700 Subject: [PATCH 28/30] bitwarden-cli: don't use versionCheckHook We'd have to set `versionCheckProgram` manually. But even then, running `bw` requires `$HOME` to be writable but we cannot pass environment variables to the hook. Not-cherry-picked-because: #412768 and #411609 were not backported --- pkgs/by-name/bi/bitwarden-cli/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 99fe107c25f7..cb8fa8c11cae 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -6,8 +6,6 @@ nodejs_22, perl, xcbuild, - writableTmpDirAsHomeHook, - versionCheckHook, nixosTests, nix-update-script, }: @@ -85,14 +83,6 @@ buildNpmPackage (finalAttrs: { installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh) ''; - doInstallCheck = true; - nativeInstallCheckInputs = [ - writableTmpDirAsHomeHook - versionCheckHook - ]; - versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; - passthru = { tests = { vaultwarden = nixosTests.vaultwarden.sqlite; From 9f6531df6980e8a9d86b97c4aa6bf8174896ae7f Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Thu, 16 Oct 2025 02:33:33 +0200 Subject: [PATCH 29/30] matrix-authentication-service: 1.3.0 -> 1.4.1 https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.4.1 (cherry picked from commit 69ea3cdbaeca7a14f6e2dd69651392c5fc0d3405) --- pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 300b74623b11..e444e7584b41 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -18,21 +18,21 @@ rustPackages_1_88.rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-iwQ+ItcpjShEyRi3RI0IuXXmlfzamGFHrdZpp7wBBis="; + hash = "sha256-9mQXWpGy+oFK5cEWeW88CSZQqfpmOAUS1x9KkyEMg+0="; }; - cargoHash = "sha256-FgV2YfU2iqlYwoq3WCaM52fDmgKIQg2gx5q68P3Mhf0="; + cargoHash = "sha256-3ODOJY8/hksbMak8SsQP87rOnCd7+1G0wD4m5daPrbk="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-PGT8UCjsgyARHw2/lbCAMSNQr/5FqbDz0Auf90jjHLk="; + hash = "sha256-UgvT81DR4pWlQRfQgmecp+AOUSih4+/v7c1ApIDf3Ts="; }; npmRoot = "frontend"; From 2cc94ad650e32532d1453d6bbe27d3530aea7146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Oct 2025 19:08:01 +0000 Subject: [PATCH 30/30] postfix-tlspol: 1.8.18 -> 1.8.19 (cherry picked from commit 8f733cf1229450aa6819451d6f1923c6f09ce0e0) --- pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 153438f7a340..948b5204a225 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.18"; + version = "1.8.19"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-ijFKFvdmA1ZHOc3r89yalVSO/tMy9Rzeu1VTgdZLlxI="; + hash = "sha256-DSkWE76GSQKkrXAlnMvjTPAa4I4J07mZL9eea06Dzb8="; }; vendorHash = null;