Merge staging-next into staging

2026-07-06 17:13:24 -05:00 · 2026-05-25 18:35:07 +00:00 · 2026-05-25 18:35:07 +00:00 · 13e9f64a65
commit 13e9f64a65
parent 1b231bee0e 93dff12487
175 changed files with 1484 additions and 615 deletions
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@ -249,8 +249,8 @@ in
        setopt ${builtins.concatStringsSep " " cfg.setOptions}
      ''}

-      # Alternative method of determining short and full hostname.
-      HOST=${config.networking.fqdnOrHostName}
+      # Determine current fqdn hostname
+      HOST=$(hostname --fqdn)

      # Setup command line history.
      # Don't export these, otherwise other shells (bash) will try to use same HISTFILE.
--- a/nixos/tests/pam/zfs-key.nix
+++ b/nixos/tests/pam/zfs-key.nix
@ -11,6 +11,7 @@ in
    { ... }:
    {
      boot.supportedFilesystems = [ "zfs" ];
+      boot.zfs.forceImportRoot = false;

      networking.hostId = "12345678";

@ -42,10 +43,10 @@ in
        machine.succeed("truncate -s 64M /testpool.img")
        machine.succeed("zpool create -O canmount=off '${pool}' /testpool.img")
        machine.succeed("zfs create -o canmount=off -p '${homes}'")
-        machine.succeed("echo ${userPassword} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/alice'")
-        machine.succeed("zfs unload-key '${homes}/alice'")
-        machine.succeed("echo ${mismatchPass} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/bob'")
-        machine.succeed("zfs unload-key '${homes}/bob'")
+        machine.succeed("echo ${userPassword} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/alice'")
+        machine.succeed("zfs unmount '${homes}/alice' && zfs unload-key '${homes}/alice'")
+        machine.succeed("echo ${mismatchPass} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/bob'")
+        machine.succeed("zfs unmount '${homes}/bob' && zfs unload-key '${homes}/bob'")

      with subtest("Switch to tty2"):
        machine.fail("pgrep -f 'agetty.*tty2'")
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@ -288,6 +288,7 @@ let

        toNvimTreesitterGrammar = makeSetupHook {
          name = "to-nvim-treesitter-grammar";
+          meta.license = lib.licenses.mit;
        } ./to-nvim-treesitter-grammar.sh;
      in

--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -8348,12 +8348,12 @@ final: prev: {

  kulala-nvim = buildVimPlugin {
    pname = "kulala.nvim";
-    version = "6.1.0";
+    version = "6.2.0";
    src = fetchFromGitHub {
      owner = "mistweaverco";
      repo = "kulala.nvim";
-      tag = "v6.1.0";
-      hash = "sha256-0wr4MdsKnS6qcmmhhRgPlSEhlyY64zQ+fArbjvdusOE=";
+      tag = "v6.2.0";
+      hash = "sha256-Uh2Lt6VZv5X9eqlbaquL40wNfJX8kON8vU9h+cHhlHg=";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@ -446,6 +446,7 @@ rec {
        vimBinary = "${vim}/bin/vim";
        inherit rtpPath;
      };
+      meta.license = lib.licenses.mit;
    } ../hooks/vim-gen-doc-hook.sh
  ) { };

@ -458,6 +459,7 @@ rec {
        vimBinary = "${neovim-unwrapped}/bin/nvim";
        inherit rtpPath;
      };
+      meta.license = lib.licenses.mit;
    } ../hooks/vim-command-check-hook.sh
  ) { };

@ -470,6 +472,7 @@ rec {
        nvimBinary = "${neovim-unwrapped}/bin/nvim";
        inherit rtpPath;
      };
+      meta.license = lib.licenses.mit;
    } ../hooks/neovim-require-check-hook.sh
  ) { };

--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@ -18,6 +18,7 @@ let
    substitutions = {
      unzip = "${buildPackages.unzip}/bin/unzip";
    };
+    meta.license = lib.licenses.mit;
  } ./unpack-vsix-setup-hook.sh;
  buildVscodeExtension = lib.extendMkDerivation {
    constructDrv = stdenv.mkDerivation;
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@ -78,6 +78,7 @@ let
      darwinSuffixSalt = stdenv.cc.suffixSalt;
      mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;
    };
+    meta.license = lib.licenses.mit;
  } ./setup-hook-darwin.sh;

  # Building Wine with these flags isn't supported on Darwin. Using any of them will result in an evaluation failures
