From 732b3d1801bf4d4852c857455526967d63886936 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Mon, 31 Mar 2025 12:10:46 +0200
Subject: [PATCH 01/34] wasmtime: include `conf.h` in `include/wasmtime`

---
 .../interpreters/wasmtime/default.nix         | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 9201f0e9c947..a8d438430d62 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,20 +2,21 @@
   lib,
   rustPlatform,
   cmake,
-  rustfmt,
   fetchFromGitHub,
   Security,
   stdenv,
 }:
-
-rustPlatform.buildRustPackage rec {
+let
+  inherit (stdenv.targetPlatform.rust) cargoShortTarget;
+in
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
   version = "31.0.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
-    repo = pname;
-    rev = "v${version}";
+    repo = "wasmtime";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo=";
     fetchSubmodules = true;
   };
@@ -37,15 +38,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
-
-  # rustfmt is brought into scope to fix the following
-  #   warning: cranelift-codegen@0.108.0:
-  #   Failed to run `rustfmt` on ISLE-generated code: Os
-  #   { code: 2, kind: NotFound, message: "No such file or directory" }
-  nativeBuildInputs = [
-    cmake
-    rustfmt
-  ];
+  nativeBuildInputs = [ cmake ];
 
   doCheck =
     with stdenv.buildPlatform;
