From a412eebf7ac038cc96c16e6d8cd29533a1556db4 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:07:01 +0200
Subject: [PATCH 01/61] phpExtensions.spx: adopt

---
 pkgs/development/php-packages/spx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index bea2aad00759..bfea69412d59 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -29,6 +29,6 @@ buildPecl {
     description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
     homepage = "https://github.com/NoiseByNorthwest/php-spx";
     license = lib.licenses.php301;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ piotrkwiecinski ];
   };
 }

From 3bb83bd10ccd571bcbd7d8821f32a5ef16264f75 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Tue, 26 Aug 2025 14:58:23 +0200
Subject: [PATCH 02/61] modules/image/repart: repart.imageFile(Basename) ->
 image.baseName

Rename remaining uses of renamed option repart.imageFileBasename to
image.baseName.

Follow up to https://github.com/NixOS/nixpkgs/pull/401872
Removes a warning when using repart-verity-store.nix.
---
 nixos/modules/image/repart-image.nix        | 8 ++++----
 nixos/modules/image/repart-verity-store.nix | 4 ++--
 nixos/modules/image/repart.nix              | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix
index 1bc50c719b14..e8047757117d 100644
--- a/nixos/modules/image/repart-image.nix
+++ b/nixos/modules/image/repart-image.nix
@@ -30,7 +30,7 @@
   # arguments
   name,
   version,
-  imageFileBasename,
+  baseName,
   compression,
   fileSystems,
   finalPartitions,
