From 8e59164a8f8d3508199baecbbe84236c36a98ef9 Mon Sep 17 00:00:00 2001
From: vai <vai.sriv@icloud.com>
Date: Tue, 3 Jun 2025 21:43:01 -0700
Subject: [PATCH 001/115] maintainers: add vaisriv

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a904bdda324d..3aadca62d638 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25865,6 +25865,12 @@
     githubId = 1525767;
     name = "Vaibhav Sagar";
   };
+  vaisriv = {
+    email = "vai.sriv@icloud.com";
+    github = "vaisriv";
+    githubId = 46390109;
+    name = "Vai";
+  };
   valebes = {
     email = "valebes@gmail.com";
     github = "valebes";

From 5de22fc6efade86a001a738f7f179d4acdf86231 Mon Sep 17 00:00:00 2001
From: vai <vai.sriv@icloud.com>
Date: Tue, 3 Jun 2025 23:46:24 -0700
Subject: [PATCH 002/115] python3Packages.timple: init at 0.1.8

Apply @emaryn 's suggestions from code review

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

Apply suggestions from code review

Co-authored-by: Ryan Omasta <git@ryand.ca>
Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>

fix test suite

Apply suggestions from code review

Co-authored-by: Aleksanaa <me@aleksana.moe>
---
 .../python-modules/timple/default.nix         | 64 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/python-modules/timple/default.nix

diff --git a/pkgs/development/python-modules/timple/default.nix b/pkgs/development/python-modules/timple/default.nix
new file mode 100644
index 000000000000..027bdffbd548
--- /dev/null
+++ b/pkgs/development/python-modules/timple/default.nix
@@ -0,0 +1,64 @@
+{
+  # lib & utils
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  nix-update-script,
+  setuptools,
+
+  # deps
+  matplotlib,
+  numpy,
+
+  # tests
+  pytestCheckHook,
+  pandas,
+}:
+
+buildPythonPackage rec {
+  pname = "timple";
+  version = "0.1.8";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "theOehrly";
+    repo = "timple";
+    tag = "v${version}";
+    hash = "sha256-tfw+m1ZrU5A9KbXmMS4c1AIP4f/9YT3/o7HRb/uxUSM";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    matplotlib
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pandas
+  ];
+  pythonImportsCheck = [ "timple" ];
+
+  disabledTests = [
+    # wants write access to nix store
+    "test_mpl_default_functionality"
+  ];
+  disabledTestPaths = [
+    # gui plotting tests
+    "timple/tests/test_timple.py"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/theOehrly/timple/releases/tag/v${version}";
+    description = "Extended functionality for plotting timedelta-like values with Matplotlib";
+    homepage = "https://github.com/theOehrly/timple";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vaisriv ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 79acec4ff1e0..a92ca880e7e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17555,6 +17555,8 @@ self: super: with self; {
 
   timm = callPackage ../development/python-modules/timm { };
 
+  timple = callPackage ../development/python-modules/timple { };
+
   timy = callPackage ../development/python-modules/timy { };
 
   tiny-cuda-nn = toPythonModule (

From cf47cb7c1043f0b3e555e7962cc8f1e117adc55d Mon Sep 17 00:00:00 2001
From: Funkeleinhorn <git@funkeleinhorn.com>
Date: Sat, 3 May 2025 20:05:50 +0200
Subject: [PATCH 003/115] openrgb: add startupProfile option to service

This commit adds a startupProfile option to the
openrgb service to make it easier to load own color profiles on boot.
---
 nixos/modules/services/hardware/openrgb.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/openrgb.nix b/nixos/modules/services/hardware/openrgb.nix
index ecbea501fd24..9d5d598db913 100644
--- a/nixos/modules/services/hardware/openrgb.nix
+++ b/nixos/modules/services/hardware/openrgb.nix
@@ -41,6 +41,11 @@ in
       description = "Set server port of openrgb.";
     };
 
+    startupProfile = lib.mkOption {
+      type = lib.types.nullOr (lib.types.str);
+      default = null;
+      description = "The profile file to load from \"/var/lib/OpenRGB\" at startup.";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -61,7 +66,9 @@ in
       serviceConfig = {
         StateDirectory = "OpenRGB";
         WorkingDirectory = "/var/lib/OpenRGB";
-        ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";
+        ExecStart =
+          "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}"
+          + lib.optionalString (builtins.isString cfg.startupProfile) " --profile ${lib.escapeShellArg cfg.startupProfile}";
         Restart = "always";
       };
     };

From 990dce30e1fb1dead0367b1410265079d377b373 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 09:06:52 +0200
Subject: [PATCH 004/115] bzflag: switch from fetchurl to fetchFromGitHub

---
 pkgs/by-name/bz/bzflag/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bz/bzflag/package.nix b/pkgs/by-name/bz/bzflag/package.nix
index 2871047c4001..ae167ba45cd2 100644
--- a/pkgs/by-name/bz/bzflag/package.nix
+++ b/pkgs/by-name/bz/bzflag/package.nix
@@ -1,7 +1,8 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   pkg-config,
   curl,
   SDL2,
@@ -16,12 +17,17 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "bzflag";
   version = "2.4.30";
 
-  src = fetchurl {
-    url = "https://download.bzflag.org/bzflag/source/${finalAttrs.version}/bzflag-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0=";
+  src = fetchFromGitHub {
+    owner = "BZFlag-Dev";
+    repo = "bzflag";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6lW3w1n1ZFs+Iw2wd0aJJpSSnymzkNmVLAgreW4l/6k=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
 
   buildInputs = [
     curl

From 7d8ff0b4e6eaa35d5d047306423a53567f9689fe Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 09:40:29 +0200
Subject: [PATCH 005/115] bcftools: switch from fetchurl to fetchFromGitHub

---
 pkgs/by-name/bc/bcftools/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bc/bcftools/package.nix b/pkgs/by-name/bc/bcftools/package.nix
index 95ad717271fa..29d200a18e2f 100644
--- a/pkgs/by-name/bc/bcftools/package.nix
+++ b/pkgs/by-name/bc/bcftools/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   htslib,
   zlib,
   bzip2,
@@ -12,16 +13,19 @@
   bash,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bcftools";
   version = "1.22";
 
-  src = fetchurl {
-    url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-8queL2BbEgOn6cv7Cj63aJMiKX+MNLRdxSN/5X2YSJ8=";
+  src = fetchFromGitHub {
+    owner = "samtools";
+    repo = "bcftools";
+    tag = finalAttrs.version;
+    hash = "sha256-S+FuqjiOf38sAQKWYOixv/MlXGnuDmkx9z4Co/pk/eM=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     perl
     python3
   ];
@@ -34,6 +38,10 @@ stdenv.mkDerivation rec {
     curl
   ];
 
+  nativeCheckInputs = [
+    htslib
+  ];
+
   strictDeps = true;
 
   makeFlags = [
@@ -59,4 +67,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = [ maintainers.mimame ];
   };
-}
+})

From eff9933eedc988bfd775fc6f90a1c90951e57792 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 10:26:01 +0200
Subject: [PATCH 006/115] form: switch from fetchurl to fetchFromGitHub

---
 pkgs/by-name/fo/form/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fo/form/package.nix b/pkgs/by-name/fo/form/package.nix
index 93521daca0f4..36d09be0dc50 100644
--- a/pkgs/by-name/fo/form/package.nix
+++ b/pkgs/by-name/fo/form/package.nix
@@ -1,21 +1,27 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   gmp,
   zlib,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   version = "4.3.1";
   pname = "form";
 
-  # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
-  src = fetchurl {
-    url = "https://github.com/vermaseren/form/releases/download/v4.3.1/form-4.3.1.tar.gz";
-    sha256 = "sha256-8fUS3DT+m71rGfLf7wX8uZEt+0PINop1t5bsRy7ou84=";
+  src = fetchFromGitHub {
+    owner = "form-dev";
+    repo = "form";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZWpfPeTekHEALqXVF/nLkcNsrkt17AKm2B/uydUBfvo=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   buildInputs = [
     gmp
     zlib
@@ -28,4 +34,4 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.veprbl ];
     platforms = platforms.unix;
   };
-}
+})

From 3264f7c600795d64431b49c4eb86e1b93a464fad Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Tue, 2 Sep 2025 08:46:42 +0100
Subject: [PATCH 007/115] zabbix70: 7.0.17 -> 7.0.18

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 2f04eefd4822..00098a26a28c 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -8,8 +8,8 @@ generic: {
     hash = "sha256-US+TP6qtCT3LlnELWR93t7nf8A1Y1xRPI+300GA1v8g=";
   };
   v70 = generic {
-    version = "7.0.17";
-    hash = "sha256-FLdfMpurJ0xiW73Z1EcR3MlmoxdVWsH5G1vSfE31iAw=";
+    version = "7.0.18";
+    hash = "sha256-kSXO4hRB/9qqGJPuEjJz740DChUJCGz63ozdCxgCupg=";
   };
   v60 = generic {
     version = "6.0.36";

From bb9f9ab8ea05773a4ae42388d67c0a79f637673b Mon Sep 17 00:00:00 2001
From: Ivan Kovalev <ivan@ikovalev.nl>
Date: Sun, 7 Sep 2025 11:32:37 +0200
Subject: [PATCH 008/115] maintainers: add shokerplz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 005baf03646b..1d0a4e0236ec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23192,6 +23192,12 @@
     githubId = 114918019;
     name = "Shourya Goel";
   };
+  shokerplz = {
+    name = "Ivan Kovalev";
+    email = "ivan@ikovalev.nl";
+    github = "shokerplz";
+    githubId = 28829931;
+  };
   shortcord = {
     name = "Short Cord";
     email = "short@shortcord.com";

From 32fd00fd767ba4d5c74fa134818895bcde3895f2 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:36:51 +0100
Subject: [PATCH 009/115] zabbix74: 7.4.0 -> 7.4.2

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index c0505b3735e8..b208cd9345a4 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
 generic: {
   v74 = generic {
-    version = "7.4.0";
-    hash = "sha256-e9VvzYM1nhFoLv9BLVOgzrnjmEPdveDwnrl/qsgKH6I=";
+    version = "7.4.2";
+    hash = "sha256-CNLVhNE5Cxzr8OUVKA6vNhFAXW/smGdpDkA4vSWcPvw=";
   };
   v72 = generic {
     version = "7.2.10";

From f7548864712cccad29d63af212c7563f274be5d7 Mon Sep 17 00:00:00 2001
From: Ivan Kovalev <ivan@ikovalev.nl>
Date: Sun, 7 Sep 2025 11:30:42 +0200
Subject: [PATCH 010/115] cloudflare-ddns: init at 1.15.1

---
 pkgs/by-name/cl/cloudflare-ddns/package.nix | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/cl/cloudflare-ddns/package.nix

diff --git a/pkgs/by-name/cl/cloudflare-ddns/package.nix b/pkgs/by-name/cl/cloudflare-ddns/package.nix
new file mode 100644
index 000000000000..366936848246
--- /dev/null
+++ b/pkgs/by-name/cl/cloudflare-ddns/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "cloudflare-ddns";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = "favonia";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-/806eUsuWhiCnvO1DasPW2xVFYYxnmki3KIDre7gjrg=";
+  };
+
+  vendorHash = "sha256-XIfPL1BNA8mcQH+w4AhThh80gh/1vUjKDtFN97O5zqw=";
+
+  subPackages = [
+    "cmd/ddns"
+  ];
+
+  meta = with lib; {
+    description = "Dynamic DNS (DDNS) client for Cloudflare";
+    longDescription = ''
+      A feature-rich and robust Cloudflare DDNS updater with a small footprint.
+      The program will detect your machine’s public IP addresses and update DNS records using the Cloudflare API.
+    '';
+    homepage = "https://github.com/favonia/cloudflare-ddns";
+    mainProgram = "ddns";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix ++ platforms.darwin;
+  };
+}

From 9007662fd02c72f608d84a5a2727799b858c9cfb Mon Sep 17 00:00:00 2001
From: Ivan Kovalev <ivan@ikovalev.nl>
Date: Sun, 7 Sep 2025 11:31:47 +0200
Subject: [PATCH 011/115] nixos/cloudflare-ddns: init module

---
 .../services/networking/cloudflare-ddns.nix   | 327 ++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100644 nixos/modules/services/networking/cloudflare-ddns.nix

diff --git a/nixos/modules/services/networking/cloudflare-ddns.nix b/nixos/modules/services/networking/cloudflare-ddns.nix
new file mode 100644
index 000000000000..bf9f36e94e96
--- /dev/null
+++ b/nixos/modules/services/networking/cloudflare-ddns.nix
@@ -0,0 +1,327 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.cloudflare-ddns;
+
+  boolToString = b: if b then "true" else "false";
+  formatList = l: lib.concatStringsSep "," l;
+  formatDuration = d: d.String;
+in
+{
+  options.services.cloudflare-ddns = {
+    enable = lib.mkEnableOption "Cloudflare Dynamic DNS service";
+
+    package = lib.mkPackageOption pkgs "cloudflare-ddns" { };
+
+    credentialsFile = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        Path to a file containing the Cloudflare API authentication token.
+        The file content should be in the format `CLOUDFLARE_API_TOKEN=YOUR_SECRET_TOKEN`.
+        The service user `${cfg.user}` needs read access to this file.
+        Ensure permissions are secure (e.g., `0400` or `0440`) and ownership is appropriate
+        (e.g., `owner = root`, `group = ${cfg.group}`).
+        Using `CLOUDFLARE_API_TOKEN` is preferred over the deprecated `CF_API_TOKEN`.
+      '';
+      example = "/run/secrets/cloudflare-ddns-token";
+    };
+
+    domains = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      description = ''
+        List of domain names (FQDNs) to manage. Wildcards like `*.example.com` are supported.
+        These domains will be managed for both IPv4 and IPv6 unless overridden by
+        `ip4Domains` or `ip6Domains`, or if the respective providers are disabled.
+        This corresponds to the `DOMAINS` environment variable.
+      '';
+      example = [
+        "home.example.com"
+        "*.dynamic.example.org"
+      ];
+    };
+
+    ip4Domains = lib.mkOption {
+      type = lib.types.nullOr (lib.types.listOf lib.types.str);
+      default = null;
+      description = ''
+        Explicit list of domains to manage only for IPv4. If set, overrides `domains` for IPv4.
+        Corresponds to the `IP4_DOMAINS` environment variable.
+      '';
+      example = [ "ipv4.example.com" ];
+    };
+
+    ip6Domains = lib.mkOption {
+      type = lib.types.nullOr (lib.types.listOf lib.types.str);
+      default = null;
+      description = ''
+        Explicit list of domains to manage only for IPv6. If set, overrides `domains` for IPv6.
+        Corresponds to the `IP6_DOMAINS` environment variable.
+      '';
+      example = [ "ipv6.example.com" ];
+    };
+
+    wafLists = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      description = ''
+        List of WAF IP Lists to manage, in the format `account-id/list-name`.
+        (Experimental feature as of cloudflare-ddns 1.14.0).
+      '';
+      example = [ "YOUR_ACCOUNT_ID/allowed_dynamic_ips" ];
+    };
+
+    provider = {
+      ipv4 = lib.mkOption {
+        type = lib.types.str;
+        default = "cloudflare.trace";
+        description = ''
+          IP detection provider for IPv4. Common values: `cloudflare.trace`, `cloudflare.doh`, `local`, `url:URL`, `none`.
+          Use `none` to disable IPv4 updates.
+          See cloudflare-ddns documentation for all options.
+        '';
+      };
+      ipv6 = lib.mkOption {
+        type = lib.types.str;
+        default = "cloudflare.trace";
+        description = ''
+          IP detection provider for IPv6. Common values: `cloudflare.trace`, `cloudflare.doh`, `local`, `url:URL`, `none`.
+          Use `none` to disable IPv6 updates.
+          See cloudflare-ddns documentation for all options.
+        '';
+      };
+    };
+
+    updateCron = lib.mkOption {
+      type = lib.types.str;
+      default = "@every 5m";
+      description = ''
+        Cron expression for how often to check and update IPs.
+        Use "@once" to run only once and then exit.
+      '';
+      example = "@hourly";
+    };
+
+    updateOnStart = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Whether to perform an update check immediately on service start.";
+    };
+
+    deleteOnStop = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to delete the managed DNS records and clear WAF lists when the service is stopped gracefully.
+        Warning: Setting this to true with `updateCron = "@once"` will cause immediate deletion.
+      '';
+    };
+
+    cacheExpiration = lib.mkOption {
+      type = lib.types.str;
+      default = "6h";
+      description = ''
+        Duration for which API responses (like Zone ID, Record IDs) are cached.
+        Uses Go's duration format (e.g., "6h", "1h30m").
+      '';
+    };
+
+    ttl = lib.mkOption {
+      type = lib.types.ints.positive;
+      default = 1;
+      description = ''
+        Time To Live (TTL) for the DNS records in seconds.
+        Must be 1 (for automatic) or between 30 and 86400.
+      '';
+    };
+
+    proxied = lib.mkOption {
+      type = lib.types.str;
+      default = "false";
+      description = ''
+        Whether the managed DNS records should be proxied through Cloudflare ('orange cloud').
+        Accepts boolean values (`true`, `false`) or a domain expression.
+        See cloudflare-ddns documentation for expression syntax (e.g., "is(a.com) || sub(b.org)").
+      '';
+      example = "true";
+    };
+
+    recordComment = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Comment to add to managed DNS records.";
+    };
+
+    wafListDescription = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Description for managed WAF lists (used when creating or verifying lists).";
+    };
+
+    detectionTimeout = lib.mkOption {
+      type = lib.types.str;
+      default = "5s";
+      description = "Timeout for detecting the public IP address.";
+    };
+
+    updateTimeout = lib.mkOption {
+      type = lib.types.str;
+      default = "30s";
+      description = "Timeout for updating records via the Cloudflare API.";
+    };
+
+    healthchecks = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+      description = "URL for Healthchecks.io monitoring endpoint (optional).";
+      example = "https://hc-ping.com/your-uuid";
+    };
+
+    uptimeKuma = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+      description = "URL for Uptime Kuma push monitor endpoint (optional).";
+      example = "https://status.example.com/api/push/tag?status=up&msg=OK&ping=";
+    };
+
+    shoutrrr = lib.mkOption {
+      type = lib.types.nullOr (lib.types.listOf lib.types.str);
+      default = null;
+      description = "List of Shoutrrr notification service URLs (optional).";
+      example = [
+        "discord://token@id"
+        "gotify://host/token"
+      ];
+    };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "cloudflare-ddns";
+      description = "User account under which the service runs.";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "cloudflare-ddns";
+      description = "Group under which the service runs.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.ttl == 1 || (cfg.ttl >= 30 && cfg.ttl <= 86400);
+        message = "services.cloudflare-ddns.ttl must be 1 or between 30 and 86400";
+      }
+      {
+        assertion = cfg.updateCron == "@once" -> !cfg.deleteOnStop;
+        message = "services.cloudflare-ddns.deleteOnStop cannot be true when updateCron is \"@once\"";
+      }
+      {
+        assertion =
+          cfg.domains != [ ] || cfg.ip4Domains != null || cfg.ip6Domains != null || cfg.wafLists != [ ];
+        message = "services.cloudflare-ddns requires at least one domain (domains, ip4Domains, ip6Domains) or WAF list (wafLists) to be specified";
+      }
+      {
+        assertion = cfg.provider.ipv4 != "none" || cfg.provider.ipv6 != "none";
+        message = "services.cloudflare-ddns requires at least one provider (ipv4 or ipv6) to be enabled (not 'none')";
+      }
+    ];
+
+    users.users.${cfg.user} = {
+      description = "Cloudflare DDNS service user";
+      isSystemUser = true;
+      group = cfg.group;
+      home = "/var/lib/${cfg.user}";
+    };
+
+    users.groups.${cfg.group} = { };
+
+    systemd.tmpfiles.settings."cloudflare-ddns" = {
+      "/var/lib/${cfg.user}".d = {
+        mode = "0750";
+        user = cfg.user;
+        group = cfg.group;
+      };
+    };
+
+    systemd.services.cloudflare-ddns = {
+      description = "Cloudflare Dynamic DNS Client Service (favonia)";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+
+        WorkingDirectory = "/var/lib/${cfg.user}";
+
+        EnvironmentFile = cfg.credentialsFile;
+
+        Environment =
+          let
+            toEnv = name: value: "${name}=\"${toString value}\"";
+            toEnvList = name: value: "${name}=\"${formatList value}\"";
+            toEnvDuration = name: value: "${name}=\"${formatDuration value}\"";
+            toEnvBool = name: value: "${name}=\"${boolToString value}\"";
+            toEnvMaybe =
+              pred: name: value:
+              lib.optionalString pred (toEnv name value);
+            toEnvMaybeList =
+              pred: name: value:
+              lib.optionalString pred (toEnvList name value);
+          in
+          lib.filter (envVar: envVar != "") [
+            (toEnvList "DOMAINS" cfg.domains)
+            (toEnvMaybeList (cfg.ip4Domains != null) "IP4_DOMAINS" cfg.ip4Domains)
+            (toEnvMaybeList (cfg.ip6Domains != null) "IP6_DOMAINS" cfg.ip6Domains)
+
+            (toEnv "IP4_PROVIDER" cfg.provider.ipv4)
+            (toEnv "IP6_PROVIDER" cfg.provider.ipv6)
+
+            (toEnvMaybeList (cfg.wafLists != [ ]) "WAF_LISTS" cfg.wafLists)
+            (toEnvMaybe (cfg.wafListDescription != "") "WAF_LIST_DESCRIPTION" cfg.wafListDescription)
+
+            (toEnv "UPDATE_CRON" cfg.updateCron)
+            (toEnvBool "UPDATE_ON_START" cfg.updateOnStart)
+            (toEnvBool "DELETE_ON_STOP" cfg.deleteOnStop)
+            (toEnv "CACHE_EXPIRATION" cfg.cacheExpiration)
+
+            (toEnv "TTL" cfg.ttl)
+            (toEnv "PROXIED" cfg.proxied)
+            (toEnvMaybe (cfg.recordComment != "") "RECORD_COMMENT" cfg.recordComment)
+
+            (toEnv "DETECTION_TIMEOUT" cfg.detectionTimeout)
+            (toEnv "UPDATE_TIMEOUT" cfg.updateTimeout)
+
+            (toEnvMaybe (cfg.healthchecks != null) "HEALTHCHECKS" cfg.healthchecks)
+            (toEnvMaybe (cfg.uptimeKuma != null) "UPTIMEKUMA" cfg.uptimeKuma)
+            (toEnvMaybeList (cfg.shoutrrr != null) "SHOUTRRR" (lib.concatStringsSep "\n" cfg.shoutrrr))
+          ];
+
+        ExecStart = lib.getExe cfg.package;
+
+        Restart = "on-failure";
+        RestartSec = "30s";
+
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        NoNewPrivileges = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+      };
+    };
+  };
+}

From 5d40726289914295fe7123943ea07395c68aa2b2 Mon Sep 17 00:00:00 2001
From: Ivan Kovalev <ivan@ikovalev.nl>
Date: Sun, 7 Sep 2025 11:33:55 +0200
Subject: [PATCH 012/115] doc: add cloudflare-ddns to release notes