@@ -65,9 +58,15 @@ rustPlatform.buildRustPackage rec {
       install -m 0644 ''${!outputLib}/lib/* $dev/lib
       rm -r ''${!outputLib}/lib
 
+      # copy the build.rs generated c-api headers
       install -d -m0755 $dev/include/wasmtime
-      install -m0644 $src/crates/c-api/include/*.h $dev/include
-      install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime
+      # https://github.com/rust-lang/cargo/issues/9661
+      install -m0644 \
+        target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/*.h \
+        $dev/include
+      install -m0644 \
+        target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/wasmtime/*.h \
+        $dev/include/wasmtime
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install_name_tool -id \
@@ -75,16 +74,16 @@ rustPlatform.buildRustPackage rec {
         $dev/lib/libwasmtime.dylib
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
     homepage = "https://wasmtime.dev/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "wasmtime";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       ereslibre
       matthewbauer
     ];
-    platforms = platforms.unix;
-    changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${version}/RELEASES.md";
+    platforms = lib.platforms.unix;
+    changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${finalAttrs.version}/RELEASES.md";
   };
-}
+})

From a92d4ccd5bcc5202b06a0a17b062769e1fb397d9 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Sun, 6 Apr 2025 22:34:10 +0200
Subject: [PATCH 02/34] sitespeed-io: 34.0.1 -> 37.3.2

---
 pkgs/by-name/si/sitespeed-io/package.nix | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 886fe060694d..ba4399a9f0f0 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   buildNpmPackage,
-  nodejs_18,
+  systemdLibs,
   coreutils,
   ffmpeg-headless,
   imagemagick_light,
@@ -26,17 +26,15 @@ assert
   (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
 buildNpmPackage rec {
   pname = "sitespeed-io";
-  version = "34.0.1";
+  version = "37.3.2";
 
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
-    rev = "v${version}";
-    hash = "sha256-yC/TlAJa71hbPYYuqPV+k3syGuo/VhnNjXmmxh47ySQ=";
+    tag = "v${version}";
+    hash = "sha256-sLRwNWAP83Lcnz39AkPc//NIGwRf70UqritTVJqMiws=";
   };
 
-  nodejs = nodejs_18;
-
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json
   '';
@@ -46,9 +44,13 @@ buildNpmPackage rec {
   GECKODRIVER_SKIP_DOWNLOAD = true;
   EDGEDRIVER_SKIP_DOWNLOAD = true;
 
+  buildInputs = [
+    systemdLibs
+  ];
+
   dontNpmBuild = true;
   npmInstallFlags = [ "--omit=dev" ];
-  npmDepsHash = "sha256-Q0cWxV5OOaG8Z3aM2j0HtD1e9yPFVDSRcMKBf/yscv4=";
+  npmDepsHash = "sha256-mDcvAvZgTJ4vEHb6ZAtZrBnmHglf1i4Yipl3bxIkw0s=";
 
   postInstall = ''
     mv $out/bin/sitespeed{.,-}io
@@ -71,7 +73,7 @@ buildNpmPackage rec {
     ''
       wrapProgram $out/bin/sitespeed-io \
         --set PATH ${
-          lib.makeBinPath ([
+          lib.makeBinPath [
             (python3.withPackages (p: [
               p.numpy
               p.opencv4
@@ -82,7 +84,7 @@ buildNpmPackage rec {
             xorg.xorgserver
             procps
             coreutils
-          ])
+          ]
         } \
         ${lib.optionalString withChromium "--add-flags '${chromiumArgs}'"} \
         ${lib.optionalString withFirefox "--add-flags '${firefoxArgs}'"} \
@@ -94,11 +96,11 @@ buildNpmPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open source tool that helps you monitor, analyze and optimize your website speed and performance";
     homepage = "https://sitespeed.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ misterio77 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ misterio77 ];
     platforms = lib.unique (geckodriver.meta.platforms ++ chromedriver.meta.platforms);
     mainProgram = "sitespeed-io";
   };

From e16a290a9c1316fd4d484b206d94d7f8a93a7164 Mon Sep 17 00:00:00 2001
From: Noah <pro@noahcode.dev>
Date: Sat, 5 Apr 2025 03:07:08 +0200
Subject: [PATCH 03/34] foodfetch: init at 0.1.1

Apply suggestions from code review

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>

fix

Update pkgs/by-name/fo/foodfetch/package.nix

Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com>

Update pkgs/by-name/fo/foodfetch/package.nix

Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com>
---
 pkgs/by-name/fo/foodfetch/package.nix | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/fo/foodfetch/package.nix

diff --git a/pkgs/by-name/fo/foodfetch/package.nix b/pkgs/by-name/fo/foodfetch/package.nix
new file mode 100644
index 000000000000..83b2f0b9a864
--- /dev/null
+++ b/pkgs/by-name/fo/foodfetch/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "foodfetch";
+  version = "0.1.1";
+  src = fetchFromGitHub {
+    owner = "noahfraiture";
+    repo = "foodfetch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TUgj3zS18lCtkyxYrG4f156YqFSCGXzfbK6b+Owacto=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ZPV6sDQHV+G0HxRAVlcilh4tCCQspTnxnH1aHxVP8tI=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  doInstallCheck = true;
+  nativeInstallCheck = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/noahfraiture/foodfetch/releases/tag/v${finalAttrs.version}";
+    description = "Yet another fetch to quickly get recipes";
+    homepage = "https://github.com/noahfraiture/foodfetch";
+    license = lib.licenses.mit;
+    mainProgram = "foodfetch";
+    maintainers = with lib.maintainers; [ noahfraiture ];
+  };
+})

From a503352bd4f01122721be5e2c7b210e273840a98 Mon Sep 17 00:00:00 2001
From: Noah <pro@noahcode.dev>
Date: Wed, 9 Apr 2025 00:50:57 +0200
Subject: [PATCH 04/34] maintainers: add noahfraiture

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 014ac42e06cd..34f30f43630d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17279,6 +17279,12 @@
     github = "noaccOS";
     githubId = 24324352;
   };
+  noahfraiture = {
+    name = "Noahcode";
+    email = "pro@noahcode.dev";
+    github = "noahfraiture";
+    githubId = 94681915;
+  };
   noahgitsham = {
     name = "Noah Gitsham";
     github = "noahgitsham";

From 6e72238343450a4b33f2ad0d2235cedce9bb0373 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Apr 2025 23:39:23 +0000
Subject: [PATCH 05/34] tidal-hifi: 5.18.0 -> 5.18.2

---
 pkgs/by-name/ti/tidal-hifi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index ec86e406ba92..e02d2f847fd7 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tidal-hifi";
-  version = "5.18.0";
+  version = "5.18.2";
 
   src = fetchurl {
     url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU=";
+    sha256 = "sha256-jo3vnq7ul7e+UsaBswil8EctUxVJMcTxo77YyQ2ncIM=";
   };
 
   nativeBuildInputs = [

From 8dbb15271fe8115f492cd8c725df39961bb80020 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 9 Apr 2025 10:46:14 -0300
Subject: [PATCH 06/34] pay-respects: 0.7.0 -> 0.7.5

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/pa/pay-respects/package.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index b88de6830945..06a7ef07bc03 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -2,33 +2,21 @@
   lib,
   fetchFromGitea,
   rustPlatform,
-  pkg-config,
-  openssl,
-  curl,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pay-respects";
-  version = "0.7.0";
+  version = "0.7.5";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "iff";
     repo = "pay-respects";
     rev = "v${version}";
-    hash = "sha256-xuZkZXVEXSmRGp1huVpqvjrP5kllq3fGg1Mg7wuyE3E=";
+    hash = "sha256-NmFuu6uS8maAoN9U2ZdEyeJeozR3ubhoMrhvWKDxbMI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-aocFplTvjc3zV6NL6UKzdfdx5ry+jhvi4azceC0KSKA=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-    curl
-  ];
+  cargoHash = "sha256-xqq4PXvon6edjJ4VhrhXD8QtDGWlMeJnl8mnH8rdIvU=";
 
   meta = {
     description = "Terminal command correction, alternative to `thefuck`, written in Rust";

From e2d0babe8467006d22fcdb745e04b4e1e34b2b0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Apr 2025 06:49:01 +0000
Subject: [PATCH 07/34] fedistar: 1.11.2 -> 1.11.3

---
 pkgs/by-name/fe/fedistar/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix
index 33b5d07a62e5..40cb8ca8a726 100644
--- a/pkgs/by-name/fe/fedistar/package.nix
+++ b/pkgs/by-name/fe/fedistar/package.nix
@@ -18,19 +18,19 @@
 let
   pnpm = pnpm_10;
   pname = "fedistar";
-  version = "1.11.2";
+  version = "1.11.3";
   src = fetchFromGitHub {
     owner = "h3poteto";
     repo = "fedistar";
     tag = "v${version}";
-    hash = "sha256-W05vWCP4zHrijFzmdCPbX/aN4UbJ0ALXGMHyMAEEig4=";
+    hash = "sha256-Q2j6K4ys/z77+n3kdGJ15rWbFlbbIHBWB9hOARsgg2A=";
   };
   fedistar-frontend = stdenvNoCC.mkDerivation (finalAttrs: {
     pname = "fedistar-frontend";
     inherit version src;
     pnpmDeps = pnpm.fetchDeps {
       inherit pname version src;
-      hash = "sha256-s2Kz5+xsrjGB11zAChSTaJNUewGFA6JAcj4kuId+CDY=";
+      hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
     };
     nativeBuildInputs = [
       pnpm.configHook
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
   sourceRoot = "${src.name}/src-tauri";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0Z1V352rUXP+yKT55UOrH9ByJDYGJl/tYJG2ofJAKA0=";
+  cargoHash = "sha256-ZJgyrFDtzAH3XqDdnJ27Yn+WsTMrZR2+lnkZ6bw6hzg=";
 
   postPatch = ''
     substituteInPlace ./tauri.conf.json \

From e4d10fa807bb6cb3e0b5f423d561bb2d9f60a072 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 13 Apr 2025 22:30:24 +0800
Subject: [PATCH 08/34] mpiCheckPhaseHook: change HYDRA_IFACE to lo0 on Darwin
 platform

---
 pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh | 2 +-
 pkgs/by-name/mp/mpiCheckPhaseHook/package.nix       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
index 6adad2b44076..77d7290e2ec1 100644
--- a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
+++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
@@ -61,7 +61,7 @@ setupMpiCheck() {
       ;;
     MPICH)
       # Fix to make mpich run in a sandbox
-      export HYDRA_IFACE=lo
+      export HYDRA_IFACE="@iface@"
       # Disable sysfs cpu topology directory discovery.
       export HWLOC_XMLFILE="@topology@"
       ;;
diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
index a49e8e338bea..c771e87376fa 100644
--- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
+++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
@@ -1,9 +1,14 @@
-{ callPackage, makeSetupHook }:
+{
+  callPackage,
+  makeSetupHook,
+  stdenv,
+}:
 
 makeSetupHook {
   name = "mpi-checkPhase-hook";
 
   substitutions = {
+    iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo";
     topology = ./topology.xml;
   };
 } ./mpi-check-hook.sh

From 3ec8616ae4bb406f61ceef07541a5923dfc98980 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Apr 2025 16:52:47 +0000
Subject: [PATCH 09/34] mountpoint-s3: 1.16.1 -> 1.16.2

---
 pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index d39b685ac140..0d18d51179e7 100644
--- a/pkgs/by-name/mo/mountpoint-s3/package.nix
+++ b/pkgs/by-name/mo/mountpoint-s3/package.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mountpoint-s3";
-  version = "1.16.1";
+  version = "1.16.2";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "mountpoint-s3";
     rev = "v${version}";
-    hash = "sha256-/a9chdeijaGKJ3nDDYYZLdS9JrZiAjC8QFQ6bjdLWT8=";
+    hash = "sha256-5zib6F+OtOqxJei4+HzzEEMvjOoltdcPfIc6kzUJYgw=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qFPvNCRF3eUprj2/88RF+H5O3Kz9QF9SQqPfXb9Yogo=";
+  cargoHash = "sha256-3wEmtBEYvvHZ0Tde+o//YW8J20o6t/v8C0vq/CICHD0=";
 
   # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
   # cargo metadata failure: error: none of the selected packages contains these features: libfuse3

From 718618e60125c188fee3bdc1c1776316af683449 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 07:42:59 +0000
Subject: [PATCH 10/34] hawkeye: 6.0.2 -> 6.0.3

---
 pkgs/by-name/ha/hawkeye/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix
index bbe5bff7a8dc..87c36b489103 100644
--- a/pkgs/by-name/ha/hawkeye/package.nix
+++ b/pkgs/by-name/ha/hawkeye/package.nix
@@ -7,17 +7,17 @@
 
 rustPackages.rustPlatform.buildRustPackage rec {
   pname = "hawkeye";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "korandoru";
     repo = "hawkeye";
     tag = "v${version}";
-    hash = "sha256-wT6c2wA31+xFcgPUp4djuvsHxwWyEderQTPSzLLqeAg=";
+    hash = "sha256-reeNsnWvn7sSfyqjGIk8jFnv8HaEBJsqitmNbRa9eTM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qWn9duoGmYVHGBnjT57/m2BT/yc9BNUGHSn748ZmAzg=";
+  cargoHash = "sha256-vvAbdY6C/cCiDu4hl4AL3Gh+TrbC93rn/l6NzgAsFuo=";
 
   nativeBuildInputs = [
     pkg-config

From 71f11f66a0ccc687c3230abb95301afca10b7d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Mon, 23 Dec 2024 08:35:00 +0100
Subject: [PATCH 11/34] nvidia-container-toolkit: 1.15.0-rc.3 -> 1.17.5

---
 .../nvidia-container-toolkit/cdi-generate.nix |  2 +-
 .../nv/nvidia-container-toolkit/package.nix   | 33 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
index 78b7ec080289..bf4e5632271a 100644
--- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
+++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
@@ -39,7 +39,7 @@ writeScriptBin "nvidia-cdi-generator" ''
       --device-name-strategy ${deviceNameStrategy} \
       --ldconfig-path ${lib.getExe' glibc "ldconfig"} \
       --library-search-path ${lib.getLib nvidia-driver}/lib \
-      --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}
+      --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"}
   }
 
   function additionalMount {
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index aa4f28e72e83..b687027940ae 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   glibc,
-  fetchFromGitLab,
+  fetchFromGitHub,
   makeWrapper,
   buildGoModule,
   formats,
@@ -26,14 +26,14 @@ let
   cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info";
 in
 buildGoModule rec {
-  pname = "container-toolkit/container-toolkit";
-  version = "1.15.0-rc.3";
+  pname = "nvidia-container-toolkit";
+  version = "1.17.5";
 
-  src = fetchFromGitLab {
-    owner = "nvidia";
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo=";
+    hash = "sha256-vEo8agJ3jTaBokBjdGcO2naE457y8KPUAedC8vtwD1Y=";
 
   };
 
@@ -51,23 +51,22 @@ buildGoModule rec {
   ];
 
   postPatch = ''
-    # Replace the default hookDefaultFilePath to the $out path and override
-    # default ldconfig locations to the one in nixpkgs.
-
     substituteInPlace internal/config/config.go \
-      --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook" \
-      --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
-
-    substituteInPlace internal/config/config_test.go \
+      --replace '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \
       --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
 
     substituteInPlace tools/container/toolkit/toolkit.go \
       --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
-
-    substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go \
-      --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
   '';
 
+  subPackages = [
+    "cmd/nvidia-cdi-hook"
+    "cmd/nvidia-container-runtime.cdi"
+    "cmd/nvidia-container-runtime-hook"
+    "cmd/nvidia-container-runtime.legacy"
+    "cmd/nvidia-ctk"
+  ];
+
   # Based on upstream's Makefile:
   # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64
   ldflags = [
@@ -104,7 +103,7 @@ buildGoModule rec {
         --prefix PATH : ${libnvidia-container}/bin
 
       mkdir -p $tools/bin
-      mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin
+      mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin
     ''
     + lib.optionalString (configTemplate != null || configTemplatePath != null) ''
       mkdir -p $out/etc/nvidia-container-runtime

From 6965426f1c78b76010860c0c2ed6b13e6ecd2209 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 10:19:30 +0000
Subject: [PATCH 12/34] zapret: 70.5 -> 70.6

---
 pkgs/by-name/za/zapret/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index a9e534fd87f1..d603a00a4bbf 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "70.5";
+  version = "70.6";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-El/3qWZCyN5WixDWbtv+W69z0WITGMODX83dwDIT/94=";
+    hash = "sha256-VnC4UeR8Zxr8oKx9icZBTUNjVWpd16wLKyZ+zNShJQk=";
   };
 
   buildInputs = [

From c8c05b7ea68c16eb35ca3bae51d00880c23e3987 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Mon, 14 Apr 2025 15:07:53 +0200
Subject: [PATCH 13/34] gajim: 2.0.3 -> 2.1.0, nbxmpp: 6.0.2 -> 6.1.1

---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 pkgs/development/python-modules/nbxmpp/default.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 471a7d47abb6..d06c751e31b1 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -40,11 +40,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    hash = "sha256-DbM80fyJ+jwB9Yc9vfoiDqW7Sx7MDR0OEkHdOC6nRG4=";
+    hash = "sha256-LuguvOkqFDHG46+J2Q0rXnRHRuiVdCG84FuZ8CeLDYE=";
   };
 
   format = "pyproject";
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index ce4a11f8e5f8..61218791fd01 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "6.0.2";
+  version = "6.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "gajim";
     repo = "python-nbxmpp";
     rev = "refs/tags/${version}";
-    hash = "sha256-k7cC1H+o+17sTahsjhkAzq5f8/61DRtK9gi+sbPCM6w=";
+    hash = "sha256-zuPaQCBXJl515MFSfJ2Y9cQtVccDGGSQzpZn3DTSa3Q=";
   };
 
   nativeBuildInputs = [

From 1308b9c5dcaf405b20382a48e6e91503152d51e8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 14 Apr 2025 20:53:54 +0200
Subject: [PATCH 14/34] python312Packages.jaxopt: 0.8.4 -> 0.8.5

Diff: https://github.com/google/jaxopt/compare/refs/tags/jaxopt-v0.8.4...jaxopt-v0.8.5

Changelog: https://github.com/google/jaxopt/releases/tag/jaxopt-v0.8.5
---
 pkgs/development/python-modules/jaxopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix
index 90dff56e0cf9..8a71974ec02f 100644
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "jaxopt";
-  version = "0.8.4";
+  version = "0.8.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "jaxopt";
     tag = "jaxopt-v${version}";
-    hash = "sha256-StuI9Z9wRjuvjsGoQUkcjoKbR6hNkGmOcddUc18yO3I=";
+    hash = "sha256-vPXrs8J81O+27w9P/fEFr7w4xClKb8T0IASD+iNhztQ=";
   };
 
   build-system = [ setuptools ];

From f5125c0c10aff116559ccb85d2c9ac4514047981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 22:17:36 +0000
Subject: [PATCH 15/34] mcaselector: 2.5.1 -> 2.5.2

---
 pkgs/tools/games/minecraft/mcaselector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix
index 15232f4c1f95..d214dfd52baf 100644
--- a/pkgs/tools/games/minecraft/mcaselector/default.nix
+++ b/pkgs/tools/games/minecraft/mcaselector/default.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mcaselector";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar";
-    hash = "sha256-pdnJK35hWFAJogRzICVerqfpGJqVxWgRsy1v5nlCLGc=";
+    hash = "sha256-bbhbTsMtBIBTGd6IRTKPzY5T8NLfLqBu2bYc8GK8y/U=";
   };
 
   dontUnpack = true;

From c88d1114ed1344d10e21597a8f15d656fda6663a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 15 Apr 2025 01:32:02 +0300
Subject: [PATCH 16/34] {discord,vesktop}: Add `NIXOS_SPEECH` variable to allow
 turning off speech without rebuilding

It's on by default and launches 6 processes

I wrote this before realizing that discord is unfree and has to be
built always anyway.

For vesktop the variable will be useful since it has to built, however
for the sake of consistency let's add it for discord too.
---
 .../networking/instant-messengers/discord/linux.nix          | 5 ++++-
 pkgs/by-name/ve/vesktop/package.nix                          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index ef77a66f3bb4..bf94609409a8 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -173,7 +173,10 @@ stdenv.mkDerivation rec {
     wrapProgramShell $out/opt/${binaryName}/${binaryName} \
         "''${gappsWrapperArgs[@]}" \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+        ${lib.strings.optionalString withTTS ''
+          --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \
+          --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \
+        ''} \
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 9ceee9d8fff6..2a78c7be03b1 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -139,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString stdenv.hostPlatform.isLinux ''
       makeWrapper ${electron}/bin/electron $out/bin/vesktop \
         --add-flags $out/opt/Vesktop/resources/app.asar \
-        ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+        ${lib.strings.optionalString withTTS ''
+          --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \
+          --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \
+        ''} \
         ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
     ''

From 73d7dea121a8511c02646c305a5253d4bad5295a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 00:19:35 +0000
Subject: [PATCH 17/34] gocryptfs: 2.5.3 -> 2.5.4

---
 pkgs/by-name/go/gocryptfs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix
index d894040fd55b..39269c428e47 100644
--- a/pkgs/by-name/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "gocryptfs";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0iCCIAOAzLIeZ+eZYJTVXgOyKIsQnKe/XazFVECZDTM=";
+    sha256 = "sha256-lDIKMcZLAE1ehijzhpx6G966xzdhusT40Dy06LXBn74=";
   };
 
   vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U=";

From 29055e399262356f58fb77966a8b68b386dce200 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 15 Apr 2025 13:25:39 +0800
Subject: [PATCH 18/34] deepin.dde-session-shell: repo has rename

See: https://www.freelists.org/post/deepin-devel/githubddesessionshellddesessionshell
---
 pkgs/desktops/deepin/core/dde-session-shell/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index 9d4e8a227878..f7e8aeee55c0 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
-    repo = pname;
+    # DDE 23 releases has moved to `linuxdeepin/dde-session-shell-snipe`
+    repo = "dde-session-shell-snipe";
     rev = version;
     hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU=";
   };

From 36c68b92e8e99f4b71a00cf715336576dddac138 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Tue, 15 Apr 2025 08:23:46 +0200
Subject: [PATCH 19/34] tailwindcss_4: 4.1.3 -> 4.1.4

---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 28e8256b3dea..b1d9a336de53 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.3";
+  version = "4.1.4";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-kQyl5X6CkuXUJK7e8bLsaIJ2Bqbw23OLnrOaFwnI0ZY=";
-      aarch64-linux = "sha256-tF7Tr5EJk1zL0GJzLk+jGymEzaobcT+osBV+GGTs78E=";
-      x86_64-darwin = "sha256-MR2i+TGVI3L0O6/k/9LBgP+axu28hoVX3HwOJbyq1V4=";
-      x86_64-linux = "sha256-xAYhKKS3oEUPDwmAvE+3Gv4VZ6a88OftvzRburDuP2Q=";
+      aarch64-darwin = "sha256-x7piRWxtlEF3XJDKbwo9+AD4LO3k6SOJ+TRTbejPUuk=";
+      aarch64-linux = "sha256-oUU371GpnBpVw3ZLc7gWgdhP91GXrXZvmmYo1hDPJ08=";
+      x86_64-darwin = "sha256-zQ4adIfAuRip9LLSLTGHUhgeiRi4Z1cLQJCC9pR1zYg=";
+      x86_64-linux = "sha256-D6i7uL7KckL2RVvwG7410wg4ePYwjsSkzsMK7Ra8pG0=";
     }
     .${system} or throwSystem;
 in

From b1518a77c790ea72397ab5ba2338b1f4f4f9af13 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 27 Mar 2025 09:06:33 +0200
Subject: [PATCH 20/34] mattermost-desktop: 5.10.2 -> 5.11.2

---
 pkgs/by-name/ma/mattermost-desktop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix
index ad141c593e89..8c9db044107b 100644
--- a/pkgs/by-name/ma/mattermost-desktop/package.nix
+++ b/pkgs/by-name/ma/mattermost-desktop/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   buildNpmPackage,
-  electron_33,
+  electron_34,
   makeWrapper,
   testers,
   mattermost-desktop,
@@ -10,21 +10,21 @@
 }:
 
 let
-  electron = electron_33;
+  electron = electron_34;
 in
 
 buildNpmPackage rec {
   pname = "mattermost-desktop";
-  version = "5.10.2";
+  version = "5.11.2";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-LHjVmrsOdk8vfsqvNEWkzpusm6jbz3SOb3bEaIb7rb4=";
+    hash = "sha256-03874pV7/GqydMdaSlh3N17LsbHppfPdYJ8nGdbvvbk=";
   };
 
-  npmDepsHash = "sha256-LAbqsMdMmmHGgvg2ilz6neQxMOK3jtCKt8K0M8BWifs=";
+  npmDepsHash = "sha256-v6XEJJ9kozkY7HSLNJtM+86+36G7wt8xIFwCyO7x11Y=";
   npmBuildScript = "build-prod";
   makeCacheWritable = true;
 

From 1920cd29add0d7f1902f81fd0b0218a2f321abd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 23:17:28 +0000
Subject: [PATCH 21/34] gh-skyline: 0.1.4 -> 0.1.5

---
 pkgs/by-name/gh/gh-skyline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix
index 2e2024557344..b4d2ba692582 100644
--- a/pkgs/by-name/gh/gh-skyline/package.nix
+++ b/pkgs/by-name/gh/gh-skyline/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gh-skyline";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-skyline";
     tag = "v${version}";
-    hash = "sha256-2i1f3iOrabTc+r5iUzghF3sJ7vgpTC1dmzY/z6h/oCg=";
+    hash = "sha256-jcdOLoyOXq270SaObMpCD+ts6Hj8wqSAjUZWEg3F9+w=";
   };
 
-  vendorHash = "sha256-g4YqNts50RUBh1Gu9vSI29uvk0iHSnMgI1+KBFm5rNI=";
+  vendorHash = "sha256-rCFHYofUQlfRMP7bJav2se7oAkE7rS8KJl1n8kCsSag=";
 
   ldflags = [
     "-s"

From 43d7b8048b9e4cb66ec3304a94d441dbc0f46558 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 10 Apr 2025 14:02:20 -0700
Subject: [PATCH 22/34] amber: Migrate to by-name

---
 .../text/amber/default.nix => by-name/am/amber/package.nix}   | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{tools/text/amber/default.nix => by-name/am/amber/package.nix} (100%)

diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/by-name/am/amber/package.nix
similarity index 100%
rename from pkgs/tools/text/amber/default.nix
rename to pkgs/by-name/am/amber/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44ec2f5dc1f3..85278cf90f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1673,10 +1673,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  amber = callPackage ../tools/text/amber {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   inherit (callPackages ../development/tools/ammonite { })
     ammonite_2_12
     ammonite_2_13

From 91b71e39615fd977a78790c5dce2a089f24f030d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 10 Apr 2025 14:32:03 -0700
Subject: [PATCH 23/34] Remove explicit darwin framework and keep libiconv.

rev -> tag
---
 pkgs/by-name/am/amber/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix
index 043e96d4d39a..8a8eef4bb0d2 100644
--- a/pkgs/by-name/am/amber/package.nix
+++ b/pkgs/by-name/am/amber/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   rustPlatform,
   libiconv,
-  Security,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -14,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
   };
 
@@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
-    Security
   ];
 
   meta = with lib; {

From a0a630e48e9bd0d0d2f613bc022ef79a1dff27a7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 15 Apr 2025 09:47:45 +0300
Subject: [PATCH 24/34] paperless-ngx: relax more deps

This broke after a python-updates run.
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 7cd092dadee2..8234e8ba8f12 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -160,8 +160,13 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "celery"
     "django-allauth"
+    "django-extensions"
     "drf-spectacular-sidecar"
+    "filelock"
+    "python-dotenv"
+    "rapidfuzz"
     # TODO: https://github.com/NixOS/nixpkgs/pull/373099
     "zxing-cpp"
   ];

From e6064cfce1df1a34e39097a0aa22fb62f8096839 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 14 Apr 2025 08:37:20 +0530
Subject: [PATCH 25/34] cosmic-settings: add upstream patch looking up
 wallpaper in NixOS-specific path

Usually, I prefer waiting for a release from upstream that includes the
commit but there appears that the next release is a few months away. So
add the patch for the time being.

Once we have a new release, the patch won't apply cleanly and we can
remove it then.
---
 pkgs/by-name/co/cosmic-settings/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 5174eaa5a661..c37320999138 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   rustPlatform,
   cmake,
   just,
@@ -36,6 +37,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE=";
   };
 
+  patches = [
+    # TODO: This is merged and will be included in the 7th Alpha release, remove it then.
+    (fetchpatch {
+      url = "https://github.com/pop-os/cosmic-settings/commit/2e2898b31fabcb3f3b561e6c4cea2aca9de9b284.patch";
+      hash = "sha256-ZGJlGmR6lZB697uQ+ZsjvisNbPKBlBdRK/Ti541ZdlE=";
+    })
+  ];
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8=";
 

From 7a74a3422ba1a4b028ff1f0f1f214aae041c8168 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 15 Apr 2025 09:21:20 +0200
Subject: [PATCH 26/34] zellij: 0.42.1 -> 0.42.2

Diff: https://github.com/zellij-org/zellij/compare/v0.42.1...v0.42.2

Changelog: https://github.com/zellij-org/zellij/releases/tag/v0.42.2
---
 pkgs/by-name/ze/zellij/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 5cb7c06e2cca..0c4b7e976449 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -15,22 +15,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zellij";
-  version = "0.42.1";
+  version = "0.42.2";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EK+eQfNhfVxjIsoyj43tcRjHDT9O8/n7hUz24BC42nw=";
+    hash = "sha256-O7BZlPSBWy+q349NYCUsw4Rb5X3xyl5Ar+a/uQPQhZY=";
   };
 
-  # Fix build with Rust 1.86
-  # FIXME: remove when merged upstream
-  # See: https://github.com/zellij-org/zellij/pull/4118
-  cargoPatches = [
-    ./rust-1.86.patch
-  ];
-
   # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
   # the vendored one
   postPatch = ''
@@ -39,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-d2/tEYU2tOLtC0NHa7YBGrbmHHDV7BkUZHJ2P7GdwAw=";
+  cargoHash = "sha256-Vo3bshaHjy2F2WFGgaIDEFFAh0e5VPp2G4fETgIH484=";
 
   env.OPENSSL_NO_VENDOR = 1;
 

From bf1acb3625cbc0fbf13224a21e2f46a016ad4cad Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Tue, 15 Apr 2025 09:21:32 +0200
Subject: [PATCH 27/34] kshutdown: 5.92-beta -> 6.0

---
 pkgs/by-name/ks/kshutdown/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix
index 7ce890468b6b..405134f87486 100644
--- a/pkgs/by-name/ks/kshutdown/package.nix
+++ b/pkgs/by-name/ks/kshutdown/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kshutdown";
-  version = "5.92-beta";
+  version = "6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kshutdown/KShutdown/${finalAttrs.version}/kshutdown-source-${finalAttrs.version}.zip";
-    hash = "sha256-EYgb2jeUoLNSPFIzlicnrmsccGc1nvoE5iDVt9x83ns=";
+    hash = "sha256-GXs0Cb1gtlPy8fxy3CJ10t97BENMWFsRJHij+104BLA=";
     name = "kshutdown-source-${finalAttrs.version}.zip";
   };
 

From 32e1dc9b4562af808e4a158197cb295e994e24f2 Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sat, 28 Dec 2024 20:33:42 +0100
Subject: [PATCH 28/34] python312Packages.csaf-tool: init at 0.3.2

---
 pkgs/by-name/cs/csaf-tool/package.nix         |  5 ++
 .../python-modules/csaf-tool/default.nix      | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/cs/csaf-tool/package.nix
 create mode 100644 pkgs/development/python-modules/csaf-tool/default.nix

diff --git a/pkgs/by-name/cs/csaf-tool/package.nix b/pkgs/by-name/cs/csaf-tool/package.nix
new file mode 100644
index 000000000000..7bf230eb5a7a
--- /dev/null
+++ b/pkgs/by-name/cs/csaf-tool/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.csaf-tool
diff --git a/pkgs/development/python-modules/csaf-tool/default.nix b/pkgs/development/python-modules/csaf-tool/default.nix
new file mode 100644
index 000000000000..bfb547ea5e8f
--- /dev/null
+++ b/pkgs/development/python-modules/csaf-tool/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  packageurl-python,
+  pythonOlder,
+  rich,
+  setuptools,
+  versionCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "csaf-tool";
+  version = "0.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "anthonyharrison";
+    repo = "csaf";
+    tag = "${version}";
+    hash = "sha256-LR6r03z0nvvAQgFHaTWfukoJmLZ6SLPXfbp/G8N/HtM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    packageurl-python
+    rich
+  ];
+
+  # has not tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "csaf" ];
+
+  nativeCheckInputs = [ versionCheckHook ];
+
+  meta = with lib; {
+    description = "CSAF generator and validator";
+    homepage = "https://github.com/anthonyharrison/csaf";
+    changelog = "https://github.com/anthonyharrison/csaf/releases/tag/${src.tag}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ teatwig ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b9247f789bb..f4f1c9e53ab6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,8 @@ self: super: with self; {
 
   crytic-compile = callPackage ../development/python-modules/crytic-compile { };
 
+  csaf-tool = callPackage ../development/python-modules/csaf-tool { };
+
   cson = callPackage ../development/python-modules/cson { };
 
   csrmesh = callPackage ../development/python-modules/csrmesh { };

From aa7b2df78dd9613b7988dbdde593484ee0adeeb7 Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sat, 28 Dec 2024 20:34:31 +0100
Subject: [PATCH 29/34] python312Packages.lib4vex: init at 0.2.0

---
 .../python-modules/lib4vex/default.nix        | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/lib4vex/default.nix

diff --git a/pkgs/development/python-modules/lib4vex/default.nix b/pkgs/development/python-modules/lib4vex/default.nix
new file mode 100644
index 000000000000..0eaa362bff7e
--- /dev/null
+++ b/pkgs/development/python-modules/lib4vex/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  csaf-tool,
+  lib4sbom,
+  packageurl-python,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lib4vex";
+  version = "0.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "anthonyharrison";
+    repo = "lib4vex";
+    tag = "v${version}";
+    hash = "sha256-mR9ZpJDC2O04js3Kd/8qlg4Ds/jy2CmpTywRVYqmnQw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    csaf-tool
+    lib4sbom
+    packageurl-python
+  ];
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "lib4vex" ];
+
+  meta = with lib; {
+    description = "Library to ingest and generate VEX documents";
+    homepage = "https://github.com/anthonyharrison/lib4vex";
+    changelog = "https://github.com/anthonyharrison/lib4vex/releases/tag/${src.tag}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ teatwig ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4f1c9e53ab6..dfb5f4b148d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7646,6 +7646,8 @@ self: super: with self; {
 
   lib4sbom = callPackage ../development/python-modules/lib4sbom { };
 
+  lib4vex = callPackage ../development/python-modules/lib4vex { };
+
   libagent = callPackage ../development/python-modules/libagent { };
 
   libais = callPackage ../development/python-modules/libais { };

From d48056f12946d464075f6faf875122dab8320cda Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sat, 8 Mar 2025 13:10:19 +0100
Subject: [PATCH 30/34] python312Packages.lib4sbom: 0.8.1 -> 0.8.3

---
 pkgs/development/python-modules/lib4sbom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index be76325f2375..2f7ac46d9d55 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.8.1";
+  version = "0.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "anthonyharrison";
     repo = "lib4sbom";
     tag = "v${version}";
-    hash = "sha256-OxYYHiV7TuPiLyd/rdrGfY3agv0vBcATaod37XYb7DY=";
+    hash = "sha256-7ERjzfMIz1tRvShxO2hR+DzRYyfV3KxpHmgJTLErnRw=";
   };
 
   build-system = [ setuptools ];
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to ingest and generate SBOMs";
     homepage = "https://github.com/anthonyharrison/lib4sbom";
-    changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/v${version}";
+    changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ teatwig ];
   };

From df40f158670694e3d151de00ade873bcb61d16db Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sat, 28 Dec 2024 20:38:42 +0100
Subject: [PATCH 31/34] cve-bin-tool: 3.3 -> 3.4

---
 pkgs/tools/security/cve-bin-tool/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index 444b5e435fec..f1fc351814a5 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -14,6 +14,7 @@
   jinja2,
   jsonschema,
   lib4sbom,
+  lib4vex,
   packageurl-python,
   packaging,
   plotly,
@@ -34,14 +35,14 @@
 
 buildPythonApplication rec {
   pname = "cve-bin-tool";
-  version = "3.3";
+  version = "3.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "cve-bin-tool";
     tag = "v${version}";
-    hash = "sha256-A5w4U5EDX+UZWNMuz8GTOcubo8N2KfDlVV0aRNsO8/E=";
+    hash = "sha256-pv8XjKjZBUw5FmmUn1dakGeS1uw2xzF3wSIZOYQ2/3c=";
   };
 
   # Wants to open a sqlite database, access the internet, etc
@@ -60,6 +61,7 @@ buildPythonApplication rec {
     jinja2
     jsonschema
     lib4sbom
+    lib4vex
     packageurl-python
     packaging
     plotly
@@ -88,6 +90,7 @@ buildPythonApplication rec {
   meta = with lib; {
     description = "CVE Binary Checker Tool";
     homepage = "https://github.com/intel/cve-bin-tool";
+    changelog = "https://github.com/intel/cve-bin-tool/releases/tag/${src.tag}";
     license = licenses.gpl3Plus;
     maintainers = [ ];
   };

From 96c8bfa278c16a2d30666eacffae3537e46fcee1 Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sat, 28 Dec 2024 23:47:18 +0100
Subject: [PATCH 32/34] cve-bin-tool: refactor to use `pyproject = true`

---
 pkgs/tools/security/cve-bin-tool/default.nix | 56 +++++++++++++-------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index f1fc351814a5..133e4f525566 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -2,15 +2,17 @@
   lib,
   buildPythonApplication,
   fetchFromGitHub,
-  # aiohttp[speedups]
-  aiodns,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   aiohttp,
   beautifulsoup4,
   brotlipy,
   cvss,
   distro,
   filetype,
-  google-cloud-sdk,
   jinja2,
   jsonschema,
   lib4sbom,
@@ -18,25 +20,29 @@
   packageurl-python,
   packaging,
   plotly,
-  pytestCheckHook,
   python-gnupg,
   pyyaml,
   requests,
   rich,
   rpmfile,
-  setuptools,
   xmlschema,
+  zipp,
   zstandard,
+
+  # optional-dependencies
   reportlab,
-  pip,
-  testers,
-  cve-bin-tool,
+
+  # runtime-dependencies
+  google-cloud-sdk,
+
+  # tests
+  versionCheckHook,
 }:
 
 buildPythonApplication rec {
   pname = "cve-bin-tool";
   version = "3.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intel";
@@ -45,19 +51,15 @@ buildPythonApplication rec {
     hash = "sha256-pv8XjKjZBUw5FmmUn1dakGeS1uw2xzF3wSIZOYQ2/3c=";
   };
 
-  # Wants to open a sqlite database, access the internet, etc
-  doCheck = false;
+  build-system = [ setuptools ];
 
   dependencies = [
-    # aiohttp[speedups]
-    aiodns
     aiohttp
     beautifulsoup4
     brotlipy
     cvss
     distro
     filetype
-    google-cloud-sdk # gsutil
     jinja2
     jsonschema
     lib4sbom
@@ -72,20 +74,36 @@ buildPythonApplication rec {
     rpmfile
     setuptools
     xmlschema
+    zipp
     zstandard
-  ];
+  ] ++ aiohttp.optional-dependencies.speedups;
 
   optional-dependencies = {
     pdf = [ reportlab ];
   };
 
-  propagatedBuildInputs = [ pip ];
+  pythonRemoveDeps = [
+    # gsutil is only called as a binary at runtime instead of being used as a library
+    "gsutil"
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  # don't run pytestCheckHook because it wants to open a sqlite database, access the internet, etc
+  nativeCheckInputs = [
+    versionCheckHook
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  pythonImportsCheck = [ "cve_bin_tool" ];
+  pythonImportsCheck = [
+    "cve_bin_tool"
+    "cve_bin_tool.mismatch_loader"
+  ];
 
-  passthru.tests.version = testers.testVersion { package = cve-bin-tool; };
+  # provide gsutil
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ google-cloud-sdk ])
+  ];
 
   meta = with lib; {
     description = "CVE Binary Checker Tool";

From 6cd82fe1f0c3ac67f90699ef69c48107c0f7e27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Weisbarth?= <joerg.weisbarth@sap.com>
Date: Tue, 15 Apr 2025 11:12:13 +0200
Subject: [PATCH 33/34] cf-uaac: init at 4.28.0

---
 .../ruby-modules/with-packages/Gemfile        |   1 +
 pkgs/top-level/ruby-packages.nix              | 489 ++++++++++++++----
 2 files changed, 376 insertions(+), 114 deletions(-)

diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index 87ae567585b1..4ab55215d8e7 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -12,6 +12,7 @@ gem 'cairo-gobject'
 gem 'camping'
 # gem 'capybara-webkit' takes too long to build right now since webkit depends on ruby
 gem 'charlock_holmes'
+gem 'cf-uaac'
 gem 'cld3'
 gem 'cocoapods'
 gem 'cocoapods-acknowledgements'
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 884c46e1b077..452e1e33facb 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -11,10 +11,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18496axh89kakw5f82mmmac3w9rwb0b0wq4j6la806p9cbgy5k3v";
+      sha256 = "1d7z3fqanmzr6d99idvm2qj6lil2pxn5haxz7kb6f1x8fm88hfsv";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   actionmailbox = {
     dependencies = [
@@ -29,10 +29,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nyfwa1kj0cm1scqsbv723ypv69bzaxh886hliyjbrhk752v73rx";
+      sha256 = "098f12d19q64d0svzgz73w23mv2y3zmccryybp3hfi8gab14fsl9";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   actionmailer = {
     dependencies = [
@@ -47,16 +47,17 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1l3pnba14p0p7zsh366c31maxap030c97597vjimdv3nhnrnijdh";
+      sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   actionpack = {
     dependencies = [
       "actionview"
       "activesupport"
       "nokogiri"
+      "racc"
       "rack"
       "rack-session"
       "rack-test"
@@ -68,10 +69,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0y2b5ydiqy32jbd9g5bl6v4aw6d7pjn5f3w2rxf2j59q9w307rwk";
+      sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   actiontext = {
     dependencies = [
@@ -86,10 +87,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1grs41yr3nzw7zbnz0vkv8f4qd448a632saxkm3vnbzf68hb63d4";
+      sha256 = "1mphlcvnfba3gd1sydcrr2i7brfwlcbxjmwjpybvcx363bjcwsgk";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   actionview = {
     dependencies = [
@@ -103,10 +104,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fyfyxf2a798lxq6sfpnj94kmnpfp17xlhvjy428zhfzbi0f2f70";
+      sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   activejob = {
     dependencies = [
@@ -117,10 +118,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jjk31di5kvcflc90wmgdd50jzhljhafi166h6hg67kbwd2qn8mh";
+      sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -128,10 +129,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v35y2jzqlfy1wnrzlzj2cxylhnz09vykaa1l2dnkq7sl5zzpq8a";
+      sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   activerecord = {
     dependencies = [
@@ -143,10 +144,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02nrya34qviawdkssyahb3mg08kqdc461b320a6ikr245jwp0d3r";
+      sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   activestorage = {
     dependencies = [
@@ -160,10 +161,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xr9cy6h8il61qq6w3rkvl56visms45ljm8f43r3ibh61wg24ggq";
+      sha256 = "0psjqn03irbfk79x57ylaaaj83pqqcwy8b4mwrp6bmnljkzkbv5l";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   activesupport = {
     dependencies = [
@@ -178,16 +179,15 @@
       "minitest"
       "securerandom"
       "tzinfo"
-      "uri"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -200,6 +200,20 @@
     };
     version = "2.8.7";
   };
+  algoliasearch = {
+    dependencies = [
+      "httpclient"
+      "json"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96";
+      type = "gem";
+    };
+    version = "1.27.5";
+  };
   ansi = {
     groups = [ "default" ];
     platforms = [ ];
@@ -231,6 +245,16 @@
     };
     version = "4.2.9";
   };
+  atomos = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
   awesome_print = {
     groups = [ "default" ];
     platforms = [ ];
@@ -296,10 +320,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19";
+      sha256 = "0n4ymlgik3xcg94h52dzmh583ss40rl3sn0kni63v56sq8g6l62k";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.5.1";
   };
   builder = {
     groups = [ "default" ];
@@ -374,6 +398,57 @@
     };
     version = "1.0.0";
   };
+  cf-uaa-lib = {
+    dependencies = [
+      "addressable"
+      "base64"
+      "httpclient"
+      "json"
+      "mutex_m"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0dp89j7q4zllfn9yn5z0ld2v0sd8s6c9jkcbr6w1n0cy04lf2miw";
+      type = "gem";
+    };
+    version = "4.0.9";
+  };
+  cf-uaac = {
+    dependencies = [
+      "cf-uaa-lib"
+      "em-http-request"
+      "eventmachine"
+      "highline"
+      "json"
+      "launchy"
+      "rack"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1la4h74fxbx0dlb7mh3mkyh0vns25l3q87221vm7fg9pcx9qfy91";
+      type = "gem";
+    };
+    version = "4.28.0";
+  };
+  CFPropertyList = {
+    dependencies = [
+      "base64"
+      "nkf"
+      "rexml"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4";
+      type = "gem";
+    };
+    version = "3.0.7";
+  };
   charlock_holmes = {
     groups = [ "default" ];
     platforms = [ ];
@@ -384,25 +459,36 @@
     };
     version = "0.7.9";
   };
+  childprocess = {
+    dependencies = [ "logger" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs";
+      type = "gem";
+    };
+    version = "5.1.0";
+  };
   claide = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lpm76j8d648i4f41kk7gkc2kgvfsjvw0sf8zknlr1gm38q68i75";
+      sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "1.1.0";
   };
   clamp = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gpz9jvg1gpr8xmfqd35gvyzsvmjvlvwm2sq3pyhml3i84a6qjrq";
+      sha256 = "08m0syh06bhx8dqn560ivjg96l5cs5s3l9jh2szsnlcdcyl9jsjg";
       type = "gem";
     };
-    version = "0.6.5";
+    version = "1.3.2";
   };
   cld3 = {
     groups = [ "default" ];
@@ -415,14 +501,33 @@
     version = "3.7.0";
   };
   cocoapods = {
+    dependencies = [
+      "addressable"
+      "claide"
+      "cocoapods-core"
+      "cocoapods-deintegrate"
+      "cocoapods-downloader"
+      "cocoapods-plugins"
+      "cocoapods-search"
+      "cocoapods-trunk"
+      "cocoapods-try"
+      "colored2"
+      "escape"
+      "fourflusher"
+      "gh_inspector"
+      "molinillo"
+      "nap"
+      "ruby-macho"
+      "xcodeproj"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sgw1aymfahgyhz1317mxglnajv5jrm6d5wai4c970avsrlc6qrm";
+      sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "1.16.2";
   };
   cocoapods-acknowledgements = {
     dependencies = [
@@ -480,6 +585,27 @@
     };
     version = "0.0.3";
   };
+  cocoapods-core = {
+    dependencies = [
+      "activesupport"
+      "addressable"
+      "algoliasearch"
+      "concurrent-ruby"
+      "fuzzy_match"
+      "nap"
+      "netrc"
+      "public_suffix"
+      "typhoeus"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab";
+      type = "gem";
+    };
+    version = "1.16.2";
+  };
   cocoapods-coverage = {
     dependencies = [
       "cocoapods-testing"
@@ -489,10 +615,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0y2mhsraf48ww9bp7c7ghrqh3kpx1f1djji5vpm4vh1gj4qz6669";
+      sha256 = "1zaid3awk470igr5yilx1wvj1jnh88fbjl11hp93a4qic7j3i6ca";
       type = "gem";
     };
-    version = "0.0.5";
+    version = "0.0.6";
   };
   cocoapods-deintegrate = {
     groups = [ "default" ];
@@ -751,25 +877,15 @@
     };
     version = "1.1.0";
   };
-  colored = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
-      type = "gem";
-    };
-    version = "1.2";
-  };
   colored2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0drbrv5m3l3qpal7s87gvss81cbzl76gad1hqkpqfqlphf0h7qb3";
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
       type = "gem";
     };
-    version = "4.0.3";
+    version = "3.1.2";
   };
   commonmarker = {
     groups = [ "default" ];
@@ -801,6 +917,16 @@
     };
     version = "2.5.0";
   };
+  cookiejar = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1px0zlnlkwwp9prdkm2lamgy412y009646n2cgsa1xxsqk7nmc8i";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
   crabstone = {
     dependencies = [ "ffi" ];
     groups = [ "default" ];
@@ -827,10 +953,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0059n2hqiv3afahq1wc4ymr7lpka7vkisvmkx7azgnkvzfz6caby";
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
       type = "gem";
     };
-    version = "3.3.3";
+    version = "3.3.4";
   };
   curb = {
     groups = [ "default" ];
@@ -847,10 +973,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ywack2dm2q67qb2an0fagzbmwm7gcizw02arp87d7bhkx8h770y";
+      sha256 = "1kqa83ycvyly3b447g774syqwyblm7pp0a0y5z3528gr5sdjzkip";
       type = "gem";
     };
-    version = "1.4.7";
+    version = "1.5.0";
   };
   daemons = {
     groups = [ "default" ];
@@ -999,10 +1125,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66";
+      sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
       type = "gem";
     };
-    version = "3.1.7";
+    version = "3.1.8";
   };
   drb = {
     groups = [ "default" ];
@@ -1025,6 +1151,37 @@
     };
     version = "1.1.3";
   };
+  em-http-request = {
+    dependencies = [
+      "addressable"
+      "cookiejar"
+      "em-socksify"
+      "eventmachine"
+      "http_parser.rb"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1azx5rgm1zvx7391sfwcxzyccs46x495vb34ql2ch83f58mwgyqn";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
+  em-socksify = {
+    dependencies = [
+      "base64"
+      "eventmachine"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1vbl74x9m4hccmmhcnp36s50mn7d81annfj3fcqjdhdcm2khi3bx";
+      type = "gem";
+    };
+    version = "0.3.3";
+  };
   em-websocket = {
     dependencies = [
       "eventmachine"
@@ -1060,6 +1217,16 @@
     };
     version = "1.13.1";
   };
+  escape = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
   ethon = {
     dependencies = [ "ffi" ];
     groups = [ "default" ];
@@ -1112,10 +1279,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
+      sha256 = "054n5rq3h8zb84jzri078zb2lk35vrq06pq3xr3c8ka33bb7qsgj";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.13.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -1247,6 +1414,26 @@
     };
     version = "2.6.0";
   };
+  fourflusher = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v";
+      type = "gem";
+    };
+    version = "2.3.1";
+  };
+  fuzzy_match = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
   gdk3 = {
     dependencies = [
       "cairo-gobject"
@@ -1300,6 +1487,16 @@
     };
     version = "3.5.1";
   };
+  gh_inspector = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
   gio2 = {
     dependencies = [
       "fiddle"
@@ -1700,10 +1897,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
+      sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
       type = "gem";
     };
-    version = "1.15.1";
+    version = "1.15.2";
   };
   jaro_winkler = {
     groups = [ "default" ];
@@ -2240,11 +2437,12 @@
   };
   jekyll-webmention_io = {
     dependencies = [
+      "activesupport"
       "htmlbeautifier"
       "jekyll"
       "json"
+      "jsonpath"
       "openssl"
-      "string_inflection"
       "uglifier"
       "webmention"
     ];
@@ -2252,10 +2450,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb";
+      sha256 = "0kkxvr1gfbmfbhy13syq4pqwmfqwhnbfcwjiqrwahf99gfcj5izh";
       type = "gem";
     };
-    version = "3.3.7";
+    version = "4.0.0";
   };
   jemoji = {
     dependencies = [
@@ -2316,6 +2514,17 @@
     };
     version = "2.8.1";
   };
+  jsonpath = {
+    dependencies = [ "multi_json" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0xxklfvmwz8z6l08704x65gnq6r8r1pb9qk125qjbndnb1zz6fsp";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
   jwt = {
     dependencies = [ "base64" ];
     groups = [ "default" ];
@@ -2369,6 +2578,7 @@
       "kramdown"
       "kramdown-parser-gfm"
       "net-http-persistent"
+      "ostruct"
       "unicode-blocks"
       "unicode-name"
       "unicode-scripts"
@@ -2377,10 +2587,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05csr84kb0jk4iciy09zz73a535nbyq27vv1mp1529y577d7ivsl";
+      sha256 = "1w44r4c1y69fzfbyw2bl8z5bs7jxsy288saijvl97vq8a33iq4cx";
       type = "gem";
     };
-    version = "1.7.27";
+    version = "1.7.29";
   };
   language_server-protocol = {
     groups = [ "default" ];
@@ -2392,6 +2602,21 @@
     };
     version = "3.17.0.4";
   };
+  launchy = {
+    dependencies = [
+      "addressable"
+      "childprocess"
+      "logger"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17h522xhwi5m4n6n9m22kw8z0vy8100sz5f3wbfqj5cnrjslgf3j";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
   libxml-ruby = {
     groups = [ "default" ];
     platforms = [ ];
@@ -2601,10 +2826,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s66lgmrwigp888j9nrrcsyzspxnq4wh0a8qlp11cchb7gjf0mw5";
+      sha256 = "0m3gn6l6c2gm9angaghwzrhbks8pap5d5vljyh3vqi72av81xppv";
       type = "gem";
     };
-    version = "3.2025.0325";
+    version = "3.2025.0408";
   };
   mini_magick = {
     dependencies = [
@@ -2665,6 +2890,16 @@
     };
     version = "5.25.5";
   };
+  molinillo = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
   msgpack = {
     groups = [ "default" ];
     platforms = [ ];
@@ -2716,6 +2951,16 @@
     };
     version = "0.5.6";
   };
+  nanaimo = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   nap = {
     groups = [ "default" ];
     platforms = [ ];
@@ -2856,6 +3101,16 @@
     };
     version = "2.7.4";
   };
+  nkf = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   nokogiri = {
     dependencies = [
       "mini_portile2"
@@ -3012,10 +3267,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parser = {
     dependencies = [
@@ -3026,10 +3281,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1awq9rswd3mj8sr5acp1ca6nbkk57zpw8388j7w163i8fhi2h9ib";
+      sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4";
       type = "gem";
     };
-    version = "3.3.7.4";
+    version = "3.3.8.0";
   };
   paru = {
     dependencies = [ "csv" ];
@@ -3255,10 +3510,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vb6f3v8q9m67xmbdl4vbmxis53a7igci4blg561jdfp613cf3i5";
+      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "4.0.7";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -3307,10 +3562,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00";
+      sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";
       type = "gem";
     };
-    version = "3.1.12";
+    version = "3.1.13";
   };
   rack-protection = {
     dependencies = [
@@ -3382,10 +3637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ik4y7c545pb9lf70prv0n4drblwjlaxb22fhq18wf607slabypx";
+      sha256 = "0h5vr7wd15s4zlhrnrm97b1h5bjdlcd5lvh6x2sl6khgnh21dnxf";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   rails-dom-testing = {
     dependencies = [
@@ -3430,10 +3685,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yaw5sw9vxvvkkc335laxv2k34rs2nxx9hdsy604k9wvqi03yz0d";
+      sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "7.2.2.1";
   };
   rainbow = {
     groups = [ "default" ];
@@ -3627,10 +3882,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
+      sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.1";
   };
   rest-client = {
     dependencies = [
@@ -3784,10 +4039,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0p9bq6dpvakndircsr4415vrp76hxjy1lxzy4d1j75xscl9ipk9m";
+      sha256 = "1j572nhgw64baa0dk6ggh8a5jz3x1mz006s2fj07whbqw93ydzcf";
       type = "gem";
     };
-    version = "1.73.2";
+    version = "1.75.2";
   };
   rubocop-ast = {
     dependencies = [
@@ -3798,10 +4053,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16mp7ppf3p516zs0iwbpqkn7fxs8iw12jargrc905qbc6fg69kcj";
+      sha256 = "14lf3d9bdr8cv8x3xcn3ijql5x23svk5zy7mdinlzw1f7ch09k73";
       type = "gem";
     };
-    version = "1.43.0";
+    version = "1.44.1";
   };
   rubocop-performance = {
     dependencies = [
@@ -3813,10 +4068,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1da08idjsdclcm9cimjbvd1jz2gm6z62fsc8mywrb0rn7vzkkgg5";
+      sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg";
       type = "gem";
     };
-    version = "1.24.0";
+    version = "1.25.0";
   };
   ruby-graphviz = {
     dependencies = [ "rexml" ];
@@ -3864,10 +4119,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0j4zcp7nncrr6sn0m3scnqsxcf7j2v82pxcd7p3436m70ncmm1x1";
+      sha256 = "0xkjb0kvzr4yycfps0vhkkcrjm7iby6bibn6qcsh8fszchnv23ib";
       type = "gem";
     };
-    version = "0.23.13";
+    version = "0.23.14";
   };
   ruby-lxc = {
     groups = [ "default" ];
@@ -3879,6 +4134,16 @@
     };
     version = "1.2.3";
   };
+  ruby-macho = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch";
+      type = "gem";
+    };
+    version = "2.5.1";
+  };
   ruby-progressbar = {
     groups = [ "default" ];
     platforms = [ ];
@@ -4093,10 +4358,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz";
+      sha256 = "0kf6i7xhlb5h0ik4sgi0m87as3w1r2gsjbm39n1ywlj6mxc05d1g";
       type = "gem";
     };
-    version = "5.90.0";
+    version = "5.91.0";
   };
   sequel_pg = {
     dependencies = [
@@ -4197,17 +4462,20 @@
   };
   slather = {
     dependencies = [
+      "CFPropertyList"
+      "activesupport"
       "clamp"
+      "nokogiri"
       "xcodeproj"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i1h1kr5j6v8kzrcdfrjxdf1qnnrwhxl9i5vkr8wgbspp5raissq";
+      sha256 = "03hhwrjdq3gnh6irzxg15iwsfbg14pwdmxadc5amqg7gx08l5s6x";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.8.5";
   };
   slop = {
     groups = [ "default" ];
@@ -4263,20 +4531,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lk5kah00nd727667qw070imclnd788kb2s34cp6xl3fz65pfk51";
+      sha256 = "1hgxw71pmav0sy93dcdq8z32m05asp9ycvkijg2v6a343qw3zl9z";
       type = "gem";
     };
-    version = "0.53.4";
+    version = "0.54.0";
   };
   sorbet-runtime = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0p9ahcr2914w9w3aig72zv6dl5l6jqwn4jjnqw7z0lkdn7x1z29n";
+      sha256 = "1knf5hnb8m6y41pkayim3vsz36bqlms0q3kvs9inkx9pyjh7mmy6";
       type = "gem";
     };
-    version = "0.5.11966";
+    version = "0.5.12016";
   };
   sqlite3 = {
     dependencies = [ "mini_portile2" ];
@@ -4301,10 +4569,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1461gina65n06xycxxv2d76vszjhwcivf5kj1iv3xifyv1qnpnmh";
+      sha256 = "0w5l1dsr7mpxf5fi8faq475952mxhp0kzd9w9090hd9140dd232r";
       type = "gem";
     };
-    version = "1.47.0";
+    version = "1.49.0";
   };
   standard-custom = {
     dependencies = [
@@ -4329,20 +4597,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "053ki51v2081mh6z7kgdwkvngfbk3wf9mvak630czh286gprlsn4";
+      sha256 = "125pjbfasldlmhk2zwhh4gry4fclcbplnhyxj6da3ck1w38bf5zd";
       type = "gem";
     };
-    version = "1.7.0";
-  };
-  string_inflection = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag";
-      type = "gem";
-    };
-    version = "0.1.2";
+    version = "1.8.0";
   };
   stringio = {
     groups = [ "default" ];
@@ -4481,10 +4739,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12hs5qzhah7jkj6hrzv930m816w2hiqvq5qsh7bd4mc4wb012xj9";
+      sha256 = "0y07285g72jdq7s6y4qrcd17ibcxhdx8xqp1f0s1ph207399wi7h";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   treetop = {
     dependencies = [ "polyglot" ];
@@ -4724,18 +4982,21 @@
   };
   xcodeproj = {
     dependencies = [
-      "activesupport"
+      "CFPropertyList"
+      "atomos"
       "claide"
-      "colored"
+      "colored2"
+      "nanaimo"
+      "rexml"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "080xdnlkx8zfh2ka5jzgmj4k5jqxirfzggpjrc5q5q1mh5jamfwj";
+      sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
       type = "gem";
     };
-    version = "0.28.2";
+    version = "1.27.0";
   };
   xctasks = {
     groups = [ "default" ];
@@ -4773,10 +5034,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4";
+      sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.6.18";
   };
   zookeeper = {
     groups = [ "default" ];

From 2e540100c585dcdea9795f77049bed3b48a9d556 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 15 Apr 2025 17:17:57 +0800
Subject: [PATCH 34/34] aapt, apksigner: add NixOS/android to maintainers

---
 pkgs/by-name/aa/aapt/package.nix      | 2 +-
 pkgs/by-name/ap/apksigner/package.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix
index c9944f844520..53bec816b815 100644
--- a/pkgs/by-name/aa/aapt/package.nix
+++ b/pkgs/by-name/aa/aapt/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec {
     mainProgram = "aapt2";
     homepage = "https://developer.android.com/tools/aapt2";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ linsui ];
+    maintainers = with lib.maintainers; [ linsui ] ++ lib.teams.android.members;
     platforms = lib.platforms.unix;
     badPlatforms = [
       # The linux executable only supports x86_64
diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix
index 108d15a89e99..84391b020bdc 100644
--- a/pkgs/by-name/ap/apksigner/package.nix
+++ b/pkgs/by-name/ap/apksigner/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     mainProgram = "apksigner";
     homepage = "https://developer.android.com/studio/command-line/apksigner";
     license = licenses.asl20;
-    maintainers = with maintainers; [ linsui ];
+    maintainers = with maintainers; [ linsui ] ++ lib.teams.android.members;
     platforms = platforms.unix;
   };
 }