@@ -205,7 +205,7 @@ stdenvNoCC.mkDerivation (
       echo "Building image with systemd-repart..."
       unshare --map-root-user fakeroot systemd-repart \
         ''${systemdRepartFlags[@]} \
-        ${imageFileBasename}.raw \
+        ${baseName}.raw \
         | tee repart-output.json
 
       runHook postBuild
@@ -220,14 +220,14 @@ stdenvNoCC.mkDerivation (
     # separate derivation to allow users to save disk space. Disk images are
     # already very space intensive so we want to allow users to mitigate this.
     + lib.optionalString compression.enable ''
-      for f in ${imageFileBasename}*; do
+      for f in ${baseName}*; do
         echo "Compressing $f with ${compression.algorithm}..."
         # Keep the original file when compressing and only delete it afterwards
         ${compressionCommand} $f && rm $f
       done
     ''
     + ''
-      mv -v repart-output.json ${imageFileBasename}* $out
+      mv -v repart-output.json ${baseName}* $out
 
       runHook postInstall
     '';
diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix
index ee2cdd05961e..b0b137789bec 100644
--- a/nixos/modules/image/repart-verity-store.nix
+++ b/nixos/modules/image/repart-verity-store.nix
@@ -194,8 +194,8 @@ in
                   | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json"
 
                 # copy the uncompressed intermediate image, so that systemd-repart picks it up
-                cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw .
-                chmod +w ${config.image.repart.imageFileBasename}.raw
+                cp -v ${config.system.build.intermediateImage}/${config.image.baseName}.raw .
+                chmod +w ${config.image.baseName}.raw
               '';
 
               # replace "TBD" with the original roothash values
diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index a44a2e5f9ea3..4190a7911db5 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -391,7 +391,7 @@ in
         mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions;
         val = pkgs.callPackage ./repart-image.nix {
           systemd = cfg.package;
-          imageFileBasename = config.image.baseName;
+          inherit (config.image) baseName;
           inherit (cfg)
             name
             version

From b58a3504175a3b182c4bccd893f6626a99950a0b Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Mon, 1 Sep 2025 15:54:42 +0200
Subject: [PATCH 03/61] redis: set upper limit for parallelism in test-suite

---
 pkgs/by-name/re/redis/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 8871982a91a5..abc1811cc8ee 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -94,10 +94,15 @@ stdenv.mkDerivation (finalAttrs: {
       -e  '/^proc wait_for_ofs_sync/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
       tests/support/util.tcl
 
+    CLIENTS="$NIX_BUILD_CORES"
+    if (( $CLIENTS > 4)); then
+      CLIENTS=4
+    fi
+
     ./runtest \
       --no-latency \
       --timeout 2000 \
-      --clients $NIX_BUILD_CORES \
+      --clients "$CLIENTS" \
       --tags -leaks \
       --skipunit integration/aof-multi-part \
       --skipunit integration/failover \

From 26dd794dc027088a2b0122965eb6c4779e3f0cbd Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Tue, 2 Sep 2025 15:15:51 +0200
Subject: [PATCH 04/61] phpPackages.psalm: 6.8.6 -> 6.13.1

---
 pkgs/development/php-packages/psalm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index ca58eb4c845e..7e0df378b41f 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -8,12 +8,12 @@
 }:
 
 let
-  version = "6.8.6";
+  version = "6.13.1";
 
   # The PHAR file is only required to get the `composer.lock` file
   psalm-phar = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    hash = "sha256-nPvA/pxBMJe4Ux4NmFOdrEmKqRqmwz8gFlCgsB0GbPI=";
+    hash = "sha256-bOxm5LYiQDCY0hU998Wnnp2+x44sidfCf/OqlQ+1gvA=";
   };
 in
 php.buildComposerProject2 (finalAttrs: {
@@ -24,14 +24,14 @@ php.buildComposerProject2 (finalAttrs: {
     owner = "vimeo";
     repo = "psalm";
     tag = finalAttrs.version;
-    hash = "sha256-CewFeIUG+/5QCRpoPSOv1gqwBL9voBf4zgIzdnhk2t8=";
+    hash = "sha256-QsANvg/QXJucjxwM6IF20mZu4DPw/RcBJV6+5tJkZB0=";
   };
 
   composerLock = runCommand "composer.lock" { } ''
     ${lib.getExe php} -r '$phar = new Phar("${psalm-phar}"); $phar->extractTo(".", "composer.lock");'
     cp composer.lock $out
   '';
-  vendorHash = "sha256-QObqXzazypumDnFtfNiFSZdpZ7PbsBZZBUsS3fseZok=";
+  vendorHash = "sha256-18FAMuOO6rWAQEIJOLGxj/Avr5ZQRuI4ao2RL2nJlYc=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From ade3f11ee482cf65d9b9aebf98b82214f5a0a2b9 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <cryolitia@gmail.com>
Date: Sun, 8 Jun 2025 23:34:38 +0800
Subject: [PATCH 05/61] dn42-cacert: init at 0-unstable-2016-01-16

---
 pkgs/by-name/dn/dn42-cacert/package.nix | 29 ++++++++
 pkgs/by-name/dn/dn42-cacert/root-ca.crt | 89 +++++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 pkgs/by-name/dn/dn42-cacert/package.nix
 create mode 100644 pkgs/by-name/dn/dn42-cacert/root-ca.crt

diff --git a/pkgs/by-name/dn/dn42-cacert/package.nix b/pkgs/by-name/dn/dn42-cacert/package.nix
new file mode 100644
index 000000000000..32fe459e9f00
--- /dev/null
+++ b/pkgs/by-name/dn/dn42-cacert/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  stdenvNoCC,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "dn42-cacert";
+
+  # check it on its homepage
+  version = "0-unstable-2016-01-16";
+
+  src = ./root-ca.crt;
+
+  dontUnpack = true;
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm644 $src $out/etc/ssl/certs/dn42-ca.crt
+  '';
+
+  meta = {
+    description = "DN42 Root CA certificate";
+    homepage = "https://wiki.dn42.dev/services/Certificate-Authority.md";
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ Cryolitia ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/dn/dn42-cacert/root-ca.crt b/pkgs/by-name/dn/dn42-cacert/root-ca.crt
new file mode 100644
index 000000000000..210ad0424366
--- /dev/null
+++ b/pkgs/by-name/dn/dn42-cacert/root-ca.crt
@@ -0,0 +1,89 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 137808117760 (0x2016010000)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA
+        Validity
+            Not Before: Jan 16 00:12:04 2016 GMT
+            Not After : Dec 31 23:59:59 2030 GMT
+        Subject: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c1:19:10:de:01:86:11:f1:82:0c:b0:d4:e5:ff:
+                    9a:c8:e3:aa:f4:00:08:82:c0:cf:7f:05:7a:21:97:
+                    c1:b5:8b:a3:d1:54:ee:fa:04:0f:77:d5:5c:98:4b:
+                    d9:88:18:c1:17:10:92:e5:24:fa:ef:61:eb:5d:7b:
+                    11:e5:be:ba:89:f2:60:c9:3b:82:05:3a:74:54:60:
+                    23:66:1a:d8:cd:28:7b:f1:ea:55:25:9a:8c:04:a0:
+                    ff:9d:48:54:4c:9d:bc:2d:a0:df:71:ae:64:47:0d:
+                    e7:75:05:f4:c5:02:2a:d2:0c:be:a3:63:54:62:2b:
+                    ad:29:eb:6a:08:a4:5e:a8:eb:f1:52:14:4e:d1:5d:
+                    41:2f:d3:19:ba:e4:82:36:7a:d1:a3:f2:84:f6:07:
+                    b2:f6:0c:30:db:db:76:ee:e9:14:05:c7:8f:75:b7:
+                    3f:d5:d5:35:56:d0:92:44:df:26:1e:00:fa:ae:cb:
+                    7a:c9:50:67:5d:69:f8:f9:fd:25:a7:1d:db:40:b1:
+                    42:bc:45:57:e1:c9:1c:42:ba:69:80:1e:ea:25:99:
+                    12:9f:6f:23:a3:d2:2e:4a:cd:15:e4:7c:49:f9:d1:
+                    c0:f0:19:0c:15:50:ce:a6:51:bb:aa:16:b2:82:ec:
+                    f4:61:44:8c:1c:dd:65:60:04:77:b0:4d:99:67:17:
+                    fb:09
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier:
+                54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15
+            X509v3 Authority Key Identifier:
+                keyid:54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15
+
+            X509v3 Name Constraints:
+                Permitted:
+                  DNS:.dn42
+                  IP:172.20.0.0/255.252.0.0
+                  IP:FD42:0:0:0:0:0:0:0/FFFF:0:0:0:0:0:0:0
+
+    Signature Algorithm: sha256WithRSAEncryption
+         5c:a4:3b:41:a0:81:69:e2:71:99:4d:75:4b:5a:20:0d:2a:d9:
+         ec:ea:bc:8d:4f:b0:6c:f3:2e:41:1a:a0:75:f3:de:7e:3a:e0:
+         a7:b9:db:cd:f5:16:e4:6a:cb:e7:cc:2a:8f:ee:7f:14:0a:a5:
+         b5:f9:66:48:81:e5:68:1e:0c:a6:a3:3c:a7:2b:e3:95:cf:e3:
+         63:15:0d:16:09:63:d9:66:31:3b:42:2e:7c:1a:e5:28:8e:5e:
+         3d:9e:28:99:48:e9:47:86:11:e2:04:29:60:2b:96:95:99:ae:
+         3f:ab:ff:3f:45:ab:7e:07:45:4e:4d:0b:18:40:3d:3b:02:9c:
+         4e:a9:0f:a5:c2:3f:4a:30:77:ae:66:5c:b3:8d:b2:41:6b:e2:
+         98:01:7d:e0:6b:52:70:4d:3d:b8:a9:48:f5:02:d2:d9:40:66:
+         b6:5e:44:25:11:55:ac:31:02:d7:67:72:6a:6a:bc:74:34:5f:
+         75:dc:9a:4f:83:28:40:e0:2a:dc:3f:41:43:5a:47:07:2b:b7:
+         a7:3f:d0:15:a2:42:d7:30:22:f2:f6:e4:b4:f6:3b:38:ca:6b:
+         4c:e7:3c:a4:70:cb:de:af:0a:14:ff:23:25:ca:04:cd:9e:49:
+         c3:4b:e4:0a:b5:0b:84:b5:ef:b4:5b:63:07:47:63:cd:5c:50:
+         0b:42:0a:a9
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIFIBYBAAAwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMC
+WEQxDTALBgNVBAoMBGRuNDIxIzAhBgNVBAsMGmRuNDIgQ2VydGlmaWNhdGUgQXV0
+aG9yaXR5MR8wHQYDVQQDDBZkbjQyIFJvb3QgQXV0aG9yaXR5IENBMCAXDTE2MDEx
+NjAwMTIwNFoYDzIwMzAxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJYRDENMAsGA1UE
+CgwEZG40MjEjMCEGA1UECwwaZG40MiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAd
+BgNVBAMMFmRuNDIgUm9vdCBBdXRob3JpdHkgQ0EwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDBGRDeAYYR8YIMsNTl/5rI46r0AAiCwM9/BXohl8G1i6PR
+VO76BA931VyYS9mIGMEXEJLlJPrvYetdexHlvrqJ8mDJO4IFOnRUYCNmGtjNKHvx
+6lUlmowEoP+dSFRMnbwtoN9xrmRHDed1BfTFAirSDL6jY1RiK60p62oIpF6o6/FS
+FE7RXUEv0xm65II2etGj8oT2B7L2DDDb23bu6RQFx491tz/V1TVW0JJE3yYeAPqu
+y3rJUGddafj5/SWnHdtAsUK8RVfhyRxCummAHuolmRKfbyOj0i5KzRXkfEn50cDw
+GQwVUM6mUbuqFrKC7PRhRIwc3WVgBHewTZlnF/sJAgMBAAGjgaowgacwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFR2iLLAtTDQ/E/J
+bTv5jFURrBUVMB8GA1UdIwQYMBaAFFR2iLLAtTDQ/E/JbTv5jFURrBUVMEQGA1Ud
+HgQ9MDugOTAHggUuZG40MjAKhwisFAAA//wAADAihyD9QgAAAAAAAAAAAAAAAAAA
+//8AAAAAAAAAAAAAAAAAADANBgkqhkiG9w0BAQsFAAOCAQEAXKQ7QaCBaeJxmU11
+S1ogDSrZ7Oq8jU+wbPMuQRqgdfPefjrgp7nbzfUW5GrL58wqj+5/FAqltflmSIHl
+aB4MpqM8pyvjlc/jYxUNFglj2WYxO0IufBrlKI5ePZ4omUjpR4YR4gQpYCuWlZmu
+P6v/P0WrfgdFTk0LGEA9OwKcTqkPpcI/SjB3rmZcs42yQWvimAF94GtScE09uKlI
+9QLS2UBmtl5EJRFVrDEC12dyamq8dDRfddyaT4MoQOAq3D9BQ1pHByu3pz/QFaJC
+1zAi8vbktPY7OMprTOc8pHDL3q8KFP8jJcoEzZ5Jw0vkCrULhLXvtFtjB0djzVxQ
+C0IKqQ==
+-----END CERTIFICATE-----

From 43a1f18c34a6989bda435c2819435b4d9824b8c3 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <cryolitia@gmail.com>
Date: Sun, 8 Jun 2025 23:44:00 +0800
Subject: [PATCH 06/61] nixos/pki: change `certificateFiles`'s example to DN42
 root cert

The original example is not a good example, `pkgs.cacert` does not need to appear in `security.pki.certificateFiles`, instead, `certificateFiles` will eventually override the input of pkgs.cacert to build the final `caBundle`. Replacing the example with DN42 will both remind users that we are now packaging DN42's root certificates and eliminate the confusion in the previous example.
---
 nixos/modules/security/ca.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index e1e8dae2a918..f634b9766961 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -40,7 +40,7 @@ in
     security.pki.certificateFiles = lib.mkOption {
       type = lib.types.listOf lib.types.path;
       default = [ ];
-      example = lib.literalExpression ''[ "''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]'';
+      example = lib.literalExpression ''[ "''${pkgs.dn42-cacert}/etc/ssl/certs/dn42-ca.crt" ]'';
       description = ''
         A list of files containing trusted root certificates in PEM
         format. These are concatenated to form

From 3fc9162b8c9d82837714266deb9cfe43d49cc97c Mon Sep 17 00:00:00 2001
From: Florian Sanders <florian.sanders@clever-cloud.com>
Date: Mon, 15 Sep 2025 12:51:51 +0200
Subject: [PATCH 07/61] clever-tools: 3.14.1 -> 4.1.0

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

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index b4cbc85702d1..10f9dcc93525 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  nodejs_20,
+  nodejs_22,
   installShellFiles,
   makeWrapper,
   stdenv,
@@ -11,27 +11,33 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "3.14.1";
+  version = "4.1.0";
 
-  nodejs = nodejs_20;
+  nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-3nCfo54p7O4Oik3fTf842IahEQnu26oPS5aOgHdhJKg=";
+    hash = "sha256-ntKxMlRBE0WoaO2Fmpymhm7y7kCwe197sotNzpK92C4=";
   };
 
-  npmDepsHash = "sha256-NWi+LJWLT2z3980d3rxBkNYzmMS6JwuP49ltGtKRd5c=";
+  npmDepsHash = "sha256-GsJlrz41q9GvFpYZcauuGXgMCG6mqSuI5gy+hxlJfUQ=";
 
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
   ];
 
+  buildPhase = ''
+    runHook preBuild
+    node scripts/bundle-cjs.js ${version} false
+    runHook postBuild
+  '';
+
   installPhase = ''
     mkdir -p $out/bin $out/lib/clever-tools
-    cp build/clever.cjs $out/lib/clever-tools/clever.cjs
+    cp build/${version}/clever.cjs $out/lib/clever-tools/clever.cjs
 
     makeWrapper ${nodejs}/bin/node $out/bin/clever \
       --add-flags "$out/lib/clever-tools/clever.cjs" \

From 6d9b5300d34c8ce2b646172b0a04060adb638a24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Sep 2025 12:51:50 +0000
Subject: [PATCH 08/61] kdePackages.plasma-wayland-protocols: 1.18.0 -> 1.19.0

---
 pkgs/kde/misc/plasma-wayland-protocols/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/plasma-wayland-protocols/default.nix b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
index 0c124dfffd6c..eb2074e70e98 100644
--- a/pkgs/kde/misc/plasma-wayland-protocols/default.nix
+++ b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
@@ -5,11 +5,11 @@
 }:
 mkKdeDerivation rec {
   pname = "plasma-wayland-protocols";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-${version}.tar.xz";
-    hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM=";
+    hash = "sha256-RWef56Y8QU8sgXk6YlKPrmzO5YS2llcZ1/n8bdSLqEY=";
   };
 
   meta.license = with lib.licenses; [

From 524053661bed2f46d5daccc04acbffbb6cef8f61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Sep 2025 12:07:04 +0000
Subject: [PATCH 09/61] nwjs-ffmpeg-prebuilt: 0.103.0 -> 0.103.1

---
 pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index e7dd3e1986b0..914de43f062b 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -7,7 +7,7 @@
 
 let
   bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.103.0";
+  version = "0.103.1";
 in
 stdenv.mkDerivation {
   pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src =
     let
       hashes = {
-        "x64" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
-        "ia32" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
+        "x64" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
+        "ia32" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
       };
     in
     fetchurl {

From d8816d3aad155fdf5c1ff13928d90ead8f6f97c7 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Wed, 10 Sep 2025 01:49:57 +0800
Subject: [PATCH 10/61] swww: 0.10.3 -> 0.11.2

Changelog: https://github.com/LGFae/swww/releases/tag/v0.11.2
Diff: https://github.com/LGFae/swww/compare/v0.10.3...v0.11.2
---
 pkgs/by-name/sw/swww/package.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix
index 497e9ebf13e6..80c85a72073f 100644
--- a/pkgs/by-name/sw/swww/package.nix
+++ b/pkgs/by-name/sw/swww/package.nix
@@ -6,6 +6,8 @@
   lz4,
   libxkbcommon,
   installShellFiles,
+  makeWrapper,
+  procps,
   scdoc,
   wayland-protocols,
   wayland-scanner,
@@ -13,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "swww";
-  version = "0.10.3";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "LGFae";
     repo = "swww";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GXqXZn29r7ktL01KBzlPZ+9b1fdnAPF8qhsQxhiqAsQ=";
+    hash = "sha256-X2ptpXRo6ps5RxDe5RS7qfTaHWqBbBNw/aSdC2tzUG8=";
   };
 
-  cargoHash = "sha256-jCjeHeHML8gHtvFcnHbiGL5fZ3LhABhXrcUTQriUDc0=";
+  cargoHash = "sha256-5KZWsdo37NbFFkK8XFc0XI9iwBkpV8KsOaOc0y287Io=";
 
   buildInputs = [
     lz4
@@ -36,6 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     installShellFiles
+    makeWrapper
     scdoc
   ];
 
@@ -52,6 +55,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh completions/_swww
   '';
 
+  postFixup = ''
+    for program in $out/bin/*; do
+      wrapProgram $program \
+        --prefix PATH : "${lib.makeBinPath [ procps ]}"
+    done
+  '';
+
   meta = {
     description = "Efficient animated wallpaper daemon for wayland, controlled at runtime";
     homepage = "https://github.com/LGFae/swww";

From 31e9d058e505d13e926958e8ff85d0f0821910ff Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 23 Sep 2025 15:57:49 +0400
Subject: [PATCH 11/61] remarshal_0_17: respect existing packageOverrides

Setting packageOverrides when overriding python will unset any previous
overrides. We have to manually compose the packageOverrides.
---
 pkgs/by-name/re/remarshal_0_17/package.nix | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
index ee9e5cd08ef9..4a6d2780b48b 100644
--- a/pkgs/by-name/re/remarshal_0_17/package.nix
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -7,26 +7,27 @@
 }:
 
 let
-  python = python3Packages.python.override {
-    self = python3Packages.python;
-    packageOverrides = self: super: {
-      tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
-        version = "0.12.5";
-        src = fetchPypi {
-          pname = "tomlkit";
-          inherit version;
-          hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
-        };
-        patches = [
-          (fetchpatch {
-            url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch";
-            hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc=";
-            excludes = [ ".github/workflows/tests.yml" ];
-          })
-        ];
-      });
-    };
+  packageOverrides = self: super: {
+    tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
+      version = "0.12.5";
+      src = fetchPypi {
+        pname = "tomlkit";
+        inherit version;
+        hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
+      };
+      patches = [
+        (fetchpatch {
+          url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch";
+          hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc=";
+          excludes = [ ".github/workflows/tests.yml" ];
+        })
+      ];
+    });
   };
+  python = python3Packages.python.override (oa: {
+    self = python3Packages.python;
+    packageOverrides = lib.composeExtensions (oa.packageOverrides or (_: _: { })) packageOverrides;
+  });
   pythonPackages = python.pkgs;
 in
 pythonPackages.buildPythonApplication rec {

From f12f3dfb21115f3e93f9ddcb9ee5e6d338941dc7 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 12 Sep 2025 14:25:30 +0400
Subject: [PATCH 12/61] nix-prefetch-git: add --no-add-path argument

Adds a new argument to `nix-prefetch-git`: `--no-add-path`. It disables
adding the path to the store. It is useful when working with a read-only
store.
---
 doc/release-notes/rl-2511.section.md         |  2 +
 pkgs/build-support/fetchgit/nix-prefetch-git | 11 +++-
 pkgs/build-support/fetchgit/tests.nix        | 61 +++++++++++++++++++-
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 45485b53eda8..cbff8cf554d5 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -229,6 +229,8 @@
 
 - `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.
 
+- `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only).
+
 - `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI.
   For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1).
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 7f3616af92fc..f9c8af8428fe 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -59,6 +59,7 @@ Options:
       --fetch-submodules Fetch submodules.
       --fetch-tags    Fetch all tags (useful for git describe).
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
+      --no-add-path   Do not actually add the contents of the git repo to the store.
       --root-dir dir  Directory in the repository that will be copied to the output instead of the full repository.
       --quiet         Only print the final json summary.
 "
@@ -91,6 +92,7 @@ for arg; do
             --fetch-submodules) fetchSubmodules=true;;
             --fetch-tags) fetchTags=true;;
             --builder) builder=true;;
+            --no-add-path) noAddPath=true;;
             --root-dir) argfun=set_rootDir;;
             -h|--help) usage; exit;;
             *)
@@ -519,7 +521,14 @@ else
         hash=$(nix-hash --type $hashType --base32 "$tmpOut")
 
         # Add the downloaded file to the Nix store.
-        finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut")
+
+        if test -z "$noAddPath"; then
+            finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut") \
+                || { printf "maybe try again with \`nix-prefetch-git --no-add-path <...>' ?\n" >&2; exit 1; }
+        else
+            printf "the path for \`%s' has NOT been added to the store\n" "$url" >&2
+            finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$hash" "$storePathName")
+        fi
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
             echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index e3fdd5fb8672..973d273c80e0 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -1,4 +1,13 @@
-{ testers, fetchgit, ... }:
+{
+  runCommand,
+  testers,
+  fetchgit,
+  nix-prefetch-git,
+  jq,
+  cacert,
+  nix,
+  ...
+}:
 {
   simple = testers.invalidateFetcherByDrvHash fetchgit {
     name = "simple-nix-source";
@@ -105,4 +114,54 @@
     rootDir = "misc/systemd";
     sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
   };
+
+  prefetch-git-no-add-path =
+    testers.invalidateFetcherByDrvHash
+      (
+        {
+          name,
+          url,
+          rev,
+          hash,
+          ...
+        }:
+        runCommand name
+          {
+            buildInputs = [
+              nix-prefetch-git
+              nix
+              cacert
+              jq
+            ];
+            outputHashMode = "recursive";
+            outputHashAlgo = null;
+            outputHash = hash;
+            inherit url rev;
+          }
+          ''
+            store_root="$(mktemp -d)"
+            prefetch() { NIX_REMOTE="local?root=$store_root" nix-prefetch-git $@ "$url" --rev "$rev" | jq -r .path; }
+            path="$(prefetch --no-add-path)"
+            if test -e "$store_root/$path"; then
+              echo "$path exists in $NIX_REMOTE when it shouldn't" >&2
+              exit 1
+            fi
+            path_added="$(prefetch)"
+            if ! test -e "$store_root/$path"; then
+              echo "$path_added doesn't exist in NIX_REMOTE when it should" >&2
+              exit 1
+            fi
+            if test "$path" != "$path_added"; then
+              echo "Paths are different with and without --no-add-path: $path != $path_added" >&2
+              exit 1
+            fi
+            cp -r "$store_root/$path_added" "$out"
+          ''
+      )
+      {
+        name = "nix-prefetch-git-no-add-path";
+        url = "https://github.com/NixOS/nix";
+        rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+        hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
+      };
 }

From 7d75d07d4449499976ba1c7005332b884bfe4f65 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 24 Sep 2025 02:34:40 +0200
Subject: [PATCH 13/61] nix-prefetch-git: Add regression test for avoiding
 fetching cached paths

---
 pkgs/build-support/fetchgit/tests.nix | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index 973d273c80e0..08eac5d59553 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -6,6 +6,7 @@
   jq,
   cacert,
   nix,
+  closureInfo,
   ...
 }:
 {
@@ -115,6 +116,35 @@
     sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
   };
 
+  # Make sure that if an expected hash is given and the corresponding store path exists already, no fetch is done
+  cached-prefetch-avoids-fetch =
+    let
+      name = "cached-prefetch-avoids-fetch";
+      url = "https://github.com/NixOS/nix";
+      rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+      sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
+      fetched = fetchgit {
+        inherit
+          name
+          url
+          rev
+          sha256
+          ;
+      };
+    in
+    runCommand "cached-prefetch-avoids-fetch"
+      {
+        nativeBuildInputs = [
+          nix-prefetch-git
+          nix
+        ];
+      }
+      ''
+        export NIX_REMOTE=local?root=$(mktemp -d)
+        nix-store --load-db < ${closureInfo { rootPaths = fetched; }}/registration
+        nix-prefetch-git --name "${name}" "${url}" "${rev}" "${sha256}" > $out
+      '';
+
   prefetch-git-no-add-path =
     testers.invalidateFetcherByDrvHash
       (

From 4d9b945334b5b0ff216348f79788972bcd3da491 Mon Sep 17 00:00:00 2001
From: Lars Jellema <lars.jellema@gmail.com>
Date: Thu, 25 Sep 2025 14:54:43 +0200
Subject: [PATCH 14/61] picoscope: 7.1.46-1r4685 -> 7.2.6.7136

---
 pkgs/by-name/pi/picoscope/package.nix  | 224 ++++++++++---------------
 pkgs/by-name/pi/picoscope/sources.json | 107 ++++++++----
 2 files changed, 158 insertions(+), 173 deletions(-)

diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix
index 4e47d0d9c896..9841f081e969 100644
--- a/pkgs/by-name/pi/picoscope/package.nix
+++ b/pkgs/by-name/pi/picoscope/package.nix
@@ -1,154 +1,103 @@
 {
-  stdenv,
-  lib,
-  fetchurl,
+  cacert,
   dpkg,
-  makeWrapper,
-  mono,
-  gtk-sharp-3_0,
+  fetchurl,
+  gdk-pixbuf,
   glib,
+  glibc,
+  gtk3,
+  icu,
+  lib,
+  libcap,
+  librsvg,
   libusb1,
-  zlib,
-  gtk3-x11,
-  callPackage,
+  makeWrapper,
+  openssl,
+  patchelf,
+  stdenv,
+  systemdMinimal,
+  tbb,
   writeTextDir,
-  scopes ? [
-    "picocv"
-    "ps2000"
-    "ps2000a"
-    "ps3000"
-    "ps3000a"
-    "ps4000"
-    "ps4000a"
-    "ps5000"
-    "ps5000a"
-    "ps6000"
-    "ps6000a"
-  ],
 }:
 
 let
-  shared_meta = lib: {
-    homepage = "https://www.picotech.com/downloads/linux";
-    maintainers = with lib.maintainers; [ wirew0rm ];
-    teams = [ lib.teams.lumiguide ];
-    platforms = [ "x86_64-linux" ];
-    license = lib.licenses.unfree;
-  };
-
-  libpicoipp = callPackage (
-    {
-      stdenv,
-      lib,
-      fetchurl,
-      autoPatchelfHook,
-      dpkg,
-    }:
-    stdenv.mkDerivation {
-      pname = "libpicoipp";
-      inherit (sources.libpicoipp) version;
-      src = fetchurl { inherit (sources.libpicoipp) url sha256; };
-      nativeBuildInputs = [
-        dpkg
-        autoPatchelfHook
-      ];
-      buildInputs = [ (lib.getLib stdenv.cc.cc) ];
-
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out/lib
-        cp -d opt/picoscope/lib/* $out/lib
-        install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright
-        runHook postInstall
-      '';
-      meta = shared_meta lib // {
-        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-        description = "Library for picotech oscilloscope software";
-      };
-    }
-  ) { };
-
-  # If we don't have a platform available, put a dummy version here, so at
-  # least evaluation succeeds.
   sources =
     (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}");
 
-  scopePkg =
-    name:
-    {
-      url,
-      version,
-      sha256,
-    }:
-    stdenv.mkDerivation {
-      pname = "lib${name}";
-      inherit version;
-      src = fetchurl { inherit url sha256; };
-      # picoscope does a signature check, so we can't patchelf these
-      nativeBuildInputs = [ dpkg ];
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out/lib
-        cp -d opt/picoscope/lib/* $out/lib
-         runHook postInstall
-      '';
-      meta =
-        with lib;
-        shared_meta lib
-        // {
-          description = "Library for picotech oscilloscope ${name} series";
-        };
-    };
+  libraryPath = lib.makeLibraryPath libraries;
+  libraries = [
+    gdk-pixbuf
+    glibc
+    gtk3
+    icu
+    libcap
+    librsvg
+    libusb1
+    openssl
+    stdenv.cc.cc.lib
+    systemdMinimal
+    tbb
+  ];
 
-  scopePkgs = lib.mapAttrs scopePkg sources;
+  gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache";
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "picoscope";
   inherit (sources.picoscope) version;
 
-  src = fetchurl { inherit (sources.picoscope) url sha256; };
+  srcs = lib.mapAttrsToList (_: src: fetchurl { inherit (src) url sha256; }) sources;
+
+  unpackPhase = ''
+    for src in $srcs; do
+      dpkg-deb -x "$src" .
+    done
+  '';
 
   nativeBuildInputs = [
     dpkg
     makeWrapper
   ];
-  buildInputs = [
-    gtk-sharp-3_0
-    mono
-    glib
-    libusb1
-    zlib
-  ];
 
-  scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
-  MONO_PATH =
-    "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:"
-    + (lib.makeLibraryPath (
-      [
-        glib
-        gtk3-x11
-        gtk-sharp-3_0
-        libusb1
-        zlib
-        libpicoipp
-      ]
-      ++ scopeLibs
-    ));
+  buildInputs = libraries;
 
   installPhase = ''
     runHook preInstall
     mkdir -p $out/
-    cp -dr usr/share $out/share
     cp -dr opt/picoscope/* $out/
-    makeWrapper "$(command -v mono)" $out/bin/picoscope \
-      --add-flags $out/lib/PicoScope.GTK.exe \
-      --prefix MONO_PATH : "$MONO_PATH" \
-      --prefix LD_LIBRARY_PATH : "$MONO_PATH" \
-      --set LANG C
+    chmod +x $out/lib/PicoScope.GTK
+
+    # Patch all ELF files to prefer Pico libs then our curated runtime
+    # Set dynamic loader to Nix's glibc ld.so
+    for f in $out/lib/{PicoScope.GTK,CrashReporter} $(find $out/lib -type f -name 'lib*.so*'); do
+      ${patchelf}/bin/patchelf \
+        --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 \
+        --set-rpath "$out/lib:${libraryPath}" \
+        "$f" || true
+    done
+
+    # LD_LIBRARY_PATH: not strictly needed for the main exe (rpath already covers it), but required
+    # for dlopened plugins that ignore rpath or use absolute sonames.
+    # GDK_PIXBUF_MODULE_FILE: points gdk-pixbuf to Nix’s loader cache so image loaders (gif/svg/png)
+    # come from our matched version, not the host. This fixes the “g_module_*” symbol errors.
+    # GIO_MODULE_DIR: restricts GIO to GLib’s core modules only (no dconf/gvfs host bleed-through).
+    # SSL_CERT_DIR/SSL_CERT_FILE: Gives OpenSSL a known CA bundle so any HTTPS inside the app works
+    # without querying host paths.
+    makeWrapper $out/lib/PicoScope.GTK $out/bin/picoscope \
+      --set LD_LIBRARY_PATH "$out/lib:${libraryPath}" \
+      --set GDK_PIXBUF_MODULE_FILE "${gdkLoadersCache}" \
+      --set GIO_MODULE_DIR "${glib.out}/lib/gio/modules" \
+      --set SSL_CERT_DIR "${cacert}/etc/ssl/certs" \
+      --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
     runHook postInstall
   '';
 
+  # Stripping causes the following error:
+  #   Failure processing application bundle; possible file corruption.
+  #   Arithmetic overflow while reading bundle.
+  #   A fatal error occurred while processing application bundle
+  dontStrip = true;
+
   # usage:
   # services.udev.packages = [ pkgs.picoscope.rules ];
   # users.groups.pico = {};
@@ -157,22 +106,23 @@ stdenv.mkDerivation rec {
     SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico"
   '';
 
-  meta =
-    with lib;
-    shared_meta lib
-    // {
-      description = "Oscilloscope application that works with all PicoScope models";
-      longDescription = ''
-        PicoScope for Linux is a powerful oscilloscope application that works
-        with all PicoScope models. The most important features from PicoScope
-        for Windows are included—scope, spectrum analyzer, advanced triggers,
-        automated measurements, interactive zoom, persistence modes and signal
-        generator control. More features are being added all the time.
+  meta = {
+    homepage = "https://www.picotech.com/downloads/linux";
+    maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members;
+    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    description = "Oscilloscope application that works with all PicoScope models";
+    longDescription = ''
+      PicoScope for Linux is a powerful oscilloscope application that works
+      with all PicoScope models. The most important features from PicoScope
+      for Windows are included—scope, spectrum analyzer, advanced triggers,
+      automated measurements, interactive zoom, persistence modes and signal
+      generator control. More features are being added all the time.
 
-        Waveform captures can be saved for off-line analysis, and shared with
-        PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
-        users, or exported in text, CSV and MathWorks MATLAB 4 formats.
-      '';
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    };
+      Waveform captures can be saved for off-line analysis, and shared with
+      PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
+      users, or exported in text, CSV and MathWorks MATLAB 4 formats.
+    '';
+  };
 }
diff --git a/pkgs/by-name/pi/picoscope/sources.json b/pkgs/by-name/pi/picoscope/sources.json
index 6b1d81978b9d..19e71d60b1d5 100644
--- a/pkgs/by-name/pi/picoscope/sources.json
+++ b/pkgs/by-name/pi/picoscope/sources.json
@@ -1,69 +1,104 @@
 {
   "x86_64-linux": {
     "libpicocv": {
-      "sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb",
-      "version": "1.1.34-beta2r172"
+      "sha256": "cff2f4b4460ce58d97a8e4dfde55386cd1836b463b551c17928757493089e475",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.43-1r443_amd64.deb",
+      "version": "1.1.43-1r443"
+    },
+    "libpicohrdl": {
+      "sha256": "920c529b8f49cfff3d1050f45753fa8bfca3f2d8e87c9712447c8f4fc766d60a",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicohrdl/libpicohrdl_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
     },
     "libpicoipp": {
       "sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d",
       "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb",
       "version": "1.4.0-4r161"
     },
+    "libpl1000": {
+      "sha256": "5f81971fb54dc12ddb3654c95b085cc6d750e932b759cdfaae47d8ad1a1bcaaf",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpl1000/libpl1000_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
+    },
+    "libplcm3": {
+      "sha256": "82a962c4a1a3049b4c258cf419e8468326f7931bdd3d5288af697271ed39a261",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libplcm3/libplcm3_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
+    },
     "libps2000": {
-      "sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb",
-      "version": "3.0.127-3r5552"
+      "sha256": "e51a2870450b9921c9b4a2a26d579b9d44047cf015ef0c51d8a19c9f26309983",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.150-3r6187_amd64.deb",
+      "version": "3.0.150-3r6187"
     },
     "libps2000a": {
-      "sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb",
-      "version": "2.1.127-5r5552"
+      "sha256": "19be0c046dbd2725e236f3508af45141a6723ec51b0fcf9a2d7bcd818d53a0b1",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.2.154-5r6530_amd64.deb",
+      "version": "2.2.154-5r6530"
     },
     "libps3000": {
-      "sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb",
-      "version": "4.0.127-3r5552"
+      "sha256": "41bbabe8abc39245612996cbc10053dfe06275b819ab57f9fbf48ef798c18a1a",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.149-3r6187_amd64.deb",
+      "version": "4.0.149-3r6187"
     },
     "libps3000a": {
-      "sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb",
-      "version": "2.1.127-6r5552"
+      "sha256": "7a01aedb064c366405e9b5d9af5b1adfc27b6b782bda1d0bd3b3bee3e595a41a",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.2.157-6r7555_amd64.deb",
+      "version": "2.2.157-6r7555"
     },
     "libps4000": {
-      "sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb",
-      "version": "2.1.127-2r5552"
+      "sha256": "0d1dff842e806e8f193ee319f88203b8fbb0391d53188e77fa9601bbbf8d2ef6",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.151-2r6187_amd64.deb",
+      "version": "2.1.151-2r6187"
     },
     "libps4000a": {
-      "sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb",
-      "version": "2.1.127-2r5552"
+      "sha256": "1d2ab448ed2b92f305410dbea452268071cb096edb88855e60dd627be7faed45",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.2.206-2r7757_amd64.deb",
+      "version": "2.2.206-2r7757"
     },
     "libps5000": {
-      "sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb",
-      "version": "2.1.127-3r5552"
+      "sha256": "e3dbd0534d1acf5c81b5170d276dcb8d0b612c3fd55f5cc212581d51734079cd",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.151-3r6187_amd64.deb",
+      "version": "2.1.151-3r6187"
     },
     "libps5000a": {
-      "sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb",
-      "version": "2.1.127-5r5552"
+      "sha256": "f17ab24eb77df24d4957b848f64815a47227d5eb246c31a111d7eadb43d04cf4",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.2.11-5r5086_amd64.deb",
+      "version": "2.2.11-5r5086"
     },
     "libps6000": {
-      "sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb",
-      "version": "2.1.127-6r5552"
+      "sha256": "01716b5d24f670ca709ca6e0947f3ca1cebb225d3b1037eee692ef049dc1946c",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.151-6r6187_amd64.deb",
+      "version": "2.1.151-6r6187"
     },
     "libps6000a": {
-      "sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb",
-      "version": "1.0.127-0r5552"
+      "sha256": "4ecf9543d388c6b972e78d3b2caa09f9a314e9cb6fd54b24c1e227fcaa3f8f12",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_2.0.156-0r167_amd64.deb",
+      "version": "2.0.156-0r167"
+    },
+    "libpsospa": {
+      "sha256": "adaf1f555b8b6f0950731cd642488bd8707a09291e0f1fb7a79ed22867203eb4",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpsospa/libpsospa_1.0.149-0r5787_amd64.deb",
+      "version": "1.0.149-0r5787"
+    },
+    "libusbdrdaq": {
+      "sha256": "0906429cd32b34aaaaa41ae9f60f6b47ecbdc0b53e49275a3349141f2e79d806",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbdrdaq/libusbdrdaq_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
+    },
+    "libusbpt104": {
+      "sha256": "a73a175dcced17e59ade58edb760c8e11551300841e5c30c16cbd7c1bfe6c540",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbpt104/libusbpt104_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
+    },
+    "libusbtc08": {
+      "sha256": "551f3f290d7ee672a4e0533ffebeab746ba552c3a4d0c857edaf7c2494a96659",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbtc08/libusbtc08_2.0.150-1r6187_amd64.deb",
+      "version": "2.0.150-1r6187"
     },
     "picoscope": {
-      "sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc",
-      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb",
-      "version": "7.1.17-1r17318"
+      "sha256": "ab4a0db634b93bd5dcf7cb7fca52591c03130d57451d3ddb3942a0e663c4ffd7",
+      "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.2.6.7136_amd64.deb",
+      "version": "7.2.6.7136"
     }
   }
 }

From 064b8df1844c77e6f59556b70e0f35be39a2f7e1 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 15:47:55 +0800
Subject: [PATCH 15/61] sidequest: 0.10.33 -> 0.10.42

---
 pkgs/by-name/si/sidequest/package.nix | 164 ++++++++++++++------------
 1 file changed, 86 insertions(+), 78 deletions(-)

diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix
index fe78c9ff3188..9bc2341ac105 100644
--- a/pkgs/by-name/si/sidequest/package.nix
+++ b/pkgs/by-name/si/sidequest/package.nix
@@ -1,8 +1,9 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchurl,
   buildFHSEnv,
+  copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
   alsa-lib,
@@ -15,6 +16,7 @@
   glib,
   gtk3,
   libgbm,
+  libGL,
   nss,
   nspr,
   libdrm,
@@ -26,100 +28,93 @@
   icu,
   openssl,
   zlib,
+  bintools,
 }:
 let
   pname = "sidequest";
-  version = "0.10.33";
-
-  desktopItem = makeDesktopItem rec {
-    name = "SideQuest";
-    exec = "SideQuest";
-    desktopName = name;
-    genericName = "VR App Store";
-    categories = [
-      "Settings"
-      "PackageManager"
-    ];
-  };
+  version = "0.10.42";
 
   sidequest = stdenv.mkDerivation {
     inherit pname version;
 
     src = fetchurl {
       url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
-      sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995";
+      hash = "sha256-YZp7OAjUOXepVv5dPhh9Q2HicUKjSOGfhrWyMKy2gME=";
     };
-    dontUnpack = true;
 
-    nativeBuildInputs = [ makeWrapper ];
+    nativeBuildInputs = [
+      copyDesktopItems
+      makeWrapper
+    ];
+
+    desktopItems = [
+      (makeDesktopItem {
+        name = "sidequest";
+        exec = "sidequest";
+        icon = "sidequest";
+        desktopName = "SideQuest";
+        genericName = "VR App Store";
+        categories = [
+          "Settings"
+          "PackageManager"
+        ];
+      })
+    ];
 
     installPhase = ''
-      mkdir -p "$out/lib/SideQuest" "$out/bin"
-      tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
+      runHook preInstall
 
-      ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
+      mkdir -p "$out/libexec" "$out/bin"
+      cp --recursive . "$out/libexec/sidequest"
+      ln -s "$out/libexec/sidequest/sidequest" "$out/bin/sidequest"
+      for size in 16 24 32 48 64 128 256 512 1024; do
+        install -D --mode=0644 resources/app.asar.unpacked/build/icons/''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/sidequest.png
+      done
+
+      runHook postInstall
     '';
 
-    postFixup =
-      let
-        libPath = lib.makeLibraryPath [
-          alsa-lib
-          at-spi2-atk
-          cairo
-          cups
-          dbus
-          expat
-          gdk-pixbuf
-          glib
-          gtk3
-          libgbm
-          nss
-          nspr
-          libdrm
-          xorg.libX11
-          xorg.libxcb
-          xorg.libXcomposite
-          xorg.libXdamage
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXrandr
-          xorg.libxshmfence
-          libxkbcommon
-          xorg.libxkbfile
-          pango
-          (lib.getLib stdenv.cc.cc)
-          systemd
-        ];
-      in
-      ''
-        patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libPath}:$out/lib/SideQuest" \
-          "$out/lib/SideQuest/sidequest"
-      '';
+    postFixup = ''
+      patchelf \
+        --set-interpreter "${bintools.dynamicLinker}" \
+        --set-rpath "${
+          lib.makeLibraryPath [
+            alsa-lib
+            at-spi2-atk
+            cairo
+            cups
+            dbus
+            expat
+            gdk-pixbuf
+            glib
+            gtk3
+            libgbm
+            libGL
+            nss
+            nspr
+            libdrm
+            xorg.libX11
+            xorg.libxcb
+            xorg.libXcomposite
+            xorg.libXdamage
+            xorg.libXext
+            xorg.libXfixes
+            xorg.libXrandr
+            xorg.libxshmfence
+            libxkbcommon
+            xorg.libxkbfile
+            pango
+            (lib.getLib stdenv.cc.cc)
+            systemd
+          ]
+        }:$out/libexec/sidequest" \
+        --add-needed libGL.so.1 \
+        "$out/libexec/sidequest/sidequest"
+    '';
   };
 in
 buildFHSEnv {
-  pname = "SideQuest";
-  inherit version;
-
-  passthru = {
-    inherit pname version;
-
-    meta = with lib; {
-      description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
-      homepage = "https://github.com/SideQuestVR/SideQuest";
-      downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
-      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-      license = licenses.mit;
-      maintainers = with maintainers; [
-        joepie91
-        rvolosatovs
-      ];
-      platforms = [ "x86_64-linux" ];
-      mainProgram = "SideQuest";
-    };
-  };
+  inherit pname version;
 
   targetPkgs = pkgs: [
     sidequest
@@ -132,9 +127,22 @@ buildFHSEnv {
   ];
 
   extraInstallCommands = ''
-    mkdir -p "$out/share/applications"
-    ln -s ${desktopItem}/share/applications/* "$out/share/applications"
+    ln -s ${sidequest}/share "$out/share"
   '';
 
   runScript = "sidequest";
+
+  meta = {
+    description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
+    homepage = "https://github.com/SideQuestVR/SideQuest";
+    downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      joepie91
+      rvolosatovs
+    ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "SideQuest";
+  };
 }

From 343a8033bd3b4963db0a29fe6fea717e71ccbc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 03:31:49 -0700
Subject: [PATCH 16/61] hal-hardware-analyzer: 4.4.1 -> 4.5.0

Diff: https://github.com/emsec/hal/compare/v4.4.1...v4.5.0

Changelog: https://github.com/emsec/hal/releases/tag/v4.5.0
---
 .../4.4.1-newer-spdlog-fmt-compat.patch       | 28 -------------------
 .../hal-hardware-analyzer/default.nix         | 25 +++--------------
 ...resynthesis-fix-narrowing-conversion.patch | 13 ---------
 3 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch
 delete mode 100644 pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch

diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch
deleted file mode 100644
index 016e74415644..000000000000
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-compatibility with newer spdlog/fmt versions
-
-diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp
-index 808875e8a68..3cf3cf1fb8b 100644
---- a/plugins/module_identification/src/api/module_identification.cpp
-+++ b/plugins/module_identification/src/api/module_identification.cpp
-@@ -406,7 +406,7 @@ namespace hal
- 
-                 const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);
- 
--                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);
-+                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));
- 
-                 auto stats = Statistics();
- 
-diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp
-index d64cab665f2..561fa7f1a23 100644
---- a/plugins/z3_utils/src/simplification.cpp
-+++ b/plugins/z3_utils/src/simplification.cpp
-@@ -617,7 +617,7 @@ namespace hal
-                     return false;
- 
-                 default: {
--                    log_error("z3_utils", "commutative check not implemeted for type {}!", t);
-+                    log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));
-                     return false;
-                 }
-             }
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 4fed26932415..136834c6a294 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -4,7 +4,6 @@
   boost,
   cmake,
   fetchFromGitHub,
-  fetchpatch,
   graphviz,
   igraph,
   llvmPackages,
@@ -23,33 +22,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.4.1";
+  version = "4.5.0";
   pname = "hal-hardware-analyzer";
 
   src = fetchFromGitHub {
     owner = "emsec";
     repo = "hal";
-    rev = "v${version}";
-    sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
+    tag = "v${version}";
+    hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "de-vendor-nlohmann-json.patch";
-      # https://github.com/emsec/hal/pull/596
-      url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";
-      hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";
-    })
-    (fetchpatch {
-      name = "fix-vendored-igraph-regression.patch";
-      # https://github.com/emsec/hal/pull/596
-      url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";
-      hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
-    })
-    ./4.4.1-newer-spdlog-fmt-compat.patch
-    ./resynthesis-fix-narrowing-conversion.patch
-  ];
-
   # make sure bundled dependencies don't get in the way - install also otherwise
   # copies them in full to the output, bloating the package
   postPatch = ''
@@ -117,6 +99,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";
     description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";
     mainProgram = "hal";
     homepage = "https://github.com/emsec/hal";
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch
deleted file mode 100644
index 58160330cd06..000000000000
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp
-index 7a7e404114f..f2889667af8 100644
---- a/plugins/resynthesis/src/resynthesis.cpp
-+++ b/plugins/resynthesis/src/resynthesis.cpp
-@@ -1058,7 +1058,7 @@ namespace hal
-             // delete the created directory and the contained files
-             std::filesystem::remove_all(base_path);
- 
--            return OK(subgraph.size());
-+            return OK(static_cast<unsigned int>(subgraph.size()));
-         }
- 
-         Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)

From 21708aaeff6c8b949eb2b51b29f588d1b4724b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 03:41:58 -0700
Subject: [PATCH 17/61] hal-hardware-analyzer: move to pkgs/by-name

---
 .../ha/hal-hardware-analyzer/package.nix}           | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  4 ----
 2 files changed, 5 insertions(+), 12 deletions(-)
 rename pkgs/{applications/science/electronics/hal-hardware-analyzer/default.nix => by-name/ha/hal-hardware-analyzer/package.nix} (96%)

diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
similarity index 96%
rename from pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
rename to pkgs/by-name/ha/hal-hardware-analyzer/package.nix
index 136834c6a294..418ad47d55ad 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
@@ -11,13 +11,10 @@
   nlohmann_json,
   pkg-config,
   python3Packages,
-  qtbase,
-  qtsvg,
-  quazip,
+  libsForQt5,
   rapidjson,
   spdlog,
   verilator,
-  wrapQtAppsHook,
   z3,
 }:
 
@@ -46,11 +43,11 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     boost
     rapidjson
     igraph
@@ -59,7 +56,7 @@ stdenv.mkDerivation rec {
     graphviz
     verilator
     z3
-    quazip
+    libsForQt5.quazip
   ]
   ++ (with python3Packages; [
     python
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43851adceefb..b4f7958530f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3086,10 +3086,6 @@ with pkgs;
 
   haste-client = callPackage ../tools/misc/haste-client { };
 
-  hal-hardware-analyzer =
-    libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer
-      { };
-
   halide = callPackage ../development/compilers/halide {
     llvmPackages = llvmPackages_19;
   };

From 06be23d66287c004cb8ef933a9ff6589276ab104 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 26 Sep 2025 03:24:43 -0700
Subject: [PATCH 18/61] verilator: fix build on Darwin

---
 pkgs/by-name/ve/verilator/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index ef657ead72a5..2ea13942aee8 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   perl,
   flex,
   bison,
@@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "clang-V3hash-overload-fix.patch";
+      url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch";
+      hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU=";
+    })
+  ];
+
   enableParallelBuilding = true;
   buildInputs = [
     perl

From 0062a56410a6e38e6f8e34720f05122b0007d202 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sat, 27 Sep 2025 08:51:15 +0000
Subject: [PATCH 19/61] =?UTF-8?q?clickhouse-lts:=2025.8.2.29-lts=20?=
 =?UTF-8?q?=E2=86=92=2025.8.7.3-lts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/cl/clickhouse/lts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index 6ba0f7439e1e..4497d9078c68 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.8.2.29-lts";
-  hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now=";
+  version = "25.8.7.3-lts";
+  hash = "sha256-wH/UxMgnsK6OIGxEv9CYA67f8PWC0u6IAiW2iY/KThk=";
   lts = true;
   nixUpdateExtraArgs = [
     "--version-regex"

From 011d73182c5dca2e3c9b34b10972484a49a3e350 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sat, 27 Sep 2025 08:51:30 +0000
Subject: [PATCH 20/61] =?UTF-8?q?clickhouse:=2025.8.2.29-lts=20=E2=86=92?=
 =?UTF-8?q?=2025.9.2.1-stable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 1b0a81348266..1fc35212e7d4 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.8.2.29-lts";
-  hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now=";
+  version = "25.9.2.1-stable";
+  hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo=";
   lts = false;
   nixUpdateExtraArgs = [
     "--version-regex"

From b68a45c94d9e065faeb6f8a3d8d83907fd8c6b1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 20:23:23 +0000
Subject: [PATCH 21/61] sesh: 2.17.1 -> 2.18.1

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

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index 663827bb5d1c..a4de0fa084eb 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule rec {
   pname = "sesh";
-  version = "2.17.1";
+  version = "2.18.1";
 
   nativeBuildInputs = [
     go-mockery
@@ -16,7 +16,7 @@ buildGoModule rec {
     owner = "joshmedeski";
     repo = "sesh";
     rev = "v${version}";
-    hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0=";
+    hash = "sha256-f63C2QFU5G/xoy6mLUSzgQv7VOJ4lv06OnGoyZy54rg=";
   };
 
   preBuild = ''

From 979a95c40a46be30589499e8871d5a7c8c0029e0 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 27 Sep 2025 11:18:45 +0200
Subject: [PATCH 22/61] sssd: fix tests issues

---
 nixos/modules/services/misc/sssd.nix                |  1 -
 pkgs/os-specific/linux/sssd/default.nix             | 12 ++++++++++++
 .../linux/sssd/fix-ldb-modules-path.patch           | 13 +++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch

diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 284b2972d300..11374f9c014d 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -21,7 +21,6 @@ in
         description = "Contents of {file}`sssd.conf`.";
         default = ''
           [sssd]
-          config_file_version = 2
           services = nss, pam
           domains = shadowutils
 
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 04118ecc168f..1072c9aa148f 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  replaceVars,
   autoreconfHook,
   makeWrapper,
   glibc,
@@ -72,8 +73,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ=";
   };
 
+  patches = [
+    (replaceVars ./fix-ldb-modules-path.patch {
+      inherit ldb;
+      out = null; # will be replaced in postPatch https://github.com/NixOS/nixpkgs/pull/446589#discussion_r2384899857
+    })
+  ];
+
   postPatch = ''
     patchShebangs ./sbus_generate.sh.in
+
+    substituteInPlace src/confdb/confdb.c \
+      --replace-fail "@out@" "${placeholder "out"}"
   '';
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
@@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}
       --with-ldb-lib-dir=$out/modules/ldb
       --with-nscd=${glibc.bin}/sbin/nscd
+      --with-sssd-user=root
     )
   ''
   + lib.optionalString withSudo ''
diff --git a/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch b/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch
new file mode 100644
index 000000000000..8324804a53e6
--- /dev/null
+++ b/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
+index 8c19142..7865684 100644
+--- a/src/confdb/confdb.c
++++ b/src/confdb/confdb.c
+@@ -775,6 +775,8 @@ int confdb_init(TALLOC_CTX *mem_ctx,
+     int ret = EOK;
+     mode_t old_umask;
+ 
++    setenv("LDB_MODULES_PATH", "@out@/modules/ldb:@ldb@/modules/ldb", 1);
++
+     if (cdb_ctx == NULL) {
+         DEBUG(SSSDBG_FATAL_FAILURE, "Bad argument\n");
+         return EFAULT;

From b4a263d74ea20e2098d8724cad1d5201b2522079 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 17:04:35 +0000
Subject: [PATCH 23/61] firefox-devedition-unwrapped: 144.0b4 -> 144.0b6

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index e4889fd3f926..81dbe8cf8c56 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "144.0b4";
+  version = "144.0b6";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "144a10bc0c2121e22990def70e1b5bcc033a8b8cd7ad433a1b1d5db33599d05142d1f5c1e486f919e7b839849aaf83c6c4287df89f337151b82f220f9bd7fe52";
+    sha512 = "08a42497eef413f097c4c8191ef2d0e4e7a6f39a63744d51352aaa4016ed8877da4eace81bfc85e97f8e4f17c7ea9225fe11c94e70d6e4c9f4ec69cd43aeecc4";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 065e7dd7cdd96c0757a32bb5d8cb82e8b6222349 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 17:04:59 +0000
Subject: [PATCH 24/61] firefox-beta-unwrapped: 144.0b4 -> 144.0b6

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index c1ac226816ff..206d2c590902 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "144.0b4";
+  version = "144.0b6";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "f49e852eae3c453e4de46cde42f3d23d977a71414e8193b49ceff7816d8aff4d11e915860b6c732a64922bb2b897ff39b9fe9919458eb943ffd03efbc1c75650";
+    sha512 = "b0e8398513db7de1f16412bedba519b3d307022c0eadc1c114f3ad247ac368c027bd968f98a38c41076c1e6e06c96ec3821230d470f4f804e51ff09ede84a618";
   };
 
   meta = {

From 26d91b9ec05cf6362f8225c77a5de54117780bde Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 28 Sep 2025 20:51:19 +0200
Subject: [PATCH 25/61] sops: 3.10.2 -> 3.11.0

https://github.com/getsops/sops/releases/tag/v3.11.0

https://github.com/getsops/sops/compare/v3.10.2...v3.11.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/so/sops/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index 89492fbdf345..5b9f8c8977a1 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (final: {
   pname = "sops";
-  version = "3.10.2";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "getsops";
     repo = final.pname;
     tag = "v${final.version}";
-    hash = "sha256-IdQnxVBMAQpSAYB2S3D3lSULelFMBpjiBGOxeTgC10I=";
+    hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU=";
   };
 
-  vendorHash = "sha256-7aHUIERVSxv3YGAMteGbqkAZQXXDVziV0rhUhjwch3U=";
+  vendorHash = "sha256-9bB3MbE03KEaxUp0VvCnNVKUY4zSUoam8h2cDlAz7RY=";
 
   subPackages = [ "cmd/sops" ];
 

From c945d08faf64a8c995311f28ef5fa8345c364b53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 00:12:06 +0000
Subject: [PATCH 26/61] attic-client: 0-unstable-2025-09-12 ->
 0-unstable-2025-09-24

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

diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 19505c29fdf6..2488f2473f25 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -21,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "attic";
-  version = "0-unstable-2025-09-12";
+  version = "0-unstable-2025-09-24";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "attic";
-    rev = "7c5d79ad62cda340cb8c80c99b921b7b7ffacf69";
-    hash = "sha256-q7q0pWT+wu5AUU1Qlbwq8Mqb+AzHKhaMCVUq/HNZfo8=";
+    rev = "12cbeca141f46e1ade76728bce8adc447f2166c6";
+    hash = "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   buildInputs = lib.optional needNixInclude nix ++ [ boost ];
 
   cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
-  cargoHash = "sha256-NdzwYnD0yMEI2RZwwXl/evYx9zdBVMOUee+V7uq1cf0=";
+  cargoHash = "sha256-h041o0s+bciXnvSuk4j+/uCY/sRRQWDVf+WEb9GEYeY=";
 
   env = {
     ATTIC_DISTRIBUTOR = "nixpkgs";

From 871e479fd5a2a0d5c01c2f7f3dc6fa8f6610ec68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 02:08:36 +0000
Subject: [PATCH 27/61] nvc: 1.17.2 -> 1.18.0

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

diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 4c336ac7fce7..4a13cbbd4434 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     tag = "r${version}";
-    hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM=";
+    hash = "sha256-PpSoqDCjvROkfXSuOlGxqa9ChdBItu/PQztdsXvVC60=";
   };
 
   nativeBuildInputs = [

From c4e90b66d6e0e0956f11622f449b691df7d39dcc Mon Sep 17 00:00:00 2001
From: Ali Rizvi <contact@frontear.dev>
Date: Sun, 28 Sep 2025 23:25:57 -0400
Subject: [PATCH 28/61] app2unit: switch from `rec` to `finalAttrs`

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

diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index c37973851c16..77e7473b7318 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -6,14 +6,14 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "app2unit";
   version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "app2unit";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI=";
   };
 
@@ -54,4 +54,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with lib.maintainers; [ fazzi ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 25140af8eae623c1d156dec84b78279cab4bf007 Mon Sep 17 00:00:00 2001
From: Ali Rizvi <contact@frontear.dev>
Date: Sun, 28 Sep 2025 23:32:53 -0400
Subject: [PATCH 29/61] app2unit: fix missing man page

---
 pkgs/by-name/ap/app2unit/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index 77e7473b7318..316350825022 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -5,6 +5,7 @@
   scdoc,
   fetchFromGitHub,
   nix-update-script,
+  installShellFiles,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "app2unit";
@@ -19,7 +20,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  nativeBuildInputs = [ scdoc ];
+  nativeBuildInputs = [
+    scdoc
+    installShellFiles
+  ];
 
   buildPhase = ''
     scdoc < app2unit.1.scd > app2unit.1
@@ -27,6 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase = ''
     install -Dt $out/bin app2unit
+    installManPage app2unit.1
 
     for link in \
       app2unit-open \

From 652002e5d45d30531ed74ec74fc6bcfb81e458fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 06:42:55 +0000
Subject: [PATCH 30/61] cinny: 4.10.0 -> 4.10.1

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

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 0d19a7278a25..3b2220d8588b 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.10.0";
+  version = "4.10.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     tag = "v${version}";
-    hash = "sha256-KpN6ul+kzGarBKnXXSP3gf9KlRII869xnfT95mzacRc=";
+    hash = "sha256-Hn49a+nGtF5kJ1ZM+rOXWH+dFG1nMSI/rIDF+9qlQk4=";
   };
 
-  npmDepsHash = "sha256-N5xHu4AmgRdd3gM+YTu+fbtAw1YDp4SMXdXUbbJnIZc=";
+  npmDepsHash = "sha256-896W5XbAGUcUa8gxeR72hg9fwTaUOR5a5hex8vS33gU=";
 
   nativeBuildInputs = [
     python3

From 8c30da5afa13669ca91eade963ad0997f2f04607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 07:49:18 +0000
Subject: [PATCH 31/61] mirrord: 3.162.0 -> 3.163.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index ab074ffc6079..c94fde332299 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.162.0",
+  "version": "3.163.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_x86_64",
-      "hash": "sha256-CTlnYQ1qiykfhcSys0v2F9m+avHVG2dw9VqhF/Vm8Ao="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_x86_64",
+      "hash": "sha256-xDdeWcPNDiqCM/wcEsuxrnklZPOeSA0nm/6yiShO8jk="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_aarch64",
-      "hash": "sha256-MpDdSB4jytSStz+xNJsv91ng1y4IYDoxioTWb/fq2KE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_aarch64",
+      "hash": "sha256-qFO1g/Tqk8sFyO10g5r4dYmuczHPb90s/p8aqc7c5+Y="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal",
-      "hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal",
+      "hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal",
-      "hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal",
+      "hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E="
     }
   }
 }

From e24a7874a3d2669b87d1920d6e649b1243054788 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 29 Sep 2025 16:49:13 +0800
Subject: [PATCH 32/61] superhtml: 0.5.3 -> 0.6.0

---
 pkgs/by-name/su/superhtml/deps.nix    | 90 ++++++++++++++-------------
 pkgs/by-name/su/superhtml/package.nix | 25 ++++----
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/pkgs/by-name/su/superhtml/deps.nix b/pkgs/by-name/su/superhtml/deps.nix
index c85582239480..bedd979a1e8a 100644
--- a/pkgs/by-name/su/superhtml/deps.nix
+++ b/pkgs/by-name/su/superhtml/deps.nix
@@ -1,61 +1,65 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
 {
   linkFarm,
   fetchzip,
   fetchgit,
 }:
+
 linkFarm "zig-packages" [
   {
-    name = "1220b9ce6dc0e1fbcd9e7b406ab164344f81774351495f860a90729187c3c058ef4f";
-    path = fetchgit {
-      url = "https://github.com/kristoff-it/zig-lsp-kit";
-      rev = "b4bf61d7fbf9cf7cfdb6f01b211947d2de3e42fd";
-      hash = "sha256-6mlnPTLBXZQwWXstV+h1PAKtMq8RGcJM2dRJ8NqqqtU=";
-    };
-  }
-  {
-    name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d";
-    path = fetchzip {
-      url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz";
-      hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo=";
-    };
-  }
-  {
-    name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147";
-    path = fetchgit {
-      url = "https://github.com/ziglibs/known-folders.git";
-      rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa";
-      hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g=";
-    };
-  }
-  {
-    name = "122014e78d7c69d93595993b3231f3141368e22634b332b0b91a2fb73a8570f147a5";
-    path = fetchgit {
-      url = "https://github.com/kristoff-it/scripty";
-      rev = "df8c11380f9e9bec34809f2242fb116d27cf39d6";
-      hash = "sha256-qVm8pIfT1mHL1zanqYdFm/6AVH8poXKqLtz4+2j+F/A=";
-    };
-  }
-  {
-    name = "1220f2d8402bb7bbc4786b9c0aad73910929ea209cbd3b063842371d68abfed33c1e";
-    path = fetchgit {
-      url = "https://github.com/kristoff-it/zig-afl-kit";
-      rev = "f003bfe714f2964c90939fdc940d5993190a66ec";
-      hash = "sha256-tJ6Ln1SY4WjFZXUWQmgggsUfkd59QgmIpgdInMuv4PI=";
-    };
-  }
-  {
-    name = "1220010a1edd8631b2644476517024992f8e57f453bdb68668720bb590d168faf7c8";
+    name = "AFLplusplus-4.21.0-aA1y4UtxAABpnSIF7ARSYDMRyqNcI-2Rwa5UeSsuw70v";
     path = fetchgit {
       url = "https://github.com/allyourcodebase/AFLplusplus";
-      rev = "032984eabf5a35af386a3d0e542df7686da339c1";
-      hash = "sha256-KB3QnKAQQ+5CKvJVrhMveMGpF3NTrlwpIyLHVIB96hs=";
+      rev = "a52f1376e2d49720c39e4abf4aa4944afbf82191";
+      hash = "sha256-AlkULC20/RTGMTPk2xWcdXCQlWn3sY3VrD0NRRoTZqY=";
     };
   }
   {
-    name = "12200966011c3dd6979d6aa88fe23061fdc6da1f584a6fb1f7682053a0b01e409dbc";
+    name = "N-V-__8AAKE4uAAJZgEcPdaXnWqoj-IwYf3G2h9YSm-x92gg";
     path = fetchzip {
       url = "https://github.com/AFLplusplus/AFLplusplus/archive/v4.21c.tar.gz";
       hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg=";
     };
   }
+  {
+    name = "afl_kit-0.1.0-NdJ3cvscAACLEvjZTB017IAks_Uq5ux1qpA-klDe384Y";
+    path = fetchgit {
+      url = "https://github.com/kristoff-it/zig-afl-kit";
+      rev = "8ef04d1db48650345dca68da1e1b8f2615125c40";
+      hash = "sha256-J0xbmsokjlhOav9KLlH2y4qiSgBit4nS+x6Q10L2OSA=";
+    };
+  }
+  {
+    name = "known_folders-0.0.0-Fy-PJtTTAADUOhGKM0sxzG4eMkNQxRvx9e5dfHVyaeA3";
+    path = fetchgit {
+      url = "https://github.com/ziglibs/known-folders";
+      rev = "ab5cf5feb936fa3b72c95d3ad0c0c67791937ba1";
+      hash = "sha256-Pdn/nUclhHBB1COTzNNR5ysE13h6uLOFJjuFrasv/2I=";
+    };
+  }
+  {
+    name = "lsp_kit-0.1.0-bi_PLzAyCgClDh8_M0U9Q50ysdsQBuRuBTZfwg6rZPd6";
+    path = fetchgit {
+      url = "https://github.com/zigtools/lsp-kit";
+      rev = "fe98e895ca3bd1b39965ab30f0f252f7b7e83ee6";
+      hash = "sha256-1HW8kWhfpbBihzE6PiXXxGN03qIW20KCsBoyfSSWgNU=";
+    };
+  }
+  {
+    name = "scripty-0.1.0-LKK5O7v4AADWWXuFcTJky_5sY12tmw3kRi3k2wkpfxAX";
+    path = fetchgit {
+      url = "https://github.com/kristoff-it/scripty";
+      rev = "50dbab8945440089384f26ec165d870c29555247";
+      hash = "sha256-r3L4iLpJUH93S0tH6d6w3pHcLzAaKZPSFBAgpnTMdeI=";
+    };
+  }
+  {
+    name = "tracy-0.0.0-4Xw-1pwwAABTfMgoDP1unCbZDZhJEfict7XCBGF6IdIn";
+    path = fetchgit {
+      url = "https://github.com/kristoff-it/tracy";
+      rev = "67d2d89e351048c76fc6d161e0ac09d8a831dc60";
+      hash = "sha256-BKo1bhua/u+f5Z//ailur5aSHZWp3GiC0iwmVLrGZkE=";
+    };
+  }
 ]
diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index eff91d54a5a1..02034775ffa7 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -3,33 +3,36 @@
   callPackage,
   fetchFromGitHub,
   stdenv,
-  zig_0_13,
+  zig_0_15,
 }:
-stdenv.mkDerivation rec {
+let
+  zig = zig_0_15;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "superhtml";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kristoff-it";
     repo = "superhtml";
-    tag = "v${version}";
-    hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EWxnozmYTvkX7mn+pVel083Cte1uzvHaes1c7iXPMUg=";
   };
 
   nativeBuildInputs = [
-    zig_0_13.hook
+    zig.hook
   ];
 
   postPatch = ''
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
   '';
 
-  meta = with lib; {
+  meta = {
     description = "HTML Language Server and Templating Language Library";
     homepage = "https://github.com/kristoff-it/superhtml";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "superhtml";
-    maintainers = with maintainers; [ petertriho ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ petertriho ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From c9355119add6500c66a73e788f35585ac4f8bda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 27 Sep 2025 20:33:50 +0200
Subject: [PATCH 33/61] vue-language-server: prune dev dependencies

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 2bd4318e40d3..59b45da99668 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   preInstall = ''
+    # the mv commands are workaround for https://github.com/pnpm/pnpm/issues/8307
+    mv packages packages.dontpruneme
+    CI=true pnpm prune --prod
+    find packages.dontpruneme/**/node_modules -xtype l -delete
+    mv packages.dontpruneme packages
+
     find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
 
     # https://github.com/pnpm/pnpm/issues/3645

From d68358456e23d8ca26d43d6d0a3b0886cbc07ce3 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 29 Sep 2025 09:29:54 +0000
Subject: [PATCH 34/61] clickhouse: Drop -lts from pname

---
 pkgs/by-name/cl/clickhouse/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix
index fffeaa3145c0..53ad8758f507 100644
--- a/pkgs/by-name/cl/clickhouse/generic.nix
+++ b/pkgs/by-name/cl/clickhouse/generic.nix
@@ -32,7 +32,7 @@ let
   llvmStdenv = llvmPackages_19.stdenv;
 in
 llvmStdenv.mkDerivation (finalAttrs: {
-  pname = "clickhouse" + lib.optionalString lts "-lts";
+  pname = "clickhouse";
   inherit version;
 
   src = fetchFromGitHub rec {

From 09c0832e17b8d4f972452857f0e328354c6fb4cb Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 29 Sep 2025 12:26:36 +0200
Subject: [PATCH 35/61] Revert "haskellPackages.kmonad: mark as broken on
 darwin"

This reverts commit bee4fcb001334bf98cfe158e7a9b91e3adb78cf1.

Reason for revert: Seems like the build failures have been resolved in
the meantime (thanks ivy for the report).
---
 .../haskell-modules/configuration-hackage2nix/main.yaml      | 1 -
 .../configuration-hackage2nix/transitive-broken.yaml         | 5 -----
 pkgs/development/haskell-modules/hackage-packages.nix        | 2 --
 3 files changed, 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index bebe29afabe4..0f06aa577172 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -711,7 +711,6 @@ unsupported-platforms:
   iwlib:                                        [ platforms.darwin ]
   Jazzkell:                                     [ platforms.darwin ] # depends on Euterpea
   jsaddle-webkit2gtk:                           [ platforms.darwin ]
-  kmonad:                                       [ platforms.darwin ]
   Kulitta:                                      [ platforms.darwin ] # depends on Euterpea
   LambdaHack:                                   [ platforms.darwin ]
   libmodbus:                                    [ platforms.darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 6c2b389503a2..41803d6cd10e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -35,7 +35,6 @@ dont-distribute-packages:
  - AERN-RnToRm
  - AERN-RnToRm-Plot
  - aeson-native
- - aeson_1_5_6_0
  - affine
  - afis
  - afv
@@ -313,7 +312,6 @@ dont-distribute-packages:
  - boots-cloud
  - boots-web
  - borel
- - botan-low
  - both
  - bound-gen
  - BPS
@@ -1649,9 +1647,6 @@ dont-distribute-packages:
  - hsql-odbc
  - hsql-postgresql
  - hsql-sqlite3
- - hsqml-datamodel-vinyl
- - hsqml-demo-morris
- - hsqml-morris
  - hsreadability
  - hssourceinfo
  - hssqlppp-th
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 27b38ff129d6..06b7b99e5cd7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -114355,7 +114355,6 @@ self: {
       ];
       description = "Low-level Botan bindings";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.mikatammi ];
     }
   ) { };
@@ -401807,7 +401806,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Advanced keyboard remapping utility";
       license = lib.licenses.mit;
-      badPlatforms = lib.platforms.darwin;
       mainProgram = "kmonad";
       maintainers = [ lib.maintainers.slotThe ];
     }

From a9584b6a15c263c0795e742c021a9674885fee04 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 29 Sep 2025 07:41:28 -0300
Subject: [PATCH 36/61] planify: 4.14.0 -> 4.14.1

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

diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index bdda3c057760..54dc10aa07bb 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.14.0";
+  version = "4.14.1";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-QvCESTpHyT6Lu4z7b9DhjFu27PhQwgAo9FY7TMsKy18=";
+    hash = "sha256-4N+2DWOriuxQJX5hfDmGy066ypSn1HkkildBIJjOXhc=";
   };
 
   nativeBuildInputs = [

From 6e597ba531a155d221f9e4ddea6f80c8638d220e Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 28 Sep 2025 07:59:33 +0200
Subject: [PATCH 37/61] kitty: 0.42.2 -> 0.43.0

Changelog:
https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes
Diff: https://github.com/kovidgoyal/kitty/compare/v0.42.2...v0.43.0
---
 pkgs/by-name/ki/kitty/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index bdde5f7fc485..b0dfc4c01647 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -45,26 +45,27 @@
   makeBinaryWrapper,
   autoSignDarwinBinariesHook,
   cairo,
+  fetchpatch,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.42.2";
+  version = "0.43.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-YDfKYzj5LRx1XaKUpBKo97CMW4jPhVQq0aXx/Qfcdzo=";
+    hash = "sha256-wPLXuZWhaA51J7jGHffh/xnXzWDKCXV2G3Uvrg7G8Kg=";
   };
 
   goModules =
     (buildGo124Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-q5LMyogAqgUFfln7LVkhuXzYSMuYmOif5sj15KkOjB4=";
+      vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A=";
     }).goModules;
 
   buildInputs = [
@@ -142,6 +143,12 @@ buildPythonApplication rec {
     # OSError: master_fd is in error condition
     ./disable-test_ssh_bootstrap_with_different_launchers.patch
 
+    # Fix test failure with fish >= 4.1
+    # See: https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66
+    (fetchpatch {
+      url = "https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66.patch";
+      hash = "sha256-LIQz3e2qgiwpsMd5EbEcvd7ePEEPJvIH4NmNpxydQiU=";
+    })
   ];
 
   hardeningDisable = [

From 88e628af040e892a8148086b81c386961abf78ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 11:30:58 +0000
Subject: [PATCH 38/61] python3Packages.pybids: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 46dd6db8deef..a9ad750c9a51 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pybids";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bids-standard";
     repo = "pybids";
     tag = version;
-    hash = "sha256-x1OlqfuRZvfWwOt+WTR8lAtOPWcrsymQyXPfiEj4lk4=";
+    hash = "sha256-e1uD9rNs50GP8myNY+5VbcdRKlLykSTd9ESKrhSW+r8=";
   };
 
   postPatch = ''

From b2fc65c9ce4fbd48e44ca86a1fbfafe07961c126 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 11:39:46 +0000
Subject: [PATCH 39/61] ente-web: 1.2.4 -> 1.2.8

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

diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index e0d1bdc94f08..6ff1c3c0176b 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web-${enteApp}";
-  version = "1.2.4";
+  version = "1.2.8";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-KCRwQmYmf2DXe3WQS8Rc8h397F0xEth4x36Yz4Ke4Y0=";
+    hash = "sha256-OIpqGFp10ncgM8OBJF+Eer3ESnvcuvWihl5cu5SuOvs=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-vm1pQrS4yWvSeTo++964kM+OK0JED8et/dHqLG6lJH0=";
+    hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU=";
   };
 
   nativeBuildInputs = [

From 092ff7a67f850eeb4f7d378bf6e37a3de9aeb580 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Sep 2025 13:43:13 +0200
Subject: [PATCH 40/61] compcert: enable for Coq 9.0.1

---
 pkgs/development/coq-modules/compcert/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 056c8436b82d..e58a42d6d2b5 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -303,6 +303,19 @@ let
               })
             ];
           }
+          {
+            cases = [
+              (isEq "9.0")
+              (isEq "3.16")
+            ];
+            out = [
+              # Support for Coq 9.0.1
+              (fetchpatch {
+                url = "https://github.com/AbsInt/CompCert/commit/a962ef9da0fb4ef2a4314ccedd111eb248e42cf2.patch";
+                hash = "sha256-ipYqcfcgz3cKyI1NGSgfOgiVdV1WUwlv6DVB1S1hJvw=";
+              })
+            ];
+          }
         ]
         [ ];
   });