---
 doc/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 3871e9ad9a57..c68d748e078d 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -95,3 +95,5 @@
 - `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
 
   See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
+
+- `cloudflare-ddns`: Added package cloudflare-ddns.

From 4b567a39f115b78620068229a67e4264a616e748 Mon Sep 17 00:00:00 2001
From: Ivan Kovalev <ivan4kovalev@gmail.com>
Date: Thu, 11 Sep 2025 23:55:50 +0200
Subject: [PATCH 013/115] cloudflare-ddns: refactor buildGoModule usage

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

diff --git a/pkgs/by-name/cl/cloudflare-ddns/package.nix b/pkgs/by-name/cl/cloudflare-ddns/package.nix
index 366936848246..477a10e4f221 100644
--- a/pkgs/by-name/cl/cloudflare-ddns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-ddns/package.nix
@@ -3,14 +3,14 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "cloudflare-ddns";
   version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "favonia";
-    repo = pname;
-    rev = "v${version}";
+    repo = "cloudflare-ddns";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/806eUsuWhiCnvO1DasPW2xVFYYxnmki3KIDre7gjrg=";
   };
 
@@ -32,4 +32,4 @@ buildGoModule rec {
     maintainers = with maintainers; [ ];
     platforms = platforms.unix ++ platforms.darwin;
   };
-}
+})

From 40765c369fdac74057aa1dd0b240ed9d6908c90b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Sep 2025 18:26:14 +0000
Subject: [PATCH 014/115] broot: 1.48.0 -> 1.49.1

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

diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 531727224277..8c102074681b 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "broot";
-  version = "1.48.0";
+  version = "1.49.1";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "broot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mNAdmIlOL+lgXi7TE0vpqPypwCrI/ZQlvm5TX174hQU=";
+    hash = "sha256-zDy494qIoo4r+oCnrMvYSetmqsWCWfS5PAVlp8sU8Zk=";
   };
 
-  cargoHash = "sha256-uCqAy8SZgDvLJD5r8tyxZXl+1POW0J1sx61Wd8+qwf0=";
+  cargoHash = "sha256-zHvfZAsEoCtdxtFP7yqrC9t49UIMji2qTm+I1bhu63A=";
 
   nativeBuildInputs = [
     installShellFiles

From c60ac8b8f9b18198cf873dcc60afed4885e9e68f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Sep 2025 04:22:31 +0000
Subject: [PATCH 015/115] glaze: 5.5.5 -> 5.7.1

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index b25e0def08f8..49288a4bccf4 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "5.5.5";
+  version = "5.7.1";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${final.version}";
-    hash = "sha256-vFAMS4sZ3/KKeKHGzTnTujh076eML35bWqxUuzTap+8=";
+    hash = "sha256-oLSjA7Q49KKuyLYcSWOYzORhKkeyzjBTNJVeHUuOIDc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9e098a4ddad4a0b24dcf625a562d3cc57125f8e0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 23 Sep 2025 11:15:22 +0200
Subject: [PATCH 016/115] maintainers: drop y0no

Inactive since 2018.
---
 maintainers/maintainer-list.nix                         | 6 ------
 pkgs/by-name/be/bettercap/package.nix                   | 1 -
 pkgs/development/python-modules/ajpy/default.nix        | 1 -
 pkgs/development/python-modules/cx-oracle/default.nix   | 1 -
 pkgs/development/python-modules/ipy/default.nix         | 1 -
 pkgs/development/python-modules/mysqlclient/default.nix | 1 -
 pkgs/development/python-modules/patator/default.nix     | 1 -
 7 files changed, 12 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 09ca05897dba..97399c5981d6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28266,12 +28266,6 @@
     githubId = 5121426;
     name = "Albert Safin";
   };
-  y0no = {
-    email = "y0no@y0no.fr";
-    github = "y0no";
-    githubId = 2242427;
-    name = "Yoann Ono";
-  };
   yah = {
     email = "yah@singularpoint.cc";
     github = "wangxiaoerYah";
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index 6b0e6a2462b3..3f3fdfa33038 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -44,7 +44,6 @@ buildGoModule rec {
     '';
     homepage = "https://www.bettercap.org/";
     license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ y0no ];
     mainProgram = "bettercap";
     # Broken on darwin for Go toolchain > 1.22, with error:
     # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'
diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix
index e8db62267dbe..b99bda50c601 100644
--- a/pkgs/development/python-modules/ajpy/default.nix
+++ b/pkgs/development/python-modules/ajpy/default.nix
@@ -21,6 +21,5 @@ buildPythonPackage rec {
     description = "AJP package crafting library";
     homepage = "https://github.com/hypn0s/AJPy/";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/pkgs/development/python-modules/cx-oracle/default.nix b/pkgs/development/python-modules/cx-oracle/default.nix
index def0ce75fac9..4adcbfe92f12 100644
--- a/pkgs/development/python-modules/cx-oracle/default.nix
+++ b/pkgs/development/python-modules/cx-oracle/default.nix
@@ -30,6 +30,5 @@ buildPythonPackage rec {
     description = "Python interface to Oracle";
     homepage = "https://oracle.github.io/python-cx_Oracle";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/pkgs/development/python-modules/ipy/default.nix b/pkgs/development/python-modules/ipy/default.nix
index 5a5876b8b2be..70617033394a 100644
--- a/pkgs/development/python-modules/ipy/default.nix
+++ b/pkgs/development/python-modules/ipy/default.nix
@@ -27,6 +27,5 @@ buildPythonPackage rec {
     description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
     homepage = "https://github.com/autocracy/python-ipy";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index cf75ff57f487..9421d73d43ee 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -27,6 +27,5 @@ buildPythonPackage rec {
     description = "Python interface to MySQL";
     homepage = "https://github.com/PyMySQL/mysqlclient-python";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix
index b944a61c3586..bf68ba363a43 100644
--- a/pkgs/development/python-modules/patator/default.nix
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -60,7 +60,6 @@ buildPythonPackage rec {
     description = "Multi-purpose brute-forcer";
     homepage = "https://github.com/lanjelot/patator";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ y0no ];
     # Still uses cx-oracle which is broken and was replaced by oracledb
     # https://github.com/lanjelot/patator/issues/234
     broken = true;

From 7d6a4cc0ff942a3ed09ce2eb93353d7508b47c70 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 23 Sep 2025 15:27:39 +0200
Subject: [PATCH 017/115] Revert "python3Packages.wgpu-py: 0.23.0 -> 0.24.0"

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

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index bcf1f70b0227..0760ef3f2270 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -38,14 +38,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.24.0";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-t6ILhMeDl8pdOKXkDpJPnXZRrKD+pIgS6BWurhGMalk=";
+    hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc=";
   };
 
   postPatch =

From 4eef2c614de82c6c2735adc71578d69cbc1a7049 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 14:01:13 +0000
Subject: [PATCH 018/115] kitex: 0.14.1 -> 0.15.0

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

diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index 287b664d2456..a91cd97fb742 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kitex";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gjkEUiGt42ZXSriu7awZxSRl8fPnbLiqCjqbe1Yjcu8=";
+    hash = "sha256-4UN8O4//vFc9HktZflzutVy2KtR/MKQUmD+iqlUV+oU=";
   };
 
-  vendorHash = "sha256-UlwaMPLo+gyDlncLvGnr0ec8sDfBa1xzVSSfXBAgngM=";
+  vendorHash = "sha256-9o+9HVC6WRhKhAKnN6suumNBKS2y392A6vQCQYtRsfM=";
 
   subPackages = [ "tool/cmd/kitex" ];
 

From 628dedf9f7b961828984a521781e7f8cb80d8cb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 14:09:10 +0000
Subject: [PATCH 019/115] juju: 3.6.9 -> 3.6.10

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

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index e2be3c03f63e..255326722325 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.9";
+  version = "3.6.10";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-AeIGnpcVj0cSByyStUSpuzAg9322uOdpIZQx1KiAjSQ=";
+    hash = "sha256-J3AFH6kg+M6/8posiUaVP4biQpKPQ07Qp5BU3prAG/A=";
   };
 
-  vendorHash = "sha256-cPfwyagNWaxxBtniEhA4P6+lxas1ffibH7J9SHXuM5g=";
+  vendorHash = "sha256-zTavqjEH4maEMj+AuYMcjT289peVNIc0rysBnnMxFNU=";
 
   subPackages = [
     "cmd/juju"

From 00efa0e919068e800354baf75da9428b9a27cd13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 14:10:05 +0000
Subject: [PATCH 020/115] gotrue-supabase: 2.179.0 -> 2.180.0

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

diff --git a/pkgs/by-name/go/gotrue-supabase/package.nix b/pkgs/by-name/go/gotrue-supabase/package.nix
index e15fa3596723..a009f5d863f2 100644
--- a/pkgs/by-name/go/gotrue-supabase/package.nix
+++ b/pkgs/by-name/go/gotrue-supabase/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.179.0";
+  version = "2.180.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-wYQHdMLpeHFvh21z9cBadzR0CMETLvj81A3x4SRGw1c=";
+    hash = "sha256-LtCe/VQMXbdarxK95+rvtaLYGtZ3U4DzLVK+T5HrWR4=";
   };
 
-  vendorHash = "sha256-1SUih8uhHvxVf+gp5S4MJZctoxyUct3e/rRK/cZEfEI=";
+  vendorHash = "sha256-knYvNkEVffWisvb4Dhm5qqtqQ4co9MGoNt6yH6dUll8=";
 
   ldflags = [
     "-s"

From 9007a0ca9046dbc97f32eaef0640bb96ba74ea80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 15:03:21 +0000
Subject: [PATCH 021/115] azure-static-sites-client:
 53b7d0e07fe5c34bf68929fab92f87ce910288dc ->
 694f9b1be52be00b1b4cde5deb5bb4994154f9b6

---
 .../azure-static-sites-client/versions.json   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/az/azure-static-sites-client/versions.json b/pkgs/by-name/az/azure-static-sites-client/versions.json
index 5f3bbeb915ba..751a06041877 100644
--- a/pkgs/by-name/az/azure-static-sites-client/versions.json
+++ b/pkgs/by-name/az/azure-static-sites-client/versions.json
@@ -1,58 +1,58 @@
 [
   {
     "version": "latest",
-    "buildId": "53b7d0e07fe5c34bf68929fab92f87ce910288dc",
-    "publishDate": "2024-10-24T20:43:23.5850191Z",
+    "buildId": "694f9b1be52be00b1b4cde5deb5bb4994154f9b6",
+    "publishDate": "2025-07-21T07:21:52.0658686Z",
     "files": {
       "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/linux/StaticSitesClient",
-        "sha": "66fca4b42cbc64d451097931ca4ed75649233bd818f97f0c3f6d1d75cff61413"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/linux/StaticSitesClient",
+        "sha": "3fdeaa74fff3e8136fa95f994761559b48900f094214dc81c98f825de506a398"
       },
       "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/windows/StaticSitesClient.exe",
-        "sha": "fc949fb19d29cce1e8b74cf1e2c31706426d46b3e03d830d601524cee63faa0b"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/windows/StaticSitesClient.exe",
+        "sha": "f55f0efd65b1b401b4ee0197143da4e16c87ff7f541b2bf5b094fcc8e3443dfe"
       },
       "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/macOS/StaticSitesClient",
-        "sha": "89ec4fe61217325e89ed849a564ffe4cc51b61c325abdca82e8e441a4959ec92"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/macOS/StaticSitesClient",
+        "sha": "0412544daa8522aafeaa495e03fad3a6530b5e121959624de4c115f76018cae9"
       }
     }
   },
   {
     "version": "stable",
-    "buildId": "53b7d0e07fe5c34bf68929fab92f87ce910288dc",
-    "publishDate": "2024-10-24T20:43:23.5850191Z",
+    "buildId": "694f9b1be52be00b1b4cde5deb5bb4994154f9b6",
+    "publishDate": "2025-07-21T07:21:52.0658686Z",
     "files": {
       "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/linux/StaticSitesClient",
-        "sha": "66fca4b42cbc64d451097931ca4ed75649233bd818f97f0c3f6d1d75cff61413"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/linux/StaticSitesClient",
+        "sha": "3fdeaa74fff3e8136fa95f994761559b48900f094214dc81c98f825de506a398"
       },
       "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/windows/StaticSitesClient.exe",
-        "sha": "fc949fb19d29cce1e8b74cf1e2c31706426d46b3e03d830d601524cee63faa0b"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/windows/StaticSitesClient.exe",
+        "sha": "f55f0efd65b1b401b4ee0197143da4e16c87ff7f541b2bf5b094fcc8e3443dfe"
       },
       "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/macOS/StaticSitesClient",
-        "sha": "89ec4fe61217325e89ed849a564ffe4cc51b61c325abdca82e8e441a4959ec92"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/694f9b1be52be00b1b4cde5deb5bb4994154f9b6/macOS/StaticSitesClient",
+        "sha": "0412544daa8522aafeaa495e03fad3a6530b5e121959624de4c115f76018cae9"
       }
     }
   },
   {
     "version": "backup",
-    "buildId": "c25b033e400580829b0fea1fc7fb566139ab61c0",
-    "publishDate": "2024-10-16T22:53:44.2035066Z",
+    "buildId": "53b7d0e07fe5c34bf68929fab92f87ce910288dc",
+    "publishDate": "2024-10-24T20:43:23.5850191Z",
     "files": {
       "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/c25b033e400580829b0fea1fc7fb566139ab61c0/linux/StaticSitesClient",
-        "sha": "25a33db34c0647e1225755fb65a441c3ccfe523523f54a38f85c3ff6531aa475"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/linux/StaticSitesClient",
+        "sha": "66fca4b42cbc64d451097931ca4ed75649233bd818f97f0c3f6d1d75cff61413"
       },
       "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/c25b033e400580829b0fea1fc7fb566139ab61c0/windows/StaticSitesClient.exe",
-        "sha": "40e9339b57c2df7fafdddb73cee5f5ed10ad03841bd25796b3ea81b793b4bf66"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/windows/StaticSitesClient.exe",
+        "sha": "fc949fb19d29cce1e8b74cf1e2c31706426d46b3e03d830d601524cee63faa0b"
       },
       "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/c25b033e400580829b0fea1fc7fb566139ab61c0/macOS/StaticSitesClient",
-        "sha": "aac8b80f43a40714f1d38a0c8c23752aaec5fc4cb32e05cd2c38ff9ef0a60f32"
+        "url": "https://swalocaldeployv2-bndtgugjgqc3dhdx.b01.azurefd.net/downloads/53b7d0e07fe5c34bf68929fab92f87ce910288dc/macOS/StaticSitesClient",
+        "sha": "89ec4fe61217325e89ed849a564ffe4cc51b61c325abdca82e8e441a4959ec92"
       }
     }
   }

From 5d878a8147e91e4ff38666894ccdddc3db54b6ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 17:02:11 +0000
Subject: [PATCH 022/115] glooctl: 1.19.6 -> 1.20.0

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 75e96a7a475c..17071abb3af8 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.19.6";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-jH/QnRGeuYv7e7QNGLvVhLwvX5kHtqArOUPYdXcKURw=";
+    hash = "sha256-cEfCpTn72HviKwqSUVv2S8kcCSxivE+a4tvozvAm6F4=";
   };
 
-  vendorHash = "sha256-OJeWijGwxuBd0Qsscy7wjTkzglUZg+jHuPX1s1ayZVI=";
+  vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 

From c25f839bac79c3ac42c05352ea2b60b0bd5a62f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 18:14:58 +0000
Subject: [PATCH 023/115] python3Packages.pyecotrend-ista: 3.3.3 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
index ee6d123f446a..5193e555b812 100644
--- a/pkgs/development/python-modules/pyecotrend-ista/default.nix
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyecotrend-ista";
-  version = "3.3.3";
+  version = "3.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Ludy87";
     repo = "pyecotrend-ista";
     tag = version;
-    hash = "sha256-x9teLjIJPLYi/mE6vy4KBUl7NI4aAwWPYSEwYZQ+4I4=";
+    hash = "sha256-GPbRlvdXLxCNuhuELg2OQT5NB8qX+bcbZSRdQimqGtQ=";
   };
 
   postPatch = ''

From e552ef3a6b7a94d6f726504653d6ba2d3b24dadd Mon Sep 17 00:00:00 2001
From: Jordan Steinke <jordan@steinke.foo>
Date: Tue, 23 Sep 2025 12:20:02 -0500
Subject: [PATCH 024/115] _1password-gui-beta: 8.11.10-32.BETA ->
 8.11.12-26.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 7ed36c3def36..68df9b533b2a 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,28 +29,28 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.8-42.BETA",
+      "version": "8.11.12-26.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.8-42.BETA.x64.tar.gz",
-          "hash": "sha256-wyKFbvxUOjVakizHmmVTsgZQyZqa7/Xmc4P3rDU5cH0="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.12-26.BETA.x64.tar.gz",
+          "hash": "sha256-1i8DqaNSsWj2dIVKOrRH07OjqeunZ/y12m01gJwuQZA="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.8-42.BETA.arm64.tar.gz",
-          "hash": "sha256-/SPlLEQ744S4KwOmJVfq+lFmupozI80cHfZWi82JPOA="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.12-26.BETA.arm64.tar.gz",
+          "hash": "sha256-0naWYmWKqTgiYbEO8aSXMJTLGTLlRBgvrGxWIyTrZtE="
         }
       }
     },
     "darwin": {
-      "version": "8.11.10-32.BETA",
+      "version": "8.11.12-26.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.10-32.BETA-x86_64.zip",
-          "hash": "sha256-37xj7rcVtK3L7ffCFjqtUhc/AdXR94w+/qoMdy1jwcg="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-x86_64.zip",
+          "hash": "sha256-0zv4U4x4dxdrsjthHrXszL5JGpe//xVsqE+VCXD1F4U="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.10-32.BETA-aarch64.zip",
-          "hash": "sha256-qwybvd63y9At51W7BvZyk/XZ9cjWn6/oLKiytBN/Hqg="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-aarch64.zip",
+          "hash": "sha256-0/ZDkeyGcnA7P41FLYk4xNLdG89Y2BWDhApNSaYcKg8="
         }
       }
     }

From bbf723c138a5b26e5b29652e08223ed4f41a6973 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 23 Sep 2025 20:40:10 +0200
Subject: [PATCH 025/115] monado: remove obsolete XRT_HAVE_STEAM

See https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2418

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/mo/monado/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 1c029e710606..49c922ec44f9 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport)
     (lib.cmakeBool "XRT_FEATURE_TRACING" tracingSupport)
     (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
-    (lib.cmakeBool "XRT_HAVE_STEAM" true)
   ];
 
   # Help openxr-loader find this runtime

From b265f3a4f4dc3dbd812b522ee2a7efce5693ce30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 20:18:28 +0000
Subject: [PATCH 026/115] steampipePackages.steampipe-plugin-azure: 1.7.0 ->
 1.8.0

---
 .../steampipe-packages/steampipe-plugin-azure/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index 06ea9cf01606..63a869fae06f 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-azure";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-azure";
     tag = "v${version}";
-    hash = "sha256-w5q8nHdAGuGiL57ks5ctFkQjJdevT+nGySHy/nGei/c=";
+    hash = "sha256-LMX+2aNX+0vYcAKVakMrdyHavaFlUoSVQ7DIg1kXqGU=";
   };
 
-  vendorHash = "sha256-3Wfqp9m4AvEqbRvjwUU1S7z+1O51XqJGPLsPke+GjCQ=";
+  vendorHash = "sha256-yBOja0QmpVBaXbXQ2AVsO4uYLalzYyghSwyEh9s2ZGA=";
 
   ldflags = [
     "-s"

From 26f45b3f634592d2d1f94b426da5ed6e1f62f04f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 21:42:50 +0000
Subject: [PATCH 027/115] vscode-extensions.dart-code.dart-code: 3.118.1 ->
 3.118.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 744f54437892..a7c9d22b9128 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1182,8 +1182,8 @@ let
         mktplcRef = {
           name = "dart-code";
           publisher = "dart-code";
-          version = "3.118.1";
-          hash = "sha256-Ug3rEfM2oh1s9a6BulHmj0++xt+nzT0XcdQ4TuH8xV4=";
+          version = "3.118.2";
+          hash = "sha256-AHT5QP8aNhuMOyyV7Nig8UnoG4dkQhN2XKw0eh+Rfbg=";
         };
 
         meta.license = lib.licenses.mit;

From 103dbb4ac431fcebc7de8ef259891ae7278be43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Gomes=20Viana?= <devel@superboring.dev>
Date: Wed, 24 Sep 2025 00:09:07 +0200
Subject: [PATCH 028/115] opencode: 0.11.1 -> 0.11.2

https://github.com/sst/opencode/releases/tag/v0.11.2
---
 pkgs/by-name/op/opencode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 974947571b84..d5de6d634b1f 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.11.1";
+  version = "0.11.2";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a3NReKk6wZre5GXmNRuBLzM0MtkAmIGe4r+zcZH+G1A=";
+    hash = "sha256-kWVDNGJS7QraLSlLh+JDvggDmskhQ0lAlKLnlmaGyQU=";
   };
 
   tui = buildGoModule {

From 70a9e432eb8ff17dee83335871689c087a167baf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 22:38:22 +0000
Subject: [PATCH 029/115] testkube: 2.2.5 -> 2.2.6

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

diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index 8d02bc096056..388ad67fe6a7 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "testkube";
-  version = "2.2.5";
+  version = "2.2.6";
 
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
     rev = "v${version}";
-    hash = "sha256-/bEkzlauhYSHQVX/GZHxbegaXySClu0mhtvPga+5fjY=";
+    hash = "sha256-aAE3Mb39ddy9I4Ftzb5WKRlcIv7iTrZ8mRsjjyyZv9Y=";
   };
 
-  vendorHash = "sha256-163gMuPqgFjkmBHdpmMQqBcQ5xGQK8XDxvYjXrMcHO8=";
+  vendorHash = "sha256-WaanaknTuCnjBjxIi39ZHTqh3C92rLQAPRFx0o7dwZY=";
 
   ldflags = [
     "-X main.version=${version}"

From 019689db473d134bc80f53c1b3e612b3cf8ce150 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 23:15:13 +0000
Subject: [PATCH 030/115] python3Packages.langgraph-sdk: 0.2.6 -> 0.2.9

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

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 1fc1067db2e4..94bf3ba3c234 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.2.6";
+  version = "0.2.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "sdk==${version}";
-    hash = "sha256-UEVhzKDu2nMkhaCLD162xCBR+2e3ipSVakmlZAzhN3Q=";
+    hash = "sha256-aEvZFF1bTRAZ7EQ6YL7p1OcQJmdysKYtTZJVPcsNU50=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";

From b8e85cd34ce1fd53030948c746d9ad5bc611036d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 02:45:44 +0000
Subject: [PATCH 031/115] nnd: 0.46 -> 0.47

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

diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 4aea97c487f3..b0436f641bce 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.46";
+  version = "0.47";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8VMucVBkB0Xkom9dJuINW2cjZ3RiYEm8xBsld5OT0zs=";
+    hash = "sha256-6lW82HcXhpkMJ278vJVkAreQtRDpKtuaJM467V7t/HA=";
   };
 
-  cargoHash = "sha256-JRRZsFiZuMLW2evsmKAiZxU5KQzIGd+uGhlY0qtyrB4=";
+  cargoHash = "sha256-rDwC8AmVSvKZyepGUztO3bn23Y7xG8RIyFO7pIEOfIY=";
 
   meta = {
     description = "Debugger for Linux";

From 957f0432511d6cd793aee3974283814255025b25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 03:50:30 +0000
Subject: [PATCH 032/115] zrc: 2.3 -> 2.3h

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

diff --git a/pkgs/by-name/zr/zrc/package.nix b/pkgs/by-name/zr/zrc/package.nix
index 394029187f49..938a7f8d7ebb 100644
--- a/pkgs/by-name/zr/zrc/package.nix
+++ b/pkgs/by-name/zr/zrc/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrc";
-  version = "2.3";
+  version = "2.3h";
 
   src = fetchFromGitHub {
     owner = "Edd12321";
     repo = "zrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BJlMrafyPmA7vMEf31ao88HLbU86tySTbtuCaN4RxtY=";
+    hash = "sha256-3DGXVQ1HWRsfe4AHjN0Rm4JEIlzr4fhvNvPIKIZbI5Q=";
   };
 
   nativeBuildInputs = [

From 6dd18881dea3af6ac0c9cd221a94dc153114a8d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 06:23:20 +0000
Subject: [PATCH 033/115] coroot-node-agent: 1.25.10 -> 1.26.1

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

diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index f2891dd61165..c17c799aae44 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.25.10";
+  version = "1.26.1";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-fzvhnakjFyfQQEcf73rGhOoUv28FzPOoYEcApV34MPc=";
+    hash = "sha256-fg+dth3wCOdsSU8B6mdvlMFgfrG7Gu6IgpxENkk2/sw=";
   };
 
-  vendorHash = "sha256-QvdFW/o481F85WuXNdz99Q9MBiGRjVSWvPRytq67vYU=";
+  vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
 
   buildInputs = [ systemdLibs ];
 

From a11d4ec2e5528e7de31cfec53352c5c97c1259a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 09:10:01 +0000
Subject: [PATCH 034/115] localstack: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index 3e1041817547..9310bff8be22 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.8.0";
+  version = "4.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     tag = "v${version}";
-    hash = "sha256-FxbfqCblVuJ5KCy9QhyK83psgF9RvsAWMw7cbrz7NVo=";
+    hash = "sha256-IN6vMpHsGFTvY4yeMCdV9nwgh17ilC3j9SpOHWVOtew=";
   };
 
   build-system = with python3.pkgs; [

From 2aa4bd6d50a6293e972883ddbdd9e546a17440d2 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 2 Sep 2025 14:19:15 +0200
Subject: [PATCH 035/115] python3Packages.pixelmatch: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix
new file mode 100644
index 000000000000..03bf5db92d6d
--- /dev/null
+++ b/pkgs/development/python-modules/pixelmatch/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchgit,
+  pillow,
+  poetry-core,
+  pytestCheckHook,
+  pytest-benchmark,
+  pythonOlder,
+}:
+let
+  owner = "whtsky";
+  repo = "pixelmatch-py";
+in
+buildPythonPackage rec {
+  pname = "pixelmatch";
+  version = "0.3.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchgit {
+    url = "https://github.com/whtsky/pixelmatch-py.git";
+    tag = "v${version}";
+    hash = "sha256-xq0LT7v83YRz0baw24iDXiuUxiNPMEsiZNIewsH3JPw=";
+    fetchLFS = true;
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  nativeCheckInputs = [
+    pillow
+    pytest-benchmark
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pixelmatch" ];
+
+  meta = {
+    description = "A pixel-level image comparison library";
+    homepage = "https://github.com/whtsky/pixelmatch-py";
+    changelog = "https://github.com/whtsky/pixelmatch-py/tree/v${version}#changelog";
+    license = with lib.licenses; [ isc ];
+    teams = [ lib.teams.geospatial ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f0135c1ca6d..df4308216d36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11853,6 +11853,8 @@ self: super: with self; {
 
   pixel-ring = callPackage ../development/python-modules/pixel-ring { };
 
+  pixelmatch = callPackage ../development/python-modules/pixelmatch { };
+
   pizzapi = callPackage ../development/python-modules/pizzapi { };
 
   pjsua2 =

From 3fc9b782ef7f0ab9adeaa3c87a1cb21b13a05180 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 2 Sep 2025 14:30:57 +0200
Subject: [PATCH 036/115] folium: fix tests

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

diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index a63d9626fb87..0527ca262007 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  branca,
   buildPythonPackage,
+  branca,
   fetchFromGitHub,
   geodatasets,
   geopandas,
@@ -10,6 +10,7 @@
   numpy,
   pandas,
   pillow,
+  pixelmatch,
   pytestCheckHook,
   pythonOlder,
   requests,
@@ -52,16 +53,16 @@ buildPythonPackage rec {
     nbconvert
     pandas
     pillow
+    pixelmatch
     pytestCheckHook
+    selenium
   ];
 
   disabledTests = [
     # Tests require internet connection
-    "test__repr_png_is_bytes"
-    "test_geojson"
-    "test_heat_map_with_weights"
     "test_json_request"
-    "test_notebook"
+    # no selenium driver
+    "test__repr_png_is_bytes"
     "test_valid_png_size"
     "test_valid_png"
     # pooch tries to write somewhere it can, and geodatasets does not give us an env var to customize this.
@@ -69,7 +70,8 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    # Import issue with selenium.webdriver.common.fedcm
+    # Selenium cannot find chrome driver, even with chromedriver package
+    "tests/snapshots/test_snapshots.py"
     "tests/selenium"
   ];
 

From 8e00ccc5416ea4119ae275966594d447be075290 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 11:34:33 +0000
Subject: [PATCH 037/115] hashcat-utils: 1.9 -> 1.10

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

diff --git a/pkgs/by-name/ha/hashcat-utils/package.nix b/pkgs/by-name/ha/hashcat-utils/package.nix
index 826792c26ecb..dc717c51b7b3 100644
--- a/pkgs/by-name/ha/hashcat-utils/package.nix
+++ b/pkgs/by-name/ha/hashcat-utils/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hashcat-utils";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "hashcat";
     repo = "hashcat-utils";
     rev = "v${version}";
-    sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr";
+    sha256 = "sha256-S2aRNTJMQO/YXdCHexKQ+gZnZp2vGvsvhD5O7t3tfhw=";
   };
 
   sourceRoot = "${src.name}/src";

From e63b5083ddba94f78d10515620f3dab9250f4924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zaffarano?= <sebas@zaffarano.com.ar>
Date: Wed, 24 Sep 2025 09:20:58 -0300
Subject: [PATCH 038/115] tmuxPlugins.tmux-toggle-popup: 0.4.3 -> 0.4.4

---
 pkgs/misc/tmux-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index baa234512542..2d006c33d0de 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -1131,12 +1131,12 @@ in
   tmux-toggle-popup = mkTmuxPlugin rec {
     pluginName = "tmux-toggle-popup";
     rtpFilePath = "toggle-popup.tmux";
-    version = "0.4.3";
+    version = "0.4.4";
     src = fetchFromGitHub {
       owner = "loichyan";
       repo = "tmux-toggle-popup";
       tag = "v${version}";
-      hash = "sha256-uQihpmQTJbjx5euXSGOFlekFgCTYXGu7SQYqyZjKLM8=";
+      hash = "sha256-tiiM5ETSrceyAyqhYRXjG1qCbjzZ0NJL5GWWbWX7Cbo=";
     };
     meta = with lib; {
       homepage = "https://github.com/loichyan/tmux-toggle-popup";

From db6c44d44ad7f5e71ae12a35a89c4e40db9d1020 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 12:41:39 +0000
Subject: [PATCH 039/115] python3Packages.locust-cloud: 1.26.3 -> 1.27.0

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

diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index c93dd8d8443b..ac503a0593c0 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "locust-cloud";
-  version = "1.26.3";
+  version = "1.27.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustcloud";
     repo = "locust-cloud";
     tag = version;
-    hash = "sha256-gOlCxu6f3+T3tmAIolze7K/+aViqO8DjuooXqEELUvs=";
+    hash = "sha256-K69VIyQggwWQQoMld0JpzmtJRQc6HYrKAGA6E9O69MQ=";
   };
 
   build-system = [

From fccd7d1db396e0963de6767befb701fbe20fb483 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 21 Sep 2025 02:42:44 +0300
Subject: [PATCH 040/115] nixosTests.terminal-emulators: remove eterm

- remove references to `eterm` from nixosTests.
`eterm` package was dropped back in 2023:
https://github.com/NixOS/nixpkgs/commit/2ab03da4fdfebfb5c408a9ca90968e1c06184bd6
---
 nixos/tests/terminal-emulators.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index fa8ab05fd5ea..f6c31afad696 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -36,10 +36,6 @@ let
 
     darktile.pkg = p: p.darktile;
 
-    eterm.pkg = p: p.eterm;
-    eterm.executable = "Eterm";
-    eterm.pinkValue = "#D40055";
-
     germinal.pkg = p: p.germinal;
 
     ghostty.pkg = p: p.ghostty;

From 5381cfa83b27cf4d26e67e7596110c8e11f01e73 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 24 Sep 2025 13:19:35 +0000
Subject: [PATCH 041/115] verible: 0.0.3956 -> 0.0.4023

Diff:
https://github.com/chipsalliance/verible/compare/v0.0-3956-ge12a194d...v0.0-4023-gc1271a00
---
 pkgs/by-name/ve/verible/package.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix
index 3c2f45c5058f..ae5a1c37bec8 100644
--- a/pkgs/by-name/ve/verible/package.nix
+++ b/pkgs/by-name/ve/verible/package.nix
@@ -16,8 +16,8 @@ let
   registry = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-central-registry";
-    rev = "bac7a5dc8b5535d7b36d0405f76badfba77c84c2";
-    hash = "sha256-TXooqzqfvf1twldfrs0m8QR3AJkUCIyBS36TFTwN4Eg=";
+    rev = "3f863a3f35f31b61982d813835d8637b3d93d87a";
+    hash = "sha256-BsxP3GrS98ubIAkFx/c4pB1i97ZZL2TijS+2ORnooww=";
   };
 in
 buildBazelPackage rec {
@@ -26,8 +26,8 @@ buildBazelPackage rec {
   # These environment variables are read in bazel/build-version.py to create
   # a build string shown in the tools --version output.
   # If env variables not set, it would attempt to extract it from .git/.
-  GIT_DATE = "2025-03-30";
-  GIT_VERSION = "v0.0-3956-ge12a194d";
+  GIT_DATE = "2025-08-29";
+  GIT_VERSION = "v0.0-4023-gc1271a00";
 
   # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
   version = builtins.concatStringsSep "." (
@@ -37,8 +37,8 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "verible";
-    rev = "${GIT_VERSION}";
-    hash = "sha256-/RZqBNmyBZI6CO2ffS6p8T4wse1MKytNMphXFdkTOWQ=";
+    tag = GIT_VERSION;
+    hash = "sha256-N+yjRcVxFI56kP3zq+qFHNXZLTtVnQaVnseZS13YN0s=";
   };
 
   bazel = bazel_7;
@@ -51,9 +51,9 @@ buildBazelPackage rec {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-jgh+wEqZba30MODmgmPoQn1ErNmm40d16jB/kE2jYPg=";
-        x86_64-linux = "sha256-kiI/LX0l9ERxItsqiAyl+BP3QnLr0Ly2YVb988M4jVs=";
-        aarch64-darwin = "sha256-bkw4ErWYblzr3lQhoXSBqIBHjXzhZHeTKdT0E/YsiFQ=";
+        aarch64-linux = "sha256-SUURIZF3mlFRFKpxdHrgYAbJQ4rkkzCeqcC/1vxmreo=";
+        x86_64-linux = "sha256-p7h2L1aLzmMeWWxXC//Qau8/F4HbnUFY6aV8u7zfjRk=";
+        aarch64-darwin = "sha256-Zn22un/KaHdTEA/ucaentR7t/krmnZQk3A+jfbPVYnA=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };
@@ -94,11 +94,11 @@ buildBazelPackage rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server";
     homepage = "https://github.com/chipsalliance/verible";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       hzeller
       newam
     ];

From d60a5f0f188e36a32d3a20ef2945c983a18fcb1b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 24 Sep 2025 18:50:10 +0400
Subject: [PATCH 042/115] =?UTF-8?q?the-foundation:=201.10.0=20=E2=86=92=20?=
 =?UTF-8?q?1.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/th/the-foundation/package.nix b/pkgs/by-name/th/the-foundation/package.nix
index 6c53c95a195c..544fa5237751 100644
--- a/pkgs/by-name/th/the-foundation/package.nix
+++ b/pkgs/by-name/th/the-foundation/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-foundation";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitea {
     domain = "git.skyjake.fi";
     owner = "skyjake";
     repo = "the_Foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+z5vw6TIs+5RyS3CLSLIdflJqnDu8NL+yFHpSxwG2fM=";
+    hash = "sha256-EGltSimFdgojbXt97TbH7+a3iwuuI/jj14u9fkw4NnA=";
   };
 
   nativeBuildInputs = [

From 7d4a1a80e6a5638d7c7ed62b9c8cae775c62e217 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 24 Sep 2025 18:50:44 +0400
Subject: [PATCH 043/115] =?UTF-8?q?lagrange:=201.19.1=20=E2=86=92=201.19.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 6fb409512768..2ca49e4dbcbc 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lagrange";
-  version = "1.19.1";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OsyWedXer1xFnPCYRpFeBQfUjpFhGViqx2FTOeZV4PI=";
+    hash = "sha256-T0xc7y5t359y/jvpekQAD1wmpMl6/lW+LzqlrSwfYv0=";
   };
 
   nativeBuildInputs = [

From c930786d3c69bdc682fb17e5c2a9f75a82911c61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 16:19:45 +0000
Subject: [PATCH 044/115] trezor-suite: 25.8.2 -> 25.9.3

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

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index de362986aa18..6b460db45daf 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.8.2";
+  version = "25.9.3";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-bVLTYCT8jkjeJMHWPvzFVkGB69Z46nvebtEDh5HfqYgd3Xwov+s1BHlr82XjN4+0cdKJchXnyKVTShO32+at5A==";
-        x86_64-linux = "sha512-wtMTW2Wj6dPsgUupXsHuP2/RS3Yp10bcCjkBfVIDfLrlClKFDHRLt9mNGtSdFfZM791NyDWsjU4xdi082BduSw==";
+        aarch64-linux = "sha512-mDEqlIxDKHD2xcwcnvehMJExytNBmvhp5iDIKBb/FfxY44We6SAknsocbeWPqq5XLkUbFjjG07IWGtZzdqTj7A==";
+        x86_64-linux = "sha512-rxCTYvi+I5ymlS9N4Y2ffIt5ZSgXf6U24mNKe1FNo5++6NfCXFf4vMWJreQ2TNUHsa8V0IixXrtar7AdWCpYQQ==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From b430a561644d0387f8968d90ab15a1edfb4067c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 17:21:18 +0000
Subject: [PATCH 045/115] python3Packages.pyside6-qtads: 4.4.0.3 -> 4.4.1

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

diff --git a/pkgs/development/python-modules/pyside6-qtads/default.nix b/pkgs/development/python-modules/pyside6-qtads/default.nix
index 68db4f71db61..77493ba43056 100644
--- a/pkgs/development/python-modules/pyside6-qtads/default.nix
+++ b/pkgs/development/python-modules/pyside6-qtads/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyside6-qtads";
-  version = "4.4.0.3";
+  version = "4.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mborgerson";
     repo = "pyside6_qtads";
     tag = "v${version}";
-    hash = "sha256-QuZaVdHfP3nVmQeCv7ra1ecvcezRh4r78XA2fbMZ9ys=";
+    hash = "sha256-XEPhZBFAZOvr3Kelz9mplkJiQH3zUf2QZJs/NNJE114=";
     fetchSubmodules = true;
   };
 

From 57c2b815d7287c89d38aeb999e2fc4375050b753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 11:11:30 -0700
Subject: [PATCH 046/115] python3Packages.doorbirdpy: 3.0.8 -> 3.0.9

Diff: https://gitlab.com/klikini/doorbirdpy/-/compare/refs/tags/3.0.8...3.0.9

Changelog: https://gitlab.com/klikini/doorbirdpy/-/tags/3.0.9
---
 .../python-modules/doorbirdpy/default.nix      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index 1c6034c8e2e4..6b61c571a75f 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -12,18 +12,22 @@
 
 buildPythonPackage rec {
   pname = "doorbirdpy";
-  version = "3.0.8";
+  version = "3.0.9";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "klikini";
     repo = "doorbirdpy";
-    rev = "refs/tags/${version}";
-    hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0=";
+    tag = version;
+    hash = "sha256-aa7u4x0WAFvCKPPGKJiZA/DYKKCa+xqabHxDMPxEbgo=";
   };
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "tenacity"
+  ];
+
   dependencies = [
     aiohttp
     tenacity
@@ -37,11 +41,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "doorbirdpy" ];
 
-  meta = with lib; {
-    changelog = "https://gitlab.com/klikini/doorbirdpy/-/tags/${version}";
+  meta = {
+    changelog = "https://gitlab.com/klikini/doorbirdpy/-/tags/${src.tag}";
     description = "Python wrapper for the DoorBird LAN API";
     homepage = "https://gitlab.com/klikini/doorbirdpy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 54910050a9d945ae9d46e3c59511bd026f2a1268 Mon Sep 17 00:00:00 2001
From: "Richard J. Acton" <richardjacton@richardjacton.net>
Date: Wed, 24 Sep 2025 19:26:01 +0100
Subject: [PATCH 047/115] globus-cli: 3.37.0 -> 3.38.0

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

diff --git a/pkgs/by-name/gl/globus-cli/package.nix b/pkgs/by-name/gl/globus-cli/package.nix
index fc51eea9b030..7b0e8c765957 100644
--- a/pkgs/by-name/gl/globus-cli/package.nix
+++ b/pkgs/by-name/gl/globus-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "globus-cli";
-  version = "3.37.0";
+  version = "3.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "globus";
     repo = "globus-cli";
     tag = version;
-    hash = "sha256-CG57RmWVI1p/8zjDhrH1ZK1KwNrwxbz0FkwOKLBbFcc=";
+    hash = "sha256-TjJ0GBXRYSMbWfCkGJSBzToHEjoN5ZJAzZe2yiRJhtg=";
   };
 
   build-system = with python3Packages; [

From 6532bf50c7dbedfd50967d75e2de4e76a47bad90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 19:28:10 +0000
Subject: [PATCH 048/115] spring-boot-cli: 3.5.5 -> 3.5.6

---
 pkgs/by-name/sp/spring-boot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
index 94d7de3c4d0d..9533614b7b77 100644
--- a/pkgs/by-name/sp/spring-boot-cli/package.nix
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spring-boot-cli";
-  version = "3.5.5";
+  version = "3.5.6";
 
   src = fetchzip {
     url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-yjPVSd/xRvgyT9iZSWzZL2ecTuxiKpZZ0z0Ti8SvAmw=";
+    hash = "sha256-ujG9miirmOfWKB5o4ju0jtYoWu9k0bYRYohFnEpOVRA=";
   };
 
   nativeBuildInputs = [

From 889fa33764927cf571fe99399b1dab6e4eb7f2f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 20:07:36 +0000
Subject: [PATCH 049/115] python3Packages.metaflow: 2.18.4 -> 2.18.9

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

diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix
index b3065d6f1e5f..c5d20fdf3733 100644
--- a/pkgs/development/python-modules/metaflow/default.nix
+++ b/pkgs/development/python-modules/metaflow/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "metaflow";
-  version = "2.18.4";
+  version = "2.18.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "metaflow";
     tag = version;
-    hash = "sha256-ijgdilia8WVwAZ0BDxvrN751ReJu6iaIW9KbIrXdwUE=";
+    hash = "sha256-TqS+bF4lyLin16YEH/CnmXLVYzdtv/8jjAsuuT1pYKo=";
   };
 
   build-system = [

From 7dd3a150ac065fe284a365b2c376a0f76ef53310 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 20:33:17 +0000
Subject: [PATCH 050/115] fblog: 4.14.0 -> 4.15.0

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

diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index 8c9ff9ef72d3..8260cdc8dbfb 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fblog";
-  version = "4.14.0";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "brocode";
     repo = "fblog";
     rev = "v${version}";
-    hash = "sha256-ImuNl7ERM7auuGkPHJ93unrqgXRCUBLAuG8OyJXFqms=";
+    hash = "sha256-IPT/1k8bs2NBbq5KthvcJY7eBwbnFop8cO0OiLgRZg4=";
   };
 
-  cargoHash = "sha256-vk07dOaKo500xgFBfgfLaWsjpaXxpvX/ETgGr5HHnNE=";
+  cargoHash = "sha256-puZN1ao+Grw9nWQvNfqAwmY9Lb6+z13EPv/cZlueYxc=";
 
   meta = with lib; {
     description = "Small command-line JSON log viewer";

From 6d2049079098d1af21bf2502597c9982c49fcb8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 21:37:31 +0000
Subject: [PATCH 051/115] velocity: 3.4.0-unstable-2025-09-07 ->
 3.4.0-unstable-2025-09-24

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

diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 172ad0408743..d886b1e7013b 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-09-07";
+  version = "3.4.0-unstable-2025-09-24";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "6e80f57739d5faea3b4e85c993c3649fe5e98cd7";
-    hash = "sha256-w6uo19FPs8lhAPcqqWABPnyQRTe5G5bsX+IfVAXcwzo=";
+    rev = "ec793a9fdbbf66fcce31fe544e8f0208cb9f9520";
+    hash = "sha256-pxk239uN7U+qfEElGTja/4VHR0wbw4RW0Mritx1P00w=";
   };
 
   nativeBuildInputs = [

From 1d35ead9961253516fd7fad9550d32f212e5ce46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 21:41:25 +0000
Subject: [PATCH 052/115] signal-export: 3.7.1 -> 3.8.0

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

diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix
index 6c14cbedb0ea..e843dfe83cb4 100644
--- a/pkgs/by-name/si/signal-export/package.nix
+++ b/pkgs/by-name/si/signal-export/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "signal-export";
-  version = "3.7.1";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "signal_export";
-    hash = "sha256-7oSaVC1TpRwoOwpXbercFOBoyrmKx8J9QUnt/a6JHGs=";
+    hash = "sha256-bl5rl6zRn4K/CXjS/5OCfngzNeUzXsXjhd2fTFHsHbg=";
   };
 
   build-system = with python3.pkgs; [

From b206234d54a769b25ca861667fab9d3b0170cf30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 23:25:45 +0000
Subject: [PATCH 053/115] trealla: 2.82.33 -> 2.83.5

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index c23d547a2789..b2b1f4490b27 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.82.33";
+  version = "2.83.5";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NjWvcNE0/FTDTafBpHen06A2UrCA4TBiQWGnDaz/3Yk=";
+    hash = "sha256-yCWn0/V+ion5Z/HTtr5jA2I+sRYQiZvXC0u3MAaCoRE=";
   };
 
   postPatch = ''

From 4412a4dffcf82d1ea499d33db6e42d114e71d9c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 00:38:59 +0000
Subject: [PATCH 054/115] agnos: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/by-name/ag/agnos/package.nix b/pkgs/by-name/ag/agnos/package.nix
index f30a0a10d836..ff17584c23ec 100644
--- a/pkgs/by-name/ag/agnos/package.nix
+++ b/pkgs/by-name/ag/agnos/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "agnos";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "krtab";
     repo = "agnos";
     tag = "v${version}";
-    hash = "sha256-hSiJvpTQIbhz/0AFBTvgfRDTqOi9YcDOvln15SksMJs=";
+    hash = "sha256-wHzKHduxqG7PBsGK39lCRyzhf47mdjCXhn3W1pOXQO0=";
   };
 
-  cargoHash = "sha256-wmnfAvtTjioslSdD6z0mMl3Hz46wpPYMk494r9xXj44=";
+  cargoHash = "sha256-iRHJ8xmF9CzuVDkBVHD1LGv/YQS5V+oV05+7Pe04ckM=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From 385b54ab3c9ad4349d6d112b9cdfaeeea8f32651 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 00:41:15 +0000
Subject: [PATCH 055/115] svu: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 13a25e5eb109..33a7edcff906 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "svu";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "svu";
     rev = "v${version}";
-    sha256 = "sha256-jnUVl34luj6kUyx27+zWFxKZMD+R1uzu78oJV7ziSag=";
+    sha256 = "sha256-NzhVEChNsUkzGe1/M8gl1K0SD5nAQ/PrYUxGQKQUAtU=";
   };
 
-  vendorHash = "sha256-P5Ys4XjT5wKCbnxl3tKjpouiSZBFf/zfXKrV8MaGyMU=";
+  vendorHash = "sha256-xhNJsARuZZx9nhmTNDMB51VC0QgjZgOYFKLhLf+3b3A=";
 
   ldflags = [
     "-s"

From 9909b59a103352c538152683ef0e31e14cacf314 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Thu, 25 Sep 2025 08:27:19 -0700
Subject: [PATCH 056/115] zig.hook: respect parallelism from nix

---
 pkgs/development/compilers/zig/setup-hook.sh | 33 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh
index 1b5c13cf3edc..1f6d8567838a 100644
--- a/pkgs/development/compilers/zig/setup-hook.sh
+++ b/pkgs/development/compilers/zig/setup-hook.sh
@@ -11,7 +11,16 @@ function zigSetGlobalCacheDir {
 function zigBuildPhase {
     runHook preBuild
 
-    local flagsArray=()
+    local buildCores=1
+
+    # Parallel building is enabled by default.
+    if [ "${enableParallelBuilding-1}" ]; then
+        buildCores="$NIX_BUILD_CORES"
+    fi
+
+    local flagsArray=(
+      "-j$buildCores"
+    )
     concatTo flagsArray zigDefaultFlagsArray \
         zigBuildFlags zigBuildFlagsArray
 
@@ -24,7 +33,16 @@ function zigBuildPhase {
 function zigCheckPhase {
     runHook preCheck
 
-    local flagsArray=()
+    local buildCores=1
+
+    # Parallel building is enabled by default.
+    if [ "${enableParallelChecking-1}" ]; then
+        buildCores="$NIX_BUILD_CORES"
+    fi
+
+    local flagsArray=(
+      "-j$buildCores"
+    )
     concatTo flagsArray zigDefaultFlagsArray \
         zigCheckFlags zigCheckFlagsArray
 
@@ -37,7 +55,16 @@ function zigCheckPhase {
 function zigInstallPhase {
     runHook preInstall
 
-    local flagsArray=()
+    local buildCores=1
+
+    # Parallel building is enabled by default.
+    if [ "${enableParallelInstalling-1}" ]; then
+        buildCores="$NIX_BUILD_CORES"
+    fi
+
+    local flagsArray=(
+      "-j$buildCores"
+    )
     concatTo flagsArray zigDefaultFlagsArray \
         zigBuildFlags zigBuildFlagsArray \
         zigInstallFlags zigInstallFlagsArray

From 5dd1e64b31016a119aaa9fc808232dd3fba1cbfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 15:54:16 +0000
Subject: [PATCH 057/115] kine: 0.14.0 -> 0.14.2

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

diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix
index 84e1bcec756e..7db1854882e7 100644
--- a/pkgs/by-name/ki/kine/package.nix
+++ b/pkgs/by-name/ki/kine/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kine";
-  version = "0.14.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "k3s-io";
     repo = "kine";
     rev = "v${version}";
-    hash = "sha256-/sI9ofYTqnEW5bzkrorWOhs4Z+U6+8yP0F+Za2s/MCE=";
+    hash = "sha256-0qT5/kZ4jRBRxzsm7oC7ymRPtxOeAYt5IN66Qlby0XI=";
   };
 
-  vendorHash = "sha256-1Dwu1b6y1ibGt7w6Iu3lKWItwVn9H/TQFbTL2z2rVoc=";
+  vendorHash = "sha256-OgKwHh4+KRQUPdN6/DBfdxXqWLKGWT0++XvHTex+0EA=";
 
   ldflags = [
     "-s"

From b8ee30758753f81c0ee6848f1608e6418e36586e Mon Sep 17 00:00:00 2001
From: John Zila <john@jzila.com>
Date: Thu, 25 Sep 2025 11:50:17 -0500
Subject: [PATCH 058/115] ollama: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index adc050c6442f..6afc055a3350 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,13 +117,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+kdKXHhv1q16CK1PubgadrBM5YMYTBaPB2Et7hSmUWk=";
+    hash = "sha256-D3b3ddW6s9NqV8mJZboQ/z8IkId8h7a4eTh/MkjPNqg=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From daae5c3bba25ede8d498e634e5b2e88c71efe72c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:29:36 +0200
Subject: [PATCH 059/115] git-recent: use `finalAttrs` pattern

---
 pkgs/applications/version-management/git-recent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 6dfd8460d658..ab692a89fb56 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -9,14 +9,14 @@
   util-linux,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "git-recent";
   version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-b6AWLEXCOza+lIHlvyYs3M6yHGr2StYXzl7OsA9gv/k=";
   };
 
@@ -45,4 +45,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.jlesquembre ];
     mainProgram = "git-recent";
   };
-}
+})

From 0de48fc9edfc37123d39a08c6db320adf37876a8 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:30:17 +0200
Subject: [PATCH 060/115] git-recent: replace `rev` with `tag`

---
 pkgs/applications/version-management/git-recent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index ab692a89fb56..58f61ec528d5 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-b6AWLEXCOza+lIHlvyYs3M6yHGr2StYXzl7OsA9gv/k=";
   };
 

From 1021d87848fbb923f89383d34d68bee9d7d8a740 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:30:51 +0200
Subject: [PATCH 061/115] git-recent: replace `sha256` with `hash`

---
 pkgs/applications/version-management/git-recent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 58f61ec528d5..ca8e18ebd5d8 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "paulirish";
     repo = "git-recent";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-b6AWLEXCOza+lIHlvyYs3M6yHGr2StYXzl7OsA9gv/k=";
+    hash = "sha256-b6AWLEXCOza+lIHlvyYs3M6yHGr2StYXzl7OsA9gv/k=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f31e7282f880140d7db5a2f613b6739f5f7bdae9 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:31:20 +0200
Subject: [PATCH 062/115] git-recent: remove `with lib;` from `meta`

---
 .../version-management/git-recent/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index ca8e18ebd5d8..8c62e83a33b7 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
       }"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/paulirish/git-recent";
     description = "See your latest local git branches, formatted real fancy";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [ maintainers.jlesquembre ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.jlesquembre ];
     mainProgram = "git-recent";
   };
 })

From 21e3d56b2736a2d0f6e21a2e1cebe2fff5e3da76 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:32:09 +0200
Subject: [PATCH 063/115] git-recent: replace `makeWrapper` with
 `makeBinaryWrapper`

---
 pkgs/applications/version-management/git-recent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 8c62e83a33b7..d5f8abea15e9 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -4,7 +4,7 @@
   git,
   less,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
   # util-linuxMinimal is included because we need the column command
   util-linux,
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-b6AWLEXCOza+lIHlvyYs3M6yHGr2StYXzl7OsA9gv/k=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   buildPhase = null;
 

From 88e82b7cda7b58ca493b374b1d9e5935d9caae72 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:32:53 +0200
Subject: [PATCH 064/115] git-recent: replace `buildPhase` with `dontBuild`

---
 pkgs/applications/version-management/git-recent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index d5f8abea15e9..48f6a97b1043 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
-  buildPhase = null;
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/bin

From 46f1a2ab7506d9348f71457101ceda23ce5d1586 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:33:35 +0200
Subject: [PATCH 065/115] git-recent: use `gitMinimal` and `util-linuxMinimal`

---
 .../version-management/git-recent/default.nix         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 48f6a97b1043..7266798f9bcb 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -1,12 +1,11 @@
 {
   lib,
   stdenv,
-  git,
-  less,
   fetchFromGitHub,
   makeBinaryWrapper,
-  # util-linuxMinimal is included because we need the column command
-  util-linux,
+  gitMinimal,
+  less,
+  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram $out/bin/git-recent \
       --prefix PATH : "${
         lib.makeBinPath [
-          git
+          gitMinimal
           less
-          util-linux
+          util-linuxMinimal
         ]
       }"
   '';

From e553bec2b8cb49422e2ddc9238878f93901b5358 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:35:41 +0200
Subject: [PATCH 066/115] git-recent: add missing phase hooks, use `install`
 command

---
 .../version-management/git-recent/default.nix             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 7266798f9bcb..e1c895ce03cb 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -24,8 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp git-recent $out/bin
+    runHook preInstall
+
+    install -D -m755 -t $out/bin git-recent
+
     wrapProgram $out/bin/git-recent \
       --prefix PATH : "${
         lib.makeBinPath [
@@ -34,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
           util-linuxMinimal
         ]
       }"
+
+    runHook postInstall
   '';
 
   meta = {

From ade43af4fa2c95f45af2c74c623e932ffca8d8fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 20:36:43 +0000
Subject: [PATCH 067/115] directx-headers: 1.616.0 -> 1.618.1

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

diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix
index ff4841c868f4..e71eea2893d6 100644
--- a/pkgs/by-name/di/directx-headers/package.nix
+++ b/pkgs/by-name/di/directx-headers/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "directx-headers";
-  version = "1.616.0";
+  version = "1.618.1";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "DirectX-Headers";
     rev = "v${version}";
-    hash = "sha256-bPFeaNCxECKnecvt9jDIvxiQE6VaT7qD8Tyqm8L3u3M=";
+    hash = "sha256-A+nOH7/xDcjVTWKduJs2qWZOos/PxJTwKuqMdMsxaZ8=";
   };
 
   nativeBuildInputs = [

From bc9f4ff73ead533b60ed0c703ada8b2c12665773 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Thu, 25 Sep 2025 15:09:48 -0700
Subject: [PATCH 068/115] albyhub: 1.19.2 -> 1.20.0

---
 pkgs/by-name/al/albyhub/ldk-node-go/default.nix | 6 +++---
 pkgs/by-name/al/albyhub/ldk-node/default.nix    | 6 +++---
 pkgs/by-name/al/albyhub/package.nix             | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix
index 2f305b54d375..01b9c2d68cb4 100644
--- a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix
+++ b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "ldk-node-go";
-  version = "0-unstable-2025-08-22";
+  version = "0-unstable-2025-09-03";
 
   src = fetchFromGitHub {
     owner = "getAlby";
     repo = "ldk-node-go";
-    rev = "93af4d511ff81466ce547b42d0c7ea6adb724ad3";
-    hash = "sha256-hDRjYUkV4dVT+iuO+hUpXrFZLZ9eLU50gBLEKVdXPLE=";
+    rev = "91db97badfc261f8c680cf64124914ef97d08d0d";
+    hash = "sha256-7HbwMDLi1vRWMbUzx1bHyq/r+BwEejbz7SM1j/5SdmE=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/al/albyhub/ldk-node/default.nix b/pkgs/by-name/al/albyhub/ldk-node/default.nix
index 05f7ffa60784..92972ba158cb 100644
--- a/pkgs/by-name/al/albyhub/ldk-node/default.nix
+++ b/pkgs/by-name/al/albyhub/ldk-node/default.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ldk-node";
-  version = "0-unstable-2025-08-21";
+  version = "0-unstable-2025-09-03";
 
   src = fetchFromGitHub {
     owner = "getAlby";
     repo = "ldk-node";
-    rev = "078a26fb3a79f1ef66443b773018a1cf917cb5da";
-    hash = "sha256-ZmeohMnIbJzJbo9U+t0AWKFqLSIzDL/G42cBSBCtj3Q=";
+    rev = "75825474e5a551bb5ae5d1cf62cc434a26c30259";
+    hash = "sha256-8LhR2Ep7y+zXTKKwVdqmAqedq1FoTfdL3GyhCruHnz8=";
   };
 
   buildFeatures = [ "uniffi" ];
diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix
index b0773f51bf3d..383c8887a2aa 100644
--- a/pkgs/by-name/al/albyhub/package.nix
+++ b/pkgs/by-name/al/albyhub/package.nix
@@ -23,16 +23,16 @@ in
 
 buildGoModule (finalAttrs: {
   pname = "albyhub";
-  version = "1.19.2";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "getAlby";
     repo = "hub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-11mHu067/SLh83UT2AZaLfYGwbB/b+vsQSN2AxuI/p4=";
+    hash = "sha256-MbEKRdPyLlZE23UbwwWO1tSFhXG0Hs/m0NaHo9d4pD8=";
   };
 
-  vendorHash = "sha256-h1I0PwddDzOFlJphKfej+dXgDXgkBOjrKigGwqfXbTU=";
+  vendorHash = "sha256-oTyMR/Nc2CngKB2f0tAqrms6E1tsqymBr1x4OhNyK/Q=";
   proxyVendor = true; # needed for secp256k1-zkp CGO bindings
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
 
   frontendYarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/frontend/yarn.lock";
-    hash = "sha256-ukLg+vK3yquRlWu8z3HtAaVFqtzWPR63oiK8e7b6Gg0=";
+    hash = "sha256-fCzrNdiZTOY/fnakwheDNny9ip1Mg/gGX7+Z2N4w6lw=";
   };
 
   preBuild = ''

From fb8d932c8622103c17640fd65234e52e5b1e3e78 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Thu, 25 Sep 2025 16:31:28 +0200
Subject: [PATCH 069/115] ghostty: limit the amount of build cores

For some bizarre reason Zig contains a bug where the compiler would crash
when a large enough file is embedded AND when too many cores are used
during compilation. This has been causing Hydra builds to repeatedly
fail, while Ofborg and manual testing by maintainers were never able to
reproduce the failure. However, given this is preventing Ghostty 1.2 from
landing in the binary cache, we need to work around it somehow. 24 cores
should be *more* than enough for now, but if it still doesn't work we can
lower the threshold even further.

Links to upstream discussions:
 * https://github.com/ziglang/zig/issues/25297
 * https://github.com/ziglang/zig/issues/22867
 * https://github.com/ghostty-org/ghostty/discussions/8676

Fixes #445326
---
 pkgs/by-name/gh/ghostty/package.nix | 43 +++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index efe02a64bf4c..f50a5da721d6 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -20,8 +20,10 @@
   pandoc,
   pkg-config,
   removeReferencesTo,
+  util-linux,
   versionCheckHook,
   wrapGAppsHook4,
+  writeShellApplication,
   zig_0_14,
 
   # Usually you would override `zig.hook` with this, but we do that internally
@@ -31,9 +33,46 @@
 }:
 let
   zig = zig_0_14;
-  zig_hook = zig.hook.overrideAttrs {
-    zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
+
+  # HACK:
+  # Work around a Zig bug where embedding a large enough file could crash
+  # the compiler when too many cores are used, which causes Hydra builds to
+  # reliably fail. See these links for more info:
+  #
+  #  * https://github.com/ziglang/zig/issues/25297
+  #  * https://github.com/ziglang/zig/issues/22867
+  #  * https://github.com/ghostty-org/ghostty/discussions/8676
+  #
+  # Note that the `-j` parameter does NOT fix this. It seems like the faulty
+  # intern pool logic always depends on the full amount of available cores
+  # instead of the value of `-j`, so we have to use `taskset` to trick Zig
+  # into thinking it only has access to a limited amount of cores.
+  zigWithLimitedCores = writeShellApplication {
+    name = "zig";
+    passthru = {
+      inherit (zig) version meta;
+    };
+    runtimeInputs = [
+      zig
+      util-linux
+    ];
+    text = ''
+      maxCores=$(nproc)
+      # 32 cores seem to be the upper limit through empiric testing
+      coreLimit=$((maxCores < 32 ? maxCores : 32))
+      # Also take NIX_BUILD_CORES into account so the build respects the `--cores` argument
+      effectiveCores=$((NIX_BUILD_CORES > coreLimit ? coreLimit : NIX_BUILD_CORES))
+      taskset -c "0-$((effectiveCores - 1))" zig "$@"
+    '';
   };
+
+  zig_hook =
+    (zig.hook.override {
+      zig = zigWithLimitedCores;
+    }).overrideAttrs
+      {
+        zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
+      };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";

From 58d9b833bcdce1130cbbc6da8503d591855b5289 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 00:22:08 +0000
Subject: [PATCH 070/115] renode-dts2repl: 0-unstable-2025-09-01 ->
 0-unstable-2025-09-24

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index 773e9e60875d..edbca57d343a 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-09-01";
+  version = "0-unstable-2025-09-24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "f0ecb42d5fd3a8d9d4b215c532b2824e8d22cf99";
-    hash = "sha256-jI0zpv3OpLWh+CUGP+duyr7s2waPZu0+ULxzX9VmHY8=";
+    rev = "2ed0a3cc5e403486593455c407de76db5dce3c04";
+    hash = "sha256-0MINLYvBynI1OSJ8Rz0KH/fxf1YHTuOSQTdLgB+3Zwo=";
   };
 
   nativeBuildInputs = [

From 475a0e3a4468b2407580d8a33ef2a18111152c7b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 25 Sep 2025 15:00:32 -0500
Subject: [PATCH 071/115] various: remove superflous usages of pname

---
 pkgs/data/fonts/openmoji/default.nix                        | 2 +-
 pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix          | 2 +-
 pkgs/data/icons/la-capitaine-icon-theme/default.nix         | 2 +-
 pkgs/data/icons/numix-icon-theme/default.nix                | 2 +-
 pkgs/data/icons/papirus-maia-icon-theme/default.nix         | 4 ++--
 pkgs/data/themes/adwaita-qt/default.nix                     | 2 +-
 pkgs/data/themes/gtk-theme-framework/default.nix            | 2 +-
 pkgs/data/themes/qogir-kde/default.nix                      | 2 +-
 pkgs/desktops/gnome-2/platform/gtkglext/default.nix         | 4 ++--
 pkgs/desktops/lumina/lumina-calculator/default.nix          | 2 +-
 pkgs/desktops/lumina/lumina-pdf/default.nix                 | 2 +-
 pkgs/desktops/lumina/lumina/default.nix                     | 2 +-
 pkgs/desktops/lxqt/compton-conf/default.nix                 | 2 +-
 pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix             | 2 +-
 pkgs/desktops/lxqt/liblxqt/default.nix                      | 2 +-
 pkgs/desktops/lxqt/libqtxdg/default.nix                     | 2 +-
 pkgs/desktops/lxqt/libsysstat/default.nix                   | 2 +-
 pkgs/desktops/lxqt/lximage-qt/default.nix                   | 2 +-
 pkgs/desktops/lxqt/lxqt-about/default.nix                   | 2 +-
 pkgs/desktops/lxqt/lxqt-admin/default.nix                   | 2 +-
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix             | 2 +-
 pkgs/desktops/lxqt/lxqt-config/default.nix                  | 2 +-
 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix              | 2 +-
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix               | 2 +-
 pkgs/desktops/lxqt/lxqt-notificationd/default.nix           | 2 +-
 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix         | 2 +-
 pkgs/desktops/lxqt/lxqt-panel/default.nix                   | 2 +-
 pkgs/desktops/lxqt/lxqt-policykit/default.nix               | 2 +-
 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix         | 2 +-
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix                | 2 +-
 pkgs/desktops/lxqt/lxqt-runner/default.nix                  | 2 +-
 pkgs/desktops/lxqt/lxqt-session/default.nix                 | 2 +-
 pkgs/desktops/lxqt/lxqt-sudo/default.nix                    | 2 +-
 pkgs/desktops/lxqt/lxqt-themes/default.nix                  | 2 +-
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix               | 2 +-
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix                   | 2 +-
 pkgs/desktops/lxqt/qlipper/default.nix                      | 2 +-
 pkgs/desktops/lxqt/qps/default.nix                          | 2 +-
 pkgs/desktops/lxqt/qterminal/default.nix                    | 2 +-
 pkgs/desktops/lxqt/qtermwidget/default.nix                  | 2 +-
 pkgs/desktops/lxqt/qtxdg-tools/default.nix                  | 2 +-
 pkgs/desktops/lxqt/screengrab/default.nix                   | 2 +-
 pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix      | 2 +-
 pkgs/desktops/mate/mate-tweak/default.nix                   | 2 +-
 pkgs/desktops/pantheon/apps/appcenter/default.nix           | 2 +-
 pkgs/desktops/pantheon/apps/sideload/default.nix            | 2 +-
 .../pantheon/apps/switchboard-plugs/about/default.nix       | 2 +-
 .../pantheon/apps/switchboard-plugs/datetime/default.nix    | 2 +-
 .../apps/switchboard-plugs/mouse-touchpad/default.nix       | 2 +-
 .../pantheon/apps/switchboard-plugs/network/default.nix     | 2 +-
 .../apps/switchboard-plugs/notifications/default.nix        | 2 +-
 .../pantheon/apps/switchboard-plugs/power/default.nix       | 2 +-
 .../pantheon/apps/switchboard-plugs/printers/default.nix    | 2 +-
 .../apps/switchboard-plugs/security-privacy/default.nix     | 2 +-
 .../pantheon/apps/switchboard-plugs/sharing/default.nix     | 2 +-
 .../pantheon/apps/switchboard-plugs/sound/default.nix       | 2 +-
 .../pantheon/apps/switchboard-plugs/wacom/default.nix       | 2 +-
 pkgs/desktops/pantheon/apps/switchboard/default.nix         | 2 +-
 .../pantheon/desktop/file-roller-contract/default.nix       | 4 ++--
 pkgs/desktops/pantheon/desktop/gala/default.nix             | 2 +-
 .../pantheon/desktop/wingpanel-indicators/a11y/default.nix  | 2 +-
 .../desktop/wingpanel-indicators/bluetooth/default.nix      | 2 +-
 .../desktop/wingpanel-indicators/datetime/default.nix       | 2 +-
 .../desktop/wingpanel-indicators/keyboard/default.nix       | 2 +-
 .../desktop/wingpanel-indicators/network/default.nix        | 2 +-
 .../desktop/wingpanel-indicators/nightlight/default.nix     | 2 +-
 .../desktop/wingpanel-indicators/notifications/default.nix  | 2 +-
 .../pantheon/desktop/wingpanel-indicators/power/default.nix | 2 +-
 .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 2 +-
 pkgs/desktops/pantheon/desktop/wingpanel/default.nix        | 2 +-
 pkgs/desktops/pantheon/libraries/granite/7/default.nix      | 2 +-
 pkgs/desktops/pantheon/libraries/granite/default.nix        | 2 +-
 pkgs/desktops/pantheon/services/contractor/default.nix      | 2 +-
 .../pantheon/services/pantheon-agent-geoclue2/default.nix   | 2 +-
 .../pantheon/services/pantheon-agent-polkit/default.nix     | 2 +-
 pkgs/development/compilers/rml/default.nix                  | 4 ++--
 pkgs/development/compilers/rust/cargo-auditable.nix         | 2 +-
 pkgs/development/compilers/scala-runners/default.nix        | 4 ++--
 pkgs/development/compilers/vala/default.nix                 | 6 +++---
 pkgs/development/embedded/tytools/default.nix               | 2 +-
 pkgs/development/interpreters/clojure/obb.nix               | 4 ++--
 pkgs/development/interpreters/gauche/default.nix            | 2 +-
 pkgs/development/interpreters/janet/jpm.nix                 | 2 +-
 pkgs/development/libraries/agda/1lab/default.nix            | 6 +++---
 pkgs/development/libraries/agda/cubical-mini/default.nix    | 4 ++--
 pkgs/development/libraries/agda/cubical/default.nix         | 2 +-
 pkgs/development/libraries/agda/generics/default.nix        | 2 +-
 pkgs/development/libraries/agg/default.nix                  | 2 +-
 pkgs/development/libraries/allegro/default.nix              | 2 +-
 pkgs/development/libraries/aqbanking/default.nix            | 2 +-
 pkgs/development/libraries/aqbanking/gwenhywfar.nix         | 2 +-
 pkgs/development/libraries/aqbanking/libchipcard.nix        | 2 +-
 pkgs/development/libraries/aspell/default.nix               | 2 +-
 pkgs/development/libraries/atkmm/2.36.nix                   | 4 ++--
 pkgs/development/libraries/atkmm/default.nix                | 4 ++--
 pkgs/development/libraries/attr/default.nix                 | 2 +-
 pkgs/development/libraries/c-ares/default.nix               | 2 +-
 pkgs/development/libraries/cxxtest/default.nix              | 2 +-
 pkgs/development/libraries/db/generic.nix                   | 2 +-
 pkgs/development/libraries/drumstick/default.nix            | 2 +-
 pkgs/development/libraries/dxflib/default.nix               | 2 +-
 pkgs/development/libraries/enchant/2.x.nix                  | 2 +-
 pkgs/development/libraries/fplll/20160331.nix               | 6 +++---
 pkgs/development/libraries/g2o/default.nix                  | 2 +-
 .../development/libraries/gamenetworkingsockets/default.nix | 2 +-
 pkgs/development/libraries/gcr/default.nix                  | 4 ++--
 pkgs/development/libraries/glibmm/2.68.nix                  | 4 ++--
 pkgs/development/libraries/glibmm/default.nix               | 2 +-
 pkgs/development/libraries/goocanvas/2.x.nix                | 6 +++---
 pkgs/development/libraries/grantlee/default.nix             | 2 +-
 pkgs/development/libraries/gsettings-qt/default.nix         | 2 +-
 pkgs/development/libraries/gssdp/default.nix                | 4 ++--
 pkgs/development/libraries/gtkmm/3.x.nix                    | 6 +++---
 pkgs/development/libraries/gtkmm/4.x.nix                    | 6 +++---
 pkgs/development/libraries/gtksourceview/4.x.nix            | 2 +-
 pkgs/development/libraries/gtksourceviewmm/4.x.nix          | 2 +-
 pkgs/development/libraries/gupnp/default.nix                | 2 +-
 pkgs/development/libraries/kdb/default.nix                  | 2 +-
 pkgs/development/libraries/kdiagram/default.nix             | 2 +-
 pkgs/development/libraries/kirigami-addons/default.nix      | 2 +-
 pkgs/development/libraries/kquickimageedit/0.3.0.nix        | 2 +-
 pkgs/development/libraries/kquickimageedit/default.nix      | 2 +-
 pkgs/development/libraries/l-smash/default.nix              | 2 +-
 pkgs/development/libraries/ldutils/default.nix              | 4 ++--
 pkgs/development/libraries/libcryptui/default.nix           | 4 ++--
 pkgs/development/libraries/libdvdnav/default.nix            | 2 +-
 pkgs/development/libraries/libgda/6.x.nix                   | 4 ++--
 pkgs/development/libraries/libgnome-games-support/2.0.nix   | 2 +-
 .../libraries/libgnome-games-support/default.nix            | 4 ++--
 pkgs/development/libraries/libhandy/0.x.nix                 | 2 +-
 pkgs/development/libraries/libhandy/default.nix             | 4 ++--
 pkgs/development/libraries/libidn2/default.nix              | 2 +-
 pkgs/development/libraries/libint/default.nix               | 6 +++---
 pkgs/development/libraries/libpeas/default.nix              | 4 ++--
 pkgs/development/libraries/librealsense/default.nix         | 2 +-
 pkgs/development/libraries/librest/default.nix              | 4 ++--
 pkgs/development/libraries/libsigcxx/3.0.nix                | 4 ++--
 pkgs/development/libraries/libsigcxx/default.nix            | 4 ++--
 pkgs/development/libraries/libsoup/3.x.nix                  | 2 +-
 pkgs/development/libraries/libsoup/default.nix              | 4 ++--
 pkgs/development/libraries/libxmlxx/default.nix             | 4 ++--
 pkgs/development/libraries/libxmlxx/v3.nix                  | 2 +-
 pkgs/development/libraries/luksmeta/default.nix             | 2 +-
 pkgs/development/libraries/maui-core/default.nix            | 2 +-
 pkgs/development/libraries/mediastreamer/default.nix        | 2 +-
 pkgs/development/libraries/mediastreamer/msopenh264.nix     | 4 ++--
 pkgs/development/libraries/mypaint-brushes/1.0.nix          | 2 +-
 pkgs/development/libraries/mypaint-brushes/default.nix      | 2 +-
 pkgs/development/libraries/nvidia-vaapi-driver/default.nix  | 2 +-
 pkgs/development/libraries/pangomm/2.42.nix                 | 4 ++--
 pkgs/development/libraries/pangomm/default.nix              | 4 ++--
 pkgs/development/libraries/phonetisaurus/default.nix        | 2 +-
 pkgs/development/libraries/qmarkdowntextedit/default.nix    | 4 ++--
 pkgs/development/libraries/qtdbusextended/default.nix       | 2 +-
 pkgs/development/libraries/quazip/default.nix               | 2 +-
 .../libraries/science/chemistry/avogadrolibs/default.nix    | 6 +++---
 .../libraries/science/chemistry/molequeue/default.nix       | 4 ++--
 .../libraries/science/chemistry/simple-dftd3/default.nix    | 2 +-
 .../libraries/science/chemistry/tblite/default.nix          | 2 +-
 pkgs/development/libraries/soci/default.nix                 | 2 +-
 pkgs/development/libraries/unqlite/default.nix              | 2 +-
 pkgs/development/libraries/vid-stab/default.nix             | 4 ++--
 162 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index 949782194406..2814c04d0b71 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "hfg-gmuend";
-    repo = pname;
+    repo = "openmoji";
     rev = version;
     hash = "sha256-4dYtLaABu88z25Ud/cuOECajxSJWR01qcTIZNWN7Fhw=";
   };
diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
index ad03691639da..f0cd2ed87c5f 100644
--- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
+++ b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "jmattheis";
-    repo = pname;
+    repo = "gruvbox-dark-icons-gtk";
     rev = "v${version}";
     sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2";
   };
diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
index 6b215636bffb..05d115b2be91 100644
--- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix
+++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "keeferrourke";
-    repo = pname;
+    repo = "la-capitaine-icon-theme";
     rev = "v${version}";
     sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs";
   };
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index b14400ed0d61..9fb4611f2233 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "numixproject";
-    repo = pname;
+    repo = "numix-icon-theme";
     rev = version;
     sha256 = "sha256-LON73XRVZQxbEMJ32qKXU/TYf6Q8nWU9wms7eT/DHa8=";
   };
diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix
index aed0efe0c1ac..3d68f98572f5 100644
--- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix
@@ -10,13 +10,13 @@
   hicolor-icon-theme,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "papirus-maia-icon-theme";
   version = "2019-07-26";
 
   src = fetchFromGitHub {
     owner = "Ste74";
-    repo = pname;
+    repo = "papirus-maia-icon-theme";
     rev = "90d47c817cc0edeed8b5a90335e669948ff4a116";
     sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p";
   };
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 3de7647405e6..0bc7a6e0297f 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
-    repo = pname;
+    repo = "adwaita-qt";
     rev = version;
     sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
   };
diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix
index 1ae655fe8c37..4d9179e8033a 100644
--- a/pkgs/data/themes/gtk-theme-framework/default.nix
+++ b/pkgs/data/themes/gtk-theme-framework/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "jaxwilko";
-    repo = pname;
+    repo = "gtk-theme-framework";
     rev = "v${version}";
     sha256 = "1z5s5rsgiypanf2z0avaisbflnvwrc8aiy5qskrsvbbaja63jy3s";
   };
diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix
index a80feee8e2f2..2819e8a16bf7 100644
--- a/pkgs/data/themes/qogir-kde/default.nix
+++ b/pkgs/data/themes/qogir-kde/default.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
-    repo = pname;
+    repo = "qogir-kde";
     rev = "31e7bbf94e905ef40d262d2bc6063156df252470";
     hash = "sha256-zgXwYmpD31vs2Gyg21m0MdOkwqzSn6V21Kva+nvNeVI=";
   };
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index c2632ec9e51b..a916de5b3f61 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -17,14 +17,14 @@
   xorg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gtkglext";
   version = "unstable-2019-12-19";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "Archive";
-    repo = pname;
+    repo = "gtkglext";
     # build fixes
     # https://gitlab.gnome.org/Archive/gtkglext/merge_requests/1
     rev = "ad95fbab68398f81d7a5c895276903b0695887e2";
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix
index b4f0e5434c0c..119540e710ff 100644
--- a/pkgs/desktops/lumina/lumina-calculator/default.nix
+++ b/pkgs/desktops/lumina/lumina-calculator/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lumina-desktop";
-    repo = pname;
+    repo = "lumina-calculator";
     rev = "v${version}";
     sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y";
   };
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix
index 83dcd0ca3af0..cf3ec15d1a90 100644
--- a/pkgs/desktops/lumina/lumina-pdf/default.nix
+++ b/pkgs/desktops/lumina/lumina-pdf/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lumina-desktop";
-    repo = pname;
+    repo = "lumina-pdf";
     rev = "v${version}";
     sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6";
   };
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index 4f8004559b30..cf9081a93bb0 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lumina-desktop";
-    repo = pname;
+    repo = "lumina";
     rev = "v${version}";
     sha256 = "1llr65gilcf0k88f9mbwzlalqwdnjy4nv2jq7w154z0xmd6iarfq";
   };
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index 05215e1c7e8a..fdb5fa86417d 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "compton-conf";
     rev = version;
     hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0=";
   };
diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index ee991093e032..b053de6e92a0 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "libdbusmenu-lxqt";
     rev = version;
     hash = "sha256-PqX8ShSu3CYN9XIRp6IjVmr/eKH+oLNhXvwiudUH660=";
   };
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 3d8172bbd04d..77e9be0f687f 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "liblxqt";
     rev = version;
     hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
   };
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 4cea52641b02..3ea0a857efe8 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "libqtxdg";
     rev = version;
     hash =
       {
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index be9f702057ee..e67dda6baa07 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "libsysstat";
     rev = version;
     hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU=";
   };
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index ac0fa037d128..3bd04943d3e0 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lximage-qt";
     rev = version;
     hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 401b29008935..868b41f1033a 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-about";
     rev = version;
     hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index dce5a83c84c0..e3fd0d11679f 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-admin";
     rev = version;
     hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index cf3e7f2f0726..abb1611778da 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-build-tools";
     rev = version;
     hash =
       {
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index be53a63748fe..e5fe0ca54639 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-config";
     rev = version;
     hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 83fa6878c54e..c6b75a2f0ed4 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-globalkeys";
     rev = version;
     hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 6bfba1c6c4f7..1a55737e7e44 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-menu-data";
     rev = version;
     hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 27fbd76e0511..693e065083d2 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-notificationd";
     rev = version;
     hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index db6129000ceb..01d02e823405 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-openssh-askpass";
     rev = version;
     hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index cd9d4b315b18..957287946690 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-panel";
     rev = version;
     hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index ee1c90116cd7..6866e0508b69 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-policykit";
     rev = version;
     hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 40837cc1af30..f467a2f42158 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-powermanagement";
     rev = version;
     hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index dddc16410841..8f11a11dbb96 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-qtplugin";
     rev = version;
     hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 0e48112192d0..7135a93c32f9 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-runner";
     rev = version;
     hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index c35e00f153af..eabe94b4b2bb 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-session";
     rev = version;
     hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index cb24eaf277e6..f98f7c43fdc9 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-sudo";
     rev = version;
     hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4=";
   };
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 84e449e6294d..f64395c948f9 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "lxqt-themes";
     rev = version;
     hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ=";
   };
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 394c7faba832..74937bcfb22d 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "pavucontrol-qt";
     rev = version;
     hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM=";
   };
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index d0935976c119..2d6f3094be2c 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "pcmanfm-qt";
     rev = version;
     hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM=";
   };
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index d188bdc262ff..6f38eac36b35 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "pvanek";
-    repo = pname;
+    repo = "qlipper";
     rev = version;
     hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834=";
   };
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 86d2b4d7767d..7fa62fb0c3e5 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "qps";
     rev = version;
     hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg=";
   };
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index c89216f0a3a6..d3bdb38a5c04 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "qterminal";
     rev = version;
     hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM=";
   };
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 0f4aa8121e2b..9cf2f488b91d 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "qtermwidget";
     rev = version;
     hash =
       {
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index 2d88ec74c901..ec94d18a1710 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "qtxdg-tools";
     rev = version;
     hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE=";
   };
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index e652e55424d8..f2ef16012680 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "screengrab";
     rev = version;
     hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
   };
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 5ae0131022af..52956cd0bc64 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
+    repo = "xdg-desktop-portal-lxqt";
     rev = version;
     hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix
index fc627ae2f1b7..2c23f7c05baa 100644
--- a/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/pkgs/desktops/mate/mate-tweak/default.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "ubuntu-mate";
-    repo = pname;
+    repo = "mate-tweak";
     rev = version;
     sha256 = "emeNgCzMhHMeLOyUkXe+8OzQMEWuwNdD4xkGXIFgbh4=";
   };
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 20538d6ab490..8a02df89ab88 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "appcenter";
     rev = version;
     hash = "sha256-DFlPXsKLlBufOx/GgFAJovaRwCaFFHo2AlnvszdU7Go=";
   };
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index 9a54eccdcdca..e45664e658d6 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "sideload";
     rev = version;
     sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 256c11c45aa1..91d7fb794fb0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-about";
     rev = version;
     sha256 = "sha256-H4BDLP3yzQi+ougpvBvnv1R1TImzUjSOVDGbOqw9hvg=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 5973b676cdf6..4caab33a0eee 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-datetime";
     rev = version;
     sha256 = "sha256-VOL0F0obuXVz0G5hMI/hpUf2T3H8XUw64wu4MxRi57g=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 08548a663b7b..9c8d0274dec2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-mouse-touchpad";
     rev = version;
     sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 13c8de063acd..f7f6d0d91685 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-network";
     rev = version;
     hash = "sha256-H43mRPEujs6A4Bk2uC3mP91Hp5I8gojaagoXUT/5eW8=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index 206cc6538868..47e52524b0f2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-notifications";
     rev = version;
     sha256 = "sha256-53rpnp1RWdPofY00XWKiz8WDPC7RNMaGQFHBDzjsIt4=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index ec47086559c8..52a174b213a8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-power";
     rev = version;
     sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index ffb3cef1ecd1..1b948098b82e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-printers";
     rev = version;
     sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 36eee188c5cb..a7a1dae6c70e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-security-privacy";
     rev = version;
     sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 5d8f8e93554e..26e4075ed986 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-sharing";
     rev = version;
     hash = "sha256-XTgUHgvBSzZeuUup0gT6sbhyT4FGGG7o+qbPmfeRVQE=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index dfd572c587ad..bb3c686fc47b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-sound";
     rev = version;
     sha256 = "sha256-GLeQxdrrjz4MurN8Ia5Q68y6gHuyxiMVNneft1AXKvs=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
index 66ec7b8ac8b4..4cd937e6b5fa 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard-plug-wacom";
     rev = version;
     sha256 = "sha256-xTv3QPlLPJQ6C5t4Udy1H9IrLQGuik8prvGlpfFm1DQ=";
   };
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index d08e591c6a43..8a9095d20b94 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "switchboard";
     rev = version;
     hash = "sha256-pVXcY/QSjgBcTr0sFQnPxICoQ0tpy2fEJ687zHEDXA0=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix
index 2fa5cd9b343d..730da8b80f2f 100644
--- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix
+++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix
@@ -7,13 +7,13 @@
   file-roller,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "file-roller-contract";
   version = "0-unstable-2021-02-22";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "file-roller-contract";
     rev = "cf001d84a7e2ddcfbee2cfdb19885798a869833e";
     sha256 = "sha256-jnXq44NiQiSYsvaBF828TklLg9d6z6n+gCZKgbFiERI=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index fe86b5284336..33258d0a87f4 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "gala";
     rev = version;
     hash = "sha256-uupFeQ73hr6ziLEtzgVJWASUxhspXJX54/U+3PLSCFY=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
index 5c09c8cc59db..949f27fbab66 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-a11y";
     rev = version;
     sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index fb536d7b1034..7af431ba1610 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-bluetooth";
     rev = version;
     sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index e7f7aa62fab9..33ae7e0953b5 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-datetime";
     rev = version;
     sha256 = "sha256-iR80pF3KUe0WboFm2/f1ZK9/wER2LfmRBd92e8jGTHs=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index cdccca9c9cf1..b775652744db 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-keyboard";
     rev = version;
     sha256 = "sha256-vPQ+Bt7ggeT3Zzsvbie8Wpu3D2WMEIh8GDOI3frnedM=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index e3f3b1f8453f..0795821bc332 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-network";
     rev = version;
     sha256 = "sha256-7zp/GwM+aSQie82asX6yFPSPUxtzeyxCwdr8DWc0LQk=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 3899b3f2399f..13166356d66e 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-nightlight";
     rev = version;
     sha256 = "sha256-77+JGJ0/Y9UJwOuKfJAqjNnmZfBy/YiEwCybx6yoVwM=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 1164b4f917b5..2e463a94ce65 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-notifications";
     rev = version;
     sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index e77c22eb4b62..c44240d5c48d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-power";
     rev = version;
     sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 73c3802d4143..89c73997a163 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel-indicator-sound";
     rev = version;
     sha256 = "sha256-oWgq8rgdK81QsN/LhVUk6YgKYG4pFjVfu00t974n+i8=";
   };
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 95002c80313e..c614ca8930b4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "wingpanel";
     rev = version;
     sha256 = "sha256-3UNtqfDqgclRE8Pe9N8rOt6i2FG6lKNfJAv5Q2OYXUU=";
   };
diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
index 46cc6820853b..c749c9262053 100644
--- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "granite";
     rev = version;
     sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";
   };
diff --git a/pkgs/desktops/pantheon/libraries/granite/default.nix b/pkgs/desktops/pantheon/libraries/granite/default.nix
index 3d32469987f6..2596afec9435 100644
--- a/pkgs/desktops/pantheon/libraries/granite/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "granite";
     rev = version;
     sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
   };
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index bc357af2e253..6375efd18ba1 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "contractor";
     rev = version;
     sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab";
   };
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 6104330ee48d..bcc1d4ab356e 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "pantheon-agent-geoclue2";
     rev = version;
     sha256 = "sha256-DvE0/bR4mVfqCw/c/1h75M8DfCiNPZ2h6Jl6ySk1qxs=";
   };
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 7a5aafe321ee..e34d7a7a1650 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "pantheon-agent-polkit";
     rev = version;
     hash = "sha256-qqeB8SLuES/KoK7ycQ2J1YBA07HITovdnO8kSsrVcfs=";
   };
diff --git a/pkgs/development/compilers/rml/default.nix b/pkgs/development/compilers/rml/default.nix
index e5f0f64f80dd..147070ea95ba 100644
--- a/pkgs/development/compilers/rml/default.nix
+++ b/pkgs/development/compilers/rml/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "reactiveml";
-    repo = pname;
-    rev = "${pname}-${version}-2021-07-26";
+    repo = "rml";
+    rev = "rml-${version}-2021-07-26";
     hash = "sha256-UFqXQBeIQMSV4O439j9s06p1hh7xA98Tu79FsjK9PIY=";
   };
 
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 95143226b041..37728f81d5b3 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -14,7 +14,7 @@ let
 
     src = fetchFromGitHub {
       owner = "rust-secure-code";
-      repo = pname;
+      repo = "cargo-auditable";
       rev = "v${version}";
       sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8=";
     };
diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix
index d950d033f681..058d32811cb2 100644
--- a/pkgs/development/compilers/scala-runners/default.nix
+++ b/pkgs/development/compilers/scala-runners/default.nix
@@ -5,12 +5,12 @@
   coursier,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "scala-runners";
   version = "unstable-2021-07-28";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "scala-runners";
     owner = "dwijnand";
     rev = "9bf096ca81f4974d7327e291eac291e22b344a8f";
     sha256 = "032fds5nr102h1lc81n9jc60jmxzivi4md4hcjrlqn076hfhj4ax";
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 709e13a0fd43..b494ce36ab12 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -50,7 +50,7 @@ let
       };
 
       src = fetchurl {
-        url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+        url = "mirror://gnome/sources/vala/${lib.versions.majorMinor version}/vala-${version}.tar.xz";
         inherit hash;
       };
 
@@ -104,8 +104,8 @@ let
             let
               roundUpToEven = num: num + lib.mod num 2;
             in
-            "${pname}_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}";
-          packageName = pname;
+            "vala_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}";
+          packageName = "vala";
           freeze = true;
         };
       };
diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 76ff17c0b6fe..14fcec5ac5ea 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "Koromix";
-    repo = pname;
+    repo = "tytools";
     rev = "v${version}";
     sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
   };
diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index e367bcd72df9..313a03dc62c1 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "babashka";
-    repo = pname;
+    repo = "obb";
     rev = "v${version}";
     sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0=";
   };
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.tests = {
-    simple = runCommand "${pname}-test" { } ''
+    simple = runCommand "obb-test" { } ''
       [ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ]
       touch $out
     '';
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index 7a72e64dec9f..bd9354fabf9d 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "shirok";
-    repo = pname;
+    repo = "gauche";
     rev = "release${lib.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-M2vZqTMkob+WxUnCo4NDxS4pCVNleVBqkiiRp9nG/KA=";
   };
diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix
index 2982822bb508..269e55d98fcc 100644
--- a/pkgs/development/interpreters/janet/jpm.nix
+++ b/pkgs/development/interpreters/janet/jpm.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "janet-lang";
-    repo = pname;
+    repo = "jpm";
     rev = "v${version}";
     sha256 = "sha256-lPB4jew6RkJlDp8xOQ4YA9MkgLBImaBHcvv4WF/sLRc=";
   };
diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix
index 4d5254a68224..d70ce596a5e8 100644
--- a/pkgs/development/libraries/agda/1lab/default.nix
+++ b/pkgs/development/libraries/agda/1lab/default.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "1lab";
   version = "unstable-2025-07-01";
 
   src = fetchFromGitHub {
     owner = "the1lab";
-    repo = pname;
+    repo = "1lab";
     rev = "e9c2ad2b3ba9cefad36e72cb9d732117c68ac862";
     hash = "sha256-wKh77+xCdfMtnq9jMlpdnEptGO+/WVNlQFa1TDbdUGs=";
   };
@@ -27,7 +27,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory ";
-    homepage = src.meta.homepage;
+    homepage = "https://github.com/the1lab/1lab";
     license = licenses.agpl3Only;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ncfavier ];
diff --git a/pkgs/development/libraries/agda/cubical-mini/default.nix b/pkgs/development/libraries/agda/cubical-mini/default.nix
index 9e6d2475ca10..2da623a44b6c 100644
--- a/pkgs/development/libraries/agda/cubical-mini/default.nix
+++ b/pkgs/development/libraries/agda/cubical-mini/default.nix
@@ -6,12 +6,12 @@
   cabal-install,
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "cubical-mini";
   version = "0.5-unstable-2025-06-13";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "cubical-mini";
     owner = "cmcmA20";
     rev = "1776874d13d0b811e6eeb70d0e5a52b4d2a978d2";
     hash = "sha256-UxWOS+uzP9aAaMdSueA2CAuzWkImGAoKxroarcgpk+w=";
diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index f328da072883..a2773829209b 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -9,7 +9,7 @@ mkDerivation rec {
   version = "0.9";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "cubical";
     owner = "agda";
     rev = "v${version}";
     hash = "sha256-Lmzofq2rKFmfsAoH3zIFB2QLeUhFmIO44JsF+dDrubw=";
diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix
index e2eefb445e9d..8de56d82a153 100644
--- a/pkgs/development/libraries/agda/generics/default.nix
+++ b/pkgs/development/libraries/agda/generics/default.nix
@@ -11,7 +11,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "flupe";
-    repo = pname;
+    repo = "generics";
     rev = "v${version}";
     sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8=";
   };
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index fe6c0c26eb2d..6ba398223771 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   pname = "agg";
   version = "2.5";
   src = fetchurl {
-    url = "https://www.antigrain.com/${pname}-${version}.tar.gz";
+    url = "https://www.antigrain.com/agg-${version}.tar.gz";
     sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index f9a1622a2a95..024218415de0 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   version = "4.4.3.1";
 
   src = fetchurl {
-    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz";
     sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc";
   };
 
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 07ee1aef910c..a173d5a6de49 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/aqbanking-${version}.tar.gz";
     inherit hash;
   };
 
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index a77943800332..055034ea2c39 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/gwenhywfar-${version}.tar.gz";
     inherit hash;
   };
 
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index e9b85f1db8de..68b98601aa42 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/libchipcard-${version}.tar.gz";
     inherit hash;
   };
 
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index fe991cc44bd4..87f1fe703d31 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     uses-curses =
-      runCommand "${pname}-curses"
+      runCommand "aspell-curses"
         {
           buildInputs = [ glibc ];
         }
diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix
index 609c56331b04..e6bdd135d324 100644
--- a/pkgs/development/libraries/atkmm/2.36.nix
+++ b/pkgs/development/libraries/atkmm/2.36.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   version = "2.36.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor version}/atkmm-${version}.tar.xz";
     sha256 = "sha256-bsJk6qDE3grbcgLGABcL3pp/vk1Ga/vpQOr3+qpsWXQ=";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "atkmm_2_36";
-      packageName = pname;
+      packageName = "atkmm";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index 3858fd287adf..336c885f2637 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   version = "2.28.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor version}/atkmm-${version}.tar.xz";
     sha256 = "sha256-ChQqgSj4PAAe+4AU7kY+mnZgVO+EaGr5UxNeBNKP2rM=";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "atkmm";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 0b82272007c2..a82736b5accc 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "2.5.2";
 
   src = fetchurl {
-    url = "mirror://savannah/attr/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/attr/attr-${version}.tar.gz";
     sha256 = "sha256-Ob9nRS+kHQlIwhl2AQU/SLPXigKTiXNDMqYwmmgMbIc=";
   };
 
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 34f2e7bbf62a..926859f60b2d 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0.
-    url = "https://github.com/c-ares/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/c-ares/c-ares/releases/download/v${version}/c-ares-${version}.tar.gz";
     hash = "sha256-fZNXkOmvCBwlxJX9E8LPzaR5KYNBjpY1jvbnMg7gY0Y=";
   };
 
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 3b1bffd6ef1e..026ae5f6f278 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "CxxTest";
-    repo = pname;
+    repo = "cxxtest";
     rev = version;
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 10b19c99b390..cbe36d489d9f 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (
     inherit version;
 
     src = fetchurl {
-      url = "https://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz";
+      url = "https://download.oracle.com/berkeley-db/db-${version}.tar.gz";
       sha256 = sha256;
     };
 
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 3f8821ce4251..c8d4ccfba632 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   version = "2.10.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/drumstick/${version}/drumstick-${version}.tar.bz2";
     hash = "sha256-rFoH1daXHiT3LZWQRP+buzMRQSWLJfGMgRtJ9XFy/L0=";
   };
 
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index acee812f5e8b..a6f77078ccc5 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.26.4";
   pname = "dxflib";
   src = fetchurl {
-    url = "https://qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz";
+    url = "https://qcad.org/archives/dxflib/dxflib-${version}-src.tar.gz";
     sha256 = "0pwic33mj6bp4axai5jiyn4xqf31y0xmb1i0pcf55b2h9fav8zah";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index a4b6497b68dc..cd06f946c685 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/rrthomas/enchant/releases/download/v${version}/enchant-${version}.tar.gz";
     hash = "sha256-2aWhDcmzikOzoPoix27W67fgnrU1r/YpVK/NvUDv/2s=";
   };
 
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
index 3936797241d6..f3560ed20a04 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -10,12 +10,12 @@
   gmp,
   mpfr,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "fplll";
   version = "20160331";
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "fplll";
+    repo = "fplll";
     rev = "11dea26c2f9396ffb7a7191aa371343f1f74c5c3";
     sha256 = "1clxch9hbr30w6s84m2mprxv58adhg5qw6sa2p3jr1cy4r7r59ib";
   };
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 9f8b5da27f15..0f6b371a1bf4 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "RainerKuemmerle";
-    repo = pname;
+    repo = "g2o";
     rev = "${version}_git";
     hash = "sha256-MW1IO1P2e3KgurOW5ZfHlxK0m5sF0JhdLmvQNEHWEtI=";
   };
diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix
index 247d5d76b4a4..da4c1d4a299a 100644
--- a/pkgs/development/libraries/gamenetworkingsockets/default.nix
+++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
-    repo = pname;
+    repo = "GameNetworkingSockets";
     rev = "v${version}";
     sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd";
   };
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 220ffdd62d51..ff6205b5a410 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gcr/${lib.versions.majorMinor version}/gcr-${version}.tar.xz";
     sha256 = "utEPPFU6DhhUZJq1nFskNNoiyhpUrmE48fU5YVZ+Grc=";
   };
 
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gcr";
       freeze = true;
     };
   };
diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix
index be8ea25ae8ac..3211986f87c1 100644
--- a/pkgs/development/libraries/glibmm/2.68.nix
+++ b/pkgs/development/libraries/glibmm/2.68.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz";
     hash = "sha256-Vu5fUcis/Ar99GlZMW5MhVTLUO0ra8XOOJ2XnLtkJQk=";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "glibmm";
       attrPath = "glibmm_2_68";
       versionPolicy = "odd-unstable";
     };
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 30cb8d74d73b..f82caca3446c 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "glibmm";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 0491a02ab860..cf60edd7000d 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/goocanvas/2.0/goocanvas-${version}.tar.xz";
     sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
   };
 
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      attrPath = "${pname}${lib.versions.major version}";
-      packageName = pname;
+      attrPath = "goocanvas${lib.versions.major version}";
+      packageName = "goocanvas";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 982023d53f3d..2704d3a718f5 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "steveire";
-    repo = pname;
+    repo = "grantlee";
     rev = "v${version}";
     hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
   };
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 119932528cef..53be76f3b2ab 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     group = "ubports";
     owner = "core";
-    repo = pname;
+    repo = "gsettings-qt";
     rev = "v${version}";
     sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92";
   };
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 1df6fa14c39d..111897349641 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals withIntrospection [ "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/gssdp-${version}.tar.xz";
     sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk=";
   };
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gssdp";
       freeze = true;
     };
 
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 0796522a5660..533446780857 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "3.24.10";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz";
     sha256 = "erfiJmgIcW4mw5kkrOH7RtqGwX7znZiWJMQjFLMrWnY=";
   };
 
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "${pname}3";
+      packageName = "gtkmm";
+      attrPath = "gtkmm3";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix
index 3ddf4bc88502..69db33598e17 100644
--- a/pkgs/development/libraries/gtkmm/4.x.nix
+++ b/pkgs/development/libraries/gtkmm/4.x.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz";
     hash = "sha256-LuMcFUefxNjpWLA8i1+7yOF7wSLCovVESXtOBWGeM+w=";
   };
 
@@ -72,8 +72,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "${pname}4";
+      packageName = "gtkmm";
+      attrPath = "gtkmm4";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 347e861e745a..8ce0277508e5 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       inherit (finalAttrs) pname version;
     in
     fetchurl {
-      url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+      url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/gtksourceview-${version}.tar.xz";
       sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0=";
     };
 
diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
index 42f841483f24..99a429683c4a 100644
--- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "gtksourceviewmm4";
-      packageName = pname;
+      packageName = "gtksourceviewmm";
       versionPolicy = "none";
     };
   };
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index b4ecc401586e..b00724512296 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gupnp";
       freeze = true;
     };
   };
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index ef74b9c5cc27..8909caffcef7 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   version = "3.2.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/kdb/src/kdb-${version}.tar.xz";
     sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
   };
 
diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
index 02d4b9c00bfc..6d52a84c97b8 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
-    repo = pname;
+    repo = "kdiagram";
     rev = "v${version}";
     sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
   };
diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix
index ed67dcb79162..c1792973990c 100644
--- a/pkgs/development/libraries/kirigami-addons/default.nix
+++ b/pkgs/development/libraries/kirigami-addons/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
-    repo = pname;
+    repo = "kirigami-addons";
     rev = "v${version}";
     hash = "sha256-KTkEfGmQf9kj+9e/rJM7jd/4BqubDLu5/oLkX88uENA=";
   };
diff --git a/pkgs/development/libraries/kquickimageedit/0.3.0.nix b/pkgs/development/libraries/kquickimageedit/0.3.0.nix
index 358105ed2c1b..5d7b4c5b2a97 100644
--- a/pkgs/development/libraries/kquickimageedit/0.3.0.nix
+++ b/pkgs/development/libraries/kquickimageedit/0.3.0.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
-    repo = pname;
+    repo = "kquickimageeditor";
     rev = "v${version}";
     sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E=";
   };
diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix
index 6b7950d4fd8b..800886be3a90 100644
--- a/pkgs/development/libraries/kquickimageedit/default.nix
+++ b/pkgs/development/libraries/kquickimageedit/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
-    repo = pname;
+    repo = "kquickimageeditor";
     rev = "v${version}";
     sha256 = "sha256-8TJBg42E9lNbLpihjtc5Z/drmmSGQmic8yO45yxSNQ4=";
   };
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 1ccac4b6fa75..455223596877 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "l-smash";
-    repo = pname;
+    repo = "l-smash";
     rev = "v${version}";
     sha256 = "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02";
   };
diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix
index 8873c48e98a6..c79f43e0d306 100644
--- a/pkgs/development/libraries/ldutils/default.nix
+++ b/pkgs/development/libraries/ldutils/default.nix
@@ -5,13 +5,13 @@
   libsForQt5,
   cmake,
 }:
-mkDerivation rec {
+mkDerivation {
   pname = "ldutils";
   version = "1.15";
 
   src = fetchFromGitLab {
     owner = "ldutils-projects";
-    repo = pname;
+    repo = "ldutils";
     rev = "4fc416f694ce888c5bd4c4432a7730bb6260475c";
     #rev = "v_${version}";
     hash = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI=";
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix
index 29242b97154e..46487596c52c 100644
--- a/pkgs/development/libraries/libcryptui/default.nix
+++ b/pkgs/development/libraries/libcryptui/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   version = "3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libcryptui/${lib.versions.majorMinor version}/libcryptui-${version}.tar.xz";
     sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
   };
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libcryptui";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 4b216465a539..5c6e4913ac68 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "6.1.1";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
+    url = "http://get.videolan.org/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
     sha256 = "sha256-wZGnR1lH0yP/doDPksD7G+gjdwGIXzdlbGTQTpjRjUg=";
   };
 
diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix
index f9f75b0312b9..a07cd590811c 100644
--- a/pkgs/development/libraries/libgda/6.x.nix
+++ b/pkgs/development/libraries/libgda/6.x.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   version = "6.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor version}/libgda-${version}.tar.xz";
     sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";
   };
 
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libgda";
       attrPath = "libgda6";
       versionPolicy = "odd-unstable";
     };
diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix
index e9b150bed5ab..e9e295f133ac 100644
--- a/pkgs/development/libraries/libgnome-games-support/2.0.nix
+++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libgnome-games-support";
       attrPath = "${pname}_2_0";
       versionPolicy = "odd-unstable";
     };
diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix
index f5916e6dd444..658cfd199763 100644
--- a/pkgs/development/libraries/libgnome-games-support/default.nix
+++ b/pkgs/development/libraries/libgnome-games-support/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "1.8.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libgnome-games-support/${lib.versions.majorMinor version}/libgnome-games-support-${version}.tar.xz";
     sha256 = "KENGBKewOHMawCMXMTiP8QT1ZbsjMMwk54zaBM/T730=";
   };
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libgnome-games-support";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index 9df815ce2e6c..9e350a81d73e 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
-    repo = pname;
+    repo = "libhandy";
     rev = "v${version}";
     sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
   };
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index e69d28ee632a..e5e6107ed7b5 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libhandy/${lib.versions.majorMinor version}/libhandy-${version}.tar.xz";
     hash = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc=";
   };
 
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libhandy";
       versionPolicy = "odd-unstable";
     };
   }
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 542c36cddd26..067eee12bbef 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "2.3.8";
 
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/libidn/${pname}-${version}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/libidn/libidn2-${version}.tar.gz";
     hash = "sha256-9VeRG/YXFiHh9y/zX1sYJbs1tS7UUyXc3ukx5dPAeHo=";
   };
 
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index 667dcd34b915..cd8bc263b33a 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -149,7 +149,7 @@ let
 
     src = fetchFromGitHub {
       owner = "evaleev";
-      repo = pname;
+      repo = "libint";
       rev = "v${version}";
       hash = "sha256-oV/RWWfD0Kf2egI40fV8z2atG+4Cs+9+Wvy0euNNjtM=";
     };
@@ -218,7 +218,7 @@ let
 
     installPhase = ''
       mkdir -p $out
-      cp ${pname}-${version}.tgz $out/.
+      cp libint-${version}.tgz $out/.
     '';
 
     enableParallelBuilding = true;
@@ -229,7 +229,7 @@ let
   codeComp = stdenv.mkDerivation {
     inherit pname version;
 
-    src = "${codeGen}/${pname}-${version}.tgz";
+    src = "${codeGen}/libint-${version}.tgz";
 
     nativeBuildInputs = [
       python3
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 98dae265244a..4e83219019ba 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libpeas/${lib.versions.majorMinor version}/libpeas-${version}.tar.xz";
     sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w=";
   };
 
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libpeas";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index d970a1fc35d8..77efee9a7023 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -39,7 +39,7 @@ stdenv'.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
-    repo = pname;
+    repo = "librealsense";
     rev = "v${version}";
     sha256 = "sha256-Stx337mGcpMCg9DlZmvX4LPQmCSzLRFcUQPxaD/Y0Ds=";
   };
diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix
index bbec9328260b..07b1be3d6b6b 100644
--- a/pkgs/development/libraries/librest/default.nix
+++ b/pkgs/development/libraries/librest/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/rest/${lib.versions.majorMinor version}/rest-${version}.tar.xz";
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "rest";
       attrPath = "librest";
       versionPolicy = "odd-unstable";
       freeze = true;
diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix
index 2ac12962a4a1..3b5734b855d0 100644
--- a/pkgs/development/libraries/libsigcxx/3.0.nix
+++ b/pkgs/development/libraries/libsigcxx/3.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "3.6.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libsigc++/${lib.versions.majorMinor version}/libsigc++-${version}.tar.xz";
     sha256 = "w9I7N9/W458uCfCRt3sVQfv6F8Twtr9cibrvcikIDhc=";
   };
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libsigc++";
       attrPath = "libsigcxx30";
       versionPolicy = "odd-unstable";
     };
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index cfac1918e807..3a5eef9490f0 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "2.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libsigc++/${lib.versions.majorMinor version}/libsigc++-${version}.tar.xz";
     sha256 = "sha256-qdvuMjNR0Qm3ruB0qcuJyj57z4rY7e8YUfTPNZvVCEM=";
   };
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libsigc++";
       attrPath = "libsigcxx";
       versionPolicy = "odd-unstable";
       freeze = "2.99.1";
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index 5b55009207de..0611a148e706 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "libsoup_3";
-      packageName = pname;
+      packageName = "libsoup";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 761ec600e246..7a9bb46c76d4 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libsoup/${lib.versions.majorMinor version}/libsoup-${version}.tar.xz";
     sha256 = "sha256-5Ld8Qc/EyMWgNfzcMgx7xs+3XvfFoDQVPfFBP6HZLxM=";
   };
 
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "libsoup_2_4";
-      packageName = pname;
+      packageName = "libsoup";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index d2739a61551a..39f2fad91809 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "2.40.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/libxml++-${version}.tar.xz";
     sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "libxmlxx";
-      packageName = pname;
+      packageName = "libxml++";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index 0b7c7f214952..b39f520d02f1 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "libxmlxx3";
-      packageName = pname;
+      packageName = "libxml++";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix
index 0968c5374a8f..d9f065fcff48 100644
--- a/pkgs/development/libraries/luksmeta/default.nix
+++ b/pkgs/development/libraries/luksmeta/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "latchset";
-    repo = pname;
+    repo = "luksmeta";
     rev = "v${version}";
     sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
   };
diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix
index 640efea0ec95..23362e0484d8 100644
--- a/pkgs/development/libraries/maui-core/default.nix
+++ b/pkgs/development/libraries/maui-core/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "Nitrux";
-    repo = pname;
+    repo = "maui-core";
     tag = "v${version}";
     sha256 = "sha256-o0Xwh9w0cClMw85FwpQB9CNWoSnzARxs6aGfvCA4BhA=";
   };
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index b388622a959a..d9e5e3080e56 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
-    repo = pname;
+    repo = "mediastreamer2";
     rev = version;
     hash = "sha256-Le52tsyzOpepmvb+GOGCPwwTriPUjhYpa6GM+y/6USA=";
   };
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index 67b063ec2129..0fb31d565b4b 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -7,7 +7,7 @@
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "msopenh264";
   version = "linphone-4.4.1";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
-    repo = pname;
+    repo = "msopenh264";
     rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b";
     sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8=";
   };
diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 3a2a41f1eb85..3c31c9b06957 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "mypaint";
-    repo = pname;
+    repo = "mypaint-brushes";
     rev = "v${version}";
     sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
   };
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index a8ca5edacc7e..af20e603e090 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "mypaint";
-    repo = pname;
+    repo = "mypaint-brushes";
     rev = "v${version}";
     sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
   };
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index dde5b3d8655c..4ae856373fe5 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "elFarto";
-    repo = pname;
+    repo = "nvidia-vaapi-driver";
     rev = "v${version}";
     sha256 = "sha256-Nf2Qh+POkcKXjiHlmpfSCbY+vgT63bWIaMxQHHYtE04=";
   };
diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix
index 2530dda54013..bc470540e723 100644
--- a/pkgs/development/libraries/pangomm/2.42.nix
+++ b/pkgs/development/libraries/pangomm/2.42.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "2.42.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/pangomm/${lib.versions.majorMinor version}/pangomm-${version}.tar.xz";
     sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io=";
   };
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "pangomm";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 3b4dcc9f0a7f..b04b4fdbb0c9 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "2.46.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/pangomm/${lib.versions.majorMinor version}/pangomm-${version}.tar.xz";
     sha256 = "sha256-uSAWZhUmQk3kuTd/FRL1l4H0H7FsnAJn1hM7oc1o2yI=";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "pangomm";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix
index 91a2f3801153..2a9df2001dcd 100644
--- a/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/pkgs/development/libraries/phonetisaurus/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "AdolfVonKleist";
-    repo = pname;
+    repo = "phonetisaurus";
     rev = version;
     sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
   };
diff --git a/pkgs/development/libraries/qmarkdowntextedit/default.nix b/pkgs/development/libraries/qmarkdowntextedit/default.nix
index 7a9567b7f049..791da76f83e0 100644
--- a/pkgs/development/libraries/qmarkdowntextedit/default.nix
+++ b/pkgs/development/libraries/qmarkdowntextedit/default.nix
@@ -5,13 +5,13 @@
   qmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "qmarkdowntextedit";
   version = "unstable-2023-04-02";
 
   src = fetchFromGitHub {
     owner = "pbek";
-    repo = pname;
+    repo = "qmarkdowntextedit";
     rev = "a23cc53e7e40e9dcfd0f815b2b3b6a5dc7304405";
     hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc=";
   };
diff --git a/pkgs/development/libraries/qtdbusextended/default.nix b/pkgs/development/libraries/qtdbusextended/default.nix
index 91ea9e49d356..c60a9d727aa7 100644
--- a/pkgs/development/libraries/qtdbusextended/default.nix
+++ b/pkgs/development/libraries/qtdbusextended/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "nemomobile";
-    repo = pname;
+    repo = "qtdbusextended";
     rev = version;
     sha256 = "sha256-tUp7OhNBXwomR2tO4UOaR0vJQ3GTirMk/hRl1cMk61o=";
   };
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index e82952780c4d..b12a23bfb93b 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "stachenov";
-    repo = pname;
+    repo = "quazip";
     rev = "v${version}";
     sha256 = "sha256-AOamvy2UgN8n7EZ8EidWkVzRICzEXMmvZsB18UwxIVo=";
   };
diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index 8dfb4aa0cf09..7a6559550ad7 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
-    repo = pname;
+    repo = "avogadrolibs";
     tag = version;
     hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk=";
   };
@@ -84,10 +84,10 @@ stdenv.mkDerivation rec {
 
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
-    substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsConfig.cmake \
+    substituteInPlace $out/lib/cmake/avogadrolibs/AvogadroLibsConfig.cmake \
       --replace "$out/" ""
 
-    substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsTargets.cmake \
+    substituteInPlace $out/lib/cmake/avogadrolibs/AvogadroLibsTargets.cmake \
       --replace "_IMPORT_PREFIX}/$out" "_IMPORT_PREFIX}/"
   '';
 
diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
index 4ac575e75238..dba6e33b22e6 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
-    repo = pname;
+    repo = "molequeue";
     rev = version;
     hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg=";
   };
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
-    substituteInPlace $out/lib/cmake/${pname}/MoleQueueConfig.cmake \
+    substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \
       --replace "$out/" ""
   '';
 
diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
index 739bf260cd37..54828c82cf87 100644
--- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
+++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "dftd3";
-    repo = pname;
+    repo = "simple-dftd3";
     tag = "v${version}";
     hash = "sha256-c4xctcMcPQ70ippqbwtinygmnZ5en6ZGF5/v0ZWtzys=";
   };
diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix
index d15613089a6f..88913f636a23 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/default.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "tblite";
-    repo = pname;
+    repo = "tblite";
     rev = "v${version}";
     hash = "sha256-hePy/slEeM2o1gtrAbq/nkEUILa6oQjkD2ddDstQ2Zc=";
   };
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index 5c649e913491..575ca413eaa7 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "SOCI";
-    repo = pname;
+    repo = "soci";
     rev = "v${version}";
     sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE=";
   };
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 4d93dec6f352..70c924e4b357 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "symisc";
-    repo = pname;
+    repo = "unqlite";
     rev = "v${version}";
     sha256 = "sha256-WLsyGEt7Xe6ZrOGMO7+3TU2sBgDTSmfD1WzD70pcDjo=";
   };
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index dcc4779090b2..aa8b9c1be1bf 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -6,13 +6,13 @@
   openmp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "vid.stab";
   version = "unstable-2022-05-30";
 
   src = fetchFromGitHub {
     owner = "georgmartius";
-    repo = pname;
+    repo = "vid.stab";
     rev = "90c76aca2cb06c3ff6f7476a7cd6851b39436656";
     sha256 = "sha256-p1VRnkBeUpET3O2FmaJMyN5/EoSOQLdmRIVbzZcQaKY=";
   };

From 8079f56f31b9c73ffbe7d0d18e016ce715f7a07c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 04:07:03 +0000
Subject: [PATCH 072/115] prometheus-postgres-exporter: 0.17.1 -> 0.18.0

---
 pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index f61099c52c07..42ce5be68b35 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "postgres_exporter";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "postgres_exporter";
     rev = "v${version}";
-    sha256 = "sha256-F7nLz6NkvWSeZTzjo1/wNWCPn3Veo9/SkJdlFRwdlo4=";
+    sha256 = "sha256-Wl84/jNJngIdl/u8JYcHSeq07+qwfRgDH4v4yZVPq3k=";
   };
 
-  vendorHash = "sha256-Dl44VTaDE90nhOU0zxZvd/zrVe8bLRnT16ISqJMpzpU=";
+  vendorHash = "sha256-/9a3lB9V25OppkeLsIr02LZPLAQrQYZ74RJIDHiG6w8=";
 
   ldflags =
     let

From 53f63d016b1e3b6c477490a321c1cd4bb00e0dcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 04:40:37 +0000
Subject: [PATCH 073/115] gqlgen: 0.17.79 -> 0.17.81

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

diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix
index 297353665f57..beb21909a9ca 100644
--- a/pkgs/by-name/gq/gqlgen/package.nix
+++ b/pkgs/by-name/gq/gqlgen/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.17.79";
+  version = "0.17.81";
 in
 buildGoModule {
   pname = "gqlgen";
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "99designs";
     repo = "gqlgen";
     tag = "v${version}";
-    hash = "sha256-hvBP+MbdyWirovDFbgscg7ilfvlXjhSde/C3mHfjdxs=";
+    hash = "sha256-JYxI3f+IFWeNkltInV7Slf4AjYCw8gsC1PxsdZ9cukw=";
   };
 
   vendorHash = "sha256-MFQwLWpjgsCkS1GFRbO/egDIWbh3HDAYuqekjGOC+ug=";

From b25897d943b073f019a904d44f98136d6fdfb0aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 05:15:31 +0000
Subject: [PATCH 074/115] go-task: 3.44.1 -> 3.45.4

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

diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index 60b2e5ee857f..875841633081 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-task";
-  version = "3.44.1";
+  version = "3.45.4";
 
   src = fetchFromGitHub {
     owner = "go-task";
     repo = "task";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KqVGVC3jg6UihB8O6g7SpcE5pc11IQ0HcXSRD2E2Tfo=";
+    hash = "sha256-LRarr739kFDSxtmAqw8BnxpBVjfI8xgejxgxjeB2oQU=";
   };
 
-  vendorHash = "sha256-IvuXL3FS/69NYxkZZHsnOl27DXpZnuOIkhivdMsG45Q=";
+  vendorHash = "sha256-/hnrVJzTqyTKlV/mK4074NE0VT4JSj7BvN3PWu6e4kI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 23d079cb00725fc629e297937817d0cdb0a41523 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 26 Sep 2025 06:19:30 +0100
Subject: [PATCH 075/115] iwd: 3.9 -> 3.10

Changes: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=3.10
---
 pkgs/by-name/iw/iwd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index 9e9243adf928..d0381262d2b3 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -34,12 +34,12 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "iwd";
-  version = "3.9";
+  version = "3.10";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     tag = finalAttrs.version;
-    hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
+    hash = "sha256-qzqBNGy67/VvRZh7n0W2ZPYwoyX/lP6k1sF57lL6v7c=";
   };
 
   patches = [

From 8558b9fe70d8e2a77e215160a3a2a39417350d39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 05:46:58 +0000
Subject: [PATCH 076/115] chatterino2: 2.5.3 -> 2.5.4

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

diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix
index 9ad3e6b96e71..ac8e02141c46 100644
--- a/pkgs/by-name/ch/chatterino2/package.nix
+++ b/pkgs/by-name/ch/chatterino2/package.nix
@@ -12,13 +12,13 @@
   (
     finalAttrs: _: {
       pname = "chatterino2";
-      version = "2.5.3";
+      version = "2.5.4";
 
       src = fetchFromGitHub {
         owner = "Chatterino";
         repo = "chatterino2";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-XV8WhdjdnVrOg0PVyIhGfxC4sJ62oH03KchvGr1c2w8=";
+        hash = "sha256-eozT3Lfra4i+q3pCxH0Z1v/3Y/FB5yJc/88tA90hTzI=";
         fetchSubmodules = true;
         leaveDotGit = true;
         postFetch = ''

From f30c8630595f60a498d8c6d187b8d8973725e78c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 26 Sep 2025 05:57:29 +0000
Subject: [PATCH 077/115] linux_xanmod: 6.12.48 -> 6.12.49

- Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.49-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.48-xanmod1..6.12.49-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index d13533e15739..948300fc7e9b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.48";
-      hash = "sha256-2dtsMOAqTOgYE7FAMX6XDieI4IfXngnYcUg0JKoQrBs=";
+      version = "6.12.49";
+      hash = "sha256-j7sVP+Aqiwz8cBZZ95NL5FNVT8NizCox1JiibSmfsIo=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 5e55d2770888e73f46b0e774d8c08a9e5baa13b3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 26 Sep 2025 06:00:37 +0000
Subject: [PATCH 078/115] linux_xanmod_latest: 6.16.8 -> 6.16.9

- Changelog: https://dl.xanmod.org/changelog/6.16/ChangeLog-6.16.9-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.16.8-xanmod1..6.16.9-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 948300fc7e9b..d957e35c43db 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.16.8";
-      hash = "sha256-8CMzqXKbd605TU4XhPqUHVECrmW0OYbazZ4RpSji974=";
+      version = "6.16.9";
+      hash = "sha256-Qu7P5l9Wz0gpptdloDUZRgOVeqXTJWq4q2AXNls6nBY=";
     };
   };
 

From 96088ed851e6ac82fb09fd4eb8b52a532a7a1ee0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 06:28:43 +0000
Subject: [PATCH 079/115] aks-mcp-server: 0.0.8 -> 0.0.9

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

diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index bad5df59f119..27515f5e717b 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.8";
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DLdNMMsBu/FpE1+39vydWLAXrotIeQ7xjnaFBYsovQQ=";
+    hash = "sha256-LhFFmzL9jTrUqYlHNMWVZBuiZFB0oFLA409byFWFIl0=";
   };
 
-  vendorHash = "sha256-Hks0iGUu5KmnZwm0TmwrYZzy/pIV3Q9mRnzvQkB1t8M=";
+  vendorHash = "sha256-tglqpX/SbqcqMXkByrzuadczXLPvPFXvslNkh1rSgWU=";
 
   subPackages = [ "cmd/aks-mcp" ];
 

From ee18acafa820645b82b300582af9df92497fd260 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Fri, 26 Sep 2025 12:26:04 +0300
Subject: [PATCH 080/115] prometheus-storagebox-exporter: Init at
 0-unstable-2025-07-28

---
 .../package.nix                               | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix

diff --git a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
new file mode 100644
index 000000000000..9a4dbd6d1a46
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule {
+  pname = "prometheus-storagebox-exporter";
+  version = "0-unstable-2025-07-28";
+
+  src = fetchFromGitHub {
+    owner = "fleaz";
+    repo = "prometheus-storagebox-exporter";
+    hash = "sha256-HGUAvoLIVXwZT/CJ1yj9H6ClNRwiJ8rjjluAQ6GdBME=";
+    rev = "e03cfd5f60f7847b74de2f6f47690bc03b7c157a";
+  };
+
+  vendorHash = "sha256-w2S8LWQyDLnUba7+YnTk7GhRXR/agbF5GFIeOPk8w64=";
+
+  meta = {
+    description = "Prometheus exporter for Hetzner storage boxes";
+    homepage = "https://github.com/fleaz/prometheus-storage-exporter";
+    license = lib.licenses.mit;
+    mainProgram = "prometheus-storagebox-exporter";
+    maintainers = with lib.maintainers; [
+      erethon
+    ];
+  };
+}

From 3cb7f20a22abe9fd193ac89d2a69bc0526e67096 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@nibelheim.ch>
Date: Fri, 26 Sep 2025 11:46:35 +0200
Subject: [PATCH 081/115] python3Packages.django-extensions: Fix tests on
 darwin

---
 .../python-modules/django-extensions/default.nix         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 46fcb57a0da0..5fa5c8a231e8 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -15,7 +15,6 @@
   mock,
   pip,
   postgresql,
-  postgresqlTestHook,
   pygments,
   pytestCheckHook,
   pytest-cov-stub,
@@ -51,7 +50,6 @@ buildPythonPackage rec {
     mock
     pip
     postgresql
-    postgresqlTestHook
     pygments # not explicitly declared in setup.py, but some tests require it
     pytest-cov-stub
     pytest-django
@@ -61,13 +59,6 @@ buildPythonPackage rec {
     werkzeug
   ];
 
-  env = {
-    postgresqlEnableTCP = 1;
-    PGUSER = "postgres";
-    PGPASSWORD = "postgres";
-    PGDATABASE = "django_extensions_test";
-  };
-
   disabledTestPaths = [
     # https://github.com/django-extensions/django-extensions/issues/1871
     "tests/test_dumpscript.py"

From bc876449c5fda07b95515982e5b17fbf690c7f15 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:08:58 +0200
Subject: [PATCH 082/115] python313Packages.tencentcloud-sdk-python: 3.0.1466
 -> 3.0.1467

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1466...3.0.1467

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1467/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index d4605b7ba5d7..7c500fbd9a71 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1466";
+  version = "3.0.1467";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-+kCnMw2gVSW6NL4Rt5lfRgtBSXTCaJJu2RVr8hRFkyo=";
+    hash = "sha256-qbmPZ6QSAe46SO3CvjcRBgLYlFxzIj/cy+ffdzclHG0=";
   };
 
   build-system = [ setuptools ];

From 16c3739d8c88b9e07f0d97d2be047b4408434da1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:12:35 +0200
Subject: [PATCH 083/115] vunnel: 0.40.1 -> 0.41.0

Diff: https://github.com/anchore/vunnel/compare/v0.40.1...v0.41.0

Changelog: https://github.com/anchore/vunnel/releases/tag/v0.41.0
---
 pkgs/by-name/vu/vunnel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 6fff22dd278a..681c5441f286 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.40.1";
+  version = "0.41.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-rO8Qhd1PEDy01Ji8uhxr1oLGU+WyYxgw1sLNCt/gaak=";
+    hash = "sha256-YlyhIT8hlkFGo7xBjxa/5feiqv7H2HfA/E4+gz9cCkw=";
     leaveDotGit = true;
   };
 

From fb60c849673edc457e46e774cb2cda67ac1c0606 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:14:14 +0200
Subject: [PATCH 084/115] python312Packages.mypy-boto3-glue: 1.40.20 -> 1.40.39

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d2f907cb4678..bb57cb01850e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ rec {
       "sha256-DS2Bb39wrP+k2H2oxkm13WzRyF6cX96P0JgF2OXAdMA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.20"
-      "sha256-wxnZ1QojsXqzUaoIt5QstNgpaaAalJvz8Ny3om8IdBk=";
+    buildMypyBoto3Package "glue" "1.40.39"
+      "sha256-3b9038gWqTWwQkZ4j4AgP+FXlowWK5uLYeXOF6qBtl0=";
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"
       "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY=";

From da3650b2e94f06949b500446ff3c4e46b0969591 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:14:46 +0200
Subject: [PATCH 085/115] python312Packages.mypy-boto3-lightsail: 1.40.1 ->
 1.40.39

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bb57cb01850e..c21c3d594303 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -801,8 +801,8 @@ rec {
       "sha256-SvXSGmSDMCmseJkD7QYE0SgeTO/AWKK/ROT32KP1RsE=";
 
   mypy-boto3-lightsail =
-    buildMypyBoto3Package "lightsail" "1.40.1"
-      "sha256-1+1UINrLuBwQrBxgjLWI4xJF7GiQDiHI6OjB6Kkct+Y=";
+    buildMypyBoto3Package "lightsail" "1.40.39"
+      "sha256-9FTMfIe6W22GTcULfhDYsYojrXXOq30TQygctO15+24=";
 
   mypy-boto3-location =
     buildMypyBoto3Package "location" "1.40.0"

From a8719b336648f78d82e5f9478dbd43ae87c01178 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:15:04 +0200
Subject: [PATCH 086/115] python312Packages.mypy-boto3-network-firewall:
 1.40.33 -> 1.40.39

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c21c3d594303..ef996dba7eec 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -949,8 +949,8 @@ rec {
       "sha256-5aD/9ACgD/76bPpbZlqHXn0biTxr9wyiLpTyIdxMKYs=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.40.33"
-      "sha256-iHNj8l1/51HN4/B7T9Be68dXpR2ljWYhU9SfKOea8XY=";
+    buildMypyBoto3Package "network-firewall" "1.40.39"
+      "sha256-ZJT+qoOmgMRj3f0mIxDJ7wuPhlQykdbXOyeo6YYQmOg=";
 
   mypy-boto3-networkmanager =
     buildMypyBoto3Package "networkmanager" "1.40.0"

From 4c421e1abe18b722713cdac18ed6ed786d5077ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:16:16 +0200
Subject: [PATCH 087/115] python313Packages.boto3-stubs: 1.40.38 -> 1.40.39

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 6a7ee66a0079..02074d16a471 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.38";
+  version = "1.40.39";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-DReGNcerzovjkikXz9gnTmbCFpcQEnYFG65iWQNTOFI=";
+    hash = "sha256-MgMVQA2aHnFwFLMDYrhFPwlXoJ3DMcWuxhKMMjE8qOI=";
   };
 
   build-system = [ setuptools ];

From 18af9ba41663d910ae722f8ff1b0e326cae0f208 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:16:45 +0200
Subject: [PATCH 088/115] python313Packages.adafruit-platformdetect: 3.83.1 ->
 3.83.2

Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.83.2
---
 .../python-modules/adafruit-platformdetect/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index a14faa4c2a43..b9267f3344e3 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.83.1";
+  version = "3.83.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "adafruit_platformdetect";
     inherit version;
-    hash = "sha256-nRmYJteKu2WXL9rqt7pp3V7hxEZywHvotd9ow77g+JA=";
+    hash = "sha256-g5KCFpuoJBeaSV/wMfWEDpvpL2LsZfQ6j6EyPVLswBA=";
   };
 
   build-system = [ setuptools-scm ];

From 1416795b8957154b5367d2a23d399dba4eb0db9e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:17:55 +0200
Subject: [PATCH 089/115] python313Packages.renault-api: 0.4.0 -> 0.4.1

Diff: https://github.com/hacf-fr/renault-api/compare/v0.4.0...v0.4.1

Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.4.1
---
 pkgs/development/python-modules/renault-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 65b18c9485e9..3326317152b9 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "renault-api";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "hacf-fr";
     repo = "renault-api";
     tag = "v${version}";
-    hash = "sha256-ynHtQN5bE8+Z7ey/UdOJ9Z1cA+cVbSc8QyvTgLYvwY4=";
+    hash = "sha256-jnmfCYFtlfnFRMrNHfoiXgL8bael7IKmhuZCj+AOuz8=";
   };
 
   build-system = [ poetry-core ];

From a36e45ddcffdd3b73bf1e0e38eb5cfd59097562a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:23:58 +0200
Subject: [PATCH 090/115] python313Packages.aioacaia: 0.1.16 -> 0.1.17

Changelog: https://github.com/zweckj/aioacaia/releases/tag/v0.1.17
---
 pkgs/development/python-modules/aioacaia/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix
index 30d5b0fc3eed..8d79e3d5b98c 100644
--- a/pkgs/development/python-modules/aioacaia/default.nix
+++ b/pkgs/development/python-modules/aioacaia/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   bleak,
+  bleak-retry-connector,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -9,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioacaia";
-  version = "0.1.16";
+  version = "0.1.17";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,12 +19,15 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "aioacaia";
     tag = "v${version}";
-    hash = "sha256-7b5ZIrChMVPGREg7M+O8m2RDJGKgdTcEcGpTF6KBy1k=";
+    hash = "sha256-y9NSHiB66ICR+qJcLOdddnkm+f5hd9Zbqamr1UCzdlk=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ bleak ];
+  dependencies = [
+    bleak
+    bleak-retry-connector
+  ];
 
   # Module only has a homebrew tests
   doCheck = false;
@@ -33,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Async implementation of pyacaia";
     homepage = "https://github.com/zweckj/aioacaia";
-    changelog = "https://github.com/zweckj/aioacaia/releases/tag/v${version}";
+    changelog = "https://github.com/zweckj/aioacaia/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };

From 61e9c8c901232b6165f2dd6cfc6056fdb8e2f2c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Sep 2025 12:36:50 +0200
Subject: [PATCH 091/115] python313Packages.model-checker: 1.2.4 -> 1.2.10

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index abf4ebdc8165..e5405c713a12 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "1.2.4";
+  version = "1.2.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-afJDpHVQv/pUqlPBT0ucQz2AjrhmVbNlrbVpiXT2w/Y=";
+    hash = "sha256-wU79zM2hGjmv/IxfQHHSLPBJFzoAPusHgtAaFSumFr0=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From 3aeef406c6d52245b5444a9285c62c04ae6dd208 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 10:36:55 +0000
Subject: [PATCH 092/115] wavelog: 2.1 -> 2.1.1

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

diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index 7a701e48f3d2..9bee77d5cea2 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "2.1";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-I9K5MRbrXDLnAROTkSfFRRIlORv8B/XQCXK+sOAVvo4=";
+    hash = "sha256-FVQ3eAXj/KUa/myHm0+7L62c8cGEa9kmmlGnLPGqSwU=";
   };
 
   installPhase = ''

From a2a44c03afb06a52ec0c8d1e4262b9781c781d5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 12:01:46 +0000
Subject: [PATCH 093/115] vscode-extensions.discloud.discloud: 2.27.0 -> 2.27.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 81b4d85e5052..22f11bfd9ccd 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1324,8 +1324,8 @@ let
         mktplcRef = {
           publisher = "discloud";
           name = "discloud";
-          version = "2.27.0";
-          hash = "sha256-EfdgQxjpsycfxe+X1QfO6WP3W+WS5Ovnb7q/qHGJ1N4=";
+          version = "2.27.2";
+          hash = "sha256-NkOYn0ZNRqgi8HHowZSYmRKeOfqcxXfKIXUQNsJ0BtM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";

From 9c16f42f073ce09d17bb0efa21f7e4d8ab761da3 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 26 Sep 2025 11:30:51 +0200
Subject: [PATCH 094/115] ocamlPackages.ocamlify: 0.0.2 -> 0.1.0

---
 .../tools/ocaml/ocamlify/default.nix          | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 0a0e93477ee7..08a301080554 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,53 +1,33 @@
 {
   lib,
-  stdenv,
+  buildDunePackage,
   fetchurl,
-  ocaml,
-  findlib,
-  ocamlbuild,
+  camlp-streams,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "ocamlify is not available for OCaml ${ocaml.version}"
+buildDunePackage (finalAttrs: {
+  pname = "ocamlify";
+  version = "0.1.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocamlify";
-    version = "0.0.2";
+  src = fetchurl {
+    url = "https://github.com/gildor478/ocamlify/releases/download/v${finalAttrs.version}/ocamlify-${finalAttrs.version}.tbz";
+    hash = "sha256-u0pGiwLR/5N0eRv+eSkdR71snyiSDPwh8JwuxbcXIGA=";
+  };
 
-    src = fetchurl {
-      url = "https://forge.ocamlcore.org/frs/download.php/1209/${pname}-${version}.tar.gz";
-      sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
-    };
+  propagatedBuildInputs = [
+    camlp-streams
+  ];
 
-    strictDeps = true;
+  doCheck = true;
+  dontStrip = true;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
+  meta = {
+    homepage = "https://github.com/gildor478/ocamlify";
+    description = "Include files in OCaml code";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
+      maggesi
     ];
-
-    configurePhase = ''
-      substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"'
-    '';
-
-    buildPhase = "ocamlbuild src/ocamlify.native";
-
-    installPhase = ''
-      mkdir -p $out/bin
-      mv _build/src/ocamlify.native $out/bin/ocamlify
-    '';
-
-    dontStrip = true;
-
-    meta = {
-      homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
-      description = "Generate OCaml modules from source files";
-      platforms = ocaml.meta.platforms or [ ];
-      license = lib.licenses.lgpl21;
-      maintainers = with lib.maintainers; [
-        maggesi
-      ];
-    };
-  }
+    mainProgram = "ocamlify";
+  };
+})

From 9fd0cb099c95eece26158a2028fd1c856c2aadd5 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Fri, 26 Sep 2025 15:20:35 +0300
Subject: [PATCH 095/115] raycast: 1.103.0 -> 1.103.2

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

diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index b4eb8d03a7fb..9e91d442af42 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -12,19 +12,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.103.0";
+  version = "1.103.2";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-nHxGcFM4tr+AO2C4+MQTveeEnaLNHQscC9vOFYfgrf8=";
+        hash = "sha256-i8wMyuHIgKztklBcr5AZjsaf+C1N7QGnF2E3VUNwh5A=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-ds32HExl4UloN+68gM64cysu335BRZ25zGaPDao0AD0=";
+        hash = "sha256-2/+/TQz7AIeR6mTZXEPKXE8K10r4Qw0hIRop9kysGpc=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 86b7a694606857a7160baa2035960df8c47d139f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 26 Sep 2025 14:28:56 +0200
Subject: [PATCH 096/115] ci/pinned: update

This gives us nixd 2.7.0, which is needed to add nixf-diagnose to
treefmt.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/build/308290354#tabs-buildinputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/128222dc911b8e2e18939537bed1762b7f3a04aa...5eda4ee8121f97b218f7cc73f5172098d458f1d1
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 7f922fff0fe0..4d5456837b2c 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0",
-      "url": "https://github.com/NixOS/nixpkgs/archive/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0.tar.gz",
-      "hash": "06lqp08pfgnsn8kb4kdpjmmjyhj4bgniv7yf9bjczg4kn25l1dz6"
+      "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939",
+      "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz",
+      "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "128222dc911b8e2e18939537bed1762b7f3a04aa",
-      "url": "https://github.com/numtide/treefmt-nix/archive/128222dc911b8e2e18939537bed1762b7f3a04aa.tar.gz",
-      "hash": "1p81chik0sb8aligng579m4h0klnndxv76z0p4gyhr4g3s9cydpw"
+      "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+      "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz",
+      "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9"
     }
   },
   "version": 5

From fa10b447b6a2d6deee5f52387460cb5451ae2ab4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:38:38 +0200
Subject: [PATCH 097/115] git-recent: move to `pkgs/by-name`

---
 .../default.nix => by-name/gi/git-recent/package.nix}         | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/version-management/git-recent/default.nix => by-name/gi/git-recent/package.nix} (100%)

diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/by-name/gi/git-recent/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-recent/default.nix
rename to pkgs/by-name/gi/git-recent/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43851adceefb..43409568f435 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1264,10 +1264,6 @@ with pkgs;
 
   git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
 
-  git-recent = callPackage ../applications/version-management/git-recent {
-    util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux;
-  };
-
   gitRepo = git-repo;
 
   gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };

From 46bbd9378422d26fe8a6ab7f0f9f8ab9f5c0ec12 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 26 Sep 2025 09:52:22 +0200
Subject: [PATCH 098/115] postgresqlPackages.postgis: 3.5.3 -> 3.6.0

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 9c14f0f30545..2c2126190ff6 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -35,7 +35,7 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "postgis";
-  version = "3.5.3";
+  version = "3.6.0";
 
   outputs = [
     "out"
@@ -46,7 +46,7 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "postgis";
     repo = "postgis";
     tag = finalAttrs.version;
-    hash = "sha256-rJxIZGsQhh8QAacgkepBzzC79McVhY9wFphQIVRQHA8=";
+    hash = "sha256-L8k3yk1Dn4Dk7UyHse+8RJsjYsYMebdsiZp6fS7cC0Y=";
   };
 
   buildInputs = [
@@ -74,10 +74,13 @@ postgresqlBuildExtension (finalAttrs: {
 
   dontDisableStatic = true;
 
+  checkInputs = [
+    cunit
+  ];
+
   nativeCheckInputs = [
     postgresql
     postgresqlTestHook
-    cunit
     libxslt
   ];
 

From eac467e888161e2b2b2f4fc2351b12aee7ba034a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:27:23 +0000
Subject: [PATCH 099/115] open-policy-agent: 1.8.0 -> 1.9.0

---
 pkgs/by-name/op/open-policy-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index f9b75016e61f..790e1b81741b 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U8LP85Qpl6G1O2UcmlXxOTohPUts0IcmTLWNYOHrTlY=";
+    hash = "sha256-VeN62lULKA+4Krd0as2B7LxaA43jcevamYV6S3OxB2o=";
   };
 
   vendorHash = null;

From b22dba9d90a4124396317d0b2b4b70dc1d027ec5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:40:44 +0000
Subject: [PATCH 100/115] emmylua-check: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix
index 9f4868452aa3..35d56c3def10 100644
--- a/pkgs/by-name/em/emmylua-check/package.nix
+++ b/pkgs/by-name/em/emmylua-check/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_check";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-93PlsVvlUravsnW7YBCii04jCEJPP+6U2vYbVBjcX8M=";
+    hash = "sha256-V/Sy5h0dLayf9Oxgh9eFfDm00hJbwq1WAD8k0AA5GTw=";
   };
 
   buildAndTestSubdir = "crates/emmylua_check";
 
-  cargoHash = "sha256-SbsYlIVWDpBU2bxJqXUtOiMHkOoa8Up27X7rVKLLLm0=";
+  cargoHash = "sha256-ijxLMf7FjX4LzrYwQilC1QfqRP91yFvq5WCoVFJ9V8M=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 3dab4e42a4a268c0c2746ab234fa5c3f419d0dac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:44:12 +0000
Subject: [PATCH 101/115] emmylua-ls: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 361b0d179922..937d0d4329d6 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_ls";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-93PlsVvlUravsnW7YBCii04jCEJPP+6U2vYbVBjcX8M=";
+    hash = "sha256-V/Sy5h0dLayf9Oxgh9eFfDm00hJbwq1WAD8k0AA5GTw=";
   };
 
   buildAndTestSubdir = "crates/emmylua_ls";
 
-  cargoHash = "sha256-SbsYlIVWDpBU2bxJqXUtOiMHkOoa8Up27X7rVKLLLm0=";
+  cargoHash = "sha256-ijxLMf7FjX4LzrYwQilC1QfqRP91yFvq5WCoVFJ9V8M=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From cc03a14da1119e527d2a95d483be0872fd18e019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:44:24 +0000
Subject: [PATCH 102/115] vscode-extensions.sonarsource.sonarlint-vscode:
 4.30.0 -> 4.31.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 81b4d85e5052..43c44647ff29 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4323,8 +4323,8 @@ let
         mktplcRef = {
           publisher = "sonarsource";
           name = "sonarlint-vscode";
-          version = "4.30.0";
-          hash = "sha256-sMiIxsMip2ep8ySOERHIAj+Ndwo+GnPhh9uaUncXO9k=";
+          version = "4.31.0";
+          hash = "sha256-Zw5Dy6VaMkt2zyEy8wZs2e92hA2j7u+moRSONHCDkgw=";
         };
         meta.license = lib.licenses.lgpl3Only;
       };

From 4cfa0c853cf700bd828ac10f9589dc0f98eeaae1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:46:55 +0000
Subject: [PATCH 103/115] typos-lsp: 0.1.43 -> 0.1.44

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

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 9285039baa59..2a8d2bd0f007 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.43";
+  version = "0.1.44";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-n1OIKCfZDUaabjlJt3yNHp434M+xTUqN5+oxLBQEvLo=";
+    hash = "sha256-8UEMcb1yN3haI4OZwl2GRIF6v6t5BoDipxd9167sa7E=";
   };
 
-  cargoHash = "sha256-G0prgRV7vSkLjZYyS5dpGw0Kt9HQNHHGG0pqdDv5rdI=";
+  cargoHash = "sha256-LZdzgqeA7Xld8Ts4efafWPX53m9YfvqagSpOMfXml/E=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From 206e03dc4c163e623f7723d182dda7c53f39b98f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 14:14:24 +0000
Subject: [PATCH 104/115] schemat: 0.4.5 -> 0.4.7

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

diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix
index 24dfc89e8da8..1ccc7a7b70b7 100644
--- a/pkgs/by-name/sc/schemat/package.nix
+++ b/pkgs/by-name/sc/schemat/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "schemat";
-  version = "0.4.5";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "schemat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gGHAkNFEkcbWqel3kr6fUiUDHwZJdf9FLHfQjD9RPUc=";
+    hash = "sha256-veGrwwERnMy+60paF/saEbVxTDyqNVT1hsfggGCzZt0=";
   };
 
-  cargoHash = "sha256-qbn/s5wMRt0Qj/H4SVP8fCcb5cMAXETzuPm68NdgkBE=";
+  cargoHash = "sha256-R43i06XW3DpP+6fPUo/CZhKOVXMyoTPuygJ01BpW1/I=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From b0896b88e74ceca25254f988cbb17b32712968e3 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 26 Sep 2025 10:18:19 -0400
Subject: [PATCH 105/115] incus: 6.16.0 -> 6.17.0

Changelog: https://github.com/lxc/incus/releases/tag/v6.17.0

https://discuss.linuxcontainers.org/t/incus-6-17-has-been-released/24862
---
 pkgs/by-name/in/incus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 8fa781df2277..91998acb2f21 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-Nnig3i21AurzstrIcx+Jca8fMZtNAGbSrB4E8JhatVE=";
-  version = "6.16.0";
-  vendorHash = "sha256-l8cu+Q6Tpco48iuooVDegk7Fkw9yW1SNfyWQXhcFo4c=";
+  hash = "sha256-QtsdKXgf995FzMxSHYz8LupECeRA2nriz9Bb3S0epKY=";
+  version = "6.17.0";
+  vendorHash = "sha256-5BQFoiutNuvFu+oA3ZpD8w8qtrf7l/B5b3eHwSEfzBU=";
   patches = [ ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"

From 3a1b9125b3c2c50078220bc8499af7fcac5658dd Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 26 Sep 2025 10:19:01 -0400
Subject: [PATCH 106/115] incus-ui-canonical: 0.18.1 -> 0.18.2

---
 pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
index fb449006089c..2a3af34055bc 100644
--- a/pkgs/by-name/in/incus-ui-canonical/package.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "incus-ui-canonical";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${version}";
-    hash = "sha256-D3k9LJZIj4EmE79X5u7MITEKhcQKpL0Eslm4FQTaHg4=";
+    hash = "sha256-MVhyKV3NGeChsLnoKw7mC9bAQRQ9Rpg8cIWkelNFXeg=";
   };
 
   offlineCache = fetchYarnDeps {

From a35c532adda1e54551150ba27326b4ec643181c6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 26 Sep 2025 11:03:18 -0400
Subject: [PATCH 107/115] zellij: drop self from maintainers

---
 pkgs/by-name/ze/zellij/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 99a15c2e45ed..5bdeba8e0fad 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -88,7 +88,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       therealansh
       _0x4A6F
       abbe
-      pyrox0
       matthiasbeyer
       ryan4yin
     ];

From 1368a8174d78a9e1c1cbe09a737bf7829352aad1 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 26 Sep 2025 23:38:07 +0800
Subject: [PATCH 108/115] nixos/incus,incus{,-lts}: add multi-platform
 incus-agent support

---
 nixos/modules/virtualisation/incus.nix |  1 +
 pkgs/by-name/in/incus/generic.nix      | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 8d4ff2aae9a8..3a97f3993ed2 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -134,6 +134,7 @@ let
       INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks";
       INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
       INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
+      INCUS_AGENT_PATH = "${cfg.package}/share/agent";
       PATH = lib.mkForce serverBinPath;
     }
     (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
index 7e2f5affe07d..8082c909b00f 100644
--- a/pkgs/by-name/in/incus/generic.nix
+++ b/pkgs/by-name/in/incus/generic.nix
@@ -10,6 +10,7 @@
 {
   callPackage,
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   acl,
@@ -114,8 +115,25 @@ buildGoModule (finalAttrs: {
     substituteInPlace Makefile --replace-fail '. $(SPHINXENV) ; ' ""
     make doc-incremental
 
+    # build multiple binaries of incus-agent
+    build_incus_agent() {
+      GOOS="$1" GOARCH="$2" CGO_ENABLED=0 \
+      go build -ldflags="-s" -tags=agent,netgo \
+        -o "$out/share/agent/incus-agent.$1.$3" ./cmd/incus-agent
+    }
+    ${lib.optionalString stdenv.hostPlatform.isx86_64 ''
+      build_incus_agent linux   amd64  x86_64
+      build_incus_agent linux   386    i686
+      build_incus_agent windows amd64  x86_64
+      build_incus_agent windows 386    i686
+    ''}
+    ${lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      build_incus_agent linux   arm64 aarch64
+      build_incus_agent windows arm64 aarch64
+    ''}
+
     # build some static executables
-    make incus-agent incus-migrate
+    make incus-migrate
   '';
 
   # Disable tests requiring local operations
@@ -140,9 +158,9 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/incus completion zsh)
 
     mkdir -p $agent_loader/bin $agent_loader/etc/systemd/system $agent_loader/lib/udev/rules.d
-    cp internal/server/instance/drivers/agent-loader/incus-agent-setup $agent_loader/bin/
-    chmod +x $agent_loader/bin/incus-agent-setup
-    patchShebangs $agent_loader/bin/incus-agent-setup
+    cp internal/server/instance/drivers/agent-loader/incus-agent{,-setup} $agent_loader/bin/
+    chmod +x $agent_loader/bin/incus-agent{,-setup}
+    patchShebangs $agent_loader/bin/incus-agent{,-setup}
     cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/
     cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.rules $agent_loader/lib/udev/rules.d/99-incus-agent.rules
     substituteInPlace $agent_loader/etc/systemd/system/incus-agent.service --replace-fail 'TARGET/systemd' "$agent_loader/bin"

From af4223229d26ad4e3e398cf4b6128d68ab728061 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 15:40:49 +0000
Subject: [PATCH 109/115] vscode-extensions.llvm-vs-code-extensions.lldb-dap:
 0.2.16 -> 0.2.18

---
 .../extensions/llvm-vs-code-extensions.lldb-dap/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
index 110d5fa78058..464d5941db35 100644
--- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "lldb-dap";
     publisher = "llvm-vs-code-extensions";
-    version = "0.2.16";
-    hash = "sha256-q0wBPSQHy/R8z5zb3iMdapzrn7c9y9X6Ow9CXY3lwtc=";
+    version = "0.2.18";
+    hash = "sha256-H2CSy+Zow6inLUgSW5VNHZBEmag1acslX3bkw3XYcKA=";
   };
 
   meta = {

From ae4aff04a2111c26e24bf442aaa3388b80666263 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 25 Sep 2025 17:35:34 +0200
Subject: [PATCH 110/115] nextcloud30: 30.0.15 -> 30.0.16

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index a44df25032d7..002457487b45 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   nextcloud30 = generic {
-    version = "30.0.15";
-    hash = "sha256-8zVS0xhel60aX+V6Sf4rVaNh3I5Pkl+xK1kgR9Hw5qU=";
+    version = "30.0.16";
+    hash = "sha256-YjbUrna8REq7U0lLN4AxWheqxUrxtC4+/gzGvRnf8zA=";
     packages = nextcloud30Packages;
   };
 

From e666fb087eb76abce01bef5255c723ab976e0c20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 16:07:47 +0000
Subject: [PATCH 111/115] discord-canary: 0.0.756 -> 0.0.761

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index d37077f52d5c..079094595b7e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -11,7 +11,7 @@ let
       {
         stable = "0.0.110";
         ptb = "0.0.161";
-        canary = "0.0.756";
+        canary = "0.0.761";
         development = "0.0.85";
       }
     else
@@ -34,7 +34,7 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-jn7s8T04us+9iTcHuM57F4sO10fs98ZjGQa0pF1SFjk=";
+        hash = "sha256-L3MIcrz/xj8zOb2QVXBrBCHGt4BdHhjwKpPZ4iClQYQ=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

From 17fc1c56ef7c337dd79ba42b64dc154c9588b24b Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 25 Sep 2025 17:36:19 +0200
Subject: [PATCH 112/115] nextcloudPackages: update

---
 pkgs/servers/nextcloud/packages/30.json | 74 +++++++++++------------
 pkgs/servers/nextcloud/packages/31.json | 80 ++++++++++++-------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 63a39fea4bac..ad2c87ee2d52 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-ypbIquAMVJ5h6RArBwOVre+o76Jrel0H+D9thbtmTg0=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.3/calendar-v5.5.3.tar.gz",
-    "version": "5.5.3",
+    "hash": "sha256-YWoaCt8X4yCDtAoFw6/AxtaHYQKrX6jKnrDR1pEDLfM=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.5/calendar-v5.5.5.tar.gz",
+    "version": "5.5.5",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-noH1E63LLbpjpKrpra12uzMfQYTghC4GRTHOu2rH6uY=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.0/contacts-v7.3.0.tar.gz",
-    "version": "7.3.0",
+    "hash": "sha256-WPswtqD9vOLZCnKMHv9hA3NbAthj50zaxc3ocXK4POY=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.2/contacts-v7.3.2.tar.gz",
+    "version": "7.3.2",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -60,9 +60,9 @@
     ]
   },
   "cospend": {
-    "hash": "sha256-rfbmlxiZ0sQxidFZ68/icFzHmLoYxLAmH20Nejj1Hv8=",
-    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.11/cospend-3.0.11.tar.gz",
-    "version": "3.0.11",
+    "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=",
+    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz",
+    "version": "3.1.3",
     "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/cospend-nc",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz",
-    "version": "5.1.2",
+    "hash": "sha256-6Y/W5xG+FjSDXBJkFfs+cyFde3l77bF0gkjbn4IfIVk=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.0/forms-v5.2.0.tar.gz",
+    "version": "5.2.0",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-OUZsjf5i/ihzihybiM+HNQwiYOOw+/QgnIOsm+ipuOk=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.4/groupfolders-v18.1.4.tar.gz",
-    "version": "18.1.4",
-    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-rM1kYCe8lzTyeKzOgO1pSUci+6Giysq6VuXE5Hsq6qo=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.6/groupfolders-v18.1.6.tar.gz",
+    "version": "18.1.6",
+    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-ckDv5RXWcVo0KBXaDR48fZ2cANjj+82+E4OuyVkL0zA=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.4.0/mail-v5.4.0.tar.gz",
-    "version": "5.4.0",
+    "hash": "sha256-zL5fkfSZNnQcbbvDb+xOmeqp4yG+dIe81MyywunmXjk=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.5/mail-v5.5.5.tar.gz",
+    "version": "5.5.5",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",
-    "version": "9.10.0",
+    "hash": "sha256-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz",
+    "version": "9.11.0",
     "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
@@ -340,9 +340,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-fO5WXaQBJRP4jzLQ2QvGmyikRB67wM3MKJmxP/SY0yY=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.10/richdocuments-v8.5.10.tar.gz",
-    "version": "8.5.10",
+    "hash": "sha256-yRAe/lw3i7sierzcVk6OCyldk0dQ30Gt55EMmVUbtds=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.11/richdocuments-v8.5.11.tar.gz",
+    "version": "8.5.11",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -360,9 +360,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-+1CdYMgyDDTUJJ/q4lqs1PMtNhkHVF/miFkbfc5j5aA=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.9/spreed-v20.1.9.tar.gz",
-    "version": "20.1.9",
+    "hash": "sha256-p6+uBVtMWVyef9wRavnUz+zaoyVtg/Govel7duRLOCM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.10/spreed-v20.1.10.tar.gz",
+    "version": "20.1.10",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-IbyoXEWo+eTRccQ7PLIfwRRAh1ft+eQZ6WzRvNKJyH0=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.3.1/twofactor_webauthn-v2.3.1.tar.gz",
-    "version": "2.3.1",
+    "hash": "sha256-yAJRmuqZCiyzG7mrcjJQquFOamBcB7tP43ryAe/Z4UY=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.0/twofactor_webauthn-v2.4.0.tar.gz",
+    "version": "2.4.0",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-24wih8ntMeAl4UpbFg0tX1YbHioEgd2BQ6CSrEPkULA=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.4.0/user_oidc-v7.4.0.tar.gz",
-    "version": "7.4.0",
+    "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz",
+    "version": "8.0.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-CrgZAgaLkRzz/w0QJmPyUKe8yMfk2c5P7nsYcBmxyt4=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.0/whiteboard-v1.2.0.tar.gz",
-    "version": "1.2.0",
+    "hash": "sha256-/tzGi1uq+1L74cLzGTdrnl+A9SMUrXOoyJPmijCOAN0=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.1/whiteboard-v1.2.1.tar.gz",
+    "version": "1.2.1",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 37bab3cb5fd2..1927092cb924 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-ypbIquAMVJ5h6RArBwOVre+o76Jrel0H+D9thbtmTg0=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.3/calendar-v5.5.3.tar.gz",
-    "version": "5.5.3",
+    "hash": "sha256-YWoaCt8X4yCDtAoFw6/AxtaHYQKrX6jKnrDR1pEDLfM=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.5/calendar-v5.5.5.tar.gz",
+    "version": "5.5.5",
     "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-noH1E63LLbpjpKrpra12uzMfQYTghC4GRTHOu2rH6uY=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.0/contacts-v7.3.0.tar.gz",
-    "version": "7.3.0",
+    "hash": "sha256-WPswtqD9vOLZCnKMHv9hA3NbAthj50zaxc3ocXK4POY=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.2/contacts-v7.3.2.tar.gz",
+    "version": "7.3.2",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -60,9 +60,9 @@
     ]
   },
   "cospend": {
-    "hash": "sha256-rfbmlxiZ0sQxidFZ68/icFzHmLoYxLAmH20Nejj1Hv8=",
-    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.11/cospend-3.0.11.tar.gz",
-    "version": "3.0.11",
+    "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=",
+    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz",
+    "version": "3.1.3",
     "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/cospend-nc",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-WOLrsu/0CYPnthm+c6TELXUis91bnEclQJ5iOdBeszc=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.1.2/forms-v5.1.2.tar.gz",
-    "version": "5.1.2",
+    "hash": "sha256-6Y/W5xG+FjSDXBJkFfs+cyFde3l77bF0gkjbn4IfIVk=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.0/forms-v5.2.0.tar.gz",
+    "version": "5.2.0",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-0z6zxuBNvEhPAtCUUDtb0BOMSS+xT/rN7H2PQQ/BLPE=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.3/groupfolders-v19.1.3.tar.gz",
-    "version": "19.1.3",
-    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-sj+5a/+xjJXwzc6is9mERQrZD2edVOQ7leUsjFbkn/w=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.5/groupfolders-v19.1.5.tar.gz",
+    "version": "19.1.5",
+    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-ckDv5RXWcVo0KBXaDR48fZ2cANjj+82+E4OuyVkL0zA=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.4.0/mail-v5.4.0.tar.gz",
-    "version": "5.4.0",
+    "hash": "sha256-zL5fkfSZNnQcbbvDb+xOmeqp4yG+dIe81MyywunmXjk=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.5/mail-v5.5.5.tar.gz",
+    "version": "5.5.5",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "onlyoffice": {
-    "hash": "sha256-JNAQQK1jA2RI3aDuIXw7NC047oXSZKkzkVjZbw8BxXs=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.10.0/onlyoffice.tar.gz",
-    "version": "9.10.0",
+    "hash": "sha256-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz",
+    "version": "9.11.0",
     "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
     "homepage": "https://www.onlyoffice.com",
     "licenses": [
@@ -320,9 +320,9 @@
     ]
   },
   "quota_warning": {
-    "hash": "sha256-SG+UxfA6+6Tna8LiwGzM3zWZ2G5zYOq1VWFhJvXEYdc=",
-    "url": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.21.0/quota_warning-v1.21.0.tar.gz",
-    "version": "1.21.0",
+    "hash": "sha256-tJtblNz6Yv0cXcr8cxHuXq/9Otz4C2ahFLtUp0Zwpd4=",
+    "url": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.22.0/quota_warning-v1.22.0.tar.gz",
+    "version": "1.22.0",
     "description": "This app sends notifications to users when they reached 85, 90 and 95% of their quota (checked once a day).\nIn addition an email can be sent to the users. The three percentages can be changed in the admin settings.\nIt is also possible to have a link in the email and the notification for upsell options.",
     "homepage": "https://github.com/nextcloud/quota_warning",
     "licenses": [
@@ -340,9 +340,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-KpZcf1zkOevqbqvcoASggCoHYFPAcy6D1B0V1I1vtHU=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.4/richdocuments-v8.7.4.tar.gz",
-    "version": "8.7.4",
+    "hash": "sha256-jXYNk3adLm+Umxx/pCrKeNidq6M9ayTquJFMU3eM8Rw=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.5/richdocuments-v8.7.5.tar.gz",
+    "version": "8.7.5",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -360,9 +360,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-c1dalC22xUNIsLNw9QhZUwvhlNypMnH9UvymlmW6ZFw=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.4/spreed-v21.1.4.tar.gz",
-    "version": "21.1.4",
+    "hash": "sha256-rpYU0ngtjBuOH6c3fSYRCcbLj9VC26GECXbzSGweMro=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.5/spreed-v21.1.5.tar.gz",
+    "version": "21.1.5",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "twofactor_webauthn": {
-    "hash": "sha256-IbyoXEWo+eTRccQ7PLIfwRRAh1ft+eQZ6WzRvNKJyH0=",
-    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.3.1/twofactor_webauthn-v2.3.1.tar.gz",
-    "version": "2.3.1",
+    "hash": "sha256-yAJRmuqZCiyzG7mrcjJQquFOamBcB7tP43ryAe/Z4UY=",
+    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.0/twofactor_webauthn-v2.4.0.tar.gz",
+    "version": "2.4.0",
     "description": "A two-factor provider for WebAuthn devices",
     "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
     "licenses": [
@@ -440,9 +440,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-24wih8ntMeAl4UpbFg0tX1YbHioEgd2BQ6CSrEPkULA=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.4.0/user_oidc-v7.4.0.tar.gz",
-    "version": "7.4.0",
+    "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz",
+    "version": "8.0.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-CrgZAgaLkRzz/w0QJmPyUKe8yMfk2c5P7nsYcBmxyt4=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.0/whiteboard-v1.2.0.tar.gz",
-    "version": "1.2.0",
+    "hash": "sha256-/tzGi1uq+1L74cLzGTdrnl+A9SMUrXOoyJPmijCOAN0=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.1/whiteboard-v1.2.1.tar.gz",
+    "version": "1.2.1",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [

From b6020b39c6d3ff98e37ba76256e156c27e0af4ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 15:26:59 +0000
Subject: [PATCH 113/115] python3Packages.rio-stac: 0.11.2 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/rio-stac/default.nix b/pkgs/development/python-modules/rio-stac/default.nix
index 2bf3e4cd29bb..e2ebdf378a36 100644
--- a/pkgs/development/python-modules/rio-stac/default.nix
+++ b/pkgs/development/python-modules/rio-stac/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "rio-stac";
-  version = "0.11.2";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "developmentseed";
     repo = "rio-stac";
     tag = version;
-    hash = "sha256-N7P1kuUwT1r6eAx4TGbu3YmskvfR8N5GYrHqtpjab1Y=";
+    hash = "sha256-ynpyRYKHHvyoVFU/BgnHPrvRzixXNNw9oOQiOKxSjiI=";
   };
 
   build-system = [ flit ];
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description = "Create STAC Items from raster datasets";
     homepage = "https://github.com/developmentseed/rio-stac";
-    changelog = "https://github.com/developmentseed/rio-stac/tag/${src.tag}";
+    changelog = "https://github.com/developmentseed/rio-stac/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ daspk04 ];
   };

From 377847e3c8e2ae07ba424dfc4ea37335ca9da38d Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Fri, 26 Sep 2025 13:27:03 +0300
Subject: [PATCH 114/115] nixos/prometheus/storagebox: Init module

---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../prometheus/exporters/storagebox.nix       | 47 +++++++++++++++++++
 nixos/tests/prometheus-exporters.nix          | 15 ++++++
 4 files changed, 65 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index fe3a5f043828..f6d4cb63bc9c 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -116,6 +116,8 @@
 
 - [SuiteNumérique Meet](https://github.com/suitenumerique/meet) is an open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React. Available as [services.lasuite-meet](#opt-services.lasuite-meet.enable).
 
+- [Prometheus Storagebox Exporter](https://github.com/fleaz/prometheus-storagebox-exporter), a Prometheus exporter for Hetzner storage boxes.
+
 - [lemurs](https://github.com/coastalwhite/lemurs), a customizable TUI display/login manager. Available at [services.displayManager.lemurs](#opt-services.displayManager.lemurs.enable).
 
 - [paisa](https://github.com/ananthakumaran/paisa), a personal finance tracker and dashboard. Available as [services.paisa](#opt-services.paisa.enable).
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 35a89ab1bf71..60e4e5ac4d15 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -124,6 +124,7 @@ let
         "snmp"
         "sql"
         "statsd"
+        "storagebox"
         "surfboard"
         "systemd"
         "tibber"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix b/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix
new file mode 100644
index 000000000000..10a102bbf62f
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix
@@ -0,0 +1,47 @@
+{
+  config,
+  lib,
+  pkgs,
+  options,
+  ...
+}:
+
+let
+  cfg = config.services.prometheus.exporters.storagebox;
+  inherit (lib) mkPackageOption;
+in
+{
+  port = 9509;
+  extraOpts = {
+    package = mkPackageOption pkgs "prometheus-storagebox-exporter" { };
+    tokenFile = lib.mkOption {
+      type = lib.types.pathWith {
+        inStore = false;
+        absolute = true;
+      };
+      description = "File that contains the Hetzner API token to use.";
+    };
+
+  };
+  serviceOpts = {
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    script = ''
+      export HETZNER_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/token")
+      exec ${lib.getExe cfg.package}
+    '';
+
+    environment = {
+      LISTEN_ADDR = "${toString cfg.listenAddress}:${toString cfg.port}";
+    };
+
+    serviceConfig = {
+      DynamicUser = true;
+      Restart = "always";
+      RestartSec = "10s";
+      LoadCredential = [
+        "token:${cfg.tokenFile}"
+      ];
+    };
+  };
+}
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 3009afa26234..c4e60a72416a 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -1615,6 +1615,21 @@ let
       '';
     };
 
+    storagebox = {
+      exporterConfig = {
+        enable = true;
+        tokenFile = "/tmp/faketoken";
+      };
+      exporterTest = ''
+        succeed(
+          'echo faketoken > /tmp/faketoken'
+        )
+        wait_for_unit("prometheus-storagebox-exporter.service")
+        wait_for_open_port(9509)
+        succeed("curl -sSf localhost:9509/metrics | grep 'process_open_fds'")
+      '';
+    };
+
     snmp = {
       exporterConfig = {
         enable = true;

From 22c26a6f15158cd852ef13bfa8a79a91ea5c2cca Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Fri, 26 Sep 2025 13:23:39 -0500
Subject: [PATCH 115/115] directx-headers: update hash after tag moved

Old tag: https://github.com/microsoft/DirectX-Headers/commit/e2db6d9b98160c7b10e41b87ccf3ab43e59cd899
New tag: https://github.com/microsoft/DirectX-Headers/commit/64c650b0c6642ab0f3cdf674e38401e02ccd2460
---
 pkgs/by-name/di/directx-headers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix
index e71eea2893d6..5889cfc534e7 100644
--- a/pkgs/by-name/di/directx-headers/package.nix
+++ b/pkgs/by-name/di/directx-headers/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "microsoft";
     repo = "DirectX-Headers";
     rev = "v${version}";
-    hash = "sha256-A+nOH7/xDcjVTWKduJs2qWZOos/PxJTwKuqMdMsxaZ8=";
+    hash = "sha256-QicnDClO7bceU/aLHjrpUtCBU58PSAW6Ef3RG6qrZw0=";
   };
 
   nativeBuildInputs = [