From 65bcc82e40abda9c0a0f36f0a80bb364b53a5fc6 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 27 Apr 2025 18:55:42 +0200
Subject: [PATCH 01/95] augeas: disable parallel building

Hydra uses -j2 and was not affected.
---
 pkgs/by-name/au/augeas/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix
index 7c735901a4d9..7f1dc2d14381 100644
--- a/pkgs/by-name/au/augeas/package.nix
+++ b/pkgs/by-name/au/augeas/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
-  enableParallelBuilding = true;
+  # Makefile doesn't specify dependencies on parser.h correctly
+  enableParallelBuilding = false;
 
   doCheck = true;
 

From 65354842895b3f051377ee142e79989e8c9259e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 14:07:11 +0000
Subject: [PATCH 02/95] hypseus-singe: 2.11.4 -> 2.11.5

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

diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix
index ae4e63657fbe..5def65d686ab 100644
--- a/pkgs/by-name/hy/hypseus-singe/package.nix
+++ b/pkgs/by-name/hy/hypseus-singe/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hypseus-singe";
-  version = "2.11.4";
+  version = "2.11.5";
 
   src = fetchFromGitHub {
     owner = "DirtBagXon";
     repo = "hypseus-singe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-04WC0fO/eNUz4muwDAbjDy5AA53QPpX5dq5Xgt8qeBI=";
+    hash = "sha256-K/U/cx1y8mbC81qYNHz+AqT/hsc108NCHo0MoDhQqvs=";
   };
 
   patches = [ ./use-shared-mpeg2.patch ];

From f5c221fe72d34320c2b14381ec009d5c0e4ae27b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 29 Apr 2025 19:22:49 +0200
Subject: [PATCH 03/95] dnsdist: 1.9.8 -> 1.9.9

Fixes CVE-2025-30194.

https://www.dnsdist.org/changelog.html#change-1.9.9
---
 pkgs/by-name/dn/dnsdist/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix
index 48e9c8e01602..044865599ada 100644
--- a/pkgs/by-name/dn/dnsdist/package.nix
+++ b/pkgs/by-name/dn/dnsdist/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dnsdist";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
-    hash = "sha256-9mT3Opao1zQ9MmlqzLcP2LHtQyjXPNsKYnpWHW4v2Z4=";
+    hash = "sha256-6GvGNtTS3IusGA7Iza+/5fNSKbYAXsFddRD7b1i0n1o=";
   };
 
   patches = [

From f945f947f7b97c53afd1bcaa0e5231c564bf3313 Mon Sep 17 00:00:00 2001
From: skittishdev <42278215+skittishdev@users.noreply.github.com>
Date: Thu, 1 May 2025 11:58:56 -0700
Subject: [PATCH 04/95] Update rbtools to the latest version 5.2.1

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

diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index bbab71ec70bb..9b244c769e03 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "rbtools";
-  version = "1.0.2";
+  version = "5.2.1";
   format = "setuptools";
 
   disabled = !isPy3k;
 
   src = fetchurl {
     url = "https://downloads.reviewboard.org/releases/RBTools/${lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
-    sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4";
+    sha256 = "f2863515ef6ff1cfcd3905d5f409ab8c4d12878b364d6f805ba848dcaecb97f2";
   };
 
   propagatedBuildInputs = [

From 09c550b09b3a2d0daf68b275a422bdda5e0c2578 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 May 2025 02:09:47 +0000
Subject: [PATCH 05/95] photoqt: 4.9 -> 4.9.1

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

diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix
index 7230ffc83cd3..972c9a19424b 100644
--- a/pkgs/by-name/ph/photoqt/package.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "photoqt";
-  version = "4.9";
+  version = "4.9.1";
 
   src = fetchurl {
     url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    hash = "sha256-Kd8h6JFJ02JH+IKMltvKT/mgnhz9jOJAFXMnNmI1BYA=";
+    hash = "sha256-dAqAM9zsFWPiGF7njhy7SM6f/5S19jMyTv57JadgHu8=";
   };
 
   nativeBuildInputs = [

From c39549ebfe35441a40633548bb22b7da8872c6b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 20:24:55 +0000
Subject: [PATCH 06/95] librechat: 0.7.7 -> 0.7.8

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

diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index 05fec51cc6d8..ba5b361880a9 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -10,13 +10,13 @@
 
 buildNpmPackage rec {
   pname = "librechat";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "danny-avila";
     repo = "LibreChat";
     tag = "v${version}";
-    hash = "sha256-U0yIoJt7wE4a7WbryN7hheLRFTRVol5qawIrmKte41M=";
+    hash = "sha256-bo26EzpRjE2hbbx6oUo0tDsLMdVpWcazCIzA5sm5L34=";
   };
 
   patches = [
@@ -37,7 +37,7 @@ buildNpmPackage rec {
     ./0003-upload-paths.patch
   ];
 
-  npmDepsHash = "sha256-r06Hcdxa7pYMqIvNWP4VclJ4woiPd9kJxEmQO88i8J8=";
+  npmDepsHash = "sha256-knmS2I6AiSdV2bSnNBThbVHdkpk6iXiRuk4adciDK1M=";
 
   nativeBuildInputs = [
     pkg-config

From 18e2327aa788d7885d65769ec5b566fdbe434f73 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 16:00:18 +0200
Subject: [PATCH 07/95] Revert "nixos/lib/testing: avoid generating darwin VM
 tests"

This reverts commit 72155225aa62c6ac9bc67a1253079f140045511f.
---
 nixos/lib/testing/default.nix | 16 +++++++---------
 nixos/lib/testing/meta.nix    |  4 +---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/nixos/lib/testing/default.nix b/nixos/lib/testing/default.nix
index 7d511619e32d..7fdd454c22b8 100644
--- a/nixos/lib/testing/default.nix
+++ b/nixos/lib/testing/default.nix
@@ -9,15 +9,13 @@ let
     };
   runTest =
     module:
-    # Infra issue: virtualization on darwin doesn't seem to work yet.
-    lib.addMetaAttrs { hydraPlatforms = lib.platforms.linux; }
-      (evalTest (
-        { config, ... }:
-        {
-          imports = [ module ];
-          result = config.test;
-        }
-      )).config.result;
+    (evalTest (
+      { config, ... }:
+      {
+        imports = [ module ];
+        result = config.test;
+      }
+    )).config.result;
 
   testModules = [
     ./call-test.nix
diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix
index 6c6cfc49f141..0a4c89ed4b06 100644
--- a/nixos/lib/testing/meta.nix
+++ b/nixos/lib/testing/meta.nix
@@ -36,9 +36,7 @@ in
           };
           platforms = lib.mkOption {
             type = types.listOf types.raw;
-            # darwin could be added, but it would add VM tests that don't work on Hydra.nixos.org (so far)
-            # see https://github.com/NixOS/nixpkgs/pull/303597#issuecomment-2128782362
-            default = lib.platforms.linux;
+            default = lib.platforms.linux ++ lib.platforms.darwin;
             description = ''
               Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
             '';

From 51d915e451bf889b4d16a1502fa3f6b653f71959 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 16:11:14 +0200
Subject: [PATCH 08/95] nixos/testing: Add meta.hydraPlatforms

---
 nixos/doc/manual/redirects.json |  3 ++
 nixos/lib/testing/meta.nix      | 75 +++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 2c9b0242e9e8..b828c0d2913d 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1865,6 +1865,9 @@
   "test-opt-meta.platforms": [
     "index.html#test-opt-meta.platforms"
   ],
+  "test-opt-meta.hydraPlatforms": [
+    "index.html#test-opt-meta.hydraPlatforms"
+  ],
   "test-opt-meta.timeout": [
     "index.html#test-opt-meta.timeout"
   ],
diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix
index 0a4c89ed4b06..d5c6de3e1e5c 100644
--- a/nixos/lib/testing/meta.nix
+++ b/nixos/lib/testing/meta.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 let
-  inherit (lib) types mkOption;
+  inherit (lib) types mkOption literalExpression;
 in
 {
   options = {
@@ -11,38 +11,49 @@ in
         Not all [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are supported, but more can be added as desired.
       '';
       apply = lib.filterAttrs (k: v: v != null);
-      type = types.submodule {
-        options = {
-          maintainers = lib.mkOption {
-            type = types.listOf types.raw;
-            default = [ ];
-            description = ''
-              The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
-            '';
+      type = types.submodule (
+        { config, ... }:
+        {
+          options = {
+            maintainers = lib.mkOption {
+              type = types.listOf types.raw;
+              default = [ ];
+              description = ''
+                The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
+              '';
+            };
+            timeout = lib.mkOption {
+              type = types.nullOr types.int;
+              default = 3600; # 1 hour
+              description = ''
+                The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
+              '';
+            };
+            broken = lib.mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
+            platforms = lib.mkOption {
+              type = types.listOf types.raw;
+              default = lib.platforms.linux ++ lib.platforms.darwin;
+              description = ''
+                Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
+            hydraPlatforms = lib.mkOption {
+              type = types.listOf types.raw;
+              default = config.platforms;
+              defaultText = literalExpression "meta.platforms";
+              description = ''
+                Sets the [`meta.hydraPlatforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-hydraPlatforms) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
           };
-          timeout = lib.mkOption {
-            type = types.nullOr types.int;
-            default = 3600; # 1 hour
-            description = ''
-              The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
-            '';
-          };
-          broken = lib.mkOption {
-            type = types.bool;
-            default = false;
-            description = ''
-              Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
-            '';
-          };
-          platforms = lib.mkOption {
-            type = types.listOf types.raw;
-            default = lib.platforms.linux ++ lib.platforms.darwin;
-            description = ''
-              Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
-            '';
-          };
-        };
-      };
+        }
+      );
       default = { };
     };
   };

From 8c9fc4a76c2b4300cf83fde1c50407865ae5a2de Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 16:03:40 +0200
Subject: [PATCH 09/95] nixos/all-tests: Set hydraPlatforms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This only sets hydraPlatforms for the in-tree tests.
See the preceding revert commit which reverts the previous solution.

Co-Authored-By: Vladimír Čunát <v@cunat.cz>
---
 nixos/tests/all-tests.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 22058134ecb2..4d7fc2ab0d53 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -90,12 +90,22 @@ let
 
   inherit
     (rec {
+
+      metaModule = {
+        _file = "${__curPos.file}##metaModule";
+        meta = {
+          # Infra issue: virtualization on darwin doesn't seem to work yet.
+          hydraPlatforms = platforms.linux;
+        };
+      };
+
       doRunTest =
         arg:
         ((import ../lib/testing-python.nix { inherit system pkgs; }).evalTest {
           imports = [
             arg
             readOnlyPkgs
+            metaModule
           ];
         }).config.result;
       findTests =

From 0433bf6a907a7ab77478ea7431af4ee29e47b695 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 16:17:17 +0200
Subject: [PATCH 10/95] nixos/testing/meta.nix: lib.mkOption -> mkOption

---
 nixos/lib/testing/meta.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix
index d5c6de3e1e5c..b1c59f325cd9 100644
--- a/nixos/lib/testing/meta.nix
+++ b/nixos/lib/testing/meta.nix
@@ -4,7 +4,7 @@ let
 in
 {
   options = {
-    meta = lib.mkOption {
+    meta = mkOption {
       description = ''
         The [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes that will be set on the returned derivations.
 
@@ -15,35 +15,35 @@ in
         { config, ... }:
         {
           options = {
-            maintainers = lib.mkOption {
+            maintainers = mkOption {
               type = types.listOf types.raw;
               default = [ ];
               description = ''
                 The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
               '';
             };
-            timeout = lib.mkOption {
+            timeout = mkOption {
               type = types.nullOr types.int;
               default = 3600; # 1 hour
               description = ''
                 The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
               '';
             };
-            broken = lib.mkOption {
+            broken = mkOption {
               type = types.bool;
               default = false;
               description = ''
                 Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
               '';
             };
-            platforms = lib.mkOption {
+            platforms = mkOption {
               type = types.listOf types.raw;
               default = lib.platforms.linux ++ lib.platforms.darwin;
               description = ''
                 Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
               '';
             };
-            hydraPlatforms = lib.mkOption {
+            hydraPlatforms = mkOption {
               type = types.listOf types.raw;
               default = config.platforms;
               defaultText = literalExpression "meta.platforms";

From ee83bfa8790131651994d77fc28b10d7f761c8d2 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 19:25:21 +0200
Subject: [PATCH 11/95] nixos/testing: Drop darwin from default hydraPlatforms

Litmus test: the following attribute disappears

    nix eval -f pkgs/top-level/release.nix tests.testers.nixosTest-example.x86_64-darwin.outPath
---
 nixos/lib/testing/meta.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix
index b1c59f325cd9..1e8f37cf9b51 100644
--- a/nixos/lib/testing/meta.nix
+++ b/nixos/lib/testing/meta.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 let
-  inherit (lib) types mkOption literalExpression;
+  inherit (lib) types mkOption literalMD;
 in
 {
   options = {
@@ -45,8 +45,10 @@ in
             };
             hydraPlatforms = mkOption {
               type = types.listOf types.raw;
-              default = config.platforms;
-              defaultText = literalExpression "meta.platforms";
+              # Ideally this would default to `platforms` again:
+              # default = config.platforms;
+              default = lib.platforms.linux;
+              defaultText = literalMD "`lib.platforms.linux` only, as the `hydra.nixos.org` build farm does not currently support virtualisation on Darwin.";
               description = ''
                 Sets the [`meta.hydraPlatforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-hydraPlatforms) attribute on the [{option}`test`](#test-opt-test) derivation.
               '';

From a8dedd3d97e85d66c577b2f7c1eae34977b4c887 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 19:27:26 +0200
Subject: [PATCH 12/95] nixos/all-tests: Rely on general hydraPlatforms
 override

It is documented to be about `hydra.nixos.org`, so this is actually
acceptable.
If your own hydra can do it, you may set `meta.hydraPlatforms` in
your tests if you want that. (e.g. set it in a common module that's
imported in all your tests)
---
 nixos/tests/all-tests.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 4d7fc2ab0d53..22058134ecb2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -90,22 +90,12 @@ let
 
   inherit
     (rec {
-
-      metaModule = {
-        _file = "${__curPos.file}##metaModule";
-        meta = {
-          # Infra issue: virtualization on darwin doesn't seem to work yet.
-          hydraPlatforms = platforms.linux;
-        };
-      };
-
       doRunTest =
         arg:
         ((import ../lib/testing-python.nix { inherit system pkgs; }).evalTest {
           imports = [
             arg
             readOnlyPkgs
-            metaModule
           ];
         }).config.result;
       findTests =

From 89f79ced4799799ec9d66442dd1ed38aa83e7bd7 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 7 May 2025 10:03:56 -0300
Subject: [PATCH 13/95] anubis: split xess derivation into a separate package

Unfortunately, because the Xess file needs to be pre-processed and
consumed by the final derivation, it couldn't be overridden if it was
written in-line. This commit splits it into a separate `anubis-xess`
package that can be overridden/overlayed.

This also adds myself as a maintainer for Anubis, and removes the
`nix-update-script` call, since it was never necessary (because Anubis
is hosted on GitHub), stopped working after e049c438a985eca2c9e2c6bf35fd6e3ea8b655ac,
and it certainly won't work now. It also corrects the homepage URL.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/an/anubis-xess/package.nix | 35 +++++++++++++++++++++
 pkgs/by-name/an/anubis/package.nix      | 42 ++++++-------------------
 2 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/by-name/an/anubis-xess/package.nix

diff --git a/pkgs/by-name/an/anubis-xess/package.nix b/pkgs/by-name/an/anubis-xess/package.nix
new file mode 100644
index 000000000000..0b6a83cbaf2a
--- /dev/null
+++ b/pkgs/by-name/an/anubis-xess/package.nix
@@ -0,0 +1,35 @@
+{ buildNpmPackage, anubis }:
+
+buildNpmPackage {
+  pname = "${anubis.pname}-xess";
+  inherit (anubis) version src;
+
+  npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
+
+  buildPhase = ''
+    runHook preBuild
+
+    npx postcss ./xess/xess.css -o xess.min.css
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 xess.min.css $out/xess.min.css
+
+    runHook postInstall
+  '';
+
+  meta = anubis.meta // {
+    description = "Xess files for Anubis";
+    longDescription = ''
+      This package is consumed by the main `anubis` package to render the final
+      styling for the bot check page.
+
+      **It is not supposed to be used as a standalone package**, and it exists to
+      ensure Anubis' styling is override-able by downstreams.
+    '';
+  };
+}
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 1fa977e1131a..39393f755aaa 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -1,50 +1,28 @@
 {
   lib,
   buildGoModule,
-  buildNpmPackage,
   fetchFromGitHub,
-  nix-update-script,
   nixosTests,
   stdenv,
 
+  anubis-xess,
+
   esbuild,
   brotli,
   zstd,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "anubis";
   version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg=";
   };
 
-  anubisXess = buildNpmPackage {
-    inherit version src;
-    pname = "${pname}-xess";
-
-    npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
-
-    buildPhase = ''
-      runHook preBuild
-      npx postcss ./xess/xess.css -o xess.min.css
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out
-      cp xess.min.css $out
-      runHook postInstall
-    '';
-  };
-in
-buildGoModule (finalAttrs: {
-  inherit pname version src;
-
   vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg=";
 
   nativeBuildInputs = [
@@ -72,27 +50,25 @@ buildGoModule (finalAttrs: {
   '';
 
   preBuild = ''
-    go generate ./... && ./web/build.sh && cp -r ${anubisXess}/xess.min.css ./xess
+    go generate ./... && ./web/build.sh && cp -r ${anubis-xess}/xess.min.css ./xess
   '';
 
   preCheck = ''
     export DONT_USE_NETWORK=1
   '';
 
-  passthru = {
-    tests = { inherit (nixosTests) anubis; };
-    updateScript = nix-update-script { };
-  };
+  passthru.tests = { inherit (nixosTests) anubis; };
 
   meta = {
     description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers";
-    homepage = "https://github.com/TecharoHQ/anubis/";
+    homepage = "https://anubis.techaro.lol/";
     changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       knightpp
       soopyc
       ryand56
+      sigmasquadron
     ];
     mainProgram = "anubis";
   };

From 8578bd1117976ecdeffc678b81a75f7716db7488 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 11 May 2025 10:01:18 +0200
Subject: [PATCH 14/95] nixos/headscale: fix `derp.auto_update_enabled` option

The options part of "services.headscale.settings" get rendered directly
into a JSON file. As such, any declared values need to match the actual
config key that upstream uses or they are ineffective.

One such key is "derp.auto_update_enable", which controls whether or not
auto-updates for the DERP map are enabled. This key is misspellt though:
the config is called "derp.auto_update_enabled", and that has always
been the case since the config has been introduced in 57f46ded (Split
derp into its own config struct, 2021-10-22). Any unknown key is simply
ignored by Headscale, and as such the setting is ineffective.

Fix this by renaming the option.
---
 nixos/modules/services/networking/headscale.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index bd17f005f69b..2d738c480787 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -164,7 +164,7 @@ in
                 '';
               };
 
-              auto_update_enable = lib.mkOption {
+              auto_update_enabled = lib.mkOption {
                 type = lib.types.bool;
                 default = true;
                 description = ''
@@ -493,7 +493,11 @@ in
   imports = with lib; [
     (mkRenamedOptionModule
       [ "services" "headscale" "derp" "autoUpdate" ]
-      [ "services" "headscale" "settings" "derp" "auto_update_enable" ]
+      [ "services" "headscale" "settings" "derp" "auto_update_enabled" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "headscale" "derp" "auto_update_enable" ]
+      [ "services" "headscale" "settings" "derp" "auto_update_enabled" ]
     )
     (mkRenamedOptionModule
       [ "services" "headscale" "derp" "paths" ]

From c29710d4ad60296481c0702da4790a2250f2a7ed Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 12 May 2025 14:09:17 -0300
Subject: [PATCH 15/95] xen: patch with XSA-469

Researchers at VU Amsterdam have released Training Solo, detailing
several speculative attacks which bypass current protections.

One issue, which Intel has named Indirect Target Selection, is a bug in
the hardware support for prediction-domain isolation.  The mitigation
for this involves both microcode and software changes in Xen.

For more details, see:
1.  https://vusec.net/projects/training-solo
2.  https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html

Another issue discussed in the Training Solo paper pertains to
classic-BPF.  Xen does not have any capability similar to BPF filters,
so is not believed to be affected by this issue.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 8383d175ad1a..e5fffebe293b 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -16,6 +16,34 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
       hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
     })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
+      hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch";
+      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch";
+      hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch";
+      hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch";
+      hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch";
+      hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
+      hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
+    })
   ];
   rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
   hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";

From c0e793cd19b1f046b8e546f386db95913d429ea1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 05:17:39 +0800
Subject: [PATCH 16/95] nwg-hello: 0.3.1 -> 0.4.0

Diff: https://github.com/nwg-piotr/nwg-hello/compare/refs/tags/v0.3.1...refs/tags/v0.4.0

Changelog: https://github.com/nwg-piotr/nwg-hello/releases/tag/v0.4.0
---
 pkgs/by-name/nw/nwg-hello/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix
index 555699bd1c97..a99cc11c4be5 100644
--- a/pkgs/by-name/nw/nwg-hello/package.nix
+++ b/pkgs/by-name/nw/nwg-hello/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-hello";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-hello";
     tag = "v${version}";
-    hash = "sha256-ZqZikkwV3UVA0e9VCFHjXAAIegvz3I6CNURZSP4owmU=";
+    hash = "sha256-yevcHctVnUWuPsdB+KN+Uuxg+iGdzP7WOOTMUvVmuEY=";
   };
 
   nativeBuildInputs = [
@@ -39,15 +39,15 @@ python3Packages.buildPythonApplication rec {
   postPatch = ''
     # hard coded paths
     substituteInPlace nwg_hello/main.py \
-      --replace '/etc/nwg-hello' "$out/etc/nwg-hello" \
-      --replace "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \
-      --replace "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions"
+      --replace-fail '/etc/nwg-hello' "$out/etc/nwg-hello" \
+      --replace-fail "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \
+      --replace-fail "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions"
 
     substituteInPlace nwg-hello-default.json \
-      --replace "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \
-      --replace "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions"
+      --replace-fail "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \
+      --replace-fail "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions"
 
-    substituteInPlace nwg_hello/ui.py --replace '/usr/share/nwg-hello' "$out/share/nwg-hello"
+    substituteInPlace nwg_hello/ui.py --replace-fail '/usr/share/nwg-hello' "$out/share/nwg-hello"
   '';
 
   postInstall = ''

From 809f76d0821d274c0dda8a133b6eb9f9fec3df6e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 05:21:13 +0800
Subject: [PATCH 17/95] flutter332: 3.32.0-0.3.pre -> 3.32.0-0.4.pre

---
 .../compilers/flutter/versions/3_32/data.json | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
index 4b043c476356..42781fe3577d 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -1,73 +1,73 @@
 {
-  "version": "3.32.0-0.3.pre",
-  "engineVersion": "453dd7174cc6555e3e9eb5f006c86e6ec221a0d2",
+  "version": "3.32.0-0.4.pre",
+  "engineVersion": "38e19d01dcac654bbb941b771cc06efd4ed4a93f",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "beta",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A=",
-      "x86_64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A="
+      "aarch64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q=",
+      "x86_64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE=",
-      "x86_64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE="
+      "aarch64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA=",
+      "x86_64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA="
     }
   },
-  "dartVersion": "3.8.0-278.2.beta",
+  "dartVersion": "3.8.0-278.4.beta",
   "dartHash": {
-    "x86_64-linux": "sha256-ux89ySr218exFOhscGhumXC1Eizdk6hvpWwxPTJDAFo=",
-    "aarch64-linux": "sha256-Ggc7HOytWwqimOKFUu4+CKtz0L4F09/fXY5BkeS/HAw=",
-    "x86_64-darwin": "sha256-etOXUGIDL4n7PmuH+g74ByXuuWjJ8JnT4iwGm4rPXYQ=",
-    "aarch64-darwin": "sha256-+7Eewv0x+V6gDqyfj5/z50whBU8NrvdidOWPPeaEAwE="
+    "x86_64-linux": "sha256-jyLGethyv9KGGV9IjlXnSno6oJTwUFpR8wsgVbT+UTY=",
+    "aarch64-linux": "sha256-NEYfdqLA5+Po9fI0YfAbsXPMgaEkhkDfm2XHOROU4MM=",
+    "x86_64-darwin": "sha256-09AvWYmW2LHaUe2hTv/EVGwjY6GTCV7reiqUVQKDkrM=",
+    "aarch64-darwin": "sha256-IwJJGFW+hdt7Yb86DdGxWjiEp0XJnLJUzqJvKrN9iTs="
   },
-  "flutterHash": "sha256-FqJR0PQYks2njzMgZCQSQqy2Goqp6QeN8Ej4a4EHVes=",
+  "flutterHash": "sha256-+UQNtN0BrSxEwGdnb9f63Bg46q+zKwqStYBKgIB/hic=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=",
-      "aarch64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw=",
-      "x86_64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=",
-      "x86_64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw="
+      "aarch64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
+      "aarch64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE=",
+      "x86_64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
+      "x86_64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
-      "aarch64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
-      "x86_64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
-      "x86_64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk="
+      "aarch64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
+      "aarch64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
+      "x86_64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
+      "x86_64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc="
     },
     "ios": {
-      "aarch64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
-      "aarch64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
-      "x86_64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
-      "x86_64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY="
+      "aarch64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
+      "aarch64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
+      "x86_64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
+      "x86_64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU="
     },
     "linux": {
-      "aarch64-darwin": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=",
-      "aarch64-linux": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=",
-      "x86_64-darwin": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo=",
-      "x86_64-linux": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo="
+      "aarch64-darwin": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
+      "aarch64-linux": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
+      "x86_64-darwin": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU=",
+      "x86_64-linux": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU="
     },
     "macos": {
-      "aarch64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
-      "aarch64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
-      "x86_64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
-      "x86_64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs="
+      "aarch64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
+      "aarch64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
+      "x86_64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
+      "x86_64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI="
     },
     "universal": {
-      "aarch64-darwin": "sha256-dIpU21J5zVQCQJWRINXleC7b480IHY5/8KZzBCi9TVc=",
-      "aarch64-linux": "sha256-/O/eAYa6KZwXG/w3sN2Egla+xBMqJ8hFAQktQjcVHxo=",
-      "x86_64-darwin": "sha256-9+I7GjB2ZX6gZsmxij1XB+iA0VYjoKJt4NFK22ooYes=",
-      "x86_64-linux": "sha256-ApqDXK7BVUDJY612PNn2SqX8fvHESYGv5pl0814+uzs="
+      "aarch64-darwin": "sha256-EocA/pXkEw7fe0fdDkC/WDk5JAVlwTJybNAQDw0/wO4=",
+      "aarch64-linux": "sha256-yIwNmd0DVsLsEUH1+W4AeJXf9l/WIC8HLbHooIZdqk0=",
+      "x86_64-darwin": "sha256-5Y5gRLoCzTYuP4JXf9APKbHXl+khuzleQIxNiWyVjbM=",
+      "x86_64-linux": "sha256-jqe3Z4caAe890CeJST9pAjgunGJsqnycGFqNvn8XNAI="
     },
     "web": {
-      "aarch64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
-      "aarch64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
-      "x86_64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
-      "x86_64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU="
+      "aarch64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
+      "aarch64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
+      "x86_64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
+      "x86_64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA="
     },
     "windows": {
-      "x86_64-darwin": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ=",
-      "x86_64-linux": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ="
+      "x86_64-darwin": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg=",
+      "x86_64-linux": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg="
     }
   },
   "pubspecLock": {

From 09d94451cadc3bc38b0771b0f9ea834e57483f66 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 05:26:12 +0800
Subject: [PATCH 18/95] flutter332, flutter329: add patch

---
 pkgs/development/compilers/flutter/default.nix        |  1 +
 .../3_29/patches/gradle-flutter-tools-wrapper.patch   | 11 +++++++++++
 .../3_32/patches/gradle-flutter-tools-wrapper.patch   | 11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index ba42bc3f78ac..a9ce1c6939aa 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -87,6 +87,7 @@ let
                 chmod +w $out/bin
                 mkdir $out/bin/cache
                 cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
+                touch $out/bin/cache/engine.realm
               '')
             else
               source
diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
index de6080efbba8..b579b4b42f8e 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch
@@ -42,3 +42,14 @@ index 0000000000..b2485c94b4
 +"""
 +
 +includeBuild(dir)
+--- a/packages/flutter_tools/gradle/build.gradle.kts
++++ b/packages/flutter_tools/gradle/build.gradle.kts
+@@ -4,6 +4,8 @@
+ 
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+ 
++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
++
+ plugins {
+     `java-gradle-plugin`
+     groovy
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
index de6080efbba8..b579b4b42f8e 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
@@ -42,3 +42,14 @@ index 0000000000..b2485c94b4
 +"""
 +
 +includeBuild(dir)
+--- a/packages/flutter_tools/gradle/build.gradle.kts
++++ b/packages/flutter_tools/gradle/build.gradle.kts
+@@ -4,6 +4,8 @@
+ 
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+ 
++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
++
+ plugins {
+     `java-gradle-plugin`
+     groovy

From 0dc8d85b12de05454054e4da1d442d65f083fccc Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 07:47:32 +0800
Subject: [PATCH 19/95] gui-for-singbox: 1.9.6 -> 1.9.7

---
 pkgs/by-name/gu/gui-for-singbox/bridge.patch | 42 ++++++++------------
 pkgs/by-name/gu/gui-for-singbox/package.nix  | 18 ++++-----
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/gu/gui-for-singbox/bridge.patch b/pkgs/by-name/gu/gui-for-singbox/bridge.patch
index e31a6d9c7512..f62c34aa0289 100644
--- a/pkgs/by-name/gu/gui-for-singbox/bridge.patch
+++ b/pkgs/by-name/gu/gui-for-singbox/bridge.patch
@@ -1,39 +1,31 @@
---- a/bridge/bridge.go	2024-12-25 20:53:45.504021585 +0000
-+++ b/bridge/bridge.go	2024-12-25 21:02:20.318422528 +0000
-@@ -38,11 +38,6 @@
- 
- func InitBridge(fs embed.FS) {
- 	// step1: Set Env
+--- a/bridge/bridge.go	2025-05-13 07:36:58.578038227 +0000
++++ b/bridge/bridge.go	2025-05-13 07:39:01.667180229 +0000
+@@ -41,13 +41,13 @@
+ }
+
+ func CreateApp(fs embed.FS) *App {
 -	exePath, err := os.Executable()
 -	if err != nil {
 -		panic(err)
--	}
--
- 	for _, v := range os.Args {
- 		if v == "tasksch" {
- 			Env.FromTaskSch = true
-@@ -50,8 +45,13 @@
- 		}
- 	}
- 
--	Env.BasePath = filepath.Dir(exePath)
--	Env.AppName = filepath.Base(exePath)
 +	Env.AppName = "GUI.for.SingBox"
 +	xdgDataHome := os.Getenv("XDG_DATA_HOME")
 +	if xdgDataHome == "" {
 +		homeDir, _ := os.UserHomeDir()
 +		xdgDataHome = filepath.Join(homeDir, ".local", "share")
-+	}
+ 	}
+-
+-	Env.BasePath = filepath.Dir(exePath)
+-	Env.AppName = filepath.Base(exePath)
 +	Env.BasePath = filepath.Join(xdgDataHome, Env.AppName)
- 
- 	// step2: Create a persistent data symlink
- 	if Env.OS == "darwin" {
-@@ -128,7 +128,7 @@
+
+ 	if slices.Contains(os.Args, "tasksch") {
+ 		Env.FromTaskSch = true
+@@ -76,7 +76,7 @@
  }
- 
+
  func (a *App) RestartApp() FlagResult {
 -	exePath := Env.BasePath + "/" + Env.AppName
 +	exePath := "@basepath@/bin" + "/" + Env.AppName
- 
+
  	cmd := exec.Command(exePath)
- 	HideExecWindow(cmd)
+ 	SetCmdWindowHidden(cmd)
\ No newline at end of file
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index 8c5c2557367d..a7480d64ee4e 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -1,10 +1,10 @@
 {
+  lib,
   stdenv,
   nodejs,
   pnpm_9,
   fetchFromGitHub,
   buildGoModule,
-  lib,
   wails,
   webkitgtk_4_0,
   pkg-config,
@@ -17,13 +17,13 @@
 
 let
   pname = "gui-for-singbox";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "GUI-for-Cores";
     repo = "GUI.for.SingBox";
     tag = "v${version}";
-    hash = "sha256-qmYZWLzGAjUlbORhr67KqhTTeOxskAb7/HO+pPZ6uQE=";
+    hash = "sha256-2wmg0qPXFRuVd5jU1RT9QuqEaG/h2R+VSNeniVZELLk=";
   };
 
   metaCommon = {
@@ -45,7 +45,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-RIkdnDyHjl5C0+Hdtne1NYEh46+yylW7Q/agT7AtDBo=";
+      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
@@ -81,7 +81,7 @@ buildGoModule {
       --replace-fail '@basepath@' "$out"
   '';
 
-  vendorHash = "sha256-4MPKAI1/F/sgfUORulhcpKJYHX7LpLknlzZx4DqnCfY=";
+  vendorHash = "sha256-Coq8GtaIS7ClmOTFw6PSgGDFW/CpGpKPvXgNw8qz3Hs=";
 
   nativeBuildInputs = [
     wails
@@ -114,12 +114,8 @@ buildGoModule {
       icon = "gui-for-singbox";
       genericName = "GUI.for.SingBox";
       desktopName = "GUI.for.SingBox";
-      categories = [
-        "Network"
-      ];
-      keywords = [
-        "Proxy"
-      ];
+      categories = [ "Network" ];
+      keywords = [ "Proxy" ];
     })
   ];
 

From ddff028954968161f02864a4a40847db89100ef4 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 07:54:25 +0800
Subject: [PATCH 20/95] gui-for-clash: 1.9.5 -> 1.9.7

---
 pkgs/by-name/gu/gui-for-clash/bridge.patch | 38 +++++++++-------------
 pkgs/by-name/gu/gui-for-clash/package.nix  | 18 ++++------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/gu/gui-for-clash/bridge.patch b/pkgs/by-name/gu/gui-for-clash/bridge.patch
index 8d6600e8519a..47ca878a594f 100644
--- a/pkgs/by-name/gu/gui-for-clash/bridge.patch
+++ b/pkgs/by-name/gu/gui-for-clash/bridge.patch
@@ -1,39 +1,31 @@
 --- a/bridge/bridge.go	2024-12-25 20:53:45.504021585 +0000
 +++ b/bridge/bridge.go	2024-12-25 21:02:20.318422528 +0000
-@@ -38,11 +38,6 @@
- 
- func InitBridge(fs embed.FS) {
- 	// step1: Set Env
+@@ -41,13 +41,13 @@
+ }
+
+ func CreateApp(fs embed.FS) *App {
 -	exePath, err := os.Executable()
 -	if err != nil {
 -		panic(err)
--	}
--
- 	for _, v := range os.Args {
- 		if v == "tasksch" {
- 			Env.FromTaskSch = true
-@@ -50,8 +45,13 @@
- 		}
- 	}
- 
--	Env.BasePath = filepath.Dir(exePath)
--	Env.AppName = filepath.Base(exePath)
 +	Env.AppName = "GUI.for.Clash"
 +	xdgDataHome := os.Getenv("XDG_DATA_HOME")
 +	if xdgDataHome == "" {
 +		homeDir, _ := os.UserHomeDir()
 +		xdgDataHome = filepath.Join(homeDir, ".local", "share")
-+	}
+ 	}
+-
+-	Env.BasePath = filepath.Dir(exePath)
+-	Env.AppName = filepath.Base(exePath)
 +	Env.BasePath = filepath.Join(xdgDataHome, Env.AppName)
- 
- 	// step2: Create a persistent data symlink
- 	if Env.OS == "darwin" {
-@@ -128,7 +128,7 @@
+
+ 	if slices.Contains(os.Args, "tasksch") {
+ 		Env.FromTaskSch = true
+@@ -76,7 +76,7 @@
  }
- 
+
  func (a *App) RestartApp() FlagResult {
 -	exePath := Env.BasePath + "/" + Env.AppName
 +	exePath := "@basepath@/bin" + "/" + Env.AppName
- 
+
  	cmd := exec.Command(exePath)
- 	HideExecWindow(cmd)
+ 	SetCmdWindowHidden(cmd)
\ No newline at end of file
diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix
index ce4b2461b137..b2dcd36565c2 100644
--- a/pkgs/by-name/gu/gui-for-clash/package.nix
+++ b/pkgs/by-name/gu/gui-for-clash/package.nix
@@ -1,10 +1,10 @@
 {
+  lib,
   stdenv,
   nodejs,
   pnpm_9,
   fetchFromGitHub,
   buildGoModule,
-  lib,
   wails,
   webkitgtk_4_0,
   pkg-config,
@@ -17,13 +17,13 @@
 
 let
   pname = "gui-for-clash";
-  version = "1.9.5";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "GUI-for-Cores";
     repo = "GUI.for.Clash";
     tag = "v${version}";
-    hash = "sha256-XQbiric4iAxvWRLKCCZtDrpFpPCylQlwnCm9dHSq/KM=";
+    hash = "sha256-Ij9zyBzYpAfDEjJXqOiPxun+5e1T5j3juYudpvraBcQ=";
   };
 
   metaCommon = {
@@ -43,7 +43,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-5SVu8eCyN89k6BvNEqgs4hOrP5IjvjUZrzrVuDwtYCk=";
+      hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
@@ -81,7 +81,7 @@ buildGoModule {
       --replace-fail '@basepath@' "$out"
   '';
 
-  vendorHash = "sha256-Zt3We+Ai8oEqof2eQvcaIkocH85goeldmPf4mmDX17o=";
+  vendorHash = "sha256-Coq8GtaIS7ClmOTFw6PSgGDFW/CpGpKPvXgNw8qz3Hs=";
 
   nativeBuildInputs = [
     wails
@@ -114,12 +114,8 @@ buildGoModule {
       icon = "gui-for-clash";
       genericName = "GUI.for.Clash";
       desktopName = "GUI.for.Clash";
-      categories = [
-        "Network"
-      ];
-      keywords = [
-        "Proxy"
-      ];
+      categories = [ "Network" ];
+      keywords = [ "Proxy" ];
     })
   ];
 

From 1c133c2bc5567fe983eff691f05ed1f620c0e060 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 09:21:53 +0800
Subject: [PATCH 21/95] saber: 0.25.5 -> 0.25.6

---
 pkgs/by-name/sa/saber/package.nix       |  4 +-
 pkgs/by-name/sa/saber/pubspec.lock.json | 88 ++++++++++++-------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 4f5a5692dde2..738f7f414964 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -17,13 +17,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "saber";
-  version = "0.25.5";
+  version = "0.25.6";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-iZy/Eb3BUe8Zs52gw7+hpncEqUwcgKFAgzB8VIsFv/E=";
+    hash = "sha256-OknqEbWAYLlxSTDWcggM6GP2V8cdKIAksbm7TmKzjKY=";
   };
 
   gitHashes = {
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 35e2801af5d9..75ef121f775c 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -44,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "direct main",
@@ -64,11 +64,11 @@
       "dependency": "transitive",
       "description": {
         "name": "asn1lib",
-        "sha256": "e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f",
+        "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.6.2"
+      "version": "1.6.4"
     },
     "assorted_layout_widgets": {
       "dependency": "transitive",
@@ -194,11 +194,11 @@
       "dependency": "direct main",
       "description": {
         "name": "bson",
-        "sha256": "9071b154b5cd96482c2e116b015e87acfdc8412630cc8f3aba60c539a8ef5442",
+        "sha256": "f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.5"
+      "version": "5.0.7"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -404,11 +404,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513",
+        "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.3.3"
+      "version": "11.4.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -514,11 +514,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "8986dec4581b4bcd4b6df5d75a2ea0bede3db802f500635d05fa8be298f9467f",
+        "sha256": "a222f231db4f822fc49e3b753674bda630e981873c84bf8604bceeb77fce0b24",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.2"
+      "version": "10.1.7"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -564,11 +564,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.7.0"
+      "version": "3.7.1"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
@@ -672,21 +672,21 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.27"
+      "version": "2.0.28"
     },
     "flutter_quill": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_quill",
-        "sha256": "6b9a29b5e054fd90373988f710e8060e3f44e9f875dd5e02bf0c10bc22e53133",
+        "sha256": "de019f6160023d36ad3e89343da6d740ab66ae7839875c89871fbeabcb9e8f9b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.2.0"
+      "version": "11.4.0"
     },
     "flutter_quill_delta_from_html": {
       "dependency": "transitive",
@@ -850,21 +850,21 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "4cdfcc6a178632d1dbb7a728f8e84a1466211354704b9cdc03eee661d3277732",
+        "sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.1.2"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "548b49cb2d7ee57664ed8cfd44df764182c59b04a437c7d695ed784e3a21569f",
+        "sha256": "0ecff8fde3eaea98d2f19449fb2becf67583cb0e98326b1a6ad47226137099a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "golden_toolkit": {
       "dependency": "transitive",
@@ -900,21 +900,21 @@
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.5+1"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -1336,11 +1336,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.16"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1416,11 +1416,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "5221e2e1567603fccbd3b1e67d6786151e04ba9d04b425a9d9d881260948d1e9",
+        "sha256": "1bde1885de38ac8ad9f8d5e4be37a57f36f23467a9bb5a586607d5e4aa153ab8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.23"
+      "version": "1.1.28"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1596,11 +1596,11 @@
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5"
     },
     "qr": {
       "dependency": "transitive",
@@ -1817,21 +1817,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "11.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.0.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -1847,11 +1847,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "c2c8c46297b5d6a80bed7741ec1f2759742c77d272f1a1698176ae828f8e1a18",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.9"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2103,11 +2103,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.15"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2153,11 +2153,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2273,11 +2273,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2313,11 +2313,11 @@
       "dependency": "direct main",
       "description": {
         "name": "worker_manager",
-        "sha256": "086ed63e9b36266e851404ca90fd44e37c0f4c9bbf819e5f8d7c87f9741c0591",
+        "sha256": "eb8ad7013f823539e259f2452b40f8bf77c0aacc7a73f66195f1ad3166eafcf8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.3"
+      "version": "7.2.4"
     },
     "workmanager": {
       "dependency": "direct main",

From 6b6e2dd0eb72677dc0e935ade24881a2ba84766d Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 09:38:09 +0800
Subject: [PATCH 22/95] windsend: 1.5.1 -> 1.5.4

---
 pkgs/by-name/wi/windsend/package.nix       |   5 +-
 pkgs/by-name/wi/windsend/pubspec.lock.json | 293 +++++++++++++++++++--
 pkgs/by-name/wi/windsend/update.sh         |   9 +-
 3 files changed, 285 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index 6dea79bfef0b..35da5be07d58 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -8,13 +8,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "windsend";
-  version = "1.5.1";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "doraemonkeys";
     repo = "WindSend";
     tag = "v${version}";
-    hash = "sha256-mE2pygb4o9gRUdgX/eVsr6WtZxIadxADg+3dpQgP0Ic=";
+    hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -22,6 +22,7 @@ flutter329.buildFlutterApplication rec {
   gitHashes = {
     open_filex = "sha256-dKLOmk+C9Rzw0wq18I5hkR2T4VcdmT4coimmgF+GzV8=";
     media_scanner = "sha256-vlHsSmw0/bVDSwB/jwdj/flfcizDjYKHOItOb/jWQGM=";
+    receive_sharing_intent = "sha256-CmE15epEWlnClAPjM73J74EKUJ/TvwUF90VnAPZBWwc=";
   };
 
   sourceRoot = "${src.name}/flutter/wind_send";
diff --git a/pkgs/by-name/wi/windsend/pubspec.lock.json b/pkgs/by-name/wi/windsend/pubspec.lock.json
index b53059860f77..c3a68aeffe4c 100644
--- a/pkgs/by-name/wi/windsend/pubspec.lock.json
+++ b/pkgs/by-name/wi/windsend/pubspec.lock.json
@@ -1,5 +1,25 @@
 {
   "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "82.0.0"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.4.5"
+    },
     "args": {
       "dependency": "transitive",
       "description": {
@@ -40,6 +60,16 @@
       "source": "hosted",
       "version": "1.4.0"
     },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "clock": {
       "dependency": "transitive",
       "description": {
@@ -80,6 +110,16 @@
       "source": "hosted",
       "version": "4.0.8"
     },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.13.1"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -234,11 +274,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c",
+        "sha256": "dd51fd20fdc45e073529c102376d54deba3e120603fe711c848ce44575b838e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.4"
+      "version": "10.1.8"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -314,6 +354,36 @@
       "source": "hosted",
       "version": "8.2.12"
     },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
     "http_parser": {
       "dependency": "transitive",
       "description": {
@@ -334,6 +404,16 @@
       "source": "hosted",
       "version": "0.19.0"
     },
+    "io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
     "irondash_engine_context": {
       "dependency": "transitive",
       "description": {
@@ -424,6 +504,16 @@
       "source": "hosted",
       "version": "2.5.0"
     },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -479,11 +569,11 @@
       "dependency": "direct main",
       "description": {
         "name": "network_info_plus",
-        "sha256": "08f4166bbb77da9e407edef6322a33f87b18c0ca46483fb25606cb3d2bfcdd2a",
+        "sha256": "f926b2ba86aa0086a0dfbb9e5072089bc213d854135c1712f1d29fc89ba3c877",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.3"
+      "version": "6.1.4"
     },
     "network_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -505,6 +595,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "open_filex": {
       "dependency": "direct main",
       "description": {
@@ -516,6 +616,16 @@
       "source": "git",
       "version": "4.7.0"
     },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
     "path": {
       "dependency": "direct main",
       "description": {
@@ -696,14 +806,35 @@
       "source": "hosted",
       "version": "4.0.0"
     },
-    "receive_sharing_intent": {
-      "dependency": "direct main",
+    "pool": {
+      "dependency": "transitive",
       "description": {
-        "name": "receive_sharing_intent",
-        "sha256": "ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593",
+        "name": "pool",
+        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
+      "version": "1.5.1"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "receive_sharing_intent": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "7880e3e28bcf1ec50c100f1d19b349fc9506768e",
+        "resolved-ref": "7880e3e28bcf1ec50c100f1d19b349fc9506768e",
+        "url": "https://github.com/Strime/receive_sharing_intent"
+      },
+      "source": "git",
       "version": "1.8.1"
     },
     "settings_ui": {
@@ -720,21 +851,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "11.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.0.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -806,12 +937,72 @@
       "source": "hosted",
       "version": "2.4.1"
     },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
     "sky_engine": {
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
       "version": "0.0.0"
     },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
     "source_span": {
       "dependency": "transitive",
       "description": {
@@ -892,6 +1083,16 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.25.15"
+    },
     "test_api": {
       "dependency": "transitive",
       "description": {
@@ -902,6 +1103,16 @@
       "source": "hosted",
       "version": "0.7.4"
     },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.8"
+    },
     "typed_data": {
       "dependency": "transitive",
       "description": {
@@ -986,11 +1197,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -1032,6 +1243,16 @@
       "source": "hosted",
       "version": "14.3.1"
     },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
     "web": {
       "dependency": "transitive",
       "description": {
@@ -1042,15 +1263,45 @@
       "source": "hosted",
       "version": "1.1.1"
     },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1081,6 +1332,16 @@
       },
       "source": "hosted",
       "version": "6.5.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
     }
   },
   "sdks": {
diff --git a/pkgs/by-name/wi/windsend/update.sh b/pkgs/by-name/wi/windsend/update.sh
index 4a736638c82d..5ef0416d5c32 100755
--- a/pkgs/by-name/wi/windsend/update.sh
+++ b/pkgs/by-name/wi/windsend/update.sh
@@ -26,9 +26,10 @@ nix-update --version=$latestVersion windsend
 
 export HOME="$(mktemp -d)"
 src="$(nix-build --no-link "$NIXPKGS_DIR" -A windsend.src)"
-TMPDIR="$(mktemp -d)"
-cp --recursive --no-preserve=mode "$src"/* $TMPDIR
-cd "$TMPDIR"/flutter/wind_send
+tmp="$(mktemp -d)"
+cp --recursive --no-preserve=mode "$src"/* $tmp
+pushd "$tmp"/flutter/wind_send
 flutter pub get
 yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json
-rm -rf $TMPDIR
+popd
+rm -rf $tmp

From b3405fc2d076d6a6a1ac34ce31387005e13d26d3 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 13 May 2025 15:34:20 +0200
Subject: [PATCH 23/95] rundeck: 5.11.1 -> 5.12.0

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

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index dce0dc27d73b..93a77617a353 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.11.1-20250415";
+  version = "5.12.0-20250512";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-WOxY2GGtll+2xkSbJUKOvgsr408nIvRcEuBULcawijc=";
+    hash = "sha256-LsKxMj+XCKTAMC3aIRnJcJkc2jytfTfu/gi0omGkMEk=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ef6fdfe41fd7e63218488170d00df3108ac1385d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 11:55:59 -0300
Subject: [PATCH 24/95] lxqt.libfm-qt: 2.1.0 -> 2.2.0

Diff: https://github.com/lxqt/libfm-qt/compare/2.1.0...2.2.0
---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 963674ef1294..f6b5f4feb83f 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -16,7 +16,7 @@
   qttools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.1.0",
+  version ? "2.2.0",
   qtx11extras ? null,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-        "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg=";
+        "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
       }
       ."${version}";
   };

From 0018305176fb7039c7c4eeef8a758cf57c98ef50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 May 2025 15:54:47 +0000
Subject: [PATCH 25/95] morgen: 3.6.12 -> 3.6.13

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

diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index 62484fc5d0a0..fff6c79404f1 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.12";
+  version = "3.6.13";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-1shqINMYy+yoMsI99+tvJcqWs8dScmmV7X9QTYZ9EfA=";
+    hash = "sha256-a7IkEHRAwa7SnsPcK6psho6E+o1aOlQPPFHaDPrrXxw=";
   };
 
   nativeBuildInputs = [

From 01d50d8935bbf50a0866b761bffcd66bfa7cc1a3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 13 May 2025 18:41:05 +0000
Subject: [PATCH 26/95] cherry-studio: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index d3d42252ea29..f5ed9312b931 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/cj4wMYPWjO5tJxIDdP7GkciWLVZBiDivEIHiOxpk0s=";
+    hash = "sha256-Tgd8MvxsiCDp2pdtz2MeCnTGY4Butw9V/UoTw0XEaIg=";
   };
 
   postPatch = ''

From 149a7743c502c65cefe88a58635b5d64fc9393a9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 14 May 2025 03:50:02 +0800
Subject: [PATCH 27/95] sparkle: init at 1.6.2

---
 pkgs/by-name/sp/sparkle/package.nix | 91 +++++++++++++++++++++++++++++
 pkgs/by-name/sp/sparkle/update.sh   | 17 ++++++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/by-name/sp/sparkle/package.nix
 create mode 100755 pkgs/by-name/sp/sparkle/update.sh

diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix
new file mode 100644
index 000000000000..6ebb29124fef
--- /dev/null
+++ b/pkgs/by-name/sp/sparkle/package.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  autoPatchelfHook,
+  nss,
+  nspr,
+  alsa-lib,
+  openssl,
+  webkitgtk_4_0,
+  udev,
+  libayatana-appindicator,
+  libGL,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sparkle";
+  version = "1.6.2";
+
+  src =
+    let
+      selectSystem =
+        attrs:
+        attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+      arch = selectSystem {
+        x86_64-linux = "amd64";
+        aarch64-linux = "arm64";
+      };
+    in
+    fetchurl {
+      url = "https://github.com/xishang0128/sparkle/releases/download/${finalAttrs.version}/sparkle-linux-${finalAttrs.version}-${arch}.deb";
+      hash = selectSystem {
+        x86_64-linux = "sha256-lUsKTEtUevBKmz21gu/AEAGXCmp0zcdSafRdncLBlQk=";
+        aarch64-linux = "sha256-sdsrUnOnvZYxs9tHSFf1k4sgJ9anp9P4s3Wz4oJY5ZU=";
+      };
+    };
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    nss
+    nspr
+    alsa-lib
+    openssl
+    webkitgtk_4_0
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp -r opt $out/opt
+    cp -r usr/share $out/share
+    substituteInPlace $out/share/applications/sparkle.desktop \
+      --replace-fail "/opt/Sparkle/sparkle" "sparkle"
+    ln -s $out/opt/Sparkle/sparkle $out/bin/sparkle
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf --add-needed libGL.so.1 \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          libGL
+          udev
+          libayatana-appindicator
+        ]
+      } $out/opt/Sparkle/sparkle
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Another Mihomo GUI";
+    homepage = "https://github.com/xishang0128/sparkle";
+    mainProgram = "sparkle";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    license = lib.licenses.gpl3Plus;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})
diff --git a/pkgs/by-name/sp/sparkle/update.sh b/pkgs/by-name/sp/sparkle/update.sh
new file mode 100755
index 000000000000..76c09d502e29
--- /dev/null
+++ b/pkgs/by-name/sp/sparkle/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix curl coreutils common-updater-scripts nix-update
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; sparkle.version or (lib.getVersion sparkle)" | tr -d '"')
+nix-update sparkle
+latestVersion=$(nix-instantiate --eval -E "with import ./. {}; sparkle.version or (lib.getVersion sparkle)" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; sparkle.src.url" --system aarch64-linux | tr -d '"')))
+update-source-version sparkle $latestVersion $hash --system=aarch64-linux --ignore-same-version

From b034efebae4af39c446afe79725023c4954ed060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 11:57:58 -0300
Subject: [PATCH 28/95] lxqt.libqtxdg: 4.1.0 -> 4.2.0

Diff: https://github.com/lxqt/libqtxdg/compare/4.1.0...4.2.0
---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 07c298747d1a..4cea52641b02 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -2,14 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   qtbase,
   qtsvg,
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "4.1.0",
+  version ? "4.2.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,20 +22,11 @@ stdenv.mkDerivation rec {
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-        "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE=";
+        "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
       }
       ."${version}";
   };
 
-  # Fix build with Qt 6.9
-  # FIXME: remove in next release
-  patches = lib.optionals (version == "4.1.0") [
-    (fetchpatch {
-      url = "https://github.com/lxqt/libqtxdg/commit/35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch";
-      hash = "sha256-udO3RQkzkcDBCxMNTIsORlDCLsZrxCbi0dXCBRuoQQQ=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From c0c3f765c45df5aad5e0ad21f454ed7b9ef922b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 11:59:09 -0300
Subject: [PATCH 29/95] lxqt.lxqt-build-tools: 2.1.0 -> 2.2.0

Diff: https://github.com/lxqt/lxqt-build-tools/compare/2.1.0...2.2.0
---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 5c5631e48587..6fa59d212205 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.1.0",
+  version ? "2.2.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.1.0" = "sha256-fZ5DbXnYm6oWDZdwiw2DpWFQMYd7VZ4oKkGIzQkaV94=";
+        "2.2.0" = "sha256-q/VkxfC2vGRpFnAGULkjhmJ8JsdpxChROqemCyf0esE=";
       }
       ."${version}";
   };

From 48bb9c4c21d1dd08d1a3593e12c1de64a64643a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:00:46 -0300
Subject: [PATCH 30/95] lxqt.lxqt-qtplugin: 2.1.0 -> 2.2.0

Diff: https://github.com/lxqt/lxqt-qtplugin/compare/2.1.0...2.2.0
---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 156ef558d567..88ce2d74396b 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -13,7 +13,7 @@
   qtsvg,
   qttools,
   wrapQtAppsHook,
-  version ? "2.1.0",
+  version ? "2.2.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
-        "2.1.0" = "sha256-F171IgAhRXJ9sTt8VVDVO9hrmyHbCElsskdDmFr3HB0=";
+        "2.2.0" = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
       }
       ."${version}";
   };

From 3bc42979279b2cf265f530e75e3ceadb7fbbaf59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:02:31 -0300
Subject: [PATCH 31/95] lxqt.qtermwidget: 2.1.0 -> 2.2.0

Diff: https://github.com/lxqt/qtermwidget/compare/2.1.0...2.2.0
---
 pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 61d1485c18a0..0f4aa8121e2b 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.1.0",
+  version ? "2.2.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-        "2.1.0" = "sha256-I8fVggCi9qN+Jpqb/EC5/DfwuhGF55trbPESZQWPZ5M=";
+        "2.2.0" = "sha256-tzgHNGB063rgFB15lHTKQplNhwJZtrRprUhMm5H62AA=";
       }
       ."${version}";
   };

From ce38e0448e10add086dafca69c800fd1eeb4fc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:52 -0300
Subject: [PATCH 32/95] lxqt.liblxqt: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index f5216c28e53d..3d8172bbd04d 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8=";
+    hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
   };
 
   nativeBuildInputs = [

From a9c0eddd10a2264b6ff0e8583813975da400eb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:52 -0300
Subject: [PATCH 33/95] lxqt.libdbusmenu-lxqt: 0.2.0 -> 0.3.0

---
 pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index a248471683d1..ee991093e032 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-lxqt";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I=";
+    hash = "sha256-PqX8ShSu3CYN9XIRp6IjVmr/eKH+oLNhXvwiudUH660=";
   };
 
   nativeBuildInputs = [

From c6ef8c1fb82f08a63cdd18781134f08a6fa4929c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:52 -0300
Subject: [PATCH 34/95] lxqt.lximage-qt: 2.1.1 -> 2.2.0

---
 pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 82475fe1f0e6..ac0fa037d128 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc=";
+    hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
   };
 
   nativeBuildInputs = [

From 82e8017252c599747eb3d0b9cd5a8d920e048ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:52 -0300
Subject: [PATCH 35/95] lxqt.lxqt-about: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index eb98b6bad08f..401b29008935 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8=";
+    hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao=";
   };
 
   nativeBuildInputs = [

From 46a732a5972bd4af3bdbecf7c9ae16f734f1e01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 36/95] lxqt.lxqt-admin: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 0565f1c10f18..dce5a83c84c0 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg=";
+    hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY=";
   };
 
   nativeBuildInputs = [

From 62c7e3db3239e19fb3a82b099d30d003621dd841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 37/95] lxqt.lxqt-archiver: 1.1.0 -> 1.2.0

---
 pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index db3e5c022859..a2c56c066b66 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4=";
+    hash = "sha256-4xGP/3ft29PFzJ3ty/9wJbv/hqcdTw9U+4xDneKHF8g=";
   };
 
   nativeBuildInputs = [

From 8523268faeae5dd0ab24eed5ea0d760d8750a617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 38/95] lxqt.lxqt-config: 2.1.1 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index d6a73eacd23c..151b24d53f34 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-config";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Vzf+Olaxl6tn3ETEQseFIPstjo+pfdzZUgyVFqk6p3c=";
+    hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA=";
   };
 
   nativeBuildInputs = [

From 34a5d1119085373c624b4e868bc9cd7810f7466b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 39/95] lxqt.lxqt-globalkeys: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 2e81f345e631..83fa6878c54e 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI=";
+    hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo=";
   };
 
   nativeBuildInputs = [

From 2c9376312c4eb7766d78ea1d781eec158e7d4139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 40/95] lxqt.lxqt-menu-data: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 3d5ca067d650..6bfba1c6c4f7 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs=";
+    hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw=";
   };
 
   nativeBuildInputs = [

From dbbfd6c75def726c2f89447a71244617f093ab5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 41/95] lxqt.lxqt-notificationd: 2.1.1 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index f08fa909adb4..27fbd76e0511 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-L2eXab1V2t7+h51wEh0p2Uzdc3ImR4euoiXVVJ8BguA=";
+    hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0=";
   };
 
   nativeBuildInputs = [

From 4128848e58ddd54a192dcc570e0876318d9d4dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:53 -0300
Subject: [PATCH 42/95] lxqt.lxqt-openssh-askpass: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index ee23ea1bdcac..db6129000ceb 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU=";
+    hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY=";
   };
 
   nativeBuildInputs = [

From ae6ffd4e58ade2deb4094ab9ca98e9b5f8351fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 43/95] lxqt.lxqt-panel: 2.1.4 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 42edf3ed126f..b61a3b0c8d08 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -23,7 +23,6 @@
   lxqt-build-tools,
   lxqt-globalkeys,
   lxqt-menu-data,
-  menu-cache,
   pcre,
   qtbase,
   qtsvg,
@@ -36,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-panel";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-WS+rPiPB/BBmg4yNkpZ2cFJG/1awdjCN0ziWtcESRP4=";
+    hash = "sha256-BMdiSm+FJXeLRGGoCdUpJjFu8JRk0+95LPZJSTFMqrM=";
   };
 
   nativeBuildInputs = [
@@ -72,7 +71,6 @@ stdenv.mkDerivation rec {
     lm_sensors
     lxqt-globalkeys
     lxqt-menu-data
-    menu-cache
     pcre
     qtbase
     qtsvg

From 4db4e4b6c7cc9c5152c965d004f5f1a6874ff903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 44/95] lxqt.lxqt-policykit: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 3885ba8b2538..ee1c90116cd7 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc=";
+    hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY=";
   };
 
   nativeBuildInputs = [

From 6f48c9a9759cb636f28762341ab49866b21252f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 45/95] lxqt.lxqt-powermanagement: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 33d5a2dbf663..4cc3c53b57af 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo=";
+    hash = "sha256-NVyt9HcGRCLIVJFlkiiZ3OOTzGEfo3boDQlTmWythGk=";
   };
 
   nativeBuildInputs = [

From 6fb762ca24305e594457b8e3446a39d7cbef7d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 46/95] lxqt.lxqt-runner: 2.1.2 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-runner/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index b535d911491f..0e48112192d0 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -9,7 +9,6 @@
   libqtxdg,
   lxqt-build-tools,
   lxqt-globalkeys,
-  menu-cache,
   muparser,
   pcre,
   pkg-config,
@@ -23,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-AJLm6bjlM6cq9PNrM8eyvX4xN6lUxVSzgJs4+p/11ug=";
+    hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM=";
   };
 
   nativeBuildInputs = [
@@ -46,7 +45,6 @@ stdenv.mkDerivation rec {
     liblxqt
     libqtxdg
     lxqt-globalkeys
-    menu-cache
     muparser
     pcre
     qtbase

From 847d6116ac54d0669b2f119f9dfce4e53018dfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 47/95] lxqt.lxqt-session: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 05407ef22890..c35e00f153af 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA=";
+    hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8=";
   };
 
   nativeBuildInputs = [

From 2925b3d1ac4e1714376f6a2be97620c769941c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 48/95] lxqt.lxqt-sudo: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index e65e8b3507ed..cb24eaf277e6 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA=";
+    hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4=";
   };
 
   nativeBuildInputs = [

From f114c0f850e5d939238ed9e3c45c033e28cd43e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:54 -0300
Subject: [PATCH 49/95] lxqt.lxqt-themes: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 13f0206348a5..84e449e6294d 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w=";
+    hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ=";
   };
 
   nativeBuildInputs = [

From 73dbfa5cf2052be1b21bebf1dcf2d7340f23c5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 50/95] lxqt.lxqt-wayland-session: 0.1.1 -> 0.2.0

---
 pkgs/desktops/lxqt/lxqt-wayland-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index be067325c904..3eceece293f1 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-UMlV8LqUXM2+3ZSLj30FFgC+ZVPmt2W8uE2RrZKqCJE=";
+    hash = "sha256-VjOLw6ByS0se9jy1VY4xhBSs26yvoffFVAc1v0gMyYk=";
   };
 
   nativeBuildInputs = [

From b940672b0962f59271da14af19c8414b43494832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 51/95] lxqt.pavucontrol-qt: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 935f516a7204..394c7faba832 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg=";
+    hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM=";
   };
 
   nativeBuildInputs = [

From a1869c5083b9e400d1a7df1adb149ad2088326aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 52/95] lxqt.pcmanfm-qt: 2.1.0 -> 2.2.0

---
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 4fae87a35cde..d0935976c119 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng=";
+    hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM=";
   };
 
   nativeBuildInputs = [

From 8cd6a231996544918cfffbb32ee1a90fefda0766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 53/95] lxqt.qps: 2.10.0 -> 2.11.0

---
 pkgs/desktops/lxqt/qps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index a001e983468d..3931917b2607 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss=";
+    hash = "sha256-Ob9SSN7czCx2I/4fTfwEc1jPEvArpovRFjFnwQqHPUM=";
   };
 
   nativeBuildInputs = [

From c89538e669c3d17eb922aa14c3cc6baa04f0669f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 54/95] lxqt.qterminal: 2.1.0 -> 2.2.1

---
 pkgs/desktops/lxqt/qterminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index 7890c491ef5a..c89216f0a3a6 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI=";
+    hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM=";
   };
 
   nativeBuildInputs = [

From 4af34efde59c06a5ffdc429af2de92df9cc7b11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 55/95] lxqt.qtxdg-tools: 4.1.0 -> 4.2.0

---
 pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index bdbcdb60d1a8..2d88ec74c901 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4=";
+    hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE=";
   };
 
   nativeBuildInputs = [

From 1fb5ae6e290fbf782405602849d49107cd0f5e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:55 -0300
Subject: [PATCH 56/95] lxqt.screengrab: 2.9.0 -> 2.10.0

---
 pkgs/desktops/lxqt/screengrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 2d59f5612112..430e2abff2b5 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "screengrab";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660=";
+    hash = "sha256-cTDGVNnnjgIiCS/KzEVmTagJvNwDKAP2UrWKwdn3WmE=";
   };
 
   nativeBuildInputs = [

From ad664122dc0f8787752308ae3d8c0a8e5cc3a06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 13 May 2025 12:04:56 -0300
Subject: [PATCH 57/95] lxqt.xdg-desktop-portal-lxqt: 1.1.0 -> 1.2.0

---
 pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 1f31a200f7a7..a09180cd17c5 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10=";
+    hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
 
   nativeBuildInputs = [

From 3fb8f03fd7f0d2ca1999434d99a1adf6a69b98a5 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 14 May 2025 01:09:18 -0400
Subject: [PATCH 58/95] brave: 1.77.101 -> 1.78.97

https://community.brave.com/t/release-channel-1-78-97/616793
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 86bede7a095f..3690ace8ee78 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.77.101";
+  version = "1.78.97";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-/JY1eBLw3xTxeAinctlpTSbwk6QibPdMVhZcBkbe7G4=";
+      hash = "sha256-7j03rArdHXYlB8g72DeXivnPVhmCjPd3rtbTsH4nAiU=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-mRbRGCsvkrNVfwYrlfgGyU94dEezFTI/ittkbVynp7Q=";
+      hash = "sha256-SjaYmLCV/od2J6HFNyhh43/swQupl+rXfU8B1VvNXf8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-tn5HdMLoVRY1oLAYc/O2v2mVblb6KYud53yoHloEQ44=";
+      hash = "sha256-12z9MMUkSOZn7vg7VZ8i/dVdxHGTRcVe4M8ryInEdHw=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-HJel3HVz5MoOWXGTEH8Gu+Fq2Xur7xHXeZTUmWcWksk=";
+      hash = "sha256-UMwwpn+ag9dDU0/YHr21a1494wTahsHdyjDnme88m7Q=";
     };
   };
 

From e01cac1f87f9298e8749436cb50ec1cd75bd2d03 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 11:01:00 +0200
Subject: [PATCH 59/95] netbox: setup update script

---
 pkgs/by-name/ne/netbox_4_2/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ne/netbox_4_2/package.nix b/pkgs/by-name/ne/netbox_4_2/package.nix
index 6783642a59bd..5fb940f7ab6d 100644
--- a/pkgs/by-name/ne/netbox_4_2/package.nix
+++ b/pkgs/by-name/ne/netbox_4_2/package.nix
@@ -4,6 +4,7 @@
   python3,
   plugins ? _ps: [ ],
   nixosTests,
+  nix-update-script,
 }:
 let
   py = python3.override {
@@ -112,6 +113,7 @@ py.pkgs.buildPythonApplication rec {
       netbox = nixosTests.netbox_4_2;
       inherit (nixosTests) netbox-upgrade;
     };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From cf7bb0e3b552ba9f7bfe77eba0027e44498e8987 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 09:01:29 +0000
Subject: [PATCH 60/95] netbox: 4.2.7 -> 4.2.8

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

diff --git a/pkgs/by-name/ne/netbox_4_2/package.nix b/pkgs/by-name/ne/netbox_4_2/package.nix
index 5fb940f7ab6d..c3da9095af63 100644
--- a/pkgs/by-name/ne/netbox_4_2/package.nix
+++ b/pkgs/by-name/ne/netbox_4_2/package.nix
@@ -15,7 +15,7 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "netbox";
-  version = "4.2.7";
+  version = "4.2.8";
 
   format = "other";
 
@@ -23,7 +23,7 @@ py.pkgs.buildPythonApplication rec {
     owner = "netbox-community";
     repo = "netbox";
     tag = "v${version}";
-    hash = "sha256-SZES80hdoP+k6o5ablMnwaFrsVGE8Baew44eX2ZCk/Y=";
+    hash = "sha256-88AxaSFpScyP8PvNQ6hoJYn2hi56eoCNeEzwbY9GxkA=";
   };
 
   patches = [

From 7c727f9f73943f40cba730d05845d13b53350e0a Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 11:38:51 +0200
Subject: [PATCH 61/95] nixos/tests/netbox-upgrade: test the 4.1 -> 4.2 upgrade

---
 nixos/tests/web-apps/netbox-upgrade.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index cc044b76f0b3..8573066298d0 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -1,8 +1,8 @@
 import ../make-test-python.nix (
   { lib, pkgs, ... }:
   let
-    oldNetbox = pkgs.netbox_3_7;
-    newNetbox = pkgs.netbox_4_1;
+    oldNetbox = pkgs.netbox_4_1;
+    newNetbox = pkgs.netbox_4_2;
   in
   {
     name = "netbox-upgrade";

From f99dcc2d6e464196aa88323b6256162956891a0c Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 11:47:30 +0200
Subject: [PATCH 62/95] netbox_4_1: mark EOL

---
 pkgs/by-name/ne/netbox_4_1/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix
index ab399f5128b7..f2b36a10cf3d 100644
--- a/pkgs/by-name/ne/netbox_4_1/package.nix
+++ b/pkgs/by-name/ne/netbox_4_1/package.nix
@@ -127,6 +127,9 @@ py.pkgs.buildPythonApplication rec {
     description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
     mainProgram = "netbox";
     license = lib.licenses.asl20;
+    knownVulnerabilities = [
+      "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions."
+    ];
     maintainers = with lib.maintainers; [
       minijackson
       raitobezarius

From 2d0fdeb0d7e935baf62416c5d9096e5e0065cecc Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 11:50:41 +0200
Subject: [PATCH 63/95] netbox_3_7: remove

as a transition path,
we already have netbox_4_1 which is EOL
---
 pkgs/servers/web-apps/netbox/config.patch |  50 ---------
 pkgs/servers/web-apps/netbox/default.nix  |  25 -----
 pkgs/servers/web-apps/netbox/generic.nix  | 119 ----------------------
 pkgs/top-level/aliases.nix                |   1 +
 pkgs/top-level/all-packages.nix           |   2 -
 5 files changed, 1 insertion(+), 196 deletions(-)
 delete mode 100644 pkgs/servers/web-apps/netbox/config.patch
 delete mode 100644 pkgs/servers/web-apps/netbox/default.nix
 delete mode 100644 pkgs/servers/web-apps/netbox/generic.nix

diff --git a/pkgs/servers/web-apps/netbox/config.patch b/pkgs/servers/web-apps/netbox/config.patch
deleted file mode 100644
index a2e0b0b95a87..000000000000
--- a/pkgs/servers/web-apps/netbox/config.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
-index 2de06dd10..00406af48 100644
---- a/netbox/netbox/settings.py
-+++ b/netbox/netbox/settings.py
-@@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
- TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
- TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)
- TASKS_REDIS_CA_CERT_PATH = TASKS_REDIS.get('CA_CERT_PATH', False)
-+TASKS_REDIS_URL = TASKS_REDIS.get('URL')
- 
- # Caching
- if 'caching' not in REDIS:
-@@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau
- CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis'
- CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False)
- CACHING_REDIS_CA_CERT_PATH = REDIS['caching'].get('CA_CERT_PATH', False)
-+CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}')
- 
- CACHES = {
-     'default': {
-         'BACKEND': 'django_redis.cache.RedisCache',
--        'LOCATION': f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_USERNAME_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}',
-+        'LOCATION': CACHING_REDIS_URL,
-         'OPTIONS': {
-             'CLIENT_CLASS': 'django_redis.client.DefaultClient',
-             'PASSWORD': CACHING_REDIS_PASSWORD,
-@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True
- X_FRAME_OPTIONS = 'SAMEORIGIN'
- 
- # Static files (CSS, JavaScript, Images)
--STATIC_ROOT = BASE_DIR + '/static'
-+STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/')
- STATIC_URL = f'/{BASE_PATH}static/'
- STATICFILES_DIRS = (
-     os.path.join(BASE_DIR, 'project-static', 'dist'),
-@@ -640,6 +642,14 @@ if TASKS_REDIS_USING_SENTINEL:
-             'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT
-         },
-     }
-+elif TASKS_REDIS_URL:
-+    RQ_PARAMS = {
-+        'URL': TASKS_REDIS_URL,
-+        'PASSWORD': TASKS_REDIS_PASSWORD,
-+        'SSL': TASKS_REDIS_SSL,
-+        'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required',
-+        'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT,
-+    }
- else:
-     RQ_PARAMS = {
-         'HOST': TASKS_REDIS_HOST,
diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix
deleted file mode 100644
index 2423e962624a..000000000000
--- a/pkgs/servers/web-apps/netbox/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  nixosTests,
-  callPackage,
-}:
-let
-  generic = import ./generic.nix;
-in
-{
-  netbox_3_7 = callPackage generic {
-    version = "3.7.8";
-    hash = "sha256-61pJbMWXNFnvWI0z9yWvsutdCAP4VydeceANNw0nKsk=";
-    extraPatches = [
-      # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
-      ./config.patch
-    ];
-    tests.netbox = nixosTests.netbox_3_7;
-
-    maintainers = with lib.maintainers; [
-      minijackson
-      raitobezarius
-    ];
-    eol = true;
-  };
-}
diff --git a/pkgs/servers/web-apps/netbox/generic.nix b/pkgs/servers/web-apps/netbox/generic.nix
deleted file mode 100644
index 23e9e20095ea..000000000000
--- a/pkgs/servers/web-apps/netbox/generic.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  version,
-  hash,
-  plugins ? ps: [ ],
-  extraPatches ? [ ],
-  tests ? { },
-  maintainers ? [ ],
-  eol ? false,
-}:
-let
-  extraBuildInputs = plugins python3.pkgs;
-in
-python3.pkgs.buildPythonApplication rec {
-  pname = "netbox";
-  inherit version;
-
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "netbox-community";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    inherit hash;
-  };
-
-  patches = extraPatches;
-
-  propagatedBuildInputs =
-    with python3.pkgs;
-    [
-      bleach
-      boto3
-      django_4
-      django-cors-headers
-      django-debug-toolbar
-      django-filter
-      django-graphiql-debug-toolbar
-      django-mptt
-      django-pglocks
-      django-prometheus
-      django-redis
-      django-rq
-      django-tables2
-      django-taggit
-      django-timezone-field
-      djangorestframework
-      drf-spectacular
-      drf-spectacular-sidecar
-      drf-yasg
-      dulwich
-      swagger-spec-validator # from drf-yasg[validation]
-      feedparser
-      graphene-django
-      jinja2
-      markdown
-      markdown-include
-      netaddr
-      pillow
-      psycopg2
-      pyyaml
-      requests
-      sentry-sdk
-      social-auth-core
-      social-auth-app-django
-      svgwrite
-      tablib
-      jsonschema
-    ]
-    ++ extraBuildInputs;
-
-  buildInputs = with python3.pkgs; [
-    mkdocs-material
-    mkdocs-material-extensions
-    mkdocstrings
-    mkdocstrings-python
-  ];
-
-  nativeBuildInputs = [
-    python3.pkgs.mkdocs
-  ];
-
-  postBuild = ''
-    PYTHONPATH=$PYTHONPATH:netbox/
-    python -m mkdocs build
-  '';
-
-  installPhase = ''
-    mkdir -p $out/opt/netbox
-    cp -r . $out/opt/netbox
-    chmod +x $out/opt/netbox/netbox/manage.py
-    makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  passthru = {
-    python = python3;
-    # PYTHONPATH of all dependencies used by the package
-    pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
-    gunicorn = python3.pkgs.gunicorn;
-    inherit tests;
-  };
-
-  meta = {
-    homepage = "https://github.com/netbox-community/netbox";
-    description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
-    mainProgram = "netbox";
-    license = lib.licenses.asl20;
-    knownVulnerabilities = (
-      lib.optional eol "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions."
-    );
-    # Warning:
-    # Notice the missing `lib` in the inherit: it is using this function argument rather than a `with lib;` argument.
-    # If you replace this by `with lib;`, pay attention it does not inherit all maintainers in nixpkgs.
-    inherit maintainers;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 71a79d73207d..32c9d1aae154 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1246,6 +1246,7 @@ mapAliases {
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
   netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
   netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
+  netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   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 a4d72af0de67..9c23d084bf2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3867,8 +3867,6 @@ with pkgs;
     hdf5 = hdf5-mpi.override { usev110Api = true; };
   };
 
-  inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;
-
   # Not in aliases because it wouldn't get picked up by callPackage
   netbox = netbox_4_2;
 

From e152cef13d3c08d83d789c02680dff1dd6650863 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 23 Apr 2025 15:29:46 +0200
Subject: [PATCH 64/95] nixos/tests/netbox-upgrade: don't require
 NIXPKGS_ALLOW_INSECURE

Before this change, this NetBox test required NIXPKGS_ALLOW_INSECURE=1,
because of its use of the end-of-line NetBox version.
This meant that the GitHub CI failed to evaluate the tests,
and so didn't run them.
---
 nixos/tests/web-apps/netbox-upgrade.nix | 35 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index 8573066298d0..417df2a32af0 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -1,8 +1,18 @@
 import ../make-test-python.nix (
   { lib, pkgs, ... }:
   let
-    oldNetbox = pkgs.netbox_4_1;
-    newNetbox = pkgs.netbox_4_2;
+    oldNetbox = "netbox_4_1";
+    newNetbox = "netbox_4_2";
+
+    apiVersion =
+      version:
+      lib.pipe version [
+        (lib.splitString ".")
+        (lib.take 2)
+        (lib.concatStringsSep ".")
+      ];
+    oldApiVersion = apiVersion pkgs."${oldNetbox}".version;
+    newApiVersion = apiVersion pkgs."${newNetbox}".version;
   in
   {
     name = "netbox-upgrade";
@@ -15,12 +25,14 @@ import ../make-test-python.nix (
     };
 
     nodes.machine =
-      { config, ... }:
+      { config, pkgs, ... }:
       {
         virtualisation.memorySize = 2048;
         services.netbox = {
           enable = true;
-          package = oldNetbox;
+          # Pick the NetBox package from this config's "pkgs" argument,
+          # so that `nixpkgs.config.permittedInsecurePackages` works
+          package = pkgs."${oldNetbox}";
           secretKeyFile = pkgs.writeText "secret" ''
             abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
           '';
@@ -42,22 +54,13 @@ import ../make-test-python.nix (
 
         networking.firewall.allowedTCPPorts = [ 80 ];
 
-        specialisation.upgrade.configuration.services.netbox.package = lib.mkForce newNetbox;
+        nixpkgs.config.permittedInsecurePackages = [ pkgs."${oldNetbox}".name ];
+
+        specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs."${newNetbox}";
       };
 
     testScript =
       { nodes, ... }:
-      let
-        apiVersion =
-          version:
-          lib.pipe version [
-            (lib.splitString ".")
-            (lib.take 2)
-            (lib.concatStringsSep ".")
-          ];
-        oldApiVersion = apiVersion oldNetbox.version;
-        newApiVersion = apiVersion newNetbox.version;
-      in
       ''
         start_all()
         machine.wait_for_unit("netbox.target")

From 59e547ab9b4dbd90fe88f8acc440daeb42169514 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 13 May 2025 13:55:25 +0200
Subject: [PATCH 65/95] netbox_4_2: 4.2.8 -> 4.2.9

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

diff --git a/pkgs/by-name/ne/netbox_4_2/package.nix b/pkgs/by-name/ne/netbox_4_2/package.nix
index c3da9095af63..371a07b361ff 100644
--- a/pkgs/by-name/ne/netbox_4_2/package.nix
+++ b/pkgs/by-name/ne/netbox_4_2/package.nix
@@ -15,7 +15,7 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "netbox";
-  version = "4.2.8";
+  version = "4.2.9";
 
   format = "other";
 
@@ -23,7 +23,7 @@ py.pkgs.buildPythonApplication rec {
     owner = "netbox-community";
     repo = "netbox";
     tag = "v${version}";
-    hash = "sha256-88AxaSFpScyP8PvNQ6hoJYn2hi56eoCNeEzwbY9GxkA=";
+    hash = "sha256-uVe4YTZoxRMBfvItFa9SMHu4AaVvygfAg9GDB115TFc=";
   };
 
   patches = [

From ea895300f2f98b9b41bf775e8cca17ffe9ebf97b Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 14 May 2025 12:16:44 +0200
Subject: [PATCH 66/95] mathemagix: 11126 -> 11229

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

diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix
index 8e0add17dcd8..26165f55eb13 100644
--- a/pkgs/by-name/ma/mathemagix/package.nix
+++ b/pkgs/by-name/ma/mathemagix/package.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mathemagix";
-  version = "11126";
+  version = "11229";
 
   src = fetchsvn {
     url = "https://subversion.renater.fr/anonscm/svn/mmx/";
     rev = finalAttrs.version;
-    hash = "sha256-AFnYd5oFg/wgaHPjfZmqXNljEpoFW4h6f3UG+KZauEs=";
+    hash = "sha256-JSjgvbOjV/66wjFpLGI1vCTvNGdYX48JTGGvWdBzQm8=";
   };
 
   strictDeps = true;

From 495d053a6f3e66ad0e2bd0c682836dd1413d9e3d Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 13:38:38 +0200
Subject: [PATCH 67/95] varnish60: 6.0.13 -> 6.0.14

https://www.openwall.com/lists/oss-security/2025/05/13/5
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 518748fb89bd..4f20ccea57a0 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -91,8 +91,8 @@ in
 {
   # EOL (LTS) TBA
   varnish60 = common {
-    version = "6.0.13";
-    hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
+    version = "6.0.14";
+    hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
   };
   # EOL 2025-09-15
   varnish76 = common {

From ae36141147442523ad611f45080566e33dcb7b65 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 14:11:04 +0200
Subject: [PATCH 68/95] varnish76: 7.6.2 -> 7.6.3

https://www.openwall.com/lists/oss-security/2025/05/13/5
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 4f20ccea57a0..c2dc0ac73a27 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -96,8 +96,8 @@ in
   };
   # EOL 2025-09-15
   varnish76 = common {
-    version = "7.6.2";
-    hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
+    version = "7.6.3";
+    hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc=";
   };
   # EOL 2026-03-15
   varnish77 = common {

From 8e09e92f117a8a1eaab47df4daa06aefe336f34b Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 14:28:49 +0200
Subject: [PATCH 69/95] varnish77: 7.7.0 -> 7.7.1

https://www.openwall.com/lists/oss-security/2025/05/13/5
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index c2dc0ac73a27..b7ab2683d681 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -101,7 +101,7 @@ in
   };
   # EOL 2026-03-15
   varnish77 = common {
-    version = "7.7.0";
-    hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ=";
+    version = "7.7.1";
+    hash = "sha256-TAbFyZaApCm3KTT5/VE5Y/fhuoVTszyn7BLIWlwrdRo=";
   };
 }

From 8c28996bad558edf38710bdd896b7373700d25f9 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 14 May 2025 12:48:48 +0200
Subject: [PATCH 70/95] bic: 1.0.0 -> 1.0.0-unstable-2022-02-16

---
 pkgs/by-name/bi/bic/package.nix | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index 452e14250925..2a57ca0d5466 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -5,44 +5,59 @@
   readline,
   autoreconfHook,
   autoconf-archive,
+  gcc,
   gmp,
   flex,
   bison,
+  libffi,
+  makeWrapper,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
   pname = "bic";
-  version = "1.0.0";
+  version = "1.0.0-unstable-2022-02-16";
 
   src = fetchFromGitHub {
     owner = "hexagonal-sun";
     repo = "bic";
-    rev = "v${version}";
-    sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw";
+    rev = "b224d2776fdfe84d02eb96a21880a9e4ceeb3065";
+    hash = "sha256-6na7/kCXhHN7utbvXvTWr3QG4YhDww9AkilyKf71HlM=";
   };
 
   buildInputs = [
     readline
+    gcc
     gmp
   ];
+
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive
     bison
     flex
+    gcc
+    libffi
+    makeWrapper
+    pkg-config
   ];
 
-  meta = with lib; {
+  postInstall = ''
+    wrapProgram $out/bin/bic \
+      --prefix PATH : ${lib.makeBinPath [ gcc ]}
+  '';
+
+  meta = {
     description = "C interpreter and API explorer";
     mainProgram = "bic";
     longDescription = ''
       bic This a project that allows developers to explore and test C-APIs using a
       read eval print loop, also known as a REPL.
     '';
-    license = with licenses; [ gpl2Plus ];
+    license = with lib.licenses; [ gpl2Plus ];
     homepage = "https://github.com/hexagonal-sun/bic";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ hexagonal-sun ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ hexagonal-sun ];
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
   };

From b8cc15156b2867e31a6a9d330ea1a177d3765e9d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 14 May 2025 22:21:04 +0800
Subject: [PATCH 71/95] pantheon-tweaks: 2.2.1 -> 2.3.0

https://github.com/pantheon-tweaks/pantheon-tweaks/compare/2.2.1...2.3.0
---
 pkgs/by-name/pa/pantheon-tweaks/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index a535c5fa428a..e90b3365cadc 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pantheon-tweaks";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = pname;
     rev = version;
-    hash = "sha256-85Yfhh6otNWhRqLeM6UMBiCf/omn0FyY5hdK1ZjjgmM=";
+    hash = "sha256-+dkjmeY4WJfXwgNR8HlRaVfvS/2icbi8eSAkiB9x7uI=";
   };
 
   nativeBuildInputs = [

From 7fafe9307332cbd66971b1c14ee0468c93406ee8 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 13 May 2025 17:56:12 +0200
Subject: [PATCH 72/95] taler-merchant: fix and enable strictDeps

---
 pkgs/by-name/ta/taler-merchant/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index c144c8a607b6..4372de34d697 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -11,6 +11,9 @@
   autoreconfHook,
   makeWrapper,
   jq,
+  libgcrypt,
+  texinfo,
+  curl,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     autoreconfHook
     makeWrapper
+    libgcrypt # AM_PATH_LIBGCRYPT
+    texinfo # makeinfo
   ];
 
   buildInputs = taler-exchange.buildInputs ++ [
@@ -51,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
     libtool
   ];
 
+  strictDeps = true;
+
   propagatedBuildInputs = [ gnunet ];
 
   # From ./bootstrap
@@ -62,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
+  configureFlags = [
+    "ac_cv_path__libcurl_config=${lib.getDev curl}/bin/curl-config"
+  ];
+
   # NOTE: The executables that need database access fail to detect the
   # postgresql library in `$out/lib/taler`, so we need to wrap them.
   postInstall = ''

From df77494b627ac44ab50efcb3fd14eae95cd585b4 Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Wed, 14 May 2025 19:04:44 +0200
Subject: [PATCH 73/95] ddnet: 19.0 -> 19.2

https://ddnet.org/downloads/#19.2
https://ddnet.org/downloads/#19.1
https://github.com/ddnet/ddnet/compare/19.0...19.2
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index 9f4ad6d0c392..8f49b6b9e41c 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.0";
+  version = "19.2";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q=";
+    hash = "sha256-7moxTdoUTOpAHDT0LNNG6ccHeXKxd6ND+GRcgchWVSI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From b0c17b788d8e4a5e6c61836fc36f44307e3b6e46 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 15 May 2025 02:34:15 +0900
Subject: [PATCH 74/95] pnpm: 10.10.0 -> 10.11.0

https://github.com/pnpm/pnpm/releases/tag/v10.11.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 94ca53a26a36..01950cb9a86e 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.10.0";
-      hash = "sha256-+g9ROqgZF2TStrQyQgeIwnDwe0+ZkJm2W7IBDuxwKjA=";
+      version = "10.11.0";
+      hash = "sha256-pp6csHfaQZ1H0Y8d1S4gckWynKxuB2rO2+uL47Gme9c=";
     };
   };
 

From 97d79a5fd3bc16e3d228ea0136d2d9255a1048da Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 May 2025 19:50:44 +0200
Subject: [PATCH 75/95] sdl3-ttf: use fixDarwinDylibNames

---
 pkgs/by-name/sd/sdl3-ttf/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix
index d38950ab2252..18c554c2e915 100644
--- a/pkgs/by-name/sd/sdl3-ttf/package.nix
+++ b/pkgs/by-name/sd/sdl3-ttf/package.nix
@@ -12,6 +12,7 @@
   harfbuzz,
   glib,
   ninja,
+  fixDarwinDylibNames,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     validatePkgConfig
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
   buildInputs = [
     sdl3

From a1e2df332caabcf8f5afc4b8c2fdd65e723bc139 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 May 2025 19:51:07 +0200
Subject: [PATCH 76/95] sdl3-ttf: remove unused input

---
 pkgs/by-name/sd/sdl3-ttf/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix
index 18c554c2e915..dbc58819aaf2 100644
--- a/pkgs/by-name/sd/sdl3-ttf/package.nix
+++ b/pkgs/by-name/sd/sdl3-ttf/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   nix-update-script,
   testers,
   validatePkgConfig,

From 455ec9067d8e6f0c607e531931299def7a3fb2cc Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 14 May 2025 21:26:15 +0200
Subject: [PATCH 77/95] =?UTF-8?q?vectorcode:=200.5.6=20=E2=86=92=200.6.7?=
 =?UTF-8?q?=20https://github.com/Davidyz/VectorCode/releases/tag/0.6.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index 51d941d15c08..7c86b426cec2 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vectorcode";
-  version = "0.5.6";
+  version = "0.6.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Davidyz";
     repo = "VectorCode";
     tag = version;
-    hash = "sha256-paFUgPf8zTtMli0qh2bXjnmny2bDQxDwWE03yn0rWUY=";
+    hash = "sha256-BDDvALeQSBVld2gEmcnlpf3GDpdEs64nFyE6cNKpeww=";
   };
 
   build-system = with python3Packages; [
@@ -27,7 +27,9 @@ python3Packages.buildPythonApplication rec {
     with python3Packages;
     [
       chromadb
+      colorlog
       httpx
+      json5
       numpy
       pathspec
       psutil
@@ -78,6 +80,8 @@ python3Packages.buildPythonApplication rec {
     # Require internet access
     "test_get_embedding_function"
     "test_get_embedding_function_fallback"
+    "test_get_reranker"
+    "test_supported_rerankers_initialization"
   ];
 
   meta = {

From 968ba0a57f89d3556aa169e1517489af5981649e Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Wed, 14 May 2025 22:35:11 +0200
Subject: [PATCH 78/95] pocket-id: 0.51.1 -> 0.53.0

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

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 61e47a833357..5f7d9c9b9922 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pocket-id";
-  version = "0.51.1";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L+Mmgyeiv/AoboGN1ux4BDhEyVQ8w7IMR8Z34eM8tSU=";
+    hash = "sha256-3lW4jPh9YElgpBcIooGQ2zZbNwC/rz7CABsp7ScTxyQ=";
   };
 
   backend = buildGoModule {
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     sourceRoot = "${finalAttrs.src.name}/backend";
 
-    vendorHash = "sha256-0LAlltXd7YNQu7ymdjUSy75hMBz6MpvmUtgct43BU7M=";
+    vendorHash = "sha256-wOrYIhOrUxz22Ay2A26FTrPJA8YRgdRihP78Ls8VgNM=";
 
     preFixup = ''
       mv $out/bin/cmd $out/bin/pocket-id-backend

From de791e7b56a21b9ede42e7c72398659d86d0e257 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Wed, 14 May 2025 23:06:29 +0200
Subject: [PATCH 79/95] scriv: fix build by disabling test

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

diff --git a/pkgs/by-name/sc/scriv/package.nix b/pkgs/by-name/sc/scriv/package.nix
index e3e3f84f3e3e..c6d475c2a4a0 100644
--- a/pkgs/by-name/sc/scriv/package.nix
+++ b/pkgs/by-name/sc/scriv/package.nix
@@ -49,9 +49,8 @@ python3.pkgs.buildPythonApplication rec {
   disabledTests = [
     # assumes we have checked out the full repo (including remotes)
     "test_real_get_github_repos"
-    # requires a newer pandoc version (as it tests for a specific format of the
-    # error message)
-    "test_bad_convert_to_markdown"
+    # test fails due to a pandoc bug (fixed in pandoc 3.6.4)
+    "test_convert_to_markdown"
   ];
 
   passthru.tests = {

From 90d4d63008c19fea4b30cb633ef543484adcce5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 22:45:22 +0000
Subject: [PATCH 80/95] python3Packages.orderly-set: 5.3.2 -> 5.4.1

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

diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix
index b083eef791a0..be269ed8c173 100644
--- a/pkgs/development/python-modules/orderly-set/default.nix
+++ b/pkgs/development/python-modules/orderly-set/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "orderly-set";
-  version = "5.3.2";
+  version = "5.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "orderly-set";
     tag = version;
-    hash = "sha256-W42p0wJqomJdS47n3MP/BbxZmlYNLLAMnfQ/hvKn+60=";
+    hash = "sha256-0B8qnXU6oET1J933uTVDf2XIHwNzecxQ3FiP7EMnxQc=";
   };
 
   build-system = [

From 4dda2e378cbc2782ee967acee275aa999501294e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 14 May 2025 20:41:12 -0300
Subject: [PATCH 81/95] jasper-gtk-theme: init at 0-unstable-2025-04-02

---
 pkgs/by-name/ja/jasper-gtk-theme/package.nix | 102 +++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 pkgs/by-name/ja/jasper-gtk-theme/package.nix

diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
new file mode 100644
index 000000000000..33ffeaeefa71
--- /dev/null
+++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gnome-themes-extra,
+  gtk-engine-murrine,
+  jdupes,
+  sassc,
+  themeVariants ? [ ], # default: teal
+  colorVariants ? [ ], # default: all
+  sizeVariants ? [ ], # default: standard
+  tweaks ? [ ],
+}:
+
+let
+  pname = "jasper-gtk-theme";
+
+in
+lib.checkListOfEnum "${pname}: theme variants"
+  [
+    "default"
+    "purple"
+    "pink"
+    "red"
+    "orange"
+    "yellow"
+    "green"
+    "blue"
+    "grey"
+    "all"
+  ]
+  themeVariants
+  lib.checkListOfEnum
+  "${pname}: color variants"
+  [ "standard" "light" "dark" ]
+  colorVariants
+  lib.checkListOfEnum
+  "${pname}: size variants"
+  [ "standard" "compact" ]
+  sizeVariants
+  lib.checkListOfEnum
+  "${pname}: tweaks"
+  [
+    "nord"
+    "dracula"
+    "black"
+    "macos"
+  ]
+  tweaks
+
+  stdenvNoCC.mkDerivation
+  rec {
+    inherit pname;
+    version = "0-unstable-2025-04-02";
+
+    src = fetchFromGitHub {
+      owner = "vinceliuice";
+      repo = "Jasper-gtk-theme";
+      rev = "71cb99a6618d839b1058cb8e6660a3b2f63aca70";
+      hash = "sha256-ZWPUyVszDPUdzttAJuIA9caDpP4SQ7mIbCoczxwvsus=";
+    };
+
+    nativeBuildInputs = [
+      jdupes
+      sassc
+    ];
+
+    buildInputs = [
+      gnome-themes-extra
+    ];
+
+    propagatedUserEnvPkgs = [
+      gtk-engine-murrine
+    ];
+
+    postPatch = ''
+      patchShebangs install.sh
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      name= HOME="$TMPDIR" ./install.sh \
+        ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
+        ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
+        ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
+        ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+        --dest $out/share/themes
+
+      jdupes --quiet --link-soft --recurse $out/share
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Modern and clean Gtk theme";
+      homepage = "https://github.com/vinceliuice/Jasper-gtk-theme";
+      license = lib.licenses.gpl3Only;
+      platforms = lib.platforms.unix;
+      maintainers = [ lib.maintainers.romildo ];
+    };
+  }

From 77dde61cdd88dd1798827d7def489e4bdf8b365b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 01:54:39 +0000
Subject: [PATCH 82/95] rembg: 2.0.65 -> 2.0.66

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

diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix
index b4a5efd51768..9cd842f33af1 100644
--- a/pkgs/development/python-modules/rembg/default.nix
+++ b/pkgs/development/python-modules/rembg/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "rembg";
-  version = "2.0.65";
+  version = "2.0.66";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danielgatis";
     repo = "rembg";
     tag = "v${version}";
-    hash = "sha256-o6M3DSW1GL3xvEx4lsE325J3XcmRrhhPszS5MkaynsE=";
+    hash = "sha256-MTwi9Cy9JWcI0CgUKfnPiA3MFBl/Ie0rYQOm0jqgyS4=";
   };
 
   build-system = [
@@ -90,7 +90,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tool to remove background from images";
     homepage = "https://github.com/danielgatis/rembg";
-    changelog = "https://github.com/danielgatis/rembg/releases/tag/v${version}";
+    changelog = "https://github.com/danielgatis/rembg/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "rembg";

From 873732972b3e25b761ec3b6b0bcf4ce46952564e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 02:01:31 +0000
Subject: [PATCH 83/95] simplotask: 1.16.4 -> 1.17.0

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

diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index 3a674ae1a181..67cb01ac86c7 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "simplotask";
-  version = "1.16.4";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     rev = "v${version}";
-    hash = "sha256-pSYYYUzChK/GNAdCybd4KMNXwkTZo/0w6CtsYOvbKj8=";
+    hash = "sha256-uMS2Nf5Brx4hXMGMG3vTU3V2y83gLPb8vau7GA+DGak=";
   };
 
   vendorHash = null;

From dac983ed241222868e58d82b00f3bdf5282b5b74 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 15 May 2025 14:05:20 +0900
Subject: [PATCH 84/95] hugo: remove kachick from maintainers

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 1b8407af73e1..8a04d2f8f16f 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -84,7 +84,6 @@ buildGoModule (finalAttrs: {
       schneefux
       Br1ght0ne
       Frostman
-      kachick
       federicoschonborn
     ];
   };

From 8e1fe516204b4fbced0d34bb3887950d55e84282 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 15 May 2025 14:05:39 +0900
Subject: [PATCH 85/95] komac: remove kachick from maintainers

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

diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix
index 70824ce6352c..a744856102ab 100644
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@@ -77,7 +77,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/russellbanks/Komac/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      kachick
       HeitorAugustoLN
     ];
     mainProgram = "komac";

From 04fa62d4f93d25af20e7c38c9eb894fe64330bca Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 15 May 2025 12:06:35 +0800
Subject: [PATCH 86/95] vscode-extensions.ms-dotnettools.csharp: remove update
 script

---
 .../ms-dotnettools.csharp/default.nix         |  2 -
 .../ms-dotnettools.csharp/update.sh           | 46 -------------------
 2 files changed, 48 deletions(-)
 delete mode 100755 pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 4cce24b6b7d9..2192aaa69faf 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -134,8 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     )
   '';
 
-  passthru.updateScript = ./update.sh;
-
   meta = {
     description = "Official C# support for Visual Studio Code";
     homepage = "https://github.com/dotnet/vscode-csharp";
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh
deleted file mode 100755
index a77818da7f23..000000000000
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix common-updater-scripts
-# shellcheck shell=bash
-set -euo pipefail
-
-export LC_ALL=C
-
-PUBLISHER=ms-dotnettools
-EXTENSION=csharp
-
-response=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \
-    -H 'accept: application/json;api-version=3.0-preview.1' \
-    -H 'content-type: application/json' \
-    --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"'"$PUBLISHER.$EXTENSION"'"}]}],"flags":16}')
-
-# Find the latest version compatible with stable vscode version
-latest_version=$(jq --raw-output '
-.results[0].extensions[0].versions
-| map(select(has("properties")))
-| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$")))
-| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.PreRelease")) | .[0].value != "true"))
-| .[0].version' <<<"$response")
-
-getDownloadUrl() {
-    nix-instantiate \
-        --eval \
-        --strict \
-        --json \
-        'pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix' \
-        --attr url \
-        --argstr publisher $PUBLISHER \
-        --argstr name $EXTENSION \
-        --argstr version "$latest_version" \
-        --argstr arch "$1" | jq . --raw-output
-}
-
-update_hash() {
-    local hash
-    hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$(getDownloadUrl "$2")")")
-    update-source-version vscode-extensions.$PUBLISHER.$EXTENSION "$latest_version" "$hash" --system="$1" --ignore-same-version
-}
-
-update_hash x86_64-linux linux-x64
-update_hash aarch64-linux linux-arm64
-update_hash x86_64-darwin darwin-x64
-update_hash aarch64-darwin darwin-arm64

From b6379913ebcef62dcd94b9173187b108540a50b9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 15 May 2025 12:11:21 +0800
Subject: [PATCH 87/95] vscode-extensions.ms-dotnettools.csharp: 2.72.34 ->
 2.76.27

---
 .../extensions/ms-dotnettools.csharp/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 2192aaa69faf..9581bd107502 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -17,19 +17,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-pMcUrsIVpb0lYhonEKB/5pZG+08OhL/Py7wmkmlXWgo=";
+        hash = "sha256-yJ4bAxIg3yfQJPWJcl6jUMwQ/ssHkstJWuEp3wr0dDA=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-dJilgYVLkx5JVHk3e3mZjW7qpWrviuB4OhtzV1DkmrI=";
+        hash = "sha256-EpWHwansBwBD0aYoW2ek7iWFbp+s7ZH6ug3ejoSRG5U=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-DyueVd+G67P48Oo0+HTC3Sg0/en/bRBV+F8mKuz66RY=";
+        hash = "sha256-345hK47tyMGMJDKiujwpECDHMbRpLi17x2lH2rMX9Lg=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-yk6bSeaEivx8kc3fqpSJBTMxUDsJGVwMoRxPPwaHgtc=";
+        hash = "sha256-u/vflQd285SuZ41ASd8nJgs+lN6892J3x6lPgWqVY+Y=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.72.34";
+    version = "2.76.27";
     inherit (extInfo) hash arch;
   };
 

From 5e31efee6b634dbe79787cc55cd152dbb474fe61 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 9 May 2025 07:13:39 +0200
Subject: [PATCH 88/95] =?UTF-8?q?ocamlPackages.junit:=202.0.2=20=E2=86=92?=
 =?UTF-8?q?=202.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/junit/alcotest.nix | 9 +++++----
 pkgs/development/ocaml-modules/junit/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/junit/ounit.nix    | 5 ++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/junit/alcotest.nix b/pkgs/development/ocaml-modules/junit/alcotest.nix
index edec978cbe8e..eb750b4372a7 100644
--- a/pkgs/development/ocaml-modules/junit/alcotest.nix
+++ b/pkgs/development/ocaml-modules/junit/alcotest.nix
@@ -1,19 +1,20 @@
 {
   buildDunePackage,
+  lib,
+  ocaml,
   junit,
   alcotest,
 }:
 
-buildDunePackage ({
+buildDunePackage {
   pname = "junit_alcotest";
 
   inherit (junit) src version meta;
-  duneVersion = "3";
 
   propagatedBuildInputs = [
     junit
     alcotest
   ];
 
-  doCheck = false; # 2 tests fail: 1) "Test with unexpected exception"; 2) "with wrong result";
-})
+  doCheck = lib.versionAtLeast ocaml.version "4.12";
+}
diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix
index e615c40d9a58..9604ec31e75a 100644
--- a/pkgs/development/ocaml-modules/junit/default.nix
+++ b/pkgs/development/ocaml-modules/junit/default.nix
@@ -8,11 +8,11 @@
 
 buildDunePackage (rec {
   pname = "junit";
-  version = "2.0.2";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz";
-    sha256 = "00bbx5j8vsy9fqbc04xa3lsalaxicirmbczr65bllfk1afv43agx";
+    hash = "sha256-j+4lfuQEWq8z8ik/zfA5phWqv8km+tGEzqG/63cbhTM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/junit/ounit.nix b/pkgs/development/ocaml-modules/junit/ounit.nix
index 2a0c47d01a51..6e4b79eea272 100644
--- a/pkgs/development/ocaml-modules/junit/ounit.nix
+++ b/pkgs/development/ocaml-modules/junit/ounit.nix
@@ -1,18 +1,17 @@
 {
   buildDunePackage,
   junit,
-  ounit,
+  ounit2,
 }:
 
 buildDunePackage ({
   pname = "junit_ounit";
 
   inherit (junit) src version meta;
-  duneVersion = "3";
 
   propagatedBuildInputs = [
     junit
-    ounit
+    ounit2
   ];
 
   doCheck = true;

From 918e0afe2b25dbc28d71c3b92e329b8f9a497814 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 07:24:07 +0000
Subject: [PATCH 89/95] libigl: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/li/libigl/package.nix b/pkgs/by-name/li/libigl/package.nix
index 085915ea352f..1fc21b8f63d4 100644
--- a/pkgs/by-name/li/libigl/package.nix
+++ b/pkgs/by-name/li/libigl/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "libigl";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "libigl";
     repo = "libigl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OpjkQGRiuc7kNlwgCeM4dcotTb5J+6LUn4IOe9bFbW4=";
+    hash = "sha256-7Cvz/yOb5kQaIceUwyijBNplXvok5reJoJsTnvKWt4M=";
   };
 
   # We could also properly use CMake, but we would have to heavily patch it

From 2c3bb1389e6359c76f5ecc3b9e16b7c804d7f3ea Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 15 May 2025 09:25:49 +0200
Subject: [PATCH 90/95] varnish76: drop

will be EOL within 25.05 support window
---
 nixos/tests/all-tests.nix         | 4 ----
 pkgs/servers/varnish/default.nix  | 5 -----
 pkgs/servers/varnish/modules.nix  | 4 ----
 pkgs/servers/varnish/packages.nix | 5 -----
 pkgs/top-level/aliases.nix        | 2 ++
 pkgs/top-level/all-packages.nix   | 2 --
 6 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 805b77bf7a96..ab914de71f38 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1424,10 +1424,6 @@ in
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish60;
   };
-  varnish76 = runTest {
-    imports = [ ./varnish.nix ];
-    _module.args.package = pkgs.varnish76;
-  };
   varnish77 = runTest {
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish77;
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index b7ab2683d681..b496c0569d79 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -94,11 +94,6 @@ in
     version = "6.0.14";
     hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
   };
-  # EOL 2025-09-15
-  varnish76 = common {
-    version = "7.6.3";
-    hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc=";
-  };
   # EOL 2026-03-15
   varnish77 = common {
     version = "7.7.1";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index ad0b47915810..3bc8b6850a4d 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -55,10 +55,6 @@ in
     version = "0.15.1";
     hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
   };
-  modules25 = common {
-    version = "0.25.0";
-    hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
-  };
   modules26 = common {
     version = "0.26.0";
     hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 1596a1f67717..3e307a566b17 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -2,7 +2,6 @@
   callPackages,
   callPackage,
   varnish60,
-  varnish76,
   varnish77,
 }:
 {
@@ -20,10 +19,6 @@
       sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
     };
   };
-  varnish76Packages = rec {
-    varnish = varnish76;
-    modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
-  };
   varnish77Packages = rec {
     varnish = varnish77;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 304eac20d07d..3e73016a999a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1919,6 +1919,8 @@ mapAliases {
   varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29
   varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
+  varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
+  varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8b53c6a3e7e..e9f04474b646 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4800,12 +4800,10 @@ with pkgs;
 
   inherit (callPackages ../servers/varnish { })
     varnish60
-    varnish76
     varnish77
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
-    varnish76Packages
     varnish77Packages
     ;
   varnishPackages = varnish77Packages;

From e4a89f5cc0244b8f75adc32adcd97fd4079ab0e0 Mon Sep 17 00:00:00 2001
From: Lucie <135951230+lweqx@users.noreply.github.com>
Date: Fri, 9 May 2025 14:12:48 +0200
Subject: [PATCH 91/95] coqPackages.HoTT: 8.20 -> 9.0

---
 pkgs/development/coq-modules/HoTT/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix
index cfb90d806a8f..ab866d467fcf 100644
--- a/pkgs/development/coq-modules/HoTT/default.nix
+++ b/pkgs/development/coq-modules/HoTT/default.nix
@@ -14,7 +14,7 @@ mkCoqDerivation {
     with lib.versions;
     lib.switch coq.coq-version [
       {
-        case = range "8.14" "8.20";
+        case = range "8.14" "9.0";
         out = coq.coq-version;
       }
     ] null;
@@ -26,6 +26,7 @@ mkCoqDerivation {
   release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc=";
   release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ=";
   release."8.20".sha256 = "sha256-XHAvomi0of11j4x5gpTgD5Mw53eF1FpnCyBvdbV3g6I=";
+  release."9.0".sha256 = "sha256-etdLH1qDyDc+ZM7K/65iib0MRlLhsnVmzWBCULUDD50=";
 
   # versions of HoTT for Coq 8.17 and onwards will use dune
   # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null;

From bf259bc8ec0fb07246b731ab44a3ef8f62e5a7c5 Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Thu, 15 May 2025 10:46:04 +0200
Subject: [PATCH 92/95] zotero: change alias zotero_7 to refer to zotero, not
 zotero-beta

Zotero 7 was released last year. I was surprised to find that zotero_7 pointed to the beta.
---
 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 a8b53c6a3e7e..6a128c2679ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14693,7 +14693,7 @@ with pkgs;
     SDL = SDL_sixel;
   };
 
-  zotero_7 = pkgs.zotero-beta;
+  zotero_7 = pkgs.zotero;
 
   zsteg = callPackage ../tools/security/zsteg { };
 

From 7a5844a90239c576511efe450ebcbacd90b558b9 Mon Sep 17 00:00:00 2001
From: Hannes <h@nnes.dev>
Date: Thu, 15 May 2025 08:40:54 +0800
Subject: [PATCH 93/95] outfieldr: init at 1.1.0

---
 pkgs/by-name/ou/outfieldr/package.nix | 34 +++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/ou/outfieldr/package.nix

diff --git a/pkgs/by-name/ou/outfieldr/package.nix b/pkgs/by-name/ou/outfieldr/package.nix
new file mode 100644
index 000000000000..e59a53dde728
--- /dev/null
+++ b/pkgs/by-name/ou/outfieldr/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitLab,
+  stdenv,
+  zig_0_14,
+}:
+
+let
+  zig = zig_0_14;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "outfieldr";
+  version = "1.1.0";
+
+  src = fetchFromGitLab {
+    owner = "ve-nt";
+    repo = "outfieldr";
+    rev = finalAttrs.version;
+    hash = "sha256-Xz5BxwPWrZfDsWnvVR9KvHidbUdPsxy7b2ONiSZY+uk=";
+  };
+
+  nativeBuildInputs = [
+    zig.hook
+  ];
+
+  meta = {
+    description = "TLDR client written in Zig";
+    homepage = "https://gitlab.com/ve-nt/outfieldr";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hasnep ];
+    mainProgram = "tldr";
+    inherit (zig.meta) platforms;
+  };
+})

From b3073ef35d9556b1c27e26eba16e26c5add8c6f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 19:44:41 +1000
Subject: [PATCH 94/95] roddhjav-apparmor-rules: 0-unstable-2025-05-03 ->
 0-unstable-2025-05-14 (#407184)

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

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 0c51f82571a2..70ae5a6af2ba 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-05-03";
+  version = "0-unstable-2025-05-14";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "6d8eda6b8735626d5c2d25a810fb7600a4e3d60e";
-    hash = "sha256-y0qdiijSZligYPpt5qbK36KAt+q6mHN03lOqq6HPSRA=";
+    rev = "877452519d3138bd4a98dc7ef3cd3dec78a5b9dc";
+    hash = "sha256-uqtCB636qAe6c/dokLsbbTGw3oeo+93YhnGfPUwg7WI=";
   };
 
   dontConfigure = true;

From 56c39dbe8b2a6c5bd4ae148825d80bb92e1fc2bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 10:54:22 +0000
Subject: [PATCH 95/95] whatsapp-emoji-font: 2.25.1.75-1 -> 2.25.9.78-1

---
 pkgs/by-name/wh/whatsapp-emoji-font/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
index 29575497c007..d83050188c99 100644
--- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
+++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "whatsapp-emoji-linux";
-  version = "2.25.1.75-1";
+  version = "2.25.9.78-1";
 
   src = fetchFromGitHub {
     tag = version;
     owner = "dmlls";
     repo = "whatsapp-emoji-linux";
-    hash = "sha256-5k5/plT3bJMrTcJt0TpWZt0oaEJPWT8ldgIhQJay23k=";
+    hash = "sha256-QopJUT6HAgvrRNQw6adHNOSZUoJO1qiFATXsDQOUf7w=";
   };
 
   makeFlags = [