From d1d4809b1b647c53f8d76179ba7e574f28f154ff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Sep 2025 13:43:37 +0200
Subject: [PATCH 41/61] compcert: default to the Coq 9.0 version

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fccc581481eb..cab717d70625 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4602,7 +4602,7 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  inherit (coqPackages_8_20) compcert;
+  inherit (coqPackages_9_0) compcert;
 
   computecpp = wrapCCWith rec {
     cc = computecpp-unwrapped;

From d6d54a41a00230ee14f3277fabed5f7982ddbef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 28 Sep 2025 04:56:33 +0700
Subject: [PATCH 42/61] =?UTF-8?q?ocamlPackages.uring:=200.9=20=E2=86=92=20?=
 =?UTF-8?q?2.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/uring/default.nix           | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix
index 7ab261c06e12..6ee432359967 100644
--- a/pkgs/development/ocaml-modules/uring/default.nix
+++ b/pkgs/development/ocaml-modules/uring/default.nix
@@ -1,5 +1,7 @@
 {
   lib,
+  ocaml,
+  version ? if lib.versionAtLeast ocaml.version "5.1" then "2.7.0" else "0.9",
   buildDunePackage,
   cstruct,
   dune-configurator,
@@ -9,15 +11,28 @@
   mdx,
 }:
 
+let
+  param =
+    {
+      "0.9" = {
+        minimalOCamlVersion = "4.12";
+        hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M=";
+      };
+      "2.7.0" = {
+        minimalOCamlVersion = "5.1.0";
+        hash = "sha256-mePi6/TXtxgtLYLyHRAdnRcgeldCVgUaPY+MZXSzC6U=";
+      };
+    }
+    .${version};
+in
 buildDunePackage rec {
   pname = "uring";
-  version = "0.9";
-
-  minimalOCamlVersion = "4.12";
+  inherit version;
+  inherit (param) minimalOCamlVersion;
 
   src = fetchurl {
     url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
-    hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M=";
+    inherit (param) hash;
   };
 
   propagatedBuildInputs = [

From e3363da081b98450ccabf292cd290adf66280a0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 12:31:15 +0000
Subject: [PATCH 43/61] arrpc: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix
index f2e8fd195dfb..cd18d75510e1 100644
--- a/pkgs/by-name/ar/arrpc/package.nix
+++ b/pkgs/by-name/ar/arrpc/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
   pname = "arrpc";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "OpenAsar";
     repo = "arrpc";
     tag = version;
-    hash = "sha256-3xkqWcLhmSIH6Al2SvM9qBpdcLzEqUmUCgwYBPAgVpo=";
+    hash = "sha256-WSwnCE3hs3Rj42XDbPtxuYL8tAlfzuWPkIypKzCu8EQ=";
   };
 
-  npmDepsHash = "sha256-lw6pngFC2Pnk+I8818TOTwN4r+8IsjvdMYIyTsTi49g=";
+  npmDepsHash = "sha256-A98oNT1rGctSlJG9yLaa6i0VsGMIo1r2NoNk00SVupk=";
 
   dontNpmBuild = true;
 

From 1e430ab57e4f46d43aeb7c4adf26dd0c002007a3 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 29 Sep 2025 05:38:04 -0700
Subject: [PATCH 44/61] cinny-desktop: 4.10.0 -> 4.10.1

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

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 447fb84165d0..f6414f19a199 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.10.0";
+  version = "4.10.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YEu1qTI2ExfS+WKFxNGkubr+HOCCuWGpZFk3hS3srCU=";
+    hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
-  cargoHash = "sha256-NksWHI2TJR0YMGRIDHBxrQPGHiir2Kn4bxnSvO7EzoA=";
+  cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU=";
 
   postPatch =
     let

From 66b171eeec5741d600b369312d7495f6c3be6af7 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Sep 2025 21:25:24 -0400
Subject: [PATCH 45/61] nixos/cardboard: drop

Corresponding package has been marked broken for a full release cycle.

Dropping per RFC 180.
---
 .../manual/release-notes/rl-2511.section.md   |  2 ++
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/programs/wayland/cardboard.nix  | 31 -------------------
 nixos/modules/rename.nix                      |  4 +++
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 nixos/modules/programs/wayland/cardboard.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 73317da2b100..904fe270a5fb 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -174,6 +174,8 @@
 
 - `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.
 
+- The `cardboard` package and `programs.cardboard` module were removed due to the package having been broken since at least November 2024.
+
 - The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.
 
 - `programs.skim.fuzzyCompletions` has been removed in favor of adding the completions to the package itself.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 043132db23c2..2a11cee90566 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -337,7 +337,6 @@
   ./programs/vivid.nix
   ./programs/vscode.nix
   ./programs/wavemon.nix
-  ./programs/wayland/cardboard.nix
   ./programs/wayland/dwl.nix
   ./programs/wayland/gtklock.nix
   ./programs/wayland/hyprland.nix
diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix
deleted file mode 100644
index 84fe878dc1f8..000000000000
--- a/nixos/modules/programs/wayland/cardboard.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.programs.cardboard;
-in
-{
-  meta.maintainers = with lib.maintainers; [ ];
-
-  options.programs.cardboard = {
-    enable = lib.mkEnableOption "cardboard";
-
-    package = lib.mkPackageOption pkgs "cardboard" { };
-  };
-
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = [ cfg.package ];
-
-        # To make a cardboard session available for certain DMs like SDDM
-        services.displayManager.sessionPackages = [ cfg.package ];
-      }
-      (import ./wayland-session.nix { inherit lib pkgs; })
-    ]
-  );
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 10651b211405..c675b14374f0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -58,6 +58,10 @@ in
       "networking"
       "wicd"
     ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [
+      "programs"
+      "cardboard"
+    ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [
       "programs"
       "gnome-documents"

From e7b674ebe44906867a6bec50e3eaaeabe7659dfc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Sep 2025 21:26:45 -0400
Subject: [PATCH 46/61] cardboard: drop

Has been marked broken for a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/ca/cardboard/package.nix | 146 --------------------------
 pkgs/top-level/aliases.nix            |   1 +
 2 files changed, 1 insertion(+), 146 deletions(-)
 delete mode 100644 pkgs/by-name/ca/cardboard/package.nix

diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix
deleted file mode 100644
index 2c966d891715..000000000000
--- a/pkgs/by-name/ca/cardboard/package.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  fetchurl,
-  fetchgit,
-  ffmpeg,
-  libGL,
-  libX11,
-  libcap,
-  libdrm,
-  libinput,
-  libpng,
-  libxcb,
-  libxkbcommon,
-  libgbm,
-  meson,
-  ninja,
-  pandoc,
-  pixman,
-  pkg-config,
-  unzip,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  xcbutilerrors,
-  xcbutilimage,
-  xcbutilwm,
-}:
-
-let
-  allSources = {
-    # cereal.wrap
-    cereal-wrap = fetchurl {
-      name = "cereal-1.3.0.tar.gz";
-      url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz";
-      hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU=";
-    };
-    cereal-wrapdb = fetchurl {
-      name = "cereal-1.3.0-1-wrap.zip";
-      url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip";
-      hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY=";
-    };
-
-    # expected.wrap
-    expected-wrap = fetchgit {
-      name = "expected";
-      url = "https://gitlab.com/cardboardwm/expected";
-      rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e";
-      hash = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo=";
-    };
-
-    # wlroots.wrap
-    wlroots-wrap = fetchgit {
-      name = "wlroots";
-      url = "https://github.com/swaywm/wlroots";
-      rev = "0.12.0";
-      hash = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY=";
-    };
-
-    # the source itself
-    cardboard = fetchFromGitLab {
-      owner = "cardboardwm";
-      repo = "cardboard";
-      rev = "b54758d85164fb19468f5ca52588ebea576cd027";
-      hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w=";
-    };
-  };
-in
-stdenv.mkDerivation {
-  pname = "cardboard";
-  version = "unstable-2021-05-10";
-
-  src = allSources.cardboard;
-
-  outputs = [
-    "out"
-    "dev"
-    "lib"
-    "man"
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pandoc
-    pkg-config
-    unzip
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    ffmpeg
-    libGL
-    libX11
-    libcap
-    libdrm
-    libinput
-    libpng
-    libxcb
-    libxkbcommon
-    libgbm
-    pixman
-    wayland
-    wayland-protocols
-    xcbutilerrors
-    xcbutilimage
-    xcbutilwm
-  ];
-
-  postPatch = ''
-    pushd subprojects
-    tar xvf ${allSources.cereal-wrap}
-    unzip ${allSources.cereal-wrapdb}
-    cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name}
-    cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name}
-    popd
-
-    # gcc12
-    sed '1i#include <functional>' -i cardboard/ViewAnimation.h
-  '';
-
-  # "Inherited" from Nixpkgs expression for wlroots
-  mesonFlags = [
-    (lib.mesonBool "man" true)
-    (lib.mesonOption "wlroots:logind-provider" "systemd")
-    (lib.mesonEnable "wlroots:libseat" false)
-  ];
-
-  # gcc12
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ];
-
-  passthru = {
-    providedSessions = [ "cardboard" ];
-  };
-
-  meta = {
-    broken = true; # Upstream is archived, fails to build on gcc-13.
-    homepage = "https://gitlab.com/cardboardwm/cardboard";
-    description = "Scrollable, tiling Wayland compositor inspired on PaperWM";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "cardboard";
-    maintainers = with lib.maintainers; [ ];
-    inherit (wayland.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9be2aa75960a..c8b1d937376c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -580,6 +580,7 @@ mapAliases {
   cask = emacs.pkgs.cask; # Added 2022-11-12
   catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
   canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
+  cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09
   cargo-espflash = espflash; # Added 2024-02-09
   cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25

From 5af281aba71d7ed32a4d3500347a00379f5e2e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 05:53:09 -0700
Subject: [PATCH 47/61] hal-hardware-analyzer: add passthru.updateScript

---
 pkgs/by-name/ha/hal-hardware-analyzer/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
index 418ad47d55ad..081e0b6db4e4 100644
--- a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
+++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
@@ -16,6 +16,7 @@
   spdlog,
   verilator,
   z3,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -95,6 +96,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";
     description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";

From b30033c7593f74ece432d452224d231d05fb36ae Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 28 Sep 2025 18:06:27 -0300
Subject: [PATCH 48/61] bolt-launcher: 0.19.1 -> 0.20.0

---
 pkgs/by-name/bo/bolt-launcher/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index 873898272736..6c7f7e05172c 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -15,6 +15,7 @@
   jdk17,
   pango,
   cairo,
+  pkg-config,
   buildFHSEnv,
   makeDesktopItem,
   copyDesktopItems,
@@ -38,14 +39,14 @@ in
 let
   bolt = stdenv.mkDerivation (finalAttrs: {
     pname = "bolt-launcher";
-    version = "0.19.1";
+    version = "0.20.0";
 
     src = fetchFromGitHub {
       owner = "AdamCake";
       repo = "bolt";
       tag = finalAttrs.version;
       fetchSubmodules = true;
-      hash = "sha256-1BvjKlpUD4gJJOlrc2wsl9Pv2x1TBcejYsGiliMrwao=";
+      hash = "sha256-Gh1xaYAysZshEGzljnEYJuK8Mv4cwSWH1W4rEu2F/0s=";
     };
 
     nativeBuildInputs = [
@@ -54,6 +55,7 @@ let
       luajit
       makeWrapper
       copyDesktopItems
+      pkg-config
     ];
 
     buildInputs = [
@@ -67,7 +69,6 @@ let
     ];
 
     cmakeFlags = [
-      "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
       "-G Ninja"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isAarch64) [

From 03405208054e557b4b2d7741c19327043f08ef01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 13:14:21 +0000
Subject: [PATCH 49/61] s7: 11.5-unstable-2025-09-18 ->
 11.5-unstable-2025-09-27

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 553c4afb5461..577086952b83 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.5-unstable-2025-09-18";
+  version = "11.5-unstable-2025-09-27";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "b1a393a89850ba54423a2360247703b2f51a8dc0";
-    hash = "sha256-+nNryibKZhNQPdExDOAjsJngMdsVauBUzDSB1JcWVlo=";
+    rev = "5e05a6ac2c21e19629018edd6e4c434db7ccefa7";
+    hash = "sha256-rMqWQeqBbHAytybX8w9yBAnlzjUJOSKtnpCVF6Nblrg=";
   };
 
   buildInputs =

From 84c671fc9002316e5bc3c33bfe874681b19b2cee Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 29 Sep 2025 09:32:23 -0400
Subject: [PATCH 50/61] woodpecker: remove adamcstephens as maintainer

---
 .../tools/continuous-integration/woodpecker/common.nix           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 036e7283cd1c..e2c7da621116 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -45,7 +45,6 @@ in
     maintainers = with maintainers; [
       ambroisie
       techknowlogick
-      adamcstephens
     ];
   };
 }

From 95c6ad063d2851b645e6099f9722357a14842a14 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Wed, 4 Jun 2025 17:31:42 +0200
Subject: [PATCH 51/61] openonload: init at 9.0.2

---
 pkgs/by-name/op/openonload/openonload.pc.in |  10 ++
 pkgs/by-name/op/openonload/package.nix      | 158 ++++++++++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 pkgs/by-name/op/openonload/openonload.pc.in
 create mode 100644 pkgs/by-name/op/openonload/package.nix

diff --git a/pkgs/by-name/op/openonload/openonload.pc.in b/pkgs/by-name/op/openonload/openonload.pc.in
new file mode 100644
index 000000000000..61a65e06def4
--- /dev/null
+++ b/pkgs/by-name/op/openonload/openonload.pc.in
@@ -0,0 +1,10 @@
+prefix=@dev@
+includedir=${prefix}/include
+libdir=@lib@/lib
+
+Name: openonload
+Description: OpenOnLoad high performance network stack from Solarflare
+URL: http://www.openonload.org/
+Version: @version@
+Cflags: -isystem${includedir}
+Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@
diff --git a/pkgs/by-name/op/openonload/package.nix b/pkgs/by-name/op/openonload/package.nix
new file mode 100644
index 000000000000..bf01d96a6d9c
--- /dev/null
+++ b/pkgs/by-name/op/openonload/package.nix
@@ -0,0 +1,158 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  coreutils,
+  libpcap,
+  which,
+  libcap,
+  makeWrapper,
+  nix-update-script,
+  perl,
+  libmnl,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openonload";
+  version = "9.0.2";
+
+  src = fetchFromGitHub {
+    owner = "Xilinx-CNS";
+    repo = "onload";
+    rev = "v${version}";
+    hash = "sha256-wyvTtOjD6fwuT2OGGhr10F0Q7hXE97mGREhq7Ns14hw=";
+  };
+
+  nativeBuildInputs = [
+    which
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libcap
+    libpcap
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+    export PATH="$PWD/scripts:$PATH"
+    patchShebangs --build \
+      scripts/ \
+      src/driver/
+    substituteInPlace \
+      scripts/mmaketool \
+      scripts/onload \
+      scripts/onload_build \
+      scripts/onload_install \
+      scripts/shell-fns/fns \
+      scripts/shell-fns/mmake-fns \
+      --replace-fail "/bin/pwd" "${coreutils}/bin/pwd"
+    substituteInPlace \
+      scripts/mmaketool \
+      scripts/onload_install \
+      scripts/sfcaffinity_config \
+      --replace-fail "/bin/ls" "${coreutils}/bin/ls"
+
+    # Disable compiler checks that are disabled for Ubuntu: https://github.com/Xilinx-CNS/onload/blob/713eff9c3a105c51fb062527e01e1663c4e61e28/scripts/mmakebuildtree#L337-L344
+    substituteInPlace scripts/mmakebuildtree \
+    --replace-fail 'W_NO_UNUSED_RESULT=
+    ' ""
+    export W_NO_UNUSED_RESULT=1 W_NO_IGNORED_ATTRIBUTES=1
+
+    # Patch unit tests to be run during check phase
+    substituteInPlace src/tests/onload/{oof,cplane_unit,cplane_sysunit,onload_remote_monitor/internal_tests}/mmake.mk \
+      --replace-fail '/usr/bin/timeout' '${coreutils}/bin/timeout'
+
+    # Honor NIX_BUILD_CORES in onload_build script
+    substituteInPlace scripts/onload_build --replace-fail 'nproc' 'echo "$NIX_BUILD_CORES"'
+    runHook postConfigure
+  '';
+
+  # This only builds the 64 bit libraries, not the kernel module.
+  buildPhase = ''
+    runHook preBuild
+    ./scripts/onload_build --user64
+    runHook postBuild
+  '';
+
+  doCheck = true;
+  nativeCheckInputs = [
+    perl
+  ];
+  checkInputs = [
+    libmnl
+  ];
+  checkPhase = ''
+    runHook preCheck
+    # Build all tests in parallel, the script does it in sequence
+    make -C "$(mmaketool --toppath)/build/$(mmaketool --userbuild)" -j$NIX_BUILD_CORES
+    scripts/run_unit_tests.sh
+    runHook postCheck
+  '';
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    i_prefix=$out scripts/onload_install --nobuild --userfiles --headers \
+      --bindir=/bin \
+      --sbindir=/bin \
+      --usrsbindir=/bin \
+      --libexecdir=/libexec \
+      --includedir=/include \
+      --lib64dir=/lib
+
+    mkdir -p $dev/lib
+    mv -v $out/include $dev
+    mv -v $out/lib/*.a $dev/lib
+    mkdir -p $lib
+    mv -v $out/lib $lib
+
+    substituteInPlace $out/bin/onload --replace-fail "/usr/libexec" "$out/libexec"
+    # This tool looks for libonload.so in environment, point default to the actual library
+    wrapProgram $out/bin/onload \
+      --set-default ONLOAD_PRELOAD $out/lib/libonload.so
+
+    # These scripts assume other binaries from this package are in PATH
+    wrapProgram $out/bin/onload_tcpdump \
+      --prefix PATH : $out/bin
+    wrapProgram $out/bin/orm_webserver \
+      --prefix PATH : $out/bin
+
+    cp -v $(find build/gnu_x86_64/tools -type f -executable -print | grep -v '/debug/' | grep -v '.so$') $out/bin
+    # Capture the test apps for validating performance/host set-up
+    cp -v $(find build/gnu_x86_64/tests/ef_vi -type f -executable -print) $out/bin
+
+    mkdir -p $dev/lib/pkgconfig/
+    export dash_l="-lonload_ext"
+    substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload.pc
+    export dash_l="-l:libonload_ext.a"
+    substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload-static.pc
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    # The test apps have a build directory in RPATH, which patchelf can't
+    # remove by default because the required library libefcp.so is there.
+    # By removing the library, patchelf is unblocked from removing the build
+    # directory from RPATH. This doesn't break the binary because the library
+    # is also available from other RPATH entries.
+    rm -v build/gnu_x86_64/lib/cplane/*.so*
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "OpenOnLoad high performance network stack from Solarflare";
+    homepage = "https://www.openonload.org";
+    license = lib.licenses.gpl2;
+    maintainers = with maintainers; [ YorikSar ];
+    # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 6e101e57444e68eab5a771e9d28a37e387ee3150 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Thu, 12 Jun 2025 14:39:07 +0200
Subject: [PATCH 52/61] tcpdirect: init at 9.0.2.45

---
 pkgs/by-name/tc/tcpdirect/package.nix     | 85 +++++++++++++++++++++++
 pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in | 10 +++
 2 files changed, 95 insertions(+)
 create mode 100644 pkgs/by-name/tc/tcpdirect/package.nix
 create mode 100644 pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in

diff --git a/pkgs/by-name/tc/tcpdirect/package.nix b/pkgs/by-name/tc/tcpdirect/package.nix
new file mode 100644
index 000000000000..ca476ac23bb9
--- /dev/null
+++ b/pkgs/by-name/tc/tcpdirect/package.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libpcap,
+  which,
+  libcap,
+  makeWrapper,
+  nix-update-script,
+  openonload,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tcpdirect";
+  version = "9.0.2.45";
+
+  src = fetchFromGitHub {
+    owner = "Xilinx-CNS";
+    repo = "tcpdirect";
+    rev = "tcpdirect-${version}";
+    hash = "sha256-7VQwep078hXdXE4pqGUe2CLqnPdDuWupcyuC+NCM5Ms=";
+  };
+
+  nativeBuildInputs = [
+    which
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libcap
+    libpcap
+    openonload
+  ];
+
+  enableParallelBuilding = true;
+  makeFlags = [
+    "CITOOLS_LIB=${lib.getDev openonload}/lib/libcitools1.a"
+    "CIUL_LIB=${lib.getDev openonload}/lib/libciul1.a"
+  ];
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin $lib/lib $dev/lib $dev/include
+
+    cp -dv \
+      build/bin/zf_internal/shared/* \
+      build/bin/zf_apps/shared/* \
+      build/bin/zf_stackdump \
+      build/bin/trade_sim/shared/* \
+      $out/bin
+
+    cp -dv build/lib/libonload_zf.so* $lib/lib
+    cp -dv build/lib/libonload_zf_static.a $dev/lib
+    cp -rdv src/include/zf $dev/include
+
+    mkdir -p $dev/lib/pkgconfig
+    export dash_l="-lonload_zf"
+    substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect.pc
+    export dash_l="-l:libonload_zf_static.a"
+    substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect-static.pc
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    # zf_init from libonload_zf dynamically loads libefcp.so from openonload
+    patchelf --add-rpath ${openonload.lib}/lib $lib/lib/libonload_zf.so
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Ultra low latency kernel bypass TCP and UDP implementation for AMD Solarflare network adapters";
+    homepage = "https://www.openonload.org";
+    license = lib.licenses.mit;
+    maintainers = with maintainers; [ YorikSar ];
+    # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in b/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in
new file mode 100644
index 000000000000..061b624cf472
--- /dev/null
+++ b/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in
@@ -0,0 +1,10 @@
+prefix=@dev@
+includedir=${prefix}/include
+libdir=@lib@/lib
+
+Name: tcpdirect
+Description: Low latency, zero-copy TCP and UDP stack for SolarFlare NICs
+URL: http://www.xilinx.com
+Version: @version@
+Cflags: -isystem${includedir}
+Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@

From 3afd6ec50d8c5b77727213db50247058e0c6a71e Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 25 Sep 2025 17:47:45 +0200
Subject: [PATCH 53/61] nextcloud30: drop

---
 doc/release-notes/rl-2511.section.md          |   2 +
 nixos/modules/services/web-apps/nextcloud.nix |   3 +-
 nixos/tests/nextcloud/default.nix             |   1 -
 pkgs/servers/nextcloud/default.nix            |   7 -
 pkgs/servers/nextcloud/packages/30.json       | 472 ------------------
 .../nextcloud/packages/apps/memories.nix      |   3 +-
 .../nextcloud/packages/apps/recognize.nix     |   5 -
 pkgs/top-level/aliases.nix                    |  12 +
 pkgs/top-level/all-packages.nix               |   2 -
 9 files changed, 16 insertions(+), 491 deletions(-)
 delete mode 100644 pkgs/servers/nextcloud/packages/30.json

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index a3189ee14a9e..d142e2494581 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -164,6 +164,8 @@
   of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
   make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.
 
+- `pkgs.nextcloud30` has been removed since it's out of support upstream.
+
 - `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.
 
 - `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 98d829c1a827..36640ea8a953 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -437,7 +437,6 @@ in
       type = lib.types.package;
       description = "Which package to use for the Nextcloud instance.";
       relatedPackages = [
-        "nextcloud30"
         "nextcloud31"
       ];
     };
@@ -549,7 +548,7 @@ in
         Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on
         configuration directives. The above are recommended for a server with 4GiB of RAM.
 
-        It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm)
+        It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#tune-php-fpm)
         and consider customizing the values.
       '';
     };
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index dc0bd933f21d..31e889b58600 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -139,7 +139,6 @@ let
 in
 listToAttrs (
   concatMap genTests [
-    30
     31
   ]
 )
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 002457487b45..da1e25b35abc 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -5,7 +5,6 @@
   nixosTests,
   cacert,
   caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt",
-  nextcloud30Packages,
   nextcloud31Packages,
 }:
 
@@ -58,12 +57,6 @@ let
     };
 in
 {
-  nextcloud30 = generic {
-    version = "30.0.16";
-    hash = "sha256-YjbUrna8REq7U0lLN4AxWheqxUrxtC4+/gzGvRnf8zA=";
-    packages = nextcloud30Packages;
-  };
-
   nextcloud31 = generic {
     version = "31.0.9";
     hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
deleted file mode 100644
index ad2c87ee2d52..000000000000
--- a/pkgs/servers/nextcloud/packages/30.json
+++ /dev/null
@@ -1,472 +0,0 @@
-{
-  "app_api": {
-    "hash": "sha256-Ke0uGO+57JG39OoQdi+xa/w+l9ldhp2ZRy6bzJXv65g=",
-    "url": "https://github.com/cloud-py-api/app_api/releases/download/v3.2.0/app_api-v3.2.0.tar.gz",
-    "version": "3.2.0",
-    "description": "### Boost your Nextcloud with AppAPI and its specially designed applications.\n\n\nThe AppAPI is a project within the Nextcloud ecosystem designed to streamline and enhance the process of\napplication development, deployment, and management.\n\nIt introduces a new methodology that allows developers to create\napplications using a variety of programming languages, not limited to PHP, which was traditionally used in Nextcloud development.\n\n### Bundled App\n\n**Starting with Nextcloud 30.0.1, this application is included in the default Nextcloud package.**\n\n### Support\n\nWe appreciate any support for this project:\n\n- ⭐ Star our work on GitHub\n- ❗ Create an Issue or feature request\n- 💁 Resolve an Issue and create a Pull Request\n- 🧑‍💻 Develop your own application using AppAPI\n\nWe are genuinely excited about the future of the AppAPI project and its potential to transform\nthe way applications are developed and experienced within Nextcloud.\n\nAs we embark on this journey, we warmly invite you - developers, thinkers, creators, and visionaries -\nto join us in shaping a more versatile, stable, and secure app landscape.\n\n*Your insights, suggestions, and contributions are invaluable to us.*",
-    "homepage": "https://github.com/nextcloud/app_api",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "bookmarks": {
-    "hash": "sha256-GorOY1XRGFXnfGV115KlrdRLJ3TpJgWipKZ8cwprzGM=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.2.0/bookmarks-15.2.0.tar.gz",
-    "version": "15.2.0",
-    "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
-    "homepage": "https://github.com/nextcloud/bookmarks",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "calendar": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "collectives": {
-    "hash": "sha256-W/bXZAMpDdFZ1AeBq9RtKEebyq4FQ8uWBn0YSmzQuos=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.1.2/collectives-3.1.2.tar.gz",
-    "version": "3.1.2",
-    "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
-    "homepage": "https://github.com/nextcloud/collectives",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "contacts": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "cookbook": {
-    "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=",
-    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz",
-    "version": "0.11.3",
-    "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
-    "homepage": "https://github.com/nextcloud/cookbook/",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "cospend": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "dav_push": {
-    "hash": "sha256-+Ji6xYFudC5ds4YLJnzZ34v7Ct615CdtkZPyq8iTsdA=",
-    "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v0.0.3/dav_push.tar.gz",
-    "version": "0.0.3",
-    "description": "**This extension is in a very early stage of development. It is for demonstration and testing purposes only. Don't use it on production systems!**\n\nIn proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n          \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "deck": {
-    "hash": "sha256-cB2EaqyaSG+cE+51Q86au0cSl5/VEZeTW2exqajmKBY=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.6/deck-v1.14.6.tar.gz",
-    "version": "1.14.6",
-    "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
-    "homepage": "https://github.com/nextcloud/deck",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "end_to_end_encryption": {
-    "hash": "sha256-ZPVvr84WTiZRobgWeagHCYxpfoVyRQgF8YIbwUoDpWo=",
-    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.16.2/end_to_end_encryption-v1.16.2.tar.gz",
-    "version": "1.16.2",
-    "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption",
-    "homepage": "https://github.com/nextcloud/end_to_end_encryption",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "files_automatedtagging": {
-    "hash": "sha256-eXLTCtdIW/D0nigyYKnHj9iFQNAxWs8F46vivCUgVYs=",
-    "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.20.0/files_automatedtagging-v1.20.0.tar.gz",
-    "version": "1.20.0",
-    "description": "An app for Nextcloud that automatically assigns tags to newly uploaded files based on some conditions.\n\nThe tags can later be used to control retention, file access, automatic script execution and more.\n\n## How it works\nTo define tags, administrators can create and manage a set of rule groups. Each rule group consists of one or more rules combined through operators. Rules can include criteria like file type, size, time and more. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given tags are assigned to the file.",
-    "homepage": "https://github.com/nextcloud/files_automatedtagging",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "files_mindmap": {
-    "hash": "sha256-SRHkK3oaSEBsrQPhjgWy9WSliubYkrOc89lix5O/fZM=",
-    "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.33/files_mindmap-0.0.33.tar.gz",
-    "version": "0.0.33",
-    "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.",
-    "homepage": "https://github.com/ACTom/files_mindmap",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "files_retention": {
-    "hash": "sha256-1Ga6l+k+QWyFxcR65Zf9aCXgIe6uSAwofTcsCvFN530=",
-    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v1.19.1/files_retention-v1.19.1.tar.gz",
-    "version": "1.19.1",
-    "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.",
-    "homepage": "https://github.com/nextcloud/files_retention",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "forms": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "gpoddersync": {
-    "hash": "sha256-PyyqE2mCClEQkW2cg3541VboCDtxKN2lwPRVRE9ewJs=",
-    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.12.0/gpoddersync.tar.gz",
-    "version": "3.12.0",
-    "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod",
-    "homepage": "https://github.com/thrillfall/nextcloud-gpodder",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "groupfolders": {
-    "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"
-    ]
-  },
-  "impersonate": {
-    "hash": "sha256-LGA3m4vubYK9QPdv9E0eQ3R0hTLjuTgNcSAq4sZVUNU=",
-    "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.1/impersonate-v1.17.1.tar.gz",
-    "version": "1.17.1",
-    "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.",
-    "homepage": "https://github.com/nextcloud/impersonate",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "integration_deepl": {
-    "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz",
-    "version": "2.0.0",
-    "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\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/integration_deepl",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "integration_openai": {
-    "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=",
-    "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz",
-    "version": "3.7.1",
-    "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\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/integration_openai",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "integration_paperless": {
-    "hash": "sha256-70goWT+uhdYCLIc68+kYEeWoO0rZMYbVgBcjQ88fKgw=",
-    "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.7/integration_paperless-v1.0.7.tar.gz",
-    "version": "1.0.7",
-    "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "mail": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "maps": {
-    "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz",
-    "version": "1.6.0",
-    "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
-    "homepage": "https://github.com/nextcloud/maps",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "music": {
-    "hash": "sha256-/hlhplGc8IKiKBkOlnF63AhMP++sEoDCUxKmouuEAmw=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.3.0/music_2.3.0_for_nextcloud.tar.gz",
-    "version": "2.3.0",
-    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
-    "homepage": "https://github.com/owncloud/music",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "news": {
-    "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=",
-    "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz",
-    "version": "26.1.0",
-    "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
-    "homepage": "https://github.com/nextcloud/news",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "nextpod": {
-    "hash": "sha256-2IvsEv3teTGITE6ilaN3RHUtNpxDk3iCLEq5sAmJ+Y4=",
-    "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.8/nextpod-nc.tar.gz",
-    "version": "0.7.8",
-    "description": "This Nextcloud app lets you visualize your podcast subscriptions and episode downloads from\n[GPodderSync](https://apps.nextcloud.com/apps/gpoddersync), which acts as a basic gpodder.net\napi to sync podcast consumer apps (podcatchers) like AntennaPod.\n\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
-    "homepage": "https://github.com/pbek/nextcloud-nextpod",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "notes": {
-    "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz",
-    "version": "4.12.3",
-    "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
-    "homepage": "https://github.com/nextcloud/notes",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "oidc_login": {
-    "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=",
-    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz",
-    "version": "3.2.2",
-    "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication",
-    "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "onlyoffice": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "phonetrack": {
-    "hash": "sha256-Le3yvewei8vty8frz66X7ij2H9ju2h4JWdGNf46L9MY=",
-    "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.9.1/phonetrack-0.9.1.tar.gz",
-    "version": "0.9.1",
-    "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\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/phonetrack",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "polls": {
-    "hash": "sha256-ib8fhoShdXaoHGra1erisE19w45D9HJ6KFMDMIcV8IE=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.3.10/polls-v8.3.10.tar.gz",
-    "version": "8.3.10",
-    "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
-    "homepage": "https://github.com/nextcloud/polls",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "previewgenerator": {
-    "hash": "sha256-4enkStAbo4dnMvPtVzOHzgKaeTKmEObBGOfrVAKvACI=",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.10.0/previewgenerator-v5.10.0.tar.gz",
-    "version": "5.10.0",
-    "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
-    "homepage": "https://github.com/nextcloud/previewgenerator",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "qownnotesapi": {
-    "hash": "sha256-zaASURjhqeiz8eYc0HmhYDOF5Z+kIjhggEcJFe96GA8=",
-    "url": "https://github.com/pbek/qownnotesapi/releases/download/v25.8.0/qownnotesapi-nc.tar.gz",
-    "version": "25.8.0",
-    "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!",
-    "homepage": "https://github.com/pbek/qownnotesapi",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "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",
-    "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": [
-      "agpl"
-    ]
-  },
-  "registration": {
-    "hash": "sha256-iskmm8s32Nj65dyhx1ZO/Rg6fPi+usF/O/dYou+Ujjk=",
-    "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.7.0/registration-v2.7.0.tar.gz",
-    "version": "2.7.0",
-    "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically",
-    "homepage": "https://github.com/nextcloud/registration",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "richdocuments": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "sociallogin": {
-    "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz",
-    "version": "6.2.2",
-    "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
-    "homepage": "https://github.com/zorn-v/nextcloud-social-login",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "spreed": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "tables": {
-    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-    "version": "0.9.5",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
-    "homepage": "https://github.com/nextcloud/tables",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "tasks": {
-    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-    "version": "0.16.1",
-    "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
-    "homepage": "https://github.com/nextcloud/tasks/",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "twofactor_admin": {
-    "hash": "sha256-zZvH7xfSooKBG4CKvSuf8D/6KnKEunLa+DRLAkWGoow=",
-    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.8.0/twofactor_admin.tar.gz",
-    "version": "4.8.0",
-    "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "twofactor_webauthn": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "unroundedcorners": {
-    "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=",
-    "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz",
-    "version": "1.1.5",
-    "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.",
-    "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "unsplash": {
-    "hash": "sha256-j0cQem+KLQFxj19DIqK6wqYYDs31V1VfVobH5JZ89RM=",
-    "url": "https://github.com/nextcloud-releases/unsplash/releases/download/v3.1.0/unsplash-v3.1.0.tar.gz",
-    "version": "3.1.0",
-    "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
-    "homepage": "https://github.com/nextcloud/unsplash/",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "uppush": {
-    "hash": "sha256-3QD3gtCfhs9tWrbiiPPV7lYxpzGQhc31unSZukcrvN0=",
-    "url": "https://codeberg.org/NextPush/uppush/archive/2.3.0.tar.gz",
-    "version": "2.3.0",
-    "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org",
-    "homepage": "",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "user_oidc": {
-    "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": [
-      "agpl"
-    ]
-  },
-  "user_saml": {
-    "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz",
-    "version": "7.0.0",
-    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
-    "homepage": "https://github.com/nextcloud/user_saml",
-    "licenses": [
-      "agpl"
-    ]
-  },
-  "whiteboard": {
-    "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": [
-      "agpl"
-    ]
-  }
-}
diff --git a/pkgs/servers/nextcloud/packages/apps/memories.nix b/pkgs/servers/nextcloud/packages/apps/memories.nix
index cfe210a8d2ee..7a3facd503e2 100644
--- a/pkgs/servers/nextcloud/packages/apps/memories.nix
+++ b/pkgs/servers/nextcloud/packages/apps/memories.nix
@@ -12,8 +12,7 @@
 }:
 let
   latestVersionForNc = {
-    "31" = latestVersionForNc."30";
-    "30" = {
+    "31" = {
       version = "7.6.1";
       appHash = "sha256-uRZBTwhdNr3OUw021WvTnEBcLd49EQbVr9bvU97zblc=";
       srcHash = "sha256-eKvdv3ng4YwPmFu7eapYvD8A2cliryAhPf6NDBJjX6c=";
diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index c0deead18dd4..0faecd1c0f50 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -21,11 +21,6 @@ let
       appHash = "sha256-G7SDE72tszifozfT3vNxHW6WmMqQKhrSayQVANQaMbs=";
       modelHash = "sha256-dB4ot/65xisR700kUXg3+Y+SkrpQO4mWrFfp+En0QEE=";
     };
-    "30" = {
-      version = "8.2.1";
-      appHash = "sha256-xSJbfL5HI1bo5KYvk/ssEjSUsWF1hFQkl5MOm/kXYDE=";
-      modelHash = "sha256-O1gh3d0MGQOHUbrIyX3f+R7lGJ7+i8tTmrnfKlczrsk=";
-    };
   };
   currentVersionInfo =
     latestVersionForNc.${ncVersion}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bbbed1b95cf3..65eb66562344 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1760,6 +1760,18 @@ mapAliases {
   nettools = net-tools; # Added 2025-06-11
   newt-go = fosrl-newt; # Added 2025-06-24
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
+  nextcloud30 = throw ''
+    Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
+    by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring
+
+        services.nextcloud.package = pkgs.nextcloud31;
+
+    in your NixOS config.
+
+    WARNING: if you were on Nextcloud 29 you have to upgrade to Nextcloud 30
+    first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
+  ''; # Added 2025-09-25
+  nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
   nextcloud29 = throw ''
     Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d92634cb035..c78906c85670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3639,11 +3639,9 @@ with pkgs;
   libnma-gtk4 = libnma.override { withGtk4 = true; };
 
   inherit (callPackages ../servers/nextcloud { })
-    nextcloud30
     nextcloud31
     ;
 
-  nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
   nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; };
 
   nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };

From 55b224c9f4ca8b36effb31276d33b0e331b16f62 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 29 Sep 2025 14:18:57 +0000
Subject: [PATCH 54/61] nunicode: fix build against CMake >= 4.0

---
 pkgs/by-name/nu/nunicode/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/nu/nunicode/package.nix b/pkgs/by-name/nu/nunicode/package.nix
index 0025372fb2eb..e8afc6c0b768 100644
--- a/pkgs/by-name/nu/nunicode/package.nix
+++ b/pkgs/by-name/nu/nunicode/package.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
   # avoid name-clash on case-insensitive filesystems
   cmakeBuildDir = "build-dir";
 
+  cmakeFlags = [
+    # fix compatibility with CMake (https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html)
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "4.0")
+  ];
+
   doCheck = true;
 
   checkPhase = ''

From 5225cc52e10adeca7d7547c6e93e7f7c9bc99b13 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Mon, 29 Sep 2025 16:18:41 +0200
Subject: [PATCH 55/61] opencode: 0.12.1 -> 0.13.5

https://github.com/sst/opencode/releases/tag/v0.13.2
https://github.com/sst/opencode/releases/tag/v0.13.3
https://github.com/sst/opencode/releases/tag/v0.13.4
https://github.com/sst/opencode/releases/tag/v0.13.5
---
 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 4a46904cf50a..fcab7e363bf6 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.12.1";
+  version = "0.13.5";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZpxHLZIc9bBzPJyvDHMjuaTEzZsHwafoBihKxe8Pr3U=";
+    hash = "sha256-GiByJg4NpllA4N4QGSyWsBNqKqKIdxicIjQpc7mHgEs=";
   };
 
   tui = buildGoModule {

From c7859a8502ca685f4864c786a716bd827a33ab6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 14:23:21 +0000
Subject: [PATCH 56/61] mediamtx: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 55837ab5d8d3..e46f26f28d4e 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGoModule (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-omeaOAhH4adNpA0VXxcZkre3tGZUwHxBrIT85X3D+n0=";
+    hash = "sha256-7RpuDn3pZl/noI0SlP7iL9dMqiPiBPQXOuq2U6FYPnM=";
   };
 
-  vendorHash = "sha256-YSH8cu7+LIsJ3/o2FYBYlnc6adORJdzhCqQVH0252Ec=";
+  vendorHash = "sha256-ZyHOn+n6RYeSd3stkozwJ1prCY7J9oTIxhJsxm/ORn0=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

From 039eddb85d9aeca4140e72c15e884805b4feb8ad Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 23 Sep 2025 21:53:08 +0400
Subject: [PATCH 57/61] civetweb: allow the OS to set the stack size

The default stack size in civetweb is 102400 (see the CMakeLists[1]).

This can lead to stack overflows even in basic usage; Setting this value
to 0 lets the OS choose the stack size instead, which results in a more
suitable value.

[1] https://github.com/civetweb/civetweb/blob/cafd5f8fae3b859b7f8c29feb03ea075c7221497/CMakeLists.txt#L56
---
 pkgs/by-name/ci/civetweb/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 5691d1af3233..7c12e2456849 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -40,6 +40,13 @@ stdenv.mkDerivation rec {
 
     # The civetweb unit tests rely on downloading their fork of libcheck.
     "-DCIVETWEB_BUILD_TESTING=OFF"
+
+    # The default stack size in civetweb is 102400 (see the CMakeLists [1]).
+    # This can lead to stack overflows even in basic usage;
+    # Setting this value to 0 lets the OS choose the stack size instead, which results in a more suitable value.
+    #
+    # [1] https://github.com/civetweb/civetweb/blob/cafd5f8fae3b859b7f8c29feb03ea075c7221497/CMakeLists.txt#L56
+    "-DCIVETWEB_THREAD_STACK_SIZE=0"
   ];
 
   meta = {

From 49c123bdfe036cd7670e01948ab15e9a035fae19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 08:14:23 -0700
Subject: [PATCH 58/61] python3Packages.notobuilder: specify meta.license

see https://github.com/notofonts/notobuilder/issues/37
---
 pkgs/development/python-modules/notobuilder/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix
index c3bb1fce5b5f..7c3c0f6e826d 100644
--- a/pkgs/development/python-modules/notobuilder/default.nix
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage {
   meta = {
     description = "Python module for building Noto fonts";
     homepage = "https://github.com/notofonts/notobuilder";
-    license = lib.licenses.unfree;
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 }

From 7147236c0815ee92fecfc6d549435e1b3b432a56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 15:22:05 +0000
Subject: [PATCH 59/61] jsoncons: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix
index b6b5bc3d30c1..3cf6e3ef99d2 100644
--- a/pkgs/by-name/js/jsoncons/package.nix
+++ b/pkgs/by-name/js/jsoncons/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5uI3AWNfsmgmUU9qnkdLeI1eXwuA2WRqeYG4eUoGdp4=";
+    hash = "sha256-aWJTJiEBpWVvNl3l8MB30NakqXVni+VoalV66Sg2g9M=";
   };
 
   nativeBuildInputs = [ cmake ];

From 5ec8c0b48b7b69627ac1fcb393af4298ca62152b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 27 Jun 2025 18:49:19 -0700
Subject: [PATCH 60/61] python3Packages.livisi: add meta.changelog

---
 pkgs/development/python-modules/livisi/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/livisi/default.nix b/pkgs/development/python-modules/livisi/default.nix
index ac9f5f3d24ad..5b6c514794a9 100644
--- a/pkgs/development/python-modules/livisi/default.nix
+++ b/pkgs/development/python-modules/livisi/default.nix
@@ -21,8 +21,6 @@ buildPythonPackage rec {
     hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc=";
   };
 
-  pythonRelaxDeps = [ "colorlog" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -38,6 +36,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/planbnet/livisi/releases/tag/${src.tag}";
     description = "Connection library for the abandoned Livisi Smart Home system";
     homepage = "https://github.com/planbnet/livisi";
     license = lib.licenses.asl20;

From 1b5c7095b8916b777a6f78af0ae575f77613de3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 09:49:15 -0700
Subject: [PATCH 61/61] picoscope: fix eval without aliases

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

diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix
index 9841f081e969..d1c04fda0f14 100644
--- a/pkgs/by-name/pi/picoscope/package.nix
+++ b/pkgs/by-name/pi/picoscope/package.nix
@@ -16,7 +16,7 @@
   patchelf,
   stdenv,
   systemdMinimal,
-  tbb,
+  onetbb,
   writeTextDir,
 }:
 
@@ -36,7 +36,7 @@ let
     openssl
     stdenv.cc.cc.lib
     systemdMinimal
-    tbb
+    onetbb
   ];
 
   gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache";