From 26b6d485cc0de1f431a55021ada5d9a4accadc7e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:08 +0200
Subject: [PATCH 01/46] catppuccin-sddm: avoid .dev outputs propagation

---
 pkgs/by-name/ca/catppuccin-sddm/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix
index 88a7152552ea..3afb73c99358 100644
--- a/pkgs/by-name/ca/catppuccin-sddm/package.nix
+++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix
@@ -35,7 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    kdePackages.qtsvg
+    # avoid .dev outputs propagation
+    kdePackages.qtsvg.out
   ];
 
   postPatch = ''
@@ -91,11 +92,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  postFixup = ''
-    mkdir -p $out/nix-support
-    echo ${kdePackages.qtsvg} >> $out/nix-support/propagated-user-env-packages
-  '';
-
   meta = {
     description = "Soothing pastel theme for SDDM";
     homepage = "https://github.com/catppuccin/sddm";

From 91d56f2fd4362e522ae7f1e6bfbcf23655e70681 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:13 +0200
Subject: [PATCH 02/46] catppuccin-sddm-corners: avoid .dev outputs propagation

---
 pkgs/by-name/ca/catppuccin-sddm-corners/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix
index 0b8550de939f..e402e763397c 100644
--- a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix
+++ b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix
@@ -21,11 +21,12 @@ stdenvNoCC.mkDerivation {
   dontBuild = true;
   dontWrapQtApps = true;
 
-  propagatedUserEnvPkgs = with qt6; [
-    qt5compat
-    qtwayland
-    qtquick3d
-    qtsvg
+  propagatedBuildInputs = with qt6; [
+    # avoid .dev outputs propagation
+    qt5compat.out
+    qtwayland.out
+    qtquick3d.out
+    qtsvg.out
   ];
 
   installPhase = ''

From 80579d36f5cb0452bb299f9c4e9cbe0579d27953 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:16 +0200
Subject: [PATCH 03/46] where-is-my-sddm-theme: avoid .dev outputs propagation

---
 pkgs/by-name/wh/where-is-my-sddm-theme/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index eb0fee939bc5..87041f4d3977 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -43,12 +43,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
       hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
     };
 
-    propagatedUserEnvPkgs =
+    propagatedBuildInputs =
       [ ]
       ++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
+      # avoid .dev outputs propagation
       ++ lib.optionals (lib.elem "qt6" variants) [
-        qt6.qt5compat
-        qt6.qtsvg
+        qt6.qt5compat.out
+        qt6.qtsvg.out
       ];
 
     installPhase = ''

From f1058fdf675de7faa3f9af072de17f74d0d6f0e7 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:20 +0200
Subject: [PATCH 04/46] elegant-sddm: avoid .dev outputs propagation

---
 pkgs/by-name/el/elegant-sddm/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/elegant-sddm/package.nix b/pkgs/by-name/el/elegant-sddm/package.nix
index aba9e5b902c2..2698963acff5 100644
--- a/pkgs/by-name/el/elegant-sddm/package.nix
+++ b/pkgs/by-name/el/elegant-sddm/package.nix
@@ -27,7 +27,8 @@ stdenvNoCC.mkDerivation {
 
   dontWrapQtApps = true;
   propagatedBuildInputs = [
-    kdePackages.qt5compat
+    # avoid .dev outputs propagation
+    kdePackages.qt5compat.out
   ];
 
   installPhase = ''

From 942e62266583dd3fcf08d47099e8364b4d2135df Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:23 +0200
Subject: [PATCH 05/46] sddm-chili-theme: avoid .dev outputs propagation, add
 qtquickcontrols

---
 pkgs/by-name/sd/sddm-chili-theme/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sd/sddm-chili-theme/package.nix b/pkgs/by-name/sd/sddm-chili-theme/package.nix
index 1708ec5ee2e4..24fab822e025 100644
--- a/pkgs/by-name/sd/sddm-chili-theme/package.nix
+++ b/pkgs/by-name/sd/sddm-chili-theme/package.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [
-    libsForQt5.qtgraphicaleffects
+    # avoid .dev outputs propagation
+    libsForQt5.qtgraphicaleffects.out
+    libsForQt5.qtquickcontrols.out
   ];
 
   dontWrapQtApps = true;
@@ -43,11 +45,6 @@ stdenv.mkDerivation {
     mv * $out/share/sddm/themes/chili/
   '';
 
-  postFixup = ''
-    mkdir -p $out/nix-support
-
-    echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
-  '';
   meta = {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ sents ];

From 959507dace3fc30c801911ea49bd218369bd5860 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:26 +0200
Subject: [PATCH 06/46] sddm-sugar-dark: avoid .dev outputs propagation

---
 pkgs/by-name/sd/sddm-sugar-dark/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/sddm-sugar-dark/package.nix b/pkgs/by-name/sd/sddm-sugar-dark/package.nix
index 162f8e4ec266..ed9b093cd059 100644
--- a/pkgs/by-name/sd/sddm-sugar-dark/package.nix
+++ b/pkgs/by-name/sd/sddm-sugar-dark/package.nix
@@ -20,7 +20,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ];
+  propagatedBuildInputs = [
+    # avoid .dev outputs propagation
+    libsForQt5.qtgraphicaleffects.out
+  ];
 
   installPhase =
     let

From aef93624f94983b51b3b9d12a3421300174d0818 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:30 +0200
Subject: [PATCH 07/46] utterly-nord-plasma: avoid .dev outputs propagation

---
 pkgs/by-name/ut/utterly-nord-plasma/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ut/utterly-nord-plasma/package.nix b/pkgs/by-name/ut/utterly-nord-plasma/package.nix
index 6e27725a1c30..7a1755fe99fe 100644
--- a/pkgs/by-name/ut/utterly-nord-plasma/package.nix
+++ b/pkgs/by-name/ut/utterly-nord-plasma/package.nix
@@ -16,12 +16,15 @@ stdenv.mkDerivation {
     hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA=";
   };
 
-  propagatedUserEnvPkgs = with kdePackages; [
-    breeze-icons
-    kdeclarative
+  dontWrapQtApps = true;
+
+  propagatedBuildInputs = with kdePackages; [
+    # avoid .dev outputs propagation
+    qt5compat.out
     kirigami
-    libplasma
-    plasma-workspace
+    libplasma.out
+    plasma5support.out
+    plasma-workspace.out
   ];
 
   installPhase = ''

From 378d1825bf977e2e4c491658aa23a29d4257ed46 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:19:34 +0200
Subject: [PATCH 08/46] nordic: avoid .dev outputs propagation

---
 pkgs/by-name/no/nordic/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix
index 418d526e703b..9369f13e7d9a 100644
--- a/pkgs/by-name/no/nordic/package.nix
+++ b/pkgs/by-name/no/nordic/package.nix
@@ -149,13 +149,11 @@ stdenvNoCC.mkDerivation {
   '';
 
   postFixup = ''
-    # Propagate sddm theme dependencies to user env otherwise sddm
-    # does not find them. Putting them in buildInputs is not enough.
-
     mkdir -p $sddm/nix-support
 
-    printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \
-      >> $sddm/nix-support/propagated-user-env-packages
+    # avoid .dev outputs propagation
+    printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \
+      >> $sddm/nix-support/propagated-build-inputs
   '';
 
   meta = {

From a7b3afcd38593bbbace4cc4df630c2f3b55e81ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2026 14:22:12 +0000
Subject: [PATCH 09/46] ffizer: 2.13.7 -> 2.13.8

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

diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index a0067b7fd95d..3042d01b5e21 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ffizer";
-  version = "2.13.7";
+  version = "2.13.8";
 
   buildFeatures = [ "cli" ];
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ffizer";
     repo = "ffizer";
     rev = finalAttrs.version;
-    hash = "sha256-r4jaqjHYDZxftU7J6hGMXW/Oq+8biy9bFoHIOt33ta8=";
+    hash = "sha256-TV1+bupdJFmq72F4MbqyyvE/p9PufdeOUo24mPYvuAc=";
   };
 
-  cargoHash = "sha256-+aXhumywpcynKz0R0wWPWhEMfqiPBuwLbIFsABvWTnA=";
+  cargoHash = "sha256-iEdNyzY4fzfQkayXIKthv4ofl11+U2KfV63VvXrR6HQ=";
 
   nativeBuildInputs = [
     pkg-config

From 0f363a1cb4f1a29a95f94c27ca22e4bcca93224f Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 12 Mar 2026 17:47:30 +0100
Subject: [PATCH 10/46] nixos: replace container activation scripts

docker: move /init symlink creation from activationScript to installBootLoader,
which is the mechanism switch-to-configuration already uses for this purpose.

lxc: remove redundant activation script.
The installBootLoader hook was already handling /sbin/init.

incus: replace activationScript with a oneshot systemd service that uses
ConditionPathExists to create /etc/nixos/configuration.nix only on first
boot.

See: https://github.com/NixOS/nixpkgs/issues/475305
---
 .../scripts/incus/incus-container-image.nix   | 22 ++++++++++++-------
 .../incus/incus-virtual-machine-image.nix     | 22 ++++++++++++-------
 nixos/modules/profiles/docker-container.nix   |  7 +++---
 .../modules/virtualisation/lxc-container.nix  |  3 ---
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/nixos/maintainers/scripts/incus/incus-container-image.nix b/nixos/maintainers/scripts/incus/incus-container-image.nix
index 9faf6a5d87ad..989f583307fe 100644
--- a/nixos/maintainers/scripts/incus/incus-container-image.nix
+++ b/nixos/maintainers/scripts/incus/incus-container-image.nix
@@ -13,18 +13,24 @@
     ];
   };
 
-  # copy the config for nixos-rebuild
-  system.activationScripts.config =
+  # Create a default configuration.nix on first boot so nixos-rebuild works
+  # out of the box.
+  systemd.services.incus-create-nixos-config =
     let
-      config = pkgs.replaceVars ./incus-container-image-inner.nix {
+      configFile = pkgs.replaceVars ./incus-container-image-inner.nix {
         stateVersion = lib.trivial.release;
       };
     in
-    ''
-      if [ ! -e /etc/nixos/configuration.nix ]; then
-        install -m 0644 -D ${config} /etc/nixos/configuration.nix
-      fi
-    '';
+    {
+      description = "Create default NixOS configuration for Incus";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix";
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix";
+      };
+    };
 
   networking = {
     dhcpcd.enable = false;
diff --git a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix
index db60160c9c77..f06b43dc2675 100644
--- a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix
+++ b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix
@@ -13,18 +13,24 @@
     ];
   };
 
-  # copy the config for nixos-rebuild
-  system.activationScripts.config =
+  # Create a default configuration.nix on first boot so nixos-rebuild works
+  # out of the box.
+  systemd.services.incus-create-nixos-config =
     let
-      config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
+      configFile = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
         stateVersion = lib.trivial.release;
       };
     in
-    ''
-      if [ ! -e /etc/nixos/configuration.nix ]; then
-        install -m 0644 -D ${config} /etc/nixos/configuration.nix
-      fi
-    '';
+    {
+      description = "Create default NixOS configuration for Incus";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix";
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix";
+      };
+    };
 
   # Network
   networking = {
diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix
index 66d69361d584..06329d5d82f1 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -57,8 +57,9 @@ in
     ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
   '';
 
-  # Install new init script
-  system.activationScripts.installInitScript = ''
-    ln -fs $systemConfig/init /init
+  # Update /init symlink when switching configurations so the container
+  # boots the new system on restart.
+  system.build.installBootLoader = pkgs.writeShellScript "install-docker-init" ''
+    ${pkgs.coreutils}/bin/ln -fs "$1/init" /init
   '';
 }
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index a6964b8b2c9a..1eb5891b953b 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -119,8 +119,5 @@
 
       systemd.packages = [ pkgs.distrobuilder.generator ];
 
-      system.activationScripts.installInitScript = lib.mkForce ''
-        ln -fs $systemConfig/init /sbin/init
-      '';
     };
 }

From 61425f107b2b26c6ed11fd7b2fd926b99b8fedef Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 18 Mar 2026 16:55:18 +0100
Subject: [PATCH 11/46] nixos/tests/incus: test config creation and
 switch-to-configuration

Add subtests to verify the activation script replacements:
- config create service creates /etc/nixos/configuration.nix on first boot
- service does not overwrite existing configuration (ConditionPathExists)
- switch-to-configuration switch calls installBootLoader, creating /sbin/init
  (container-only, since VMs use a real bootloader)
---
 nixos/tests/incus/incus-tests-module.nix | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix
index 085dbfbc8750..8d8752fde81f 100644
--- a/nixos/tests/incus/incus-tests-module.nix
+++ b/nixos/tests/incus/incus-tests-module.nix
@@ -156,6 +156,16 @@ in
 
                       server.succeed(f"incus exec {instance_name} -- test -e /dev/tpm0")
                       server.succeed(f"incus exec {instance_name} -- test -e /dev/tpmrm0")
+
+                  with subtest("[${image_id}] default configuration.nix is created on first boot"):
+                      server.succeed(f"incus exec {instance_name} -- test -f /etc/nixos/configuration.nix")
+
+                  with subtest("[${image_id}] configuration.nix create service does not overwrite existing config"):
+                      server.succeed(f"incus exec {instance_name} -- systemctl restart incus-create-nixos-config.service")
+                      status = server.succeed(
+                          f"incus exec {instance_name} -- systemctl show -p ActiveState incus-create-nixos-config.service"
+                      ).strip()
+                      assert "inactive" in status, f"Expected inactive (ConditionPathExists should prevent start), got {status}"
                 ''
                 #
                 # container specific
@@ -164,6 +174,21 @@ in
                   lib.optionalString (config.type == "container")
                     # python
                     ''
+                      with subtest("[${image_id}] switch-to-configuration updates /sbin/init via installBootLoader"):
+                          # Remove /sbin/init so we can verify installBootLoader recreates it
+                          server.succeed(f"incus exec {instance_name} -- rm -f /sbin/init")
+                          server.fail(f"incus exec {instance_name} -- test -e /sbin/init")
+
+                          server.succeed(
+                              f"incus exec {instance_name} -- /run/current-system/bin/switch-to-configuration switch"
+                          )
+
+                          # Verify installBootLoader recreated /sbin/init pointing to the system's init
+                          server.succeed(f"incus exec {instance_name} -- test -x /sbin/init")
+                          target = server.succeed(f"incus exec {instance_name} -- readlink -f /sbin/init").strip()
+                          current = server.succeed(f"incus exec {instance_name} -- readlink -f /run/current-system/init").strip()
+                          assert target == current, f"/sbin/init -> {target}, expected {current}"
+
                       # TODO troubleshoot VM hot memory resizing which was introduced in 6.12
                       with subtest("[${image_id}] memory limits can be hotplug changed"):
                           server.set_instance_config(instance_name, "limits.memory 512MB")

From dcc5b8f7d3d883d01854fa15d00c58b8e7b81b47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 17:03:23 +0000
Subject: [PATCH 12/46] solarus: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index e6f4d1b9f9af..c5cf0d1e851b 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = "solarus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gfKf4ERdZd2g+aiMAM/16/W04G1rNDLaSO3QbhatRxU=";
+    hash = "sha256-dgsRxP0tZQjwlQhgEd8RwPtO/oU62xyy8WrHECBRMjQ=";
   };
 
   outputs = [

From 32c3ab2c64fe340a866d85ff8dbd751c88a8934e Mon Sep 17 00:00:00 2001
From: Aiden Schembri <aidsch0605@outlook.com>
Date: Wed, 8 Apr 2026 10:19:20 +0200
Subject: [PATCH 13/46] antigravity: 1.21.9 -> 1.22.2

---
 pkgs/by-name/an/antigravity/information.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json
index 237942111016..0bd4832fc776 100644
--- a/pkgs/by-name/an/antigravity/information.json
+++ b/pkgs/by-name/an/antigravity/information.json
@@ -1,22 +1,22 @@
 {
-  "version": "1.21.9",
+  "version": "1.22.2",
   "vscodeVersion": "1.107.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-x64/Antigravity.tar.gz",
-      "sha256": "85ea4d55f52d32fbbf9d92fddc747f10e8d04c1bd00a07721b571fa7f2ef5226"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-x64/Antigravity.tar.gz",
+      "sha256": "85c6b2decfefef2c6e0adaf161b602da7c1ecb2db6157ec0a4caffcfe4811209"
     },
     "aarch64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-arm/Antigravity.tar.gz",
-      "sha256": "76d56462e0fad95a98efaf25d06be9c4789e3b8551fe5b936a6858b14c723364"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-arm/Antigravity.tar.gz",
+      "sha256": "601fe7d97bf49fe06ebde331f1385e9e7e58269d23667808ae58256a87929a23"
     },
     "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-x64/Antigravity.zip",
-      "sha256": "a8ebdbf3b18c75d39b876541904c95576422e281fd92e45f7f7f4e7231ac769c"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-x64/Antigravity.zip",
+      "sha256": "14686d6b15741b33abaf52b19a10f18e8427796461efa285a2fa2ddb30e0dcad"
     },
     "aarch64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-arm/Antigravity.zip",
-      "sha256": "f9ec42d0a791cc13cbb57a1f7c36b2421e67f180cd0bdfb01fd8fa23ad87440b"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-arm/Antigravity.zip",
+      "sha256": "51e1f488da34f4e38c63806eed28a6b4bd5b583c275907945871710bed0f85d5"
     }
   }
 }

From 226ab2049795def5642273886e6b33d3822a872b Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Wed, 8 Apr 2026 12:22:42 +0000
Subject: [PATCH 14/46] supabase-cli: 2.84.2 -> 2.88.1

---
 pkgs/by-name/su/supabase-cli/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index fc1e90e768a8..04206a38e8bd 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.84.2";
+  version = "2.88.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0S+FV1aty/RzkLA6WK4Me/eKEr4LduDfIVdruQO9ZrM=";
+    hash = "sha256-v4H+sABhR53vKreq+yX9iJK7+5xlM+KXcuEUawDFZto=";
   };
 
-  vendorHash = "sha256-7BkSPFR5ciEVA/i1gy53SZu26MMkZNC+VwRHMoLJSxI=";
+  vendorHash = "sha256-5DWsFaZ700FGb6AnqTs3ewhieHuTl4SrnQHdbiNZBY4=";
 
   ldflags = [
     "-s"
@@ -60,6 +60,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       gerschtli
       kashw2
+      yuannan
     ];
     mainProgram = "supabase";
   };

From 1d8461260cca63a42ea86e330a9de14f40439cf3 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Apr 2026 15:37:37 -0400
Subject: [PATCH 15/46] telegram-desktop: 6.6.2 -> 6.7.5

Diff: https://github.com/telegramdesktop/tdesktop/compare/v6.6.2...v6.7.5

Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v6.7.5
---
 .../telegram/telegram-desktop/unwrapped.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 5af1e743f91b..148ea225fa6d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -45,14 +45,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "6.6.2";
+  version = "6.7.5";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-sMg7h+he+mlqTu8wSLAsSJzCmwTX3t+suTEY77RH+aI=";
+    hash = "sha256-HsXNTZY/+Xz7pIT7durOd5T/u7jML0rVBOPb4pnIXow=";
   };
 
   nativeBuildInputs = [

From e14f108586e373dd08933185baf878b8db47651f Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 7 Apr 2026 14:56:24 -0400
Subject: [PATCH 16/46] telegram-desktop: disable swift 6 local translation

---
 .../instant-messengers/telegram/telegram-desktop/unwrapped.nix  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 148ea225fa6d..e1c442e386bf 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -104,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
     # We're allowed to used the API ID of the Snap package:
     (lib.cmakeFeature "TDESKTOP_API_ID" "611335")
     (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c")
+    # swift 6 is not available in nixpkgs
+    (lib.cmakeBool "DESKTOP_APP_DISABLE_SWIFT6" true)
   ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 8211b89bd1f7d60c356e7316e0d455f064047e60 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 2 Apr 2026 19:57:25 -0400
Subject: [PATCH 17/46] _64gram: 1.1.94 -> 1.1.99

Diff: https://github.com/TDesktop-x64/tdesktop/compare/v1.1.94...v1.1.99

Changelog: https://github.com/TDesktop-x64/tdesktop/releases/tag/v1.1.99
---
 pkgs/by-name/_6/_64gram/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix
index 61861c856227..18968647d9e8 100644
--- a/pkgs/by-name/_6/_64gram/package.nix
+++ b/pkgs/by-name/_6/_64gram/package.nix
@@ -10,13 +10,13 @@ telegram-desktop.override {
   inherit withWebkit;
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
     pname = "64gram-unwrapped";
-    version = "1.1.94";
+    version = "1.1.99";
 
     src = fetchFromGitHub {
       owner = "TDesktop-x64";
       repo = "tdesktop";
       tag = "v${version}";
-      hash = "sha256-pMcG0B3YxrvvaLsC2yWJsm9wHpv5+xLtp+wQhRtJ38Q=";
+      hash = "sha256-p1mdNoTjftbAeoWJ+AKVPFr87BoxOLIT5fDzWY3VXMQ=";
       fetchSubmodules = true;
     };
 

From 82195b062b401acfb62f4e5af2c295c6741e98a3 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@github.no-sp.am>
Date: Wed, 8 Apr 2026 23:09:36 +0200
Subject: [PATCH 18/46] ollama: 0.20.3 -> 0.20.4

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 2a0d37e666e8..f5a8bb751000 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -94,7 +94,7 @@ let
 
   cudaToolkit = buildEnv {
     # ollama hardcodes the major version in the Makefile to support different variants.
-    # - https://github.com/ollama/ollama/blob/v0.20.3/CMakePresets.json#L21-L47
+    # - https://github.com/ollama/ollama/blob/v0.20.4/CMakePresets.json#L21-L47
     name = "cuda-merged-${cudaMajorVersion}";
     paths = map lib.getLib cudaLibs ++ [
       (lib.getOutput "static" cudaPackages.cuda_cudart)
@@ -140,13 +140,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.20.3";
+  version = "0.20.4";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0=";
+    hash = "sha256-8TbZvxxaUdROpe3gnBx0XzX62tbQ9QeJP3Yp7XXJoTQ=";
   };
 
   vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
@@ -232,7 +232,7 @@ goBuild (finalAttrs: {
     '';
 
   # ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
-  # https://github.com/ollama/ollama/blob/v0.20.3/docs/development.md#library-detection
+  # https://github.com/ollama/ollama/blob/v0.20.4/docs/development.md#library-detection
   postInstall = ''
     mkdir -p $out/lib
     cp -r build/lib/ollama $out/lib/

From 61f94de09c835444639cbfd0e402ce3f7a64bc81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 23:55:28 +0000
Subject: [PATCH 19/46] ananicy-rules-cachyos: 0-unstable-2026-03-30 ->
 0-unstable-2026-04-06

---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 8d0e58a9face..03787e8af1dc 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-03-30";
+  version = "0-unstable-2026-04-06";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "7460ed8d375425f50517119b0df3a57b876b504e";
-    hash = "sha256-hFBQGmGKUw/LT1DiyfnTsYO5Lt2c7LBMLRVBMmjYakY=";
+    rev = "ca5e3e7714eb051de7d70ee0324c11b5cecf10f8";
+    hash = "sha256-a0T6KYB6ZpCCIbEIgvkx7mb0iOS75r9aC5xmmhR5/f0=";
   };
 
   dontConfigure = true;

From fa9a9172d673f69cc40454b9e0c5c474c04bd6de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 05:45:37 +0000
Subject: [PATCH 20/46] libretro.gambatte: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-03

---
 pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 85d58a1129be..c7e77bc9a076 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "9669d1f9266684e60ac1c5ed9b438bd2a02a3b4d";
-    hash = "sha256-/mxkjVG7fkjUZ1LHNtFYA0/7ZTyvAYtcF5xO8cxWkzc=";
+    rev = "483a1f13f7e8a1c2b3076eb8bfc38e668e640c17";
+    hash = "sha256-efpehssNF3FmSbJAqRS1PkYWTs1v0y0KTdBiRV8K/WY=";
   };
 
   meta = {

From 45b7befa6e5722d74f11573968d4d2f325da27f7 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Wed, 8 Apr 2026 10:37:40 +0200
Subject: [PATCH 21/46] libwebsockets: Fix CMake config for static build

---
 pkgs/by-name/li/libwebsockets/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 973541089c39..1435543f0ad7 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: {
       ]
   );
 
+  # Remove after https://github.com/warmcat/libwebsockets/pull/3567 has been merged or otherwise addressed
+  postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
+    substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \
+      "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \
+      "set(LIBWEBSOCKETS_LIBRARIES websockets)"
+  '';
+
   postInstall = ''
     # Fix path that will be incorrect on move to "dev" output.
     substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \

From fb31a51f8cb28815f3674dd19d044e17a0e9bedf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 11:21:33 +0000
Subject: [PATCH 22/46] deezer-desktop: 7.1.120 -> 7.1.140

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

diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix
index ab20516815a8..12220e390402 100644
--- a/pkgs/by-name/de/deezer-desktop/package.nix
+++ b/pkgs/by-name/de/deezer-desktop/package.nix
@@ -8,15 +8,15 @@
 }:
 
 let
-  version = "7.1.120";
+  version = "7.1.140";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
-      hash = "sha256-RrsM8Rx/uYJpH9+w/XX0RoPw+N/+nzJCC+KFdbYzSdc=";
+      hash = "sha256-e7wgUH7sh8SwyRq/llCBu8ZuB74LTPiDEW35dfX8da4=";
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
-      hash = "sha256-WgCfX7Av8YoCHmhACyyVtxut0FUfAdgTAXaIBydWTRI=";
+      hash = "sha256-6PA/f7QOXR9BZGtINtNW00BRQ6ghWVIJudQ+/lx7kZc=";
     };
   };
 

From 74f15b9b2a861f166309090a67d92547d4e5d8e3 Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Thu, 9 Apr 2026 13:31:29 +0200
Subject: [PATCH 23/46] context7-mcp: 2.1.6 -> 2.1.7

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

diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index 8c3dabd9feaf..a1c1dc60f8ee 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
-  version = "2.1.4";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${tag-prefix}@${finalAttrs.version}";
-    hash = "sha256-bQXmKY4I5k5uaQ2FVEOPkym5X3mR87nALf3+jqJjJjE=";
+    hash = "sha256-u0sFNX19ZBWvA7HYWdM4iI9AvEVz/CK6dLfZ80Rxa9c=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-EjEdbPKXJbxaDBuAg/j+BSjI/W3HdsqbtDky0TPUB88=";
+    hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q=";
   };
 
   buildPhase = ''

From 96590d9a80c11eac1be72ee3ffb298d7fbcadffa Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Thu, 9 Apr 2026 13:32:31 +0200
Subject: [PATCH 24/46] context7-mcp: add versionCheckHook

---
 pkgs/by-name/co/context7-mcp/package.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index a1c1dc60f8ee..d3fc98d89159 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   nix-update-script,
+  versionCheckHook,
 
   nodejs,
   pnpm,
@@ -62,25 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    echo "Executing custom version check for MCP stdio server..."
-
-    output=$(< /dev/null $out/bin/context7-mcp 2>&1 || true)
-
-    if echo "$output" | grep -Fq "v${finalAttrs.version}"; then
-      echo "versionCheckPhase: found version v${finalAttrs.version}"
-    else
-      echo "versionCheckPhase: failed to find version v${finalAttrs.version}"
-      echo "Output was:"
-      echo "$output"
-      exit 1
-    fi
-
-    runHook postInstallCheck
-  '';
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version-regex '${tag-prefix}@(.*)'" ];

From aae94c5c77ffc655fc93cfb88fef59c12d85bac4 Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Thu, 9 Apr 2026 13:33:01 +0200
Subject: [PATCH 25/46] context7-mcp: fix nix-update-script arguments

---
 pkgs/by-name/co/context7-mcp/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index d3fc98d89159..c30396501940 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex '${tag-prefix}@(.*)'" ];
+    extraArgs = [
+      "--version-regex"
+      "${tag-prefix}@(.*)"
+    ];
   };
 
   meta = {

From b5fbd6ab90da6ff56cd6bfb5b3cba7d02ab00b62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:02:36 +0000
Subject: [PATCH 26/46] dn42-registry-wizard: 0.4.19 -> 0.4.20

---
 pkgs/by-name/dn/dn42-registry-wizard/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dn/dn42-registry-wizard/package.nix b/pkgs/by-name/dn/dn42-registry-wizard/package.nix
index 41add124d1a3..3bbe574b6dd9 100644
--- a/pkgs/by-name/dn/dn42-registry-wizard/package.nix
+++ b/pkgs/by-name/dn/dn42-registry-wizard/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dn42-registry-wizard";
-  version = "0.4.19";
+  version = "0.4.20";
 
   src = fetchFromGitHub {
     owner = "Kioubit";
     repo = "dn42_registry_wizard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-axtNkBX0OTm/3HwpZATsAefW/LEFDtTODLJgHJiFws8=";
+    hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E=";
   };
 
-  cargoHash = "sha256-VfdxsS8VIgDDyhNXML5jVl+9uxwHa83aWB6nJ7mHflI=";
+  cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM=";
 
   postInstall = ''
     mv $out/bin/{registry_wizard,dn42-registry-wizard}

From 335e648e74bb03a88b82c2a84ff6e68661a4c837 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:05:33 +0000
Subject: [PATCH 27/46] betterleaks: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix
index 0c4d6b2358d0..14ff444c2642 100644
--- a/pkgs/by-name/be/betterleaks/package.nix
+++ b/pkgs/by-name/be/betterleaks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "betterleaks";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "betterleaks";
     repo = "betterleaks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU=";
+    hash = "sha256-JgwusK6iYuFkba1Gekir9ufKStqL8phmKbIgNzF+JDE=";
   };
 
-  vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ=";
+  vendorHash = "sha256-wAYKsNI4FxF702Jb/82u5Ga/u2+ReRPo3LamPIHw6tM=";
 
   ldflags = [
     "-s"

From 97673d2b4037440acc7ba6ffaf453cbcf290bc11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:27:56 +0000
Subject: [PATCH 28/46] libretro.play: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-07

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index 4dd6b1f215b0..8babb39b5a13 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-07";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "cd1dba563cb39925796175f2b8ce95a15c90ee1a";
-    hash = "sha256-nP22juzUOuD/SQqrIm3AXfa1x98Uqf9rKLhzhXA4yQI=";
+    rev = "d862ad9cae6c76cbe494db54fa985f21bfcef2a8";
+    hash = "sha256-//P/ApU/36TamIMepjoBWsUHs2tR5K47V9Gf5HG3goE=";
     fetchSubmodules = true;
   };
 

From 3766bb7b6efac72713cb577246f892ab436445e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:33:23 +0000
Subject: [PATCH 29/46] sfeed: 2.3 -> 2.4

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

diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index 6f3fad79ba59..96b1067b3a57 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sfeed";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
     tag = finalAttrs.version;
-    hash = "sha256-VvPBRc2mRuDXaCz0Ds8012wSbcRo+2bZ4n7KKwDmvhw=";
+    hash = "sha256-4ItAZ3HYmFc/OlUErAhUANm/BkeCIHvPtriWn9N29lg=";
   };
 
   buildInputs = [ ncurses ];

From 7921127c00dc1389ec65f1fbbc6bec862cefe8c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:39:27 +0000
Subject: [PATCH 30/46] clever-tools: 4.7.1 -> 4.8.0

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

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 5e29e6c203ae..7335c70aa945 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.7.1";
+  version = "4.8.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-FUhqvUN4ml3uCKnU6YJLp96rX27/+LL+mrUul+LV4Vs=";
+    hash = "sha256-ei5wwx9rUfKe6hGbHuNU65kGo5quvTtRKb6sHjkEzQE=";
   };
 
-  npmDepsHash = "sha256-sT3rNYPli6hy7fv3v++JQ9Pex6y5h1tyCWAU1TekqLw=";
+  npmDepsHash = "sha256-3gmDTBi0WpmtN+qTQXDvuXGkw0g/wdxuruMdyD4UMIc=";
 
   nativeBuildInputs = [
     installShellFiles

From cf775bf62c8995030e40f0f3c8e0193a8fdadcc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 13:26:35 +0000
Subject: [PATCH 31/46] secrethound: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix
index 18eb778b9839..e836371ac04c 100644
--- a/pkgs/by-name/se/secrethound/package.nix
+++ b/pkgs/by-name/se/secrethound/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "secrethound";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "rafabd1";
     repo = "SecretHound";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mZ2rZMjNKLJ+AQQlEGUwgSpIAhqbHG53wUNDIEtJXwI=";
+    hash = "sha256-ca0AwD1oFBB8F2J4gLMtaDssacczugAkkSYdBTvT4VQ=";
   };
 
   vendorHash = "sha256-oTyI3/+evDTzyH+BjfSP0A1r2bYVAMxtWRsg0G1d2zQ=";

From dbda3b9deae9813d5e04034fd37a94c975290bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 13:28:01 +0000
Subject: [PATCH 32/46] the-powder-toy: 99.3.384 -> 99.5.394

---
 pkgs/by-name/th/the-powder-toy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 6c88a58767d1..779cfb0e645c 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-powder-toy";
-  version = "99.3.384";
+  version = "99.5.394";
 
   src = fetchFromGitHub {
     owner = "The-Powder-Toy";
     repo = "The-Powder-Toy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vlswHNkjyxM9sZT+mwiCMfNbdAbhYyx06w+ZLfaPaEQ=";
+    hash = "sha256-ejkWIxlS6J9DHw/XNmEC94oc0xmqvj+hFu3TBPyCqwg=";
   };
 
   nativeBuildInputs = [

From 4c4626a7c5cc0e81a45adc75a2aaf7485bd3f0be Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 26 Mar 2026 01:10:11 +0000
Subject: [PATCH 33/46] ocamlPackages.luv: 0.5.12 -> 0.5.14

---
 pkgs/development/compilers/haxe/default.nix   |  4 +-
 .../development/ocaml-modules/luv/default.nix | 99 ++++++++++---------
 pkgs/top-level/ocaml-packages.nix             |  9 +-
 3 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index a103221b85b9..953949b949a0 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -24,7 +24,7 @@ let
         ptmap
         camlp5
         sha
-        luv
+        luv-0-5-12
         extlib
       ]
     else
@@ -37,7 +37,7 @@ let
         ptmap
         camlp5
         sha
-        luv
+        luv-0-5-12
         extlib-1-7-7
       ];
 
diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
index 207d1a1aea3e..465d8c4b75cb 100644
--- a/pkgs/development/ocaml-modules/luv/default.nix
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -1,5 +1,3 @@
-# nixpkgs-update: no auto update
-# haxe depends on specific version of luv
 {
   lib,
   buildDunePackage,
@@ -11,51 +9,64 @@
   file,
 }:
 
-buildDunePackage rec {
-  pname = "luv";
-  version = "0.5.12";
+let
+  generic =
+    {
+      version,
+      sha256,
+    }:
+    buildDunePackage rec {
+      pname = "luv";
+      inherit version;
 
-  minimalOCamlVersion = "4.03";
+      minimalOCamlVersion = "4.03";
 
-  src = fetchurl {
-    url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
+      src = fetchurl {
+        url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
+        inherit sha256;
+      };
+
+      patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff;
+
+      postConfigure = ''
+        for f in src/c/vendor/configure/{ltmain.sh,configure}; do
+          substituteInPlace "$f" --replace /usr/bin/file file
+        done
+      '';
+
+      nativeBuildInputs = [ file ];
+      propagatedBuildInputs = [
+        ctypes
+        result
+      ];
+      checkInputs = [ alcotest ];
+      # Alcotest depends on fmt that needs 4.08 or newer
+      doCheck = lib.versionAtLeast ocaml.version "4.08";
+
+      meta = {
+        homepage = "https://github.com/aantron/luv";
+        description = "Binding to libuv: cross-platform asynchronous I/O";
+        # MIT-licensed, extra licenses apply partially to libuv vendor
+        license = with lib.licenses; [
+          mit
+          bsd2
+          bsd3
+          cc-by-sa-40
+        ];
+        maintainers = with lib.maintainers; [
+          locallycompact
+          sternenseemann
+        ];
+      };
+    };
+in
+{
+  luv-0-5-12 = generic {
+    version = "0.5.12";
     sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";
   };
-
-  patches = [
-    # backport of patch to fix incompatible pointer type. remove next update
-    # https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2
-    ./incompatible-pointer-type-fix.diff
-  ];
-
-  postConfigure = ''
-    for f in src/c/vendor/configure/{ltmain.sh,configure}; do
-      substituteInPlace "$f" --replace /usr/bin/file file
-    done
-  '';
-
-  nativeBuildInputs = [ file ];
-  propagatedBuildInputs = [
-    ctypes
-    result
-  ];
-  checkInputs = [ alcotest ];
-  # Alcotest depends on fmt that needs 4.08 or newer
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
-
-  meta = {
-    homepage = "https://github.com/aantron/luv";
-    description = "Binding to libuv: cross-platform asynchronous I/O";
-    # MIT-licensed, extra licenses apply partially to libuv vendor
-    license = with lib.licenses; [
-      mit
-      bsd2
-      bsd3
-      cc-by-sa-40
-    ];
-    maintainers = with lib.maintainers; [
-      locallycompact
-      sternenseemann
-    ];
+  luv = generic {
+    version = "0.5.14";
+    sha256 = "sha256-jgG0pQyIds3ZjY4kXAaHxNxNiDrtFhrZxazh+x/arpk=";
   };
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 72027961b6da..85a8b5df2a14 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1147,9 +1147,12 @@ let
 
         lutils = callPackage ../development/ocaml-modules/lutils { };
 
-        luv = callPackage ../development/ocaml-modules/luv {
-          inherit (pkgs) file;
-        };
+        inherit
+          (callPackage ../development/ocaml-modules/luv {
+          })
+          luv-0-5-12
+          luv
+          ;
 
         lwd = callPackage ../development/ocaml-modules/lwd { };
 

From 41b660719803ab4a584a82ef7e0e3bb0c5ff0157 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 9 Apr 2026 11:08:52 +0100
Subject: [PATCH 34/46] ocamlPackages.luv: clean up ocaml version handling

OCaml 4.08 and below has been removed from nix so we can assume we have
at least 4.09.
---
 pkgs/development/ocaml-modules/luv/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
index 465d8c4b75cb..bfa6774d0575 100644
--- a/pkgs/development/ocaml-modules/luv/default.nix
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildDunePackage,
-  ocaml,
   fetchurl,
   ctypes,
   result,
@@ -19,8 +18,6 @@ let
       pname = "luv";
       inherit version;
 
-      minimalOCamlVersion = "4.03";
-
       src = fetchurl {
         url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
         inherit sha256;
@@ -40,8 +37,7 @@ let
         result
       ];
       checkInputs = [ alcotest ];
-      # Alcotest depends on fmt that needs 4.08 or newer
-      doCheck = lib.versionAtLeast ocaml.version "4.08";
+      doCheck = true;
 
       meta = {
         homepage = "https://github.com/aantron/luv";

From 5d7f24d5155a30f7b60d88f84c31a047887f1504 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 9 Apr 2026 12:27:28 +0100
Subject: [PATCH 35/46] ocamlPackages.luv: clean up autotool file patching

Files named configure are already patched automatically:
97c43828fb7e016b4ee8fe434bc4d5e0b8a8b4be. We only need to worry about
ltmain.sh now.

Since we no longer have to worry about the missing substitution in
configure, we can use --replace-fail instead of --replace which avoids
the deprecation warning.
---
 pkgs/development/ocaml-modules/luv/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
index bfa6774d0575..193edadb4b09 100644
--- a/pkgs/development/ocaml-modules/luv/default.nix
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -26,9 +26,7 @@ let
       patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff;
 
       postConfigure = ''
-        for f in src/c/vendor/configure/{ltmain.sh,configure}; do
-          substituteInPlace "$f" --replace /usr/bin/file file
-        done
+        substituteInPlace "src/c/vendor/configure/ltmain.sh" --replace-fail /usr/bin/file file
       '';
 
       nativeBuildInputs = [ file ];

From aaec4c2dad11247694f0ab41913c89e7eaf6ddf5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Apr 2026 15:54:39 +0200
Subject: [PATCH 36/46] secrethound: add changelog to meta

- update meta
---
 pkgs/by-name/se/secrethound/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix
index e836371ac04c..1e90e726faf2 100644
--- a/pkgs/by-name/se/secrethound/package.nix
+++ b/pkgs/by-name/se/secrethound/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafabd1";
     repo = "SecretHound";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ca0AwD1oFBB8F2J4gLMtaDssacczugAkkSYdBTvT4VQ=";
   };
 
@@ -23,8 +23,9 @@ buildGoModule (finalAttrs: {
   ];
 
   meta = {
-    description = "A powerful CLI tool designed to find secrets in JavaScript files, web pages, and other text sources.";
+    description = "CLI tool designed to find secrets in JavaScript files, web pages, and other text sources";
     homepage = "https://github.com/rafabd1/SecretHound";
+    changelog = "https://github.com/rafabd1/SecretHound/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.michaelBelsanti ];
     mainProgram = "secrethound";

From 7cce57d87a63ea7374bed2c2e49f97c96837c5f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Apr 2026 17:52:16 +0200
Subject: [PATCH 37/46] evcc: 0.304.0 -> 0.304.2

https://github.com/evcc-io/evcc/releases/tag/0.304.2
---
 pkgs/by-name/ev/evcc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 70be3472aef2..326002a5aacb 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.304.0";
+  version = "0.304.2";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-zT/V3b0SQbstUk/dLmCN7bufQ7NsS5UTHIzmQsnaHIU=";
+    hash = "sha256-BViPo9P3c5ptI+pvKfpPVrYJFbbV5cF3Nn1eZ90BaRM=";
   };
 
-  vendorHash = "sha256-7Uz/VYuVnRjpDHvwPO2LLif9iWrGDvxdsre0fENBiwU=";
+  vendorHash = "sha256-CDbFutP+pLHt9IJWaCdVxoM/PE/tJ/XU7SStqMd6A6Y=";
 
   commonMeta = {
     license = lib.licenses.mit;
@@ -52,7 +52,7 @@ buildGo126Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-/M/htYm3T5DJfNKLMudItfKKQ179mrUWdL/EVGSt2ss=";
+    hash = "sha256-DmpwSART/Aw2vLMAp9fxoZ6iDZiSfDfvNCFLlAdDDRU=";
   };
 
   nativeBuildInputs = [

From 4ff5bde55c65f498892d201dfed75f01351d0697 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 Mar 2026 12:48:02 +0100
Subject: [PATCH 38/46] python3Packages.ebcdic: 1.1.1 -> 2.0.0

---
 .../python-modules/ebcdic/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ebcdic/default.nix b/pkgs/development/python-modules/ebcdic/default.nix
index 2c925eedd853..40aa8512dce9 100644
--- a/pkgs/development/python-modules/ebcdic/default.nix
+++ b/pkgs/development/python-modules/ebcdic/default.nix
@@ -2,25 +2,25 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  flit-core,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ebcdic";
-  version = "1.1.1";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roskakori";
     repo = "CodecMapper";
-    tag = "v${version}";
-    hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-71EMWUGoJrsc3EOVHeV4xqSJRKoA7Sz2dvmZJ1sjQCg=";
   };
 
-  sourceRoot = "${src.name}/${pname}";
+  sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}";
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -40,4 +40,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 7afb723621dc0d40e227920fe3ceb929bf18bc35 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Apr 2026 13:16:04 +0200
Subject: [PATCH 39/46] nginxModules.vod: 1.33 -> 1.7.0; switch to fork

The kaltura upstream has not merged any PRs since 2024-05. In the
meantime a well-maintained upstream has picked up open PRs and made 12
releases since 2025-06.
---
 pkgs/servers/http/nginx/modules.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 87d9c905ee51..e4ba92fa0bf6 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -998,35 +998,35 @@ let
       };
     };
 
-    vod = {
+    vod = rec {
       name = "vod";
+      version = "1.7.0";
+
       src = applyPatches {
         name = "vod";
         src = fetchFromGitHub {
-          owner = "kaltura";
+          owner = "dio-az";
           repo = "nginx-vod-module";
-          tag = "1.33";
-          hash = "sha256-hf4iprkdNP7lVlrm/7kMkrp/8440PuTZiL1hv/Icfm4=";
+          tag = "v${version}";
+          hash = "sha256-IcXbbmAs16F9qOEJWgH6XqP5sBMYszclGByVghj0eBM=";
         };
+
         postPatch = ''
           substituteInPlace vod/media_set.h \
             --replace-fail "MAX_CLIPS (128)" "MAX_CLIPS (1024)"
-          substituteInPlace vod/subtitle/dfxp_format.c \
-            --replace-fail '(!ctxt->wellFormed && !ctxt->recovery))' '!ctxt->wellFormed)'
-          # https://github.com/kaltura/nginx-vod-module/pull/1593
-          substituteInPlace ngx_http_vod_module.c \
-            --replace-fail 'ngx_http_vod_exit_process()' 'ngx_http_vod_exit_process(ngx_cycle_t *cycle)'
         '';
       };
 
       inputs = [
-        ffmpeg_6-headless
+        ffmpeg-headless
         fdk_aac
         openssl
         libxml2
         libiconv
       ];
 
+      passthru.tests = nixosTests.frigate;
+
       meta = {
         description = "VOD packager";
         homepage = "https://github.com/kaltura/nginx-vod-module";

From 50271477c4a5a9e6b69f0be0db0d8aa3e19c6af8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Apr 2026 16:50:39 +0200
Subject: [PATCH 40/46] nixos/frigate: set vod_hls_version

Nginx warned with the updated vod plugin:

> "vod_hls_version" must be at least 6 when "vod_hls_container_format" is fmp4
---
 nixos/modules/services/video/frigate.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index c21be4a189d2..5ecb88bfb8a2 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -640,6 +640,7 @@ in
           listen 127.0.0.1:5000;
 
           # vod settings
+          vod_hls_version 6;
           vod_base_url "";
           vod_segments_base_url "";
           vod_mode mapped;

From 3f9466994ec1379cc8f613bf0df0191bf6a43ad2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Apr 2026 18:01:48 +0200
Subject: [PATCH 41/46] python3Packages.oletools: disable failing tests

---
 pkgs/development/python-modules/oletools/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index 2ccd85b43e80..bc197109e83a 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -43,6 +43,10 @@ buildPythonPackage rec {
     # Test fails with AssertionError: Tuples differ: ('MS Word 2007+...
     "test_all"
     "test_xlm"
+    # AssertionError: Found "warn" in output...
+    "test_empty_behaviour"
+    "test_rtf_behaviour"
+    "test_text_behaviour"
   ];
 
   pythonImportsCheck = [ "oletools" ];

From e82e9bd8a33da6facd6d2368274ee40e393173e5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Apr 2026 18:05:39 +0200
Subject: [PATCH 42/46] python3Packages.oletools: modernize

---
 .../python-modules/oletools/default.nix       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index bc197109e83a..2d10dfe9509a 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -7,11 +7,12 @@
   msoffcrypto-tool,
   olefile,
   pcodedmp,
+  setuptools,
   pyparsing,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "oletools";
   version = "0.60.2";
   format = "setuptools";
@@ -19,11 +20,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "decalage2";
     repo = "oletools";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";
   };
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "pyparsing" ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     colorclass
     easygui
     msoffcrypto-tool
@@ -34,11 +39,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0"
-  '';
-
   disabledTests = [
     # Test fails with AssertionError: Tuples differ: ('MS Word 2007+...
     "test_all"
@@ -54,10 +54,11 @@ buildPythonPackage rec {
   meta = {
     description = "Module to analyze MS OLE2 files and MS Office documents";
     homepage = "https://github.com/decalage2/oletools";
+    changelog = "https://github.com/decalage2/oletools/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [
       bsd2 # and
       mit
     ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 7316724ca89d58f096e36bb610faf748e9a6db08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 17:05:58 +0000
Subject: [PATCH 43/46] azurehound: 2.11.0 -> 2.12.0

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

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index c21c58408c3c..0878a72d7602 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "azurehound";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HelzDMnQOZP8LBcF5eoQfgTOk6fBK5oCx+gu4v638JA=";
+    hash = "sha256-+3h9/R909/Bkxq0Y7oN0xpE6OH8+0Xvs/8X1NBQFrMg=";
   };
 
   vendorHash = "sha256-QCZFIDUL/RbSMrDfQ8L0A6xJPcWJorBXvHhdIA1WK4Q=";

From bb92560436e16d508499c8e2b43e574c9b4b8116 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Apr 2026 19:06:46 +0200
Subject: [PATCH 44/46] python3Packages.extract-msg: relax ebcdic

---
 pkgs/development/python-modules/extract-msg/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix
index 633218c3621b..d0cd36b0d317 100644
--- a/pkgs/development/python-modules/extract-msg/default.nix
+++ b/pkgs/development/python-modules/extract-msg/default.nix
@@ -31,13 +31,13 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-n/v3ubgzWlWqLXZfy1O7+FvTJoLMtgL7DFPL39SZnfM=";
   };
 
-  build-system = [
-    setuptools
-  ];
-
   pythonRelaxDeps = [
     "beautifulsoup4"
+    "ebcdic"
   ];
+
+  build-system = [ setuptools ];
+
   dependencies = [
     beautifulsoup4
     compressed-rtf

From 1ae6be9291582bdf9c546dbe7bab6202cb23d06c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 17:06:47 +0000
Subject: [PATCH 45/46] python3Packages.py-ocsf-models: 0.8.1 -> 0.9.0

---
 pkgs/development/python-modules/py-ocsf-models/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix
index 43c17483b57f..76744b7ddaa4 100644
--- a/pkgs/development/python-modules/py-ocsf-models/default.nix
+++ b/pkgs/development/python-modules/py-ocsf-models/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "py-ocsf-models";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "py-ocsf-models";
     tag = finalAttrs.version;
-    hash = "sha256-Wtls4Ei1160hxvZjdyH0rJCQWEN/CwpxfllwgGTzMog=";
+    hash = "sha256-MdDpCr6FuPEt67PUjF0MjWXiA+ZyKLiACc/XPp+NoII=";
   };
 
   pythonRelaxDeps = true;

From 1d070f2f478b870824f83ee40346f2cec97cc2f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 17:29:27 +0000
Subject: [PATCH 46/46] python3Packages.python-fsutil: 0.16.0 -> 0.16.1

---
 pkgs/development/python-modules/python-fsutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
index de5c9aac1dcb..ae8d768045c6 100644
--- a/pkgs/development/python-modules/python-fsutil/default.nix
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-fsutil";
-  version = "0.16.0";
+  version = "0.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "python-fsutil";
     tag = finalAttrs.version;
-    hash = "sha256-1XYyfBuaUED+xnVrILEtB+fUpc8sk4BDzGp8Hln/rlc=";
+    hash = "sha256-/KlnQdN8R95qjxMGui0SofLFZl10vq6ufl05JuVuhDw=";
   };
 
   build-system = [ setuptools ];