--- a/pkgs/applications/office/activitywatch/aw-notify-desktop-notifier-6.patch
+++ b/pkgs/applications/office/activitywatch/aw-notify-desktop-notifier-6.patch
@ -0,0 +1,72 @@
+diff --git a/aw_notify/main.py b/aw_notify/main.py
+index c749725..44dce5a 100644
+--- a/aw_notify/main.py
+++ b/aw_notify/main.py
+@@ -3,6 +3,7 @@
+ and send notifications to the user on predefined conditions.
+ """
+ 
+import asyncio
+ import logging
+ import sys
+ import threading
+@@ -23,7 +24,7 @@
+ import aw_client.queries
+ import click
+ from aw_core.log import setup_logging
+-from desktop_notifier import DesktopNotifier
+from desktop_notifier import DesktopNotifier, Icon
+ from typing_extensions import TypeAlias
+ 
+ logger = logging.getLogger(__name__)
+@@ -149,11 +150,20 @@ def notify(title: str, msg: str):
+     if notifier is None:
+         notifier = DesktopNotifier(
+             app_name="AW",
+-            app_icon=f"file://{icon_path}",
+            app_icon=Icon(uri=f"file://{icon_path}"),
+             notification_limit=10,
+         )
+ 
+     logger.info(f'Showing: "{title} - {msg}"')
+-    notifier.send_sync(title=title, message=msg)
+
+    # Get or create event loop
+    try:
+        loop = asyncio.get_running_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+    # Send notification
+    loop.run_until_complete(notifier.send(title=title, message=msg))
+ 
+ 
+ class CategoryAlert:
+diff --git a/pyproject.toml b/pyproject.toml
+index 314fe2f..0d6d5a9 100644
+--- a/pyproject.toml
+++ b/pyproject.toml
+@@ -13,15 +13,15 @@ packages = [{include = "aw_notify"}]
+ aw-notify = "aw_notify.main:main"
+ 
+ [tool.poetry.dependencies]
+-python = "^3.9,<3.12"
+-aw-client = "^0.5.13"
+-desktop-notifier = "^3.4.2"
+-rubicon-objc = { version = "^0.4.0", platform = "darwin" }
+python = ">=3.9,<3.14"
+aw-client = "^0.5.15"
+desktop-notifier = "^6.0.0"
+rubicon-objc = { version = "^0.5.0", platform = "darwin" }
+ 
+ [tool.poetry.group.dev.dependencies]
+ black = "*"
+ mypy = "*"
+-pyinstaller = "^6.6"
+-pytest = "^7.4"
+pyinstaller = "^6.12.0"
+pytest = "*"
+ 
+ [build-system]
+ requires = ["poetry-core"]
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@ -159,6 +159,12 @@ rec {
    pyproject = true;
    build-system = [ python3Packages.poetry-core ];

+    patches = [
+      # Backport desktop-notifier 6 / rubicon-objc 0.5 support.
+      # https://github.com/ActivityWatch/aw-notify/pull/10
+      ./aw-notify-desktop-notifier-6.patch
+    ];
+
    dependencies = with python3Packages; [
      aw-client
      desktop-notifier
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@ -400,7 +400,7 @@ in
  # https://github.com/moby/moby/tree/${mobyRev}/Dockerfile
  docker_25 =
    let
-      version = "25.0.13";
+      version = "25.0.16";
    in
    callPackage dockerGen {
      inherit version;
@ -409,7 +409,7 @@ in
      cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
      cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
      mobyRev = "v${version}";
-      mobyHash = "sha256-X+1QG/toJt+VNLktR5vun8sG3PRoTVBAcekFXxocJdU=";
+      mobyHash = "sha256-St5yLoxo8QUTu7PjNcblS/EzZm98T189RPl1y+pAyHA=";
      runcRev = "v1.2.5";
      runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
      containerdRev = "v1.7.27";
--- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
@ -15,16 +15,20 @@
    substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ]));
    substitutions.packageGraphScript = ../../pub2nix/package-graph.py;
    substitutions.workspacePackageConfigScript = ../workspace-package-config.py;
+    meta.license = lib.licenses.mit;
  } ./dart-config-hook.sh;
  dartBuildHook = makeSetupHook {
    name = "dart-build-hook";
    substitutions.yq = "${yq}/bin/yq";
    substitutions.jq = "${jq}/bin/jq";
+    meta.license = lib.licenses.mit;
  } ./dart-build-hook.sh;
  dartInstallHook = makeSetupHook {
    name = "dart-install-hook";
+    meta.license = lib.licenses.mit;
  } ./dart-install-hook.sh;
  dartFixupHook = makeSetupHook {
    name = "dart-fixup-hook";
+    meta.license = lib.licenses.mit;
  } ./dart-fixup-hook.sh;
 }
--- a/pkgs/build-support/dlang/builddubpackage/hooks/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/hooks/default.nix
@ -1,10 +1,11 @@
-{ callPackage }:
+{ lib, callPackage }:

 {
  dubSetupHook = callPackage (
    { makeSetupHook }:
    makeSetupHook {
      name = "dub-setup-hook";
+      meta.license = lib.licenses.mit;
    } ./dub-setup-hook.sh
  ) { };

@ -13,6 +14,7 @@
    makeSetupHook {
      name = "dub-build-hook";
      propagatedBuildInputs = [ dub ];
+      meta.license = lib.licenses.mit;
    } ./dub-build-hook.sh
  ) { };

@ -21,6 +23,7 @@
    makeSetupHook {
      name = "dub-check-hook";
      propagatedBuildInputs = [ dub ];
+      meta.license = lib.licenses.mit;
    } ./dub-check-hook.sh
  ) { };
 }
--- a/pkgs/build-support/dlang/dub-support.nix
+++ b/pkgs/build-support/dlang/dub-support.nix
@ -1,8 +1,8 @@
-{ callPackage }:
+{ lib, callPackage }:

 {
  dub-to-nix = callPackage ./dub-to-nix { };
  importDubLock = callPackage ./builddubpackage/import-dub-lock.nix { };
  buildDubPackage = callPackage ./builddubpackage { };
 }
-// import ./builddubpackage/hooks { inherit callPackage; }
+// import ./builddubpackage/hooks { inherit lib callPackage; }
--- a/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix
+++ b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix
@ -11,4 +11,5 @@ makeSetupHook {
    shell = lib.getExe bash;
    patchcil = lib.getExe patchcil;
  };
+  meta.license = lib.licenses.mit;
 } ./auto-patchcil.sh
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
@ -15,4 +15,5 @@ makeSetupHook {
      coreutils
    ];
  };
+  meta.license = lib.licenses.mit;
 } ./dotnet-hook.sh
--- a/pkgs/build-support/node/build-npm-package/hooks/default.nix
+++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix
@ -31,10 +31,12 @@
      nodeVersion = nodejs.version;
      nodeVersionMajor = lib.versions.major nodejs.version;
    };
+    meta.license = lib.licenses.mit;
  } ./npm-config-hook.sh;

  npmBuildHook = makeSetupHook {
    name = "npm-build-hook";
+    meta.license = lib.licenses.mit;
  } ./npm-build-hook.sh;

  npmInstallHook = makeSetupHook {
@ -50,5 +52,6 @@
    substitutions = {
      jq = "${jq}/bin/jq";
    };
+    meta.license = lib.licenses.mit;
  } ./npm-install-hook.sh;
 }
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@ -249,5 +249,6 @@ in
      npmArch = stdenvNoCC.targetPlatform.node.arch;
      npmPlatform = stdenvNoCC.targetPlatform.node.platform;
    };
+    meta.license = lib.licenses.mit;
  } ./pnpm-config-hook.sh;
 }
--- a/pkgs/build-support/node/fetch-yarn-deps/default.nix
+++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix
@ -180,6 +180,7 @@ in
    };
    meta = {
      description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps";
+      license = lib.licenses.mit;
    };
  } ./yarn-config-hook.sh;

@ -187,6 +188,7 @@ in
    name = "yarn-build-hook";
    meta = {
      description = "Run yarn build in buildPhase";
+      license = lib.licenses.mit;
    };
  } ./yarn-build-hook.sh;

@ -202,6 +204,7 @@ in
    };
    meta = {
      description = "Prune yarn dependencies and install files for packages using Yarn 1";
+      license = lib.licenses.mit;
    };
  } ./yarn-install-hook.sh;
 }
--- a/pkgs/build-support/node/import-npm-lock/hooks/default.nix
+++ b/pkgs/build-support/node/import-npm-lock/hooks/default.nix
@ -14,6 +14,7 @@
      canonicalizeSymlinksScript = ./canonicalize-symlinks.js;
      storePrefix = builtins.storeDir;
    };
+    meta.license = lib.licenses.mit;
  } ./npm-config-hook.sh;

  linkNodeModulesHook = makeSetupHook {
@ -23,5 +24,6 @@
      script = ./link-node-modules.js;
      storePrefix = builtins.storeDir;
    };
+    meta.license = lib.licenses.mit;
  } ./link-node-modules-hook.sh;
 }
--- a/pkgs/build-support/php/builders/v1/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v1/hooks/default.nix
@ -26,6 +26,7 @@ in
    substitutions = {
      phpScriptUtils = lib.getExe php-script-utils;
    };
+    meta.license = lib.licenses.mit;
  } ./composer-repository-hook.sh;

  composerInstallHook = makeSetupHook {
@ -42,6 +43,7 @@ in
      cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
      phpScriptUtils = lib.getExe php-script-utils;
    };
+    meta.license = lib.licenses.mit;
  } ./composer-install-hook.sh;

  composerWithPluginVendorHook = makeSetupHook {
@ -58,5 +60,6 @@ in
      cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
      phpScriptUtils = lib.getExe php-script-utils;
    };
+    meta.license = lib.licenses.mit;
  } ./composer-with-plugin-vendor-hook.sh;
 }
--- a/pkgs/build-support/php/builders/v2/hooks/default.nix
+++ b/pkgs/build-support/php/builders/v2/hooks/default.nix
@ -26,6 +26,7 @@ in
    substitutions = {
      phpScriptUtils = lib.getExe php-script-utils;
    };
+    meta.license = lib.licenses.mit;
  } ./composer-vendor-hook.sh;

  composerInstallHook = makeSetupHook {
@ -42,5 +43,6 @@ in
      cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
      phpScriptUtils = lib.getExe php-script-utils;
    };
+    meta.license = lib.licenses.mit;
  } ./composer-install-hook.sh;
 }
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@ -107,6 +107,7 @@ stdenv.mkDerivation {
            wrapperName
            ;
        };
+        meta.license = lib.licenses.mit;
      } ../setup-hooks/role.bash;
      setupHook = makeSetupHook {
        name = "pkgs-config-setup-hook";
@ -116,6 +117,7 @@ stdenv.mkDerivation {
            baseBinName
            ;
        };
+        meta.license = lib.licenses.mit;
      } ./setup-hook.sh;
    in
    [
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@ -30,6 +30,7 @@
    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
    };
+    meta.license = lib.licenses.mit;
  } ./cargo-build-hook.sh;

  cargoCheckHook = makeSetupHook {
@ -44,6 +45,7 @@
    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
    };
+    meta.license = lib.licenses.mit;
  } ./cargo-check-hook.sh;

  cargoInstallHook = makeSetupHook {
@ -57,6 +59,7 @@
    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
    };
+    meta.license = lib.licenses.mit;
  } ./cargo-install-hook.sh;

  cargoNextestHook = makeSetupHook {
@ -71,6 +74,7 @@
    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
    };
+    meta.license = lib.licenses.mit;
  } ./cargo-nextest-hook.sh;

  cargoSetupHook = makeSetupHook {
@ -110,6 +114,7 @@
    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
    };
+    meta.license = lib.licenses.mit;
  } ./cargo-setup-hook.sh;

  maturinBuildHook = makeSetupHook {
@ -124,6 +129,7 @@
      inherit (rust.envVars) setEnv;

    };
+    meta.license = lib.licenses.mit;
  } ./maturin-build-hook.sh;

  bindgenHook = makeSetupHook {
@ -132,5 +138,6 @@
      libclang = (lib.getLib clang.cc);
      inherit clang;
    };
+    meta.license = lib.licenses.mit;
  } ./rust-bindgen-hook.sh;
 }
--- a/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/getRunpathEntries/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  callPackages,
  isDeclaredArray,
  makeSetupHook,
@ -11,5 +12,8 @@ makeSetupHook {
    patchelf
  ];
  passthru.tests = callPackages ./tests.nix { };
-  meta.description = "Appends runpath entries of a file to an array";
+  meta = {
+    description = "Appends runpath entries of a file to an array";
+    license = lib.licenses.mit;
+  };
 } ./getRunpathEntries.bash
--- a/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/getSortedMapKeys/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  callPackages,
  isDeclaredArray,
  isDeclaredMap,
@ -13,5 +14,8 @@ makeSetupHook {
    sortArray
  ];
  passthru.tests = callPackages ./tests.nix { };
-  meta.description = "Gets the sorted indices of an associative array";
+  meta = {
+    description = "Gets the sorted indices of an associative array";
+    license = lib.licenses.mit;
+  };
 } ./getSortedMapKeys.bash
--- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/package.nix
@ -1,9 +1,13 @@
 {
+  lib,
  callPackages,
  makeSetupHook,
 }:
 makeSetupHook {
  name = "isDeclaredArray";
  passthru.tests = callPackages ./tests.nix { };
-  meta.description = "Tests if an array is declared";
+  meta = {
+    description = "Tests if an array is declared";
+    license = lib.licenses.mit;
+  };
 } ./isDeclaredArray.bash
--- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/package.nix
@ -1,9 +1,13 @@
 {
+  lib,
  callPackages,
  makeSetupHook,
 }:
 makeSetupHook {
  name = "isDeclaredMap";
  passthru.tests = callPackages ./tests.nix { };
-  meta.description = "Tests if an associative array is declared";
+  meta = {
+    description = "Tests if an associative array is declared";
+    license = lib.licenses.mit;
+  };
 } ./isDeclaredMap.bash
--- a/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/sortArray/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  callPackages,
  isDeclaredArray,
  makeSetupHook,
@ -7,5 +8,8 @@ makeSetupHook {
  name = "sortArray";
  propagatedBuildInputs = [ isDeclaredArray ];
  passthru.tests = callPackages ./tests.nix { };
-  meta.description = "Sorts an array";
+  meta = {
+    description = "Sorts an array";
+    license = lib.licenses.mit;
+  };
 } ./sortArray.bash
--- a/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix
+++ b/pkgs/build-support/setup-hooks/flatten-include-hack/default.nix
@ -1,2 +1,8 @@
-{ makeSetupHook }:
-makeSetupHook { name = "flatten-include-hack-hook"; } ./flatten-include-hack-hook.sh
+{
+  lib,
+  makeSetupHook,
+}:
+makeSetupHook {
+  name = "flatten-include-hack-hook";
+  meta.license = lib.licenses.mit;
+} ./flatten-include-hack-hook.sh
--- a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix
+++ b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix
@ -12,6 +12,7 @@ in
    name = "patch-rc-path-bash";
    meta = {
      description = "Setup-hook to inject source-time PATH prefix to a Bash/Ksh/Zsh script";
+      license = lib.licenses.mit;
      maintainers = with lib.maintainers; [ ShamrockLee ];
    };
    passthru.tests = {
@ -25,6 +26,7 @@ in
    };
    meta = {
      description = "Setup-hook to inject source-time PATH prefix to a Csh script";
+      license = lib.licenses.mit;
      maintainers = with lib.maintainers; [ ShamrockLee ];
    };
    passthru.tests = {
@ -35,6 +37,7 @@ in
    name = "patch-rc-path-fish";
    meta = {
      description = "Setup-hook to inject source-time PATH prefix to a Fish script";
+      license = lib.licenses.mit;
      maintainers = with lib.maintainers; [ ShamrockLee ];
    };
    passthru.tests = {
@ -48,6 +51,7 @@ in
    };
    meta = {
      description = "Setup-hook to inject source-time PATH prefix to a POSIX shell script";
+      license = lib.licenses.mit;
      maintainers = with lib.maintainers; [ ShamrockLee ];
    };
    passthru.tests = {
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
@ -51,6 +51,7 @@ makeSetupHook {
      # D-Bus service enabled globally (e.g. through a NixOS module).
      dconf.lib
    ];
+  meta.license = lib.licenses.mit;
  passthru = {
    tests =
      let
--- a/pkgs/by-name/ad/addDriverRunpath/package.nix
+++ b/pkgs/by-name/ad/addDriverRunpath/package.nix
@ -11,4 +11,6 @@ makeSetupHook {
    # hardware drivers installed by NixOS
    driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32";
  };
+
+  meta.license = lib.licenses.mit;
 } ./setup-hook.sh
--- a/pkgs/by-name/ad/adguardhome/package.nix
+++ b/pkgs/by-name/ad/adguardhome/package.nix
@ -9,15 +9,15 @@

 buildGoModule (finalAttrs: {
  pname = "adguardhome";
-  version = "0.107.74";
+  version = "0.107.76";
  src = fetchFromGitHub {
    owner = "AdguardTeam";
    repo = "AdGuardHome";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cAuthACY/rBVRTSv/UIarhScm+EoTUhnkQ0RUtvhAFg=";
+    hash = "sha256-CF1Ieu7oCnzvXwoHzX5126gQGcgXL+giMtUciKBZ2ZU=";
  };

-  vendorHash = "sha256-o4hpiqQEt8gkYFeAkxPDisvLWbi7WOBZ7xMXrPt6Cdo=";
+  vendorHash = "sha256-tHabP5I7PZtDkVucF95StRyXGEsfbuc6Z3AhQZ/g2f8=";

  dashboard = buildNpmPackage {
    inherit (finalAttrs) src version;
@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
    postPatch = ''
      cd client
    '';
-    npmDepsHash = "sha256-SOHmXvGLpjs8h0X+AJ6/jAYpxzoizhwRjIzx4SqJOCo=";
+    npmDepsHash = "sha256-Yyv8dTKhZ9IlIW/x/57cl/+cpvjjycaFLSyOR0IiIPk=";
    npmBuildScript = "build-prod";
    postBuild = ''
      mkdir -p $out/build/
--- a/pkgs/by-name/an/antigravity-cli/package.nix
+++ b/pkgs/by-name/an/antigravity-cli/package.nix
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall

-    install -Dm755 antigravity $out/bin/antigravity-cli
+    install -Dm755 antigravity $out/bin/agy

    runHook postInstall
  '';
@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.unfree;
    maintainers = with lib.maintainers; [ u3kkasha ];
    platforms = lib.attrNames sources;
-    mainProgram = "antigravity-cli";
+    mainProgram = "agy";
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
 })
--- a/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/passthru-private-frameworks.nix
@ -1,9 +1,14 @@
-{ makeSetupHook, sdkVersion }:
+{
+  lib,
+  makeSetupHook,
+  sdkVersion,
+}:

 self: super: {
  passthru = super.passthru or { } // {
    privateFrameworksHook = makeSetupHook {
      name = "apple-sdk-private-frameworks-hook";
+      meta.license = lib.licenses.mit;
    } ../setup-hooks/add-private-frameworks.sh;
  };
 }
--- a/pkgs/by-name/as/asyncapi/package.nix
+++ b/pkgs/by-name/as/asyncapi/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "asyncapi";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "asyncapi";
+    repo = "cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-AvEzwUMXZZRexlcYbD4iW2GYmndN0usFxYJclXst57g=";
+  };
+
+  npmDepsHash = "sha256-f+1KRqPIufMoSv6pa7CAd8fvG8uigNjr6QE6leVCtUI=";
+
+  env.PUPPETEER_SKIP_DOWNLOAD = "true";
+
+  postPatch = ''
+    # The build script fetches AsyncAPI examples from the internet.
+    # Replace with a no-op since the CLI works without bundled examples.
+    mkdir -p assets/examples
+    echo '[]' > assets/examples/examples.json
+    substituteInPlace package.json \
+      --replace-fail "node scripts/fetch-asyncapi-example.js && " ""
+
+    # The logger tries to create a logs directory relative to __dirname,
+    # which ends up inside the read-only Nix store. Use a writable path instead.
+    substituteInPlace src/utils/logger.ts \
+      --replace-fail "path.join(__dirname, config.has('log.dir') ? config.get('log.dir') : 'logs')" \
+        "path.join(process.env.XDG_STATE_HOME || path.join(require('os').homedir(), '.local', 'state'), 'asyncapi', 'logs')" \
+      --replace-fail "fs.mkdirSync(logDir)" \
+        "fs.mkdirSync(logDir, { recursive: true })"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "CLI to work with your AsyncAPI files. You can validate them and in the future use a generator and even bootstrap a new file";
+    homepage = "https://www.asyncapi.com/tools/cli";
+    changelog = "https://github.com/asyncapi/cli/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pmyjavec ];
+    mainProgram = "asyncapi";
+  };
+})
--- a/pkgs/by-name/at/attyx/package.nix
+++ b/pkgs/by-name/at/attyx/package.nix
@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "attyx";
-  version = "0.4.0";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "semos-labs";
    repo = "attyx";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9OTvpkkIo6pb9G2mvlNeZrwyOwIhAM7f9zy1LJzxJG0=";
+    hash = "sha256-b8a/fLW4jeek5KckBWmd+fIhN6S2JoNvxAW2zBCokiY=";
  };

  deps = callPackage ./build.zig.zon.nix { };
--- a/pkgs/by-name/au/autoAddDriverRunpath/package.nix
+++ b/pkgs/by-name/au/autoAddDriverRunpath/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  addDriverRunpath,
  autoFixElfFiles,
  makeSetupHook,
@ -10,4 +11,5 @@ makeSetupHook {
    addDriverRunpath
    autoFixElfFiles
  ];
+  meta.license = lib.licenses.mit;
 } ./auto-add-driver-runpath-hook.sh
--- a/pkgs/by-name/au/autoFixElfFiles/package.nix
+++ b/pkgs/by-name/au/autoFixElfFiles/package.nix
@ -1,5 +1,9 @@
-{ makeSetupHook }:
+{
+  lib,
+  makeSetupHook,
+}:

 makeSetupHook {
  name = "auto-fix-elf-files";
+  meta.license = lib.licenses.mit;
 } ./auto-fix-elf-files.sh
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@ -10,15 +10,15 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "aws-sso-cli";
-  version = "2.1.0";
+  version = "2.2.4";

  src = fetchFromGitHub {
    owner = "synfinatic";
    repo = "aws-sso-cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-MomH4Zcc6iyVmLfA0PPsWgEqMBAAaPd+21NX4GdnFk0=";
+    hash = "sha256-JkCHzIbIeFvmXrIkQaybjUtPDzmZ2XPv6tz3fA6ni44=";
  };
-  vendorHash = "sha256-Le5BOD/iBIMQwTNmb7JcW8xJS7WG5isf4HXpJxyvez0=";
+  vendorHash = "sha256-euqhgbyz8H/fQ1RAP0k4GMOjOu7gVeYzQv75tjCh5z0=";

  nativeBuildInputs = [
    makeWrapper
@ -46,14 +46,18 @@ buildGoModule (finalAttrs: {
  checkFlags =
    let
      skippedTests = [
-        "TestAWSConsoleUrl"
        "TestAWSFederatedUrl"
-        "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x
+        "TestAWSConsoleUrlChina"
+        "TestAWSConsoleUrlEU"
+        "TestAWSConsoleUrlUSEast"
+        "TestAWSConsoleUrlUSGov"
      ]
      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ];
    in
    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

+  __darwinAllowLocalNetworking = true;
+
  meta = {
    homepage = "https://github.com/synfinatic/aws-sso-cli";
    description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard";
--- a/pkgs/by-name/br/breakpointHook/package.nix
+++ b/pkgs/by-name/br/breakpointHook/package.nix
@ -22,7 +22,10 @@ in

 makeSetupHook {
  name = "breakpoint-hook";
-  meta.broken = !stdenv.buildPlatform.isLinux;
+  meta = {
+    broken = !stdenv.buildPlatform.isLinux;
+    license = lib.licenses.mit;
+  };
  substitutions = {
    attach = "${attach}/bin/attach";
    # The default interactive shell in case $debugShell is not set in the derivation.
--- a/pkgs/by-name/br/breakpointHookCntr/package.nix
+++ b/pkgs/by-name/br/breakpointHookCntr/package.nix
@ -1,6 +1,13 @@
-{ stdenv, makeSetupHook }:
+{
+  lib,
+  stdenv,
+  makeSetupHook,
+}:

 makeSetupHook {
  name = "breakpoint-hook";
-  meta.broken = !stdenv.buildPlatform.isLinux;
+  meta = {
+    broken = !stdenv.buildPlatform.isLinux;
+    license = lib.licenses.mit;
+  };
 } ./breakpoint-hook.sh
--- a/pkgs/by-name/bu/buildbox/package.nix
+++ b/pkgs/by-name/bu/buildbox/package.nix
@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "buildbox";
-  version = "1.4.6";
+  version = "1.4.7";

  src = fetchFromGitLab {
    owner = "BuildGrid";
    repo = "buildbox/buildbox";
    tag = finalAttrs.version;
-    hash = "sha256-zNZMk9C/KsiqqGZOzc6B1WjL4wemWmdrr0a+CMA2BlQ=";
+    hash = "sha256-+OK9rmAGGLq/rJIHs++dbdyvh6WFu+Xhcp48TpnYV0w=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@ -23,7 +23,7 @@
  optipng,
  piper-tts,
  pkg-config,
-  podofo_0_10,
+  podofo0,
  poppler-utils,
  python314Packages,
  qt6,
@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
    libuchardet
    libusb1
    onnxruntime
-    podofo_0_10
+    podofo0
    poppler-utils
    qt6.qtbase
    qt6.qtwayland
@ -170,8 +170,8 @@ stdenv.mkDerivation (finalAttrs: {
    MAGICK_LIB = "${lib.getLib imagemagick}/lib";
    FC_INC_DIR = "${lib.getDev fontconfig}/include/fontconfig";
    FC_LIB_DIR = "${lib.getLib fontconfig}/lib";
-    PODOFO_INC_DIR = "${lib.getDev podofo_0_10}/include/podofo";
-    PODOFO_LIB_DIR = "${lib.getLib podofo_0_10}/lib";
+    PODOFO_INC_DIR = "${lib.getDev podofo0}/include/podofo";
+    PODOFO_LIB_DIR = "${lib.getLib podofo0}/lib";
    XDG_DATA_HOME = "${placeholder "out"}/share";
    XDG_UTILS_INSTALL_MODE = "user";
  }
--- a/pkgs/by-name/ca/cargo-tauri/hook.nix
+++ b/pkgs/by-name/ca/cargo-tauri/hook.nix
@ -77,5 +77,6 @@ makeSetupHook {
    inherit (cargo-tauri.meta) maintainers broken;
    # Platforms that Tauri supports bundles for
    platforms = lib.platforms.darwin ++ lib.platforms.linux;
+    license = lib.licenses.mit;
  };
 } ./hook.sh
--- a/pkgs/by-name/cc/cccc/cccc.patch
+++ b/pkgs/by-name/cc/cccc/cccc.patch
@ -1,24 +0,0 @@
-diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
-index df98e2b..59f2572 100644
--- a/cccc/cccc_tbl.cc
-+++ b/cccc/cccc_tbl.cc
-@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_ptr)
-   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
-   if(value_iterator!=map_t::end())
-     {
-      erase(value_iterator);
-+      map_t::erase(value_iterator);
-       retval=true;
-     }
-   return retval;
-diff --git a/makefile b/makefile
-index 23ad004..2cca469 100644
--- a/makefile
-+++ b/makefile
-@@ -20,5 +20,5 @@ test :
- 	cd test ; make -f posix.mak
- 
- install : 
-	cd install ; su root -c "make -f install.mak" 
-+	cd install ; make -f install.mak
- 
--- a/pkgs/by-name/cc/cccc/package.nix
+++ b/pkgs/by-name/cc/cccc/package.nix
@ -1,31 +1,38 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "cccc";
-  version = "3.1.4";
+  version = "3.2.0";

-  src = fetchurl {
-    url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz";
-    sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7";
+  src = fetchFromGitHub {
+    owner = "sarnold";
+    repo = "cccc";
+    tag = finalAttrs.version;
+    sha256 = "sha256-5UgCz9zURD+LsMB3kLSdkS1zFOTCuU16hK253GFu9HU";
  };

  hardeningDisable = [ "format" ];

-  patches = [ ./cccc.patch ];
-
-  preConfigure = ''
-    substituteInPlace install/install.mak --replace /usr/local/bin $out/bin
-    substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p"
-  '';
  buildFlags = [
    "CCC=c++"
    "LD=c++"
  ];

+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp cccc/cccc $out/bin/
+
+    runHook postInstall
+  '';
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-register " + lib.optionalString stdenv.cc.isGNU "-std=gnu17";
+
  meta = {
    description = "C and C++ Code Counter";
    mainProgram = "cccc";
@ -34,13 +41,9 @@ stdenv.mkDerivation rec {
      on various metrics of the code. Metrics supported include lines of code, McCabe's
      complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
    '';
-    homepage = "https://cccc.sourceforge.net/";
+    homepage = "https://github.com/sarnold/cccc";
    license = lib.licenses.gpl2;
    platforms = lib.platforms.unix;
-    maintainers = [ ];
-    # The last successful Darwin Hydra build was in 2023
-    # On linux fails to build on gcc-15, needs porting to c23, but
-    # the upstream code did not update since 2006.
-    broken = true;
+    maintainers = with lib.maintainers; [ tbutter ];
  };
-}
+})
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@ -15,7 +15,7 @@
  libxml2,
  openssl,
  pcsclite,
-  podofo_0_10,
+  podofo0,
  ghostscript,
 }:

@ -54,7 +54,7 @@ stdenv.mkDerivation {
  buildInputs = [
    cryptopp
    fontconfig
-    podofo_0_10
+    podofo0
    openssl
    pcsclite
    curl
--- a/pkgs/by-name/ct/ctestCheckHook/package.nix
+++ b/pkgs/by-name/ct/ctestCheckHook/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  makeSetupHook,
  cmake,
 }:
@ -6,4 +7,5 @@
 makeSetupHook {
  name = "ctestCheckHook";
  propagatedBuildInputs = [ cmake ];
+  meta.license = lib.licenses.mit;
 } ./ctest-check-hook.sh
--- a/pkgs/by-name/de/devede/package.nix
+++ b/pkgs/by-name/de/devede/package.nix
@ -11,6 +11,13 @@
  wrapGAppsHook3,
  gdk-pixbuf,
  gobject-introspection,
+  # The subtitle encoder and mixer 'spumux' looks for the font 'arial' by default (hardcoded in devede)
+  # and it should be made available to that program in the user environment or it throws an error.
+  # If overrideFont is true we instead use a particular font file in the nix store,
+  # which is always available by design.
+  overrideFont ? true,
+  liberation_ttf,
+  fontPath ? "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf",
 }:

 let
@ -33,7 +40,7 @@ buildPythonApplication (finalAttrs: {
  src = fetchFromGitLab {
    owner = "rastersoft";
    repo = "devedeng";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
    hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg=";
  };

@ -63,16 +70,27 @@ buildPythonApplication (finalAttrs: {
  ];

  postPatch = ''
-    substituteInPlace setup.py --replace "'/usr'," ""
    substituteInPlace src/devedeng/configuration_data.py \
-      --replace "/usr/share" "$out/share" \
-      --replace "/usr/local/share" "$out/share"
+      --replace-fail "/usr/share" "$out/share" \
+      --replace-fail "/usr/local/share" "$out/share"
+  ''
+  + lib.optionalString overrideFont ''
+    substituteInPlace src/devedeng/subtitles_mux.py \
+      --replace-fail arial ${fontPath}
+  '';
+
+  # Prevent double wrapping, let the Python wrapper use the args in preFixup.
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';

  passthru.updateScript = ./update.sh;

  meta = {
    description = "DVD Creator for Linux";
+    mainProgram = "devede_ng";
    homepage = "https://www.rastersoft.com/programas/devede.html";
    license = lib.licenses.gpl3;
    maintainers = [
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@ -61,13 +61,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "easyeffects";
-  version = "8.2.2";
+  version = "8.2.4";

  src = fetchFromGitHub {
    owner = "wwmm";
    repo = "easyeffects";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-rdg7XvrJU7HH9aGd/TwMqqexmFeLOMBldh1XQakQSeM=";
+    hash = "sha256-hhQVfUXjobQmrSYFquxbkIuCdBYaExAtjtwbyVqyVUg=";
  };

  nativeBuildInputs = [
@ -114,8 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
    speexdsp'
    onetbb
    webrtc-audio-processing
-    x42-plugins
    zita-convolver
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86 [
+    x42-plugins
  ];

  preFixup =
@ -124,8 +126,10 @@ stdenv.mkDerivation (finalAttrs: {
        calf # compressor exciter, bass enhancer and others
        lsp-plugins # delay, limiter, multiband compressor
        mda_lv2 # loudness
-        x42-plugins # autotune
        zam-plugins # maximizer
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isx86 [
+        x42-plugins # autotune
      ];

      ladspaPlugins = [
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@ -17,16 +17,16 @@
 }:

 let
-  version = "0.307.0";
+  version = "0.307.1";

  src = fetchFromGitHub {
    owner = "evcc-io";
    repo = "evcc";
    tag = version;
-    hash = "sha256-G6+8cJF+So9kePDpNlFGuvsTU5+KXg9dlgaMnElWwL8=";
+    hash = "sha256-ED+mRcnkerdPFjEhxH3fBr8GcH0geLVnjnejpNqNBdI=";
  };

-  vendorHash = "sha256-ie5wCRgGj8DeotYD/GrDP9qTnonTJsMqj1fBqHNR84M=";
+  vendorHash = "sha256-sOyx1Ev0UfoI6mOQAWide19Sg/MWJ8VUVftN9psNq5U=";

  commonMeta = {
    license = lib.licenses.mit;
@ -40,7 +40,7 @@ buildGo126Module rec {

  npmDeps = fetchNpmDeps {
    inherit src;
-    hash = "sha256-CtZoPtpENUfaVvs2zozBWsMYD8ZJFAXig7sYcNNLwzY=";
+    hash = "sha256-U7gcAkfw7a0skM91mSAZJIPUPBRfSkyJYVjjVyEyZ4E=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "files-cli";
-  version = "2.15.297";
+  version = "2.15.305";

  src = fetchFromGitHub {
    repo = "files-cli";
    owner = "files-com";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-oXgAQikdzzcp0SxYSerqXvjZ4/hI8Wt9ZJio7tHlt38=";
+    hash = "sha256-LnwcDzJLqxqYtjqi9XWOpa80DHKUDaL5eu6Yv/ZKiNs=";
  };

-  vendorHash = "sha256-SYi7Pq+vIMp0SH434cp0zJLV7ZkzODW3+FIarnX4ezs=";
+  vendorHash = "sha256-vGhH3CTEQ5YIFZo/HYN6iMBTnH2O5mO1XbDCbWZDvYE=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/fl/flux9s/package.nix
+++ b/pkgs/by-name/fl/flux9s/package.nix
@ -5,17 +5,18 @@
  pkg-config,
  rustPlatform,
  versionCheckHook,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "flux9s";
-  version = "0.7.2";
+  version = "0.9.0";

  src = fetchCrate {
    inherit (finalAttrs) pname version;
-    hash = "sha256-B1BZuR+ieW4/ykYl0kltM7hou7oBT9qky9MY5V43r9g=";
+    hash = "sha256-cto3Fu2UW8+Pq6OK5miw+cAwzqiotTGWPD0Yyckh1/M=";
  };

-  cargoHash = "sha256-Re+vX59uJQyQsPBJTWjj8QphxqyN/KpbcS+jzRBlyEw=";
+  cargoHash = "sha256-uOa/qWBtTQf7jJWJhFJBmYWQ5mU/3P/YuACbnVbHdJc=";

  nativeBuildInputs = [ pkg-config ];

@ -25,6 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
  doInstallCheck = true;
  versionCheckProgramArg = "version";

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "K9s-inspired terminal UI for monitoring Flux GitOps resources in real-time";
    mainProgram = "flux9s";
--- a/pkgs/by-name/gc/gclient2nix/package.nix
+++ b/pkgs/by-name/gc/gclient2nix/package.nix
@ -46,6 +46,7 @@ let
      substitutions = {
        jq = lib.getExe buildPackages.jq;
      };
+      meta.license = lib.licenses.mit;
    } ./gclient-unpack-hook.sh
  ) { };

--- a/pkgs/by-name/gi/gimagereader/package.nix
+++ b/pkgs/by-name/gi/gimagereader/package.nix
@ -6,7 +6,7 @@
  pkg-config,
  libuuid,
  sane-backends,
-  podofo_0_10,
+  podofo0,
  libjpeg,
  djvulibre,
  libxmlxx3,
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
    libzip
    libuuid
    sane-backends
-    podofo_0_10
+    podofo0
    libjpeg
    djvulibre
    tesseract
--- a/pkgs/by-name/gi/gitSetupHook/package.nix
+++ b/pkgs/by-name/gi/gitSetupHook/package.nix
@ -11,4 +11,5 @@ makeSetupHook {
    gitMinimal = lib.getExe gitMinimal;
  };

+  meta.license = lib.licenses.mit;
 } ./gitSetupHook.sh
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@ -10,16 +10,16 @@
 }:
 buildGo126Module (finalAttrs: {
  pname = "goreleaser";
-  version = "2.15.4";
+  version = "2.16.0";

  src = fetchFromGitHub {
    owner = "goreleaser";
    repo = "goreleaser";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-KpOttfnlVB+4YHg/SHqJHjQtK7DDO2yh6WH1kQFe/tE=";
+    hash = "sha256-TV03T9OZXiEa4+v1teI9YA2ilDEU4RoDY9kGdENfZqU=";
  };

-  vendorHash = "sha256-I4y+0yT6/SFvJbJTByHn/EPQ3rNzpUEb4/7gtF+i80o=";
+  vendorHash = "sha256-9an5C6xLxyiC4pejOZlz40ZNdc6c0A1mvekXefrCTeQ=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ha/hare/hook.nix
+++ b/pkgs/by-name/ha/hare/hook.nix
@ -52,5 +52,6 @@ makeSetupHook {
  meta = {
    description = "Setup hook for the Hare compiler";
    inherit (hare.meta) badPlatforms platforms;
+    license = lib.licenses.mit;
  };
 } ./setup-hook.sh
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@ -15,7 +15,7 @@
  ninja,
  opencascade-occt_7_6,
  pkg-config,
-  podofo_0_10,
+  podofo0,
  sqlite,
 }:
 let
@ -51,7 +51,7 @@ rec {
    librsvg
    libuuid
    opencascade-occt
-    podofo_0_10
+    podofo0
    sqlite
  ];

--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@ -6,10 +6,10 @@
 }:
 let
  pname = "hydralauncher";
-  version = "3.9.5";
+  version = "3.9.8";
  src = fetchurl {
    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-FFF5k+eGKg066zYYc9GvRMCsXdu092h9SQGvO6S8rBA=";
+    hash = "sha256-jKhmcHfi3QuihTxIX73QRLfs8K7iH+lKxhCNpKJsumk=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname src version; };
--- a/pkgs/by-name/hy/hyprmon/package.nix
+++ b/pkgs/by-name/hy/hyprmon/package.nix
@ -1,27 +1,28 @@
 {
-  lib,
  buildGo126Module,
  fetchFromGitHub,
+  lib,
 }:
 buildGo126Module (finalAttrs: {
  pname = "hyprmon";
-  version = "0.0.15";
+  version = "0.0.17";

  src = fetchFromGitHub {
    owner = "erans";
    repo = "hyprmon";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-dcjEnxSQwXUPJ44gj7pVPQtZUkBXbqLvQgmhYvANz8o=";
+    hash = "sha256-1rtmToVveAkNRqPR1gDCYIOS+nM9Ag+3T5QYJmdtbEg=";
  };

-  vendorHash = "sha256-n4RZxpsrlSUD3B/GLVoM2CPckvDkbyaMyg6h4QNbuH0=";
+  vendorHash = "sha256-U2fw/1tnRwmd9qzEcrMduZbbNU67NbDhG2Id5IHj5js=";

  meta = {
    description = "TUI monitor configuration tool for Hyprland with visual layout, drag-and-drop, and profile management";
-    homepage = "https://github.com/erans/hyprmon";
+    inherit (finalAttrs.src.meta) homepage;
+    changelog = "${finalAttrs.src.meta.homepage}/releases/tag/${finalAttrs.src.rev}";
    license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ onatustun ];
    mainProgram = "hyprmon";
+    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/in/installShellFiles/package.nix
+++ b/pkgs/by-name/in/installShellFiles/package.nix
@ -13,4 +13,5 @@ makeSetupHook {
      directory = ./tests;
    };
  };
+  meta.license = lib.licenses.mit;
 } ./setup-hook.sh
--- a/pkgs/by-name/ju/juce/projucerHook.nix
+++ b/pkgs/by-name/ju/juce/projucerHook.nix
@ -6,5 +6,8 @@
 makeSetupHook {
  name = "projucer-hook";
  propagatedBuildInputs = [ (callPackage ./package.nix { }) ];
-  meta.platforms = lib.platforms.linux;
+  meta = {
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+  };
 } ./projucer-hook.sh
--- a/pkgs/by-name/ju/julec/hook.nix
+++ b/pkgs/by-name/ju/julec/hook.nix
@ -1,4 +1,5 @@
 {
+  lib,
  julec,
  makeSetupHook,
 }:
@ -10,5 +11,6 @@ makeSetupHook {

  meta = {
    inherit (julec.meta) maintainers;
+    license = lib.licenses.mit;
  };
 } ./hook.sh
--- a/pkgs/by-name/kr/krename/package.nix
+++ b/pkgs/by-name/kr/krename/package.nix
@ -6,7 +6,7 @@
  kdePackages,
  taglib,
  exiv2,
-  podofo_0_10,
+  podofo0,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = with kdePackages; [
    exiv2
-    podofo_0_10
+    podofo0
    kio
    kxmlgui
    qtbase
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "kubectl-cnpg";
-  version = "1.29.0";
+  version = "1.29.1";

  src = fetchFromGitHub {
    owner = "cloudnative-pg";
    repo = "cloudnative-pg";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-D4Z2v0bBctQPVm7lblyQP3qD16GXGLF+5gQ6tCsuu8M=";
+    hash = "sha256-SlisY7v/CFVXH85IAvlBH1RjyrTS+e8hFHJIwh0FgCc=";
  };

-  vendorHash = "sha256-WDVipOz2yx9kvSQnc0Fnn+es0OhLgXye4e6jro0xDZ8=";
+  vendorHash = "sha256-He5L4HBTMOlzLgB+tAxNbjvDdvGyz5UolC8mMFibwZ4=";

  subPackages = [ "cmd/kubectl-cnpg" ];

--- a/pkgs/by-name/ku/kulala-core/package.nix
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@ -10,7 +10,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "kulala-core";
-  version = "0.6.0";
+  version = "0.7.0";

  strictDeps = true;
  __structuredAttrs = true;
@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "mistweaverco";
    repo = "kulala-core";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qEPJFd1/C9F8oyUTx3PMmRS9B8kdjQT9O0bfoalAJ/k=";
+    hash = "sha256-zY/Yg/1s/pyyuKxtUa2cIzLCraSNSzpPMBx9EbGIIGI=";
  };

  node_modules = stdenv.mkDerivation {
--- a/pkgs/by-name/le/lensfun/package.nix
+++ b/pkgs/by-name/le/lensfun/package.nix
@ -1,6 +1,7 @@
 {
  lib,
  stdenv,
+  stdenvNoCC,
  fetchFromGitHub,
  pkg-config,
  glib,
@ -9,20 +10,54 @@
  cmake,
  python3,
  python3Packages,
+
+  # optionally specify a derivation containing the lens data as generated from the `generate_db.py` script
+  lensfunDatabases ? null,
 }:

 let
  version = "0.3.4";
  pname = "lensfun";

-  # Fetch a more recent version of the repo containing a more recent lens
-  # database
-  lensfunDatabase = fetchFromGitHub {
-    owner = "lensfun";
-    repo = "lensfun";
-    rev = "a1510e6f33ce9bc8b5056a823c6d5bc6b8cba033";
-    sha256 = "sha256-qdONyKk873Tq11M33JmznhJMAGd4dqp5KdXdVhfy/Ak=";
-  };
+  lensData =
+    if lensfunDatabases != null then
+      lensfunDatabases
+    else
+      # fetch a more recent version of the lens database
+      stdenvNoCC.mkDerivation {
+        name = "lensfun-databases";
+
+        src = fetchFromGitHub {
+          owner = "lensfun";
+          repo = "lensfun";
+          rev = "201da1a7433626a2a1ecd67e1f21a42fb17aa4a5";
+          sha256 = "sha256-64ZcupHA4oClPRCnG8KofGC46M/mZFermugzQ15B6k4=";
+
+          leaveDotGit = true;
+          # generate timestamp based on the most recent commit
+          postFetch = ''
+            cd $out
+            git log -1 --format=%at > $out/timestamp.txt
+            rm -R .git
+          '';
+        };
+
+        nativeBuildInputs = [
+          python3
+          python3Packages.setuptools
+          python3Packages.lxml
+        ];
+
+        # generates versioned tarballs of lens data
+        # patch applied so that we read the previously generated `timestamp.txt` instead
+        # of trying to read from `.git` (which is deleted during `postFetch`)
+        buildPhase = ''
+          substituteInPlace tools/update_database/generate_db.py \
+            --replace-fail '"git", "log", "-1", "--format=%ad", "--date=raw", "--", "*.xml"' '"cat", "timestamp.txt"'
+          python3 tools/update_database/generate_db.py --input data/db --output $out
+          cp timestamp.txt $out/timestamp.txt
+        '';
+      };

 in
 stdenv.mkDerivation {
@ -36,15 +71,13 @@ stdenv.mkDerivation {
  };

  # replace database with a more recent snapshot
-  # the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
-  # so we run the conversion tool the project provides,
-  # then untar the version 1 profiles into the source dir before we build
+  # the master branch uses version 2 profiles, while this version requires version 1 profiles
+  # also copies in the required `timestamp.txt` file
  prePatch = ''
    rm -R data/db
-    python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db
    mkdir -p data/db
-    tar xvf $TMPDIR/db/version_1.tar -C data/db
-    date +%s > data/db/timestamp.txt
+    tar xvfj ${lensData}/version_1.tar.bz2 -C data/db
+    cp ${lensData}/timestamp.txt data/db/timestamp.txt
  ''
  # Backport CMake 4 support
  # This is already on master, but not yet in a stable release:
@ -60,9 +93,6 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    cmake
    pkg-config
-    python3
-    python3Packages.setuptools
-    python3Packages.lxml # For the db converison
  ];

  buildInputs = [
--- a/pkgs/by-name/li/libcosmicAppHook/package.nix
+++ b/pkgs/by-name/li/libcosmicAppHook/package.nix
@ -91,5 +91,6 @@ makeSetupHook {
  meta = {
    description = "Setup hook for configuring and wrapping applications based on libcosmic";
    teams = [ lib.teams.cosmic ];
+    license = lib.licenses.mit;
  };
 } ./libcosmic-app-hook.sh
--- a/pkgs/by-name/li/libudev-zero/package.nix
+++ b/pkgs/by-name/li/libudev-zero/package.nix
@ -2,23 +2,25 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  hwdata,
  testers,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "libudev-zero";
-  version = "1.0.3";
+  version = "1.0.4";

  src = fetchFromGitHub {
    owner = "illiliti";
    repo = "libudev-zero";
    rev = finalAttrs.version;
-    sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI=";
+    sha256 = "sha256-uKOfN9oJBFkR5n92bQ8RxVxfNaE2EKajrQseDkH5q+k=";
  };

  makeFlags = [
    "PREFIX=$(out)"
    "AR=${stdenv.cc.targetPrefix}ar"
+    "USB_IDS_PATH=${hwdata}/share/hwdata/usb.ids"
  ];

  # Just let the installPhase build stuff, because there's no
--- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix
+++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix
@ -30,4 +30,6 @@ makeSetupHook {

    tests = tests.makeBinaryWrapper;
  };
+
+  meta.license = lib.licenses.mit;
 } ./make-binary-wrapper.sh
--- a/pkgs/by-name/mc/mcat-unwrapped/package.nix
+++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix
@ -9,21 +9,26 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mcat-unwrapped";
-  version = "0.4.6";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "Skardyy";
    repo = "mcat";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8NWWEV/1Kk3s/Ip6Mtt2uSX8lhsaVFmkldBG1qyCTrM=";
+    hash = "sha256-zedVMX3JV0jHSUzSY3x9Olimy4Y6GrNVGRSc6Eev9ow=";
  };

-  cargoHash = "sha256-VrJMM++giBJQt+8YBPu370AScLTOgaLZNiRP3wk9nt8=";
+  cargoHash = "sha256-szqXS2CRfHoCtt6Lq1DuVb199mIuf7HUPiN7fj5BGtc=";

  nativeBuildInputs = [
    installShellFiles
  ];

+  checkFlags = [
+    # Requires network access: the test embeds a remote URL in the SVG.
+    "--skip=stdin_svg_output_is_image"
+  ];
+
  postInstall =
    let
      mcat =
--- a/pkgs/by-name/me/memcachedTestHook/package.nix
+++ b/pkgs/by-name/me/memcachedTestHook/package.nix
@ -15,4 +15,6 @@ makeSetupHook {
  passthru.tests = {
    simple = callPackage ./test.nix { };
  };
+
+  meta.license = lib.licenses.mit;
 } ./memcached-test-hook.sh
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@ -74,7 +74,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    license = lib.licenses.bsd0;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [
-      quadradical
      aleksana
    ];
    mainProgram = "monophony";
--- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
+++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  callPackage,
  makeSetupHook,
  stdenv,
@ -11,4 +12,6 @@ makeSetupHook {
    iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo";
    topology = ./topology.xml;
  };
+
+  meta.license = lib.licenses.mit;
 } ./mpi-check-hook.sh
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix
@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-data-flows";
+  version = "1.5.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Alef-Burzmali";
+    repo = "netbox-data-flows";
+    tag = "v${version}";
+    hash = "sha256-fry8AK0qgPs+QC5L2oilGSY68m1Y9KHWQ/QOzQ7B2+k=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_data_flows" ];
+
+  meta = {
+    description = "NetBox plugin to document data flows between systems and applications";
+    homepage = "https://github.com/Alef-Burzmali/netbox-data-flows";
+    changelog = "https://github.com/Alef-Burzmali/netbox-data-flows/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix
@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-inventory";
+  version = "2.5.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "ArnesSI";
+    repo = "netbox-inventory";
+    tag = "v${version}";
+    hash = "sha256-6MIYwz11YZhu3ksM7iAfKACKIKpuq283DTzaRR3lcXA=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_inventory" ];
+
+  meta = {
+    description = "NetBox plugin to manage hardware inventory";
+    homepage = "https://github.com/ArnesSI/netbox-inventory";
+    changelog = "https://github.com/ArnesSI/netbox-inventory/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+  pycryptodome,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-secrets";
+  version = "3.0.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Onemind-Services-LLC";
+    repo = "netbox-secrets";
+    tag = "v${version}";
+    hash = "sha256-4qUbzQTfSCXT7b8DfrsP9y3tatJZa5F40kl9tuMKed4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pycryptodome ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_secrets" ];
+
+  meta = {
+    description = "NetBox plugin to enhance secret management with encrypted storage and flexible, user-friendly features";
+    homepage = "https://github.com/Onemind-Services-LLC/netbox-secrets";
+    changelog = "https://github.com/Onemind-Services-LLC/netbox-secrets/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
--- a/pkgs/by-name/ne/netron/package.nix
+++ b/pkgs/by-name/ne/netron/package.nix
@ -16,16 +16,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
  pname = "netron";
-  version = "9.0.8";
+  version = "9.0.9";

  src = fetchFromGitHub {
    owner = "lutzroeder";
    repo = "netron";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vWzifB8A0VzzSkPVrcFtrR/tLBeFh1n+xwefhNo4PDQ=";
+    hash = "sha256-SNBNjMmOVkOpLGnzrXotUecQuEKii8bg22GPA1wiF3s=";
  };

-  npmDepsHash = "sha256-3Vaoym7o3sTmEHTNTG90i/NgdJ2x+skJ1slpp0dmv64=";
+  npmDepsHash = "sha256-KgMf4qWM8HeaZ6UQNVqLjbFZvlFZ/Y2YydI/dtGaeEw=";

  nativeBuildInputs = [ jq ];

--- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
@ -4,20 +4,20 @@
  rustPlatform,
  makeWrapper,
  nix,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "nixpkgs-hammering";
-  version = "0-unstable-2025-09-10";
+  version = "0-unstable-2026-04-21";

  src = fetchFromGitHub {
    owner = "jtojnar";
    repo = "nixpkgs-hammering";
-    rev = "8cb86601cfa5521b454974d7219924f2d1c304c9";
-    hash = "sha256-9rSdimO591tpfe3MpcHkqsc0lPk6roNwgj6ajVSOG7E=";
+    rev = "0ca8e718c6809e0c2b640b954bfe000b915634dc";
+    hash = "sha256-j/jqwdM466jE2Rf6aW3DfI6wQa44eN8W8/ii1aX8HDs=";
  };

-  cargoHash = "sha256-MRwmeR5rj0PWUF5VMW5+9BbcX7Pq82YhufUv2Gt107U=";
+  cargoHash = "sha256-Lmj9XWUUavlmZn/IK+CcXQhKUYfz3dKF6S2U3BMhoIc=";

  nativeBuildInputs = [ makeWrapper ];
  postInstall = ''
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # running checks requires to run nix inside of the builder which fails due to permission errors
  doCheck = false;

-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

  meta = {
    description = "Set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests";
--- a/pkgs/by-name/no/nodejsInstallExecutables/package.nix
+++ b/pkgs/by-name/no/nodejsInstallExecutables/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  makeSetupHook,
  installShellFiles,
  makeWrapper,
@ -16,4 +17,5 @@ makeSetupHook {
    hostNode = "${nodejs}/bin/node";
    jq = "${jq}/bin/jq";
  };
+  meta.license = lib.licenses.mit;
 } ./hook.sh
--- a/pkgs/by-name/no/nodejsInstallManuals/package.nix
+++ b/pkgs/by-name/no/nodejsInstallManuals/package.nix
@ -1,4 +1,5 @@
 {
+  lib,
  makeSetupHook,
  installShellFiles,
  jq,
@ -10,4 +11,5 @@ makeSetupHook {
  substitutions = {
    jq = "${jq}/bin/jq";
  };
+  meta.license = lib.licenses.mit;
 } ./hook.sh
--- a/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix
+++ b/pkgs/by-name/or/or-tools/pybind11-2.13.6.nix
@ -26,6 +26,7 @@ let
      pythonIncludeDir = "${python}/include/python${python.pythonVersion}";
      pythonSitePackages = "${python}/${python.sitePackages}";
    };
+    meta.license = lib.licenses.mit;
  } ./pybind11-setup-hook.sh;
 in
 buildPythonPackage (finalAttrs: {
--- a/pkgs/by-name/pa/patchPpdFilesHook/package.nix
+++ b/pkgs/by-name/pa/patchPpdFilesHook/package.nix
@ -14,6 +14,7 @@ makeSetupHook {
  passthru.tests.test = callPackage ./test.nix { };
  meta = {
    description = "Setup hook to patch executable paths in ppd files";
+    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.yarny ];
  };
 } ./patch-ppd-hook.sh
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@ -32,13 +32,13 @@

 (resholve.mkDerivation (finalAttrs: {
  pname = "pihole";
-  version = "6.4";
+  version = "6.4.2";

  src = fetchFromGitHub {
    owner = "pi-hole";
    repo = "pi-hole";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-aBQO+wAqeuXc9ekByVFlOZQ9SBCGsozGdoS8r1qhGuk=";
+    hash = "sha256-A34LLXI+hmDNXN4MoLLlC9tW3xx+v/1La/qzFSDW0xQ=";
  };

  patches = [
@ -231,6 +231,11 @@
      ];
    };

+  passthru = {
+    inherit stateDir;
+    tests = nixosTests.pihole-ftl;
+  };
+
  meta = {
    description = "Black hole for Internet advertisements";
    homepage = "https://pi-hole.net";
@ -240,12 +245,11 @@
    platforms = lib.platforms.linux;
    mainProgram = "pihole";
  };
-
-  passthru.tests = nixosTests.pihole-ftl;
-
-  passthru = { inherit stateDir; };
 })).overrideAttrs
  (old: {
+    # fixes nix-update trying to update resholve instead of this package
+    inherit (old) version src;
+
    # Resholve can't fix the hardcoded absolute paths, so substitute them before resholving
    preFixup = ''
      scriptsDir=$out/share/pihole
--- a/pkgs/by-name/po/podofo_1_0/package.nix
+++ b/pkgs/by-name/po/podofo_1_0/package.nix
@ -47,13 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  cmakeFlags = [
-    "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
-    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+    (lib.cmakeBool "PODOFO_BUILD_STATIC" stdenv.hostPlatform.isStatic)
+    (lib.cmakeBool "CMAKE_BUILD_WITH_INSTALL_NAME_DIR" true)
  ];

+  strictDeps = true;
+  __structuredAttrs = true;
+
  meta = {
    homepage = "https://github.com/podofo/podofo";
    description = "Library to work with the PDF file format";
+    changelog = "https://github.com/podofo/podofo/blob/${finalAttrs.version}/CHANGELOG.md";
    platforms = lib.platforms.all;
    license = with lib.licenses; [
      gpl2Plus
--- a/pkgs/by-name/po/podofo0/package.nix
+++ b/pkgs/by-name/po/podofo0/package.nix
@ -0,0 +1,11 @@
+{
+  podofo,
+  libidn,
+}:
+podofo.overrideAttrs (prevAttrs: {
+  version = "0.10.6";
+  src = prevAttrs.src.override {
+    hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI=";
+  };
+  buildInputs = prevAttrs.buildInputs ++ [ libidn ];
+})
--- a/pkgs/by-name/po/podofo_0_10/package.nix
+++ b/pkgs/by-name/po/podofo_0_10/package.nix
@ -1,68 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  fontconfig,
-  freetype,
-  libidn,
-  libjpeg,
-  libpng,
-  libtiff,
-  libxml2,
-  openssl,
-  pkg-config,
-  zlib,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "podofo";
-  version = "0.10.6";
-
-  src = fetchFromGitHub {
-    owner = "podofo";
-    repo = "podofo";
-    rev = finalAttrs.version;
-    hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    fontconfig
-    freetype
-    libidn
-    libjpeg
-    libpng
-    libtiff
-    libxml2
-    openssl
-    zlib
-  ];
-
-  cmakeFlags = [
-    "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
-    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-  ];
-
-  meta = {
-    homepage = "https://github.com/podofo/podofo";
-    description = "Library to work with the PDF file format";
-    platforms = lib.platforms.all;
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl2Plus
-    ];
-    maintainers = with lib.maintainers; [
-      kuflierl
-    ];
-  };
-})
--- a/pkgs/by-name/po/podofo_0_9/package.nix
+++ b/pkgs/by-name/po/podofo_0_9/package.nix
@ -1,82 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  zlib,
-  freetype,
-  libjpeg,
-  libtiff,
-  fontconfig,
-  openssl,
-  libpng,
-  lua5,
-  pkg-config,
-  libidn,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.8";
-  pname = "podofo";
-
-  src = fetchFromGitHub {
-    owner = "podofo";
-    repo = "podofo";
-    rev = finalAttrs.version;
-    hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-    "lib"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    zlib
-    freetype
-    libjpeg
-    libtiff
-    fontconfig
-    openssl
-    libpng
-    libidn
-    lua5
-  ];
-
-  cmakeFlags = [
-    "-DPODOFO_BUILD_SHARED=ON"
-    "-DPODOFO_BUILD_STATIC=OFF"
-    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-  ];
-
-  postPatch = ''
-    # Use GNU directories to fix multiple outputs
-    failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}'
-    sed -ni src/podofo/CMakeLists.txt \
-        -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches"
-    sed -ni src/podofo/libpodofo.pc.in \
-        -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
-
-    substituteInPlace {src/podofo/,./}CMakeLists.txt \
-      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  meta = {
-    homepage = "https://podofo.sourceforge.net";
-    description = "Library to work with the PDF file format";
-    platforms = lib.platforms.all;
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl2Plus
-    ];
-    maintainers = with lib.maintainers; [
-      kuflierl
-    ];
-  };
-})
--- a/pkgs/by-name/po/postgresqlTestHook/package.nix
+++ b/pkgs/by-name/po/postgresqlTestHook/package.nix
@ -9,6 +9,9 @@ makeSetupHook {
  passthru.tests = {
    simple = callPackage ./test.nix { };
  };
-  # See comment in postgresql's generic.nix doInstallCheck section.
-  meta.badPlatforms = lib.platforms.darwin;
+  meta = {
+    # See comment in postgresql's generic.nix doInstallCheck section.
+    badPlatforms = lib.platforms.darwin;
+    license = lib.licenses.mit;
+  };
 } ./postgresql-test-hook.sh
--- a/pkgs/by-name/py/pyright/package-lock.json
+++ b/pkgs/by-name/py/pyright/package-lock.json
@ -6,74 +6,123 @@
    "": {
      "name": "pyright-root",
      "devDependencies": {
-        "glob": "^8.1.0",
-        "jsonc-parser": "^3.2.0"
+        "glob": "^11.1.0",
+        "jsonc-parser": "^3.3.1"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-9.0.0.tgz",
+      "integrity": "sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
      }
    },
    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
      "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
    },
    "node_modules/brace-expansion": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
-      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
      }
    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
      "dev": true,
-      "license": "ISC"
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
    },
-    "node_modules/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
      },
      "engines": {
-        "node": ">=12"
+        "node": ">=14"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/glob": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
      "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
      }
    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
      "dev": true,
      "license": "ISC"
    },
+    "node_modules/jackspeak": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.2.3.tgz",
+      "integrity": "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^9.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
    "node_modules/jsonc-parser": {
      "version": "3.3.1",
      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
@ -81,35 +130,127 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/minimatch": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+    "node_modules/lru-cache": {
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz",
+      "integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==",
      "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.5"
      },
      "engines": {
-        "node": ">=10"
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
      }
    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "wrappy": "1"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true,
-      "license": "ISC"
    }
  }
 }
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@ -7,13 +7,13 @@
 }:

 let
-  version = "1.1.409";
+  version = "1.1.410";

  src = fetchFromGitHub {
    owner = "Microsoft";
    repo = "pyright";
    tag = version;
-    hash = "sha256-h0sXYwRCIQlrnNIp/a7ow55McA9fdHP2FcvrRCqWROg=";
+    hash = "sha256-ouG+Lz08eljOU6ved1IoeeW/3GJWbFT7WzdhTilWqBs=";
  };

  patchedPackageJSON =
@ -32,7 +32,7 @@ let
    pname = "pyright-root";
    inherit version src;
    sourceRoot = "${src.name}"; # required for update.sh script
-    npmDepsHash = "sha256-OpXxcALwMyBJEcZz5WTnjAysufbgWkW/VKAg1zIJgDE=";
+    npmDepsHash = "sha256-Q7niMODoPmtn4zbou3OeJFAGEjRtt8j40qiw2NJvo8k=";
    dontNpmBuild = true;
    postPatch = ''
      cp ${patchedPackageJSON} ./package.json
@ -49,7 +49,7 @@ let
    pname = "pyright-internal";
    inherit version src;
    sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-HG2714eCHWD6aQAKGpGClMg+XDPQ08Q0ofXf3wMafg0=";
+    npmDepsHash = "sha256-lzwDayoN2qmF33Slv7r+rv1bl81utjRGGeeXI6jCd0U=";
    dontNpmBuild = true;
    installPhase = ''
      runHook preInstall
@ -63,7 +63,7 @@ buildNpmPackage rec {
  inherit version src;

  sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-wyswu6pTtZmksj1hZUhaZLWuJnf8WKofo1htLtgKm9w=";
+  npmDepsHash = "sha256-nCfoa+c6I8khFqXBRI5AAdFzn1tO3G03KT+LPqHY82U=";

  postPatch = ''
    chmod +w ../../
--- a/pkgs/by-name/qi/qidi-studio/package.nix
+++ b/pkgs/by-name/qi/qidi-studio/package.nix
@ -7,11 +7,11 @@
 }:
 let
  pname = "qidi-studio";
-  version = "2.05.02.50";
+  version = "2.06.00.51";

  src = fetchurl {
    url = "https://github.com/QIDITECH/QIDIStudio/releases/download/v${version}/QIDIStudio_v0${version}_Ubuntu24.AppImage";
-    hash = "sha256-dHefxOelz8B40HFxqDdG0+whPMYLlbLDbx3AM7+R/TA=";
+    hash = "sha256-Qb/NbyjOCtIg74O5yPxX9Jq0Hf92hJXo9RqQTQh/ESM=";
  };

  appimageContents = appimageTools.extract {
--- a/pkgs/by-name/rc/rcon-cli/package.nix
+++ b/pkgs/by-name/rc/rcon-cli/package.nix
@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "rcon-cli";
-  version = "1.7.4";
+  version = "1.7.5";

  src = fetchFromGitHub {
    owner = "itzg";
    repo = "rcon-cli";
    tag = finalAttrs.version;
-    hash = "sha256-Cs2SYz6+3ziAbnoXiWdpwBg3lmIJWq06wuYy/TKoVSU=";
+    hash = "sha256-GNojgZ416OheIL/b4hV4TBr7PKnEGxPSom3F1mo52hg=";
  };

  vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA=";
--- a/pkgs/by-name/re/redisTestHook/package.nix
+++ b/pkgs/by-name/re/redisTestHook/package.nix
@ -16,4 +16,5 @@ makeSetupHook {
    simple = callPackage ./test.nix { };
    python3-valkey = python3Packages.valkey;
  };
+  meta.license = lib.licenses.mit;
 } ./redis-test-hook.sh
--- a/pkgs/by-name/re/redisinsight/package.nix
+++ b/pkgs/by-name/re/redisinsight/package.nix
@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "redisinsight";
-  version = "2.70.0";
+  version = "3.4.2";

  src = fetchFromGitHub {
-    owner = "RedisInsight";
+    owner = "redis";
    repo = "RedisInsight";
    rev = finalAttrs.version;
-    hash = "sha256-b97/hBhXqSFDzcyrQKu5Ebu1Ud3wpWEjyzUehj0PP9w=";
+    hash = "sha256-QV1xxpr8aMgkxWitJPVjXB/G2UaAYrV2wMM1FbltZpE=";
  };

  patches = [
@ -42,21 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
  baseOfflineCache = fetchYarnDeps {
    name = "redisinsight-${finalAttrs.version}-base-offline-cache";
    inherit (finalAttrs) src patches;
-    hash = "sha256-m3relh3DZGReEi4dVOJcIXU9QVClisXw+f7K5i25x24=";
+    hash = "sha256-hU8/ycljmRxqQEx0neezQmJPaianJhL0IyVOJEfLy5o=";
  };

  innerOfflineCache = fetchYarnDeps {
    name = "redisinsight-${finalAttrs.version}-inner-offline-cache";
    inherit (finalAttrs) src patches;
    postPatch = "cd redisinsight";
-    hash = "sha256-rqmrETlc2XoZDM4GP1+qI4eK4oGmtpmc6TVvAam2+W8=";
+    hash = "sha256-s4JTgqXT+5P/C5e3/c30/VZHt8MRct3KViZOD1Fekqc=";
  };

  apiOfflineCache = fetchYarnDeps {
    name = "redisinsight-${finalAttrs.version}-api-offline-cache";
    inherit (finalAttrs) src patches;
    postPatch = "cd redisinsight/api";
-    hash = "sha256-KFtmq3iYAnsAi5ysvGCzBk9RHV7EE7SIPbzPza7vBdA=";
+    hash = "sha256-GsdKJjQltpHKDZmGRF60M1TLTbnwyHt9e5ayrXgbFOU=";
  };

  nativeBuildInputs = [
@ -120,9 +120,13 @@ stdenv.mkDerivation (finalAttrs: {
    # TODO: Generate defaults. Currently broken because it requires network access.
    # yarn --offline --cwd=redisinsight/api build:defaults

+    # Electron dist needs to be writable during the build.
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+
    yarn --offline electron-builder \
      --dir \
-      -c.electronDist=${electron.dist} \
+      -c.electronDist=electron-dist \
      -c.electronVersion=${electron.version} \
      -c.npmRebuild=false # we've already rebuilt the native libs using the electron headers

@ -167,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {

  meta = {
    description = "Developer GUI for Redis";
-    homepage = "https://github.com/RedisInsight/RedisInsight";
+    homepage = "https://github.com/redis/RedisInsight";
    license = lib.licenses.sspl;
    maintainers = with lib.maintainers; [
      tomasajt
--- a/pkgs/by-name/re/redisinsight/remove-cpu-features.patch
+++ b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch
@ -1,20 +1,20 @@
 diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
-index 4a24ac8..fab339c 100644
+index 825b18a59..034bb9491 100644
 --- a/redisinsight/api/package.json
 +++ b/redisinsight/api/package.json
-@@ -49,7 +49,6 @@
-     "@nestjs/platform-socket.io/socket.io": "^4.8.0",
-     "@nestjs/cli/**/braces": "^3.0.3",
+@@ -44,7 +44,6 @@
+     "jest/**/micromatch": "^4.0.8",
+     "mocha/minimatch": "^3.0.5",
     "**/semver": "^7.5.2",
 -    "**/cpu-features": "file:./stubs/cpu-features",
     "**/cross-spawn": "^7.0.5",
     "**/redis-parser": "3.0.0",
-     "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
+     "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0",
 diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock
-index e0e8495..dfed1ae 100644
+index dfdb57365..7aef4106b 100644
 --- a/redisinsight/api/yarn.lock
 +++ b/redisinsight/api/yarn.lock
-@@ -3223,9 +3223,6 @@ cosmiconfig@^8.2.0:
+@@ -3080,9 +3080,6 @@ cosmiconfig@^8.2.0:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
@ -24,47 +24,47 @@ index e0e8495..dfed1ae 100644
 create-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
-@@ -7969,7 +7966,6 @@ ssh2@^1.15.0:
+@@ -6945,7 +6942,6 @@ ssh2@^1.15.0:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
 -    cpu-features "~0.0.9"
     nan "^2.18.0"
 
- ssri@^8.0.0, ssri@^8.0.1:
+ stack-trace@0.0.x:
 diff --git a/redisinsight/package.json b/redisinsight/package.json
-index 8649be7..354ed42 100644
+index c7d8a7f89..d0c06916c 100644
 --- a/redisinsight/package.json
 +++ b/redisinsight/package.json
-@@ -16,8 +16,7 @@
+@@ -15,8 +15,7 @@
+     "postinstall": "npx patch-package"
   },
   "resolutions": {
-     "**/semver": "^7.5.2",
-    "sqlite3/**/tar": "^6.2.1",
+-    "**/semver": "^7.5.2",
 -    "**/cpu-features": "file:./api/stubs/cpu-features"
-+    "sqlite3/**/tar": "^6.2.1"
+    "**/semver": "^7.5.2"
   },
   "dependencies": {
-     "keytar": "^7.9.0",
+     "better-sqlite3": "^12.8.0",
 diff --git a/redisinsight/yarn.lock b/redisinsight/yarn.lock
-index 7a063ce..22f37a7 100644
+index 1d164a2e6..b239a21eb 100644
 --- a/redisinsight/yarn.lock
 +++ b/redisinsight/yarn.lock
-@@ -183,9 +183,6 @@ console-control-strings@^1.1.0:
-   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+@@ -58,9 +58,6 @@ chownr@^1.1.1:
+   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 -"cpu-features@file:./api/stubs/cpu-features", cpu-features@~0.0.10:
 -  version "1.0.0"
 -
- debug@4, debug@^4.3.3:
-   version "4.3.4"
-   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-@@ -807,7 +804,6 @@ ssh2@^1.15.0:
+ decompress-response@^6.0.0:
+   version "6.0.0"
+   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+@@ -281,7 +278,6 @@ ssh2@^1.15.0:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
 -    cpu-features "~0.0.10"
     nan "^2.20.0"
 
- ssri@^8.0.0, ssri@^8.0.1:
+ string_decoder@^1.1.1:
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rune";
-  version = "0.14.1";
+  version = "0.14.2";

  src = fetchCrate {
    pname = "rune-cli";
    inherit (finalAttrs) version;
-    hash = "sha256-Y/iCH6hwYRhDnu+lPVcJd2YaK3c4YJbfp9VEP1/c1ic=";
+    hash = "sha256-f/kpdDrLQLuKrOTV+AkxzbzBBLIW6j+RAERn5YIUSL4=";
  };

-  cargoHash = "sha256-Xp87BvDh3uPtvUMmG1R8g6lEZcf/frEHVXdQ/+kV5OI=";
+  cargoHash = "sha256-l/RlOi7DVLNlqAb5M0pvU7Eks3xmhmOgmkLFvoGyMLs=";

  env = {
    RUNE_VERSION = finalAttrs.version;
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@ -73,14 +73,14 @@ let
  ];
 in
 stdenv.mkDerivation rec {
-  version = "5.0.1";
+  version = "5.0.3";
  pname = "sabnzbd";

  src = fetchFromGitHub {
    owner = "sabnzbd";
    repo = "sabnzbd";
    rev = version;
-    hash = "sha256-wx3lNGeHsNvd+nLiI9jfIKHcsVstfjEpZry6o3xbWd4=";
+    hash = "sha256-UTzdBM64fCbyY8+h94G8XbTIdoXk0mDZjlnGPywRB4Q=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/Show more
+++ b/Show more