From 4752577dd6177044913018acdf2bd456b4e08837 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 15 Apr 2025 12:26:03 +0200
Subject: [PATCH 01/67] lib.modules: Add _prefix module argument

---
 lib/modules.nix                              |  1 +
 lib/tests/modules.sh                         |  3 +++
 lib/tests/modules/prefix-module-argument.nix | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 lib/tests/modules/prefix-module-argument.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 290b9ce0b698..ad71209a62a3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -258,6 +258,7 @@ let
                     specialArgs
                     ;
                   _class = class;
+                  _prefix = prefix;
                 }
                 // specialArgs
               );
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index d0f25c283dcb..d7006d9c58fc 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -352,6 +352,9 @@ checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-s
 ## Paths should be allowed as values and work as expected
 checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix
 
+## _prefix module argument is available at import time and contains the prefix
+checkConfigOutput '^true$' config.foo.ok ./prefix-module-argument.nix
+
 ## deferredModule
 # default module is merged into nodes.foo
 checkConfigOutput '"beta"' config.nodes.foo.settingsDict.c ./deferred-module.nix
diff --git a/lib/tests/modules/prefix-module-argument.nix b/lib/tests/modules/prefix-module-argument.nix
new file mode 100644
index 000000000000..2cb854341a22
--- /dev/null
+++ b/lib/tests/modules/prefix-module-argument.nix
@@ -0,0 +1,17 @@
+{ lib, ... }:
+{
+  options.foo = lib.mkOption {
+    type = lib.types.submodule { };
+    default = { };
+  };
+
+  config = {
+    foo =
+      { _prefix, ... }:
+      assert _prefix == [ "foo" ];
+      {
+        options.ok = lib.mkOption { };
+        config.ok = true;
+      };
+  };
+}

From ce0c6e269d6c0a40c63e1f8b7f40ec1aac0e7ffd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 15 Apr 2025 12:28:37 +0200
Subject: [PATCH 02/67] lib.modules: Typos

---
 lib/modules.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index ad71209a62a3..89c12bcf1a77 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -2024,12 +2024,13 @@ let
           value,
           _type,
           expectedClass ? null,
+          prefix,
         }:
         paragraphs (
           [
             ''
               Expected a module, but found a value of type ${warn (escapeNixString _type)}${into_fallback_file_maybe fallbackFile}.
-              A module is typically loaded by adding it the ${code "imports = [ ... ];"} attribute of an existing module, or in the ${code "modules = [ ... ];"} argument of various functions.
+              A module is typically loaded by adding it to the ${code "imports = [ ... ];"} attribute of an existing module, or in the ${code "modules = [ ... ];"} argument of various functions.
               Please make sure that each of the list items is a module, and not a different kind of value.
             ''
           ]
@@ -2058,7 +2059,7 @@ let
                 '')
               ]
               ++ optionalMatch {
-                # We'll no more than 5 custom suggestions here.
+                # We'll add no more than 5 custom suggestions here.
                 # Please switch to `.modules.${class}` in your Module System application.
                 "nixos" = trim ''
                   or

From 38bb05d169a51fc7c7187867440d2968212d1267 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 15 Apr 2025 12:39:35 +0200
Subject: [PATCH 03/67] lib.modules: Add prefix to imports type check error

---
 lib/modules.nix                              |  7 ++++++-
 lib/tests/modules.sh                         |  1 +
 lib/tests/modules/import-error-submodule.nix | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 lib/tests/modules/import-error-submodule.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 89c12bcf1a77..73cc9fc94ca4 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -389,6 +389,7 @@ let
                 value = m;
                 _type = m._type;
                 expectedClass = class;
+                prefix = args._prefix;
               }
             )
         else if isList m then
@@ -1977,6 +1978,10 @@ let
           file != null && file != unknownModule
         ) ", while trying to load a module into ${toString file}";
 
+      into_prefix_maybe =
+        prefix:
+        optionalString (prefix != [ ]) ", while trying to load a module into ${code (showOption prefix)}";
+
       /**
         Format text with one line break between each list item.
       */
@@ -2029,7 +2034,7 @@ let
         paragraphs (
           [
             ''
-              Expected a module, but found a value of type ${warn (escapeNixString _type)}${into_fallback_file_maybe fallbackFile}.
+              Expected a module, but found a value of type ${warn (escapeNixString _type)}${into_fallback_file_maybe fallbackFile}${into_prefix_maybe prefix}.
               A module is typically loaded by adding it to the ${code "imports = [ ... ];"} attribute of an existing module, or in the ${code "modules = [ ... ];"} argument of various functions.
               Please make sure that each of the list items is a module, and not a different kind of value.
             ''
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index d7006d9c58fc..929543fd827f 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -606,6 +606,7 @@ checkConfigError 'Expected a module, but found a value of type .*"flake".*, whil
 checkConfigOutput '^true$' config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix
 checkConfigError 'Expected a module, but found a value of type .*"configuration".*, while trying to load a module into .*/import-configuration.nix.' config ./import-configuration.nix
 checkConfigError 'please only import the modules that make up the configuration' config ./import-configuration.nix
+checkConfigError 'Expected a module, but found a value of type "configuration", while trying to load a module into .*/import-error-submodule.nix, while trying to load a module into .*foo.*\.' config.foo ./import-error-submodule.nix
 
 # doRename works when `warnings` does not exist.
 checkConfigOutput '^1234$' config.c.d.e ./doRename-basic.nix
diff --git a/lib/tests/modules/import-error-submodule.nix b/lib/tests/modules/import-error-submodule.nix
new file mode 100644
index 000000000000..d2237c58bb5a
--- /dev/null
+++ b/lib/tests/modules/import-error-submodule.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+let
+  myconf = lib.evalModules { modules = [ { } ]; };
+in
+{
+  options.foo = lib.mkOption {
+    type = lib.types.submodule { };
+    default = { };
+  };
+  config.foo =
+    { ... }:
+    {
+      imports = [
+        # error, like `import-configuration.nix`, but in a submodule this time
+        myconf
+      ];
+    };
+}

From 1de329f5e181b4e46607934ef323f4931803e42b Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 15 Apr 2025 13:20:40 +0200
Subject: [PATCH 04/67] doc: Module arguments

---
 doc/module-system/module-system.chapter.md | 45 ++++++++++++++++++++++
 doc/redirects.json                         | 18 +++++++++
 2 files changed, 63 insertions(+)

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 0c91012eebb4..eaeda870def6 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -115,3 +115,48 @@ A nominal type marker, always `"configuration"`.
 #### `class` {#module-system-lib-evalModules-return-value-_configurationClass}
 
 The [`class` argument](#module-system-lib-evalModules-param-class).
+
+## Module arguments {#module-system-module-arguments}
+
+Module arguments are the attribute values passed to modules when they are evaluated.
+
+They originate from these sources:
+1. Built-in arguments
+  - `lib`,
+  - `config`,
+  - `options`,
+  - `_class`,
+  - `_prefix`,
+2. Attributes from the [`specialArgs`] which were passed to [`evalModules`] or `submoduleWith`. These are application-specific.
+3. Attributes from the `_module.args` option value. These are application-specific and can be provided by any module.
+
+The prior two categories are available while evaluating the `imports`, whereas
+the last category is only available after the `imports` have been resolved.
+
+### `lib` {#module-system-module-argument-lib}
+
+A reference to the Nixpkgs library.
+
+### `config` {#module-system-module-argument-config}
+
+All option values.
+Unlike the `evalModules` [`config` return attribute](#module-system-lib-evalModules-return-value-config), this includes `_module`.
+
+### `options` {#module-system-module-argument-options}
+
+All evaluated option declarations.
+
+### `_class` {#module-system-module-argument-_class}
+
+The [expected class](#module-system-lib-evalModules-param-class) of the loaded modules.
+
+### `_prefix` {#module-system-module-argument-_prefix}
+
+The location under which the module is evaluated. This is used to improve error reporting and find the implicit `name` module argument in submodules.
+
+It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree.
+For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
+Any dependencies on `_prefix` should be replaced with explicit options, whose default definitions can be provided by the module that imports them.
+
+[`evalModules`]: #module-system-lib-evalModules
+[`specialArgs`]: #module-system-lib-evalModules-param-specialArgs
diff --git a/doc/redirects.json b/doc/redirects.json
index 2a8069a490bb..714e4a691753 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -4363,5 +4363,23 @@
   ],
   "sec-interop.cylonedx-fod": [
     "index.html#sec-interop.cylonedx-fod"
+  ],
+  "module-system-module-argument-_prefix": [
+    "index.html#module-system-module-argument-_prefix"
+  ],
+  "module-system-module-argument-lib": [
+    "index.html#module-system-module-argument-lib"
+  ],
+  "module-system-module-argument-config": [
+    "index.html#module-system-module-argument-config"
+  ],
+  "module-system-module-arguments": [
+    "index.html#module-system-module-arguments"
+  ],
+  "module-system-module-argument-_class": [
+    "index.html#module-system-module-argument-_class"
+  ],
+  "module-system-module-argument-options": [
+    "index.html#module-system-module-argument-options"
   ]
 }

From 5e6504c0dfc3663665ce05bb52489150ab014fca Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Fri, 9 May 2025 18:26:10 +0200
Subject: [PATCH 05/67] doc/module-system: Apply suggestions from code review

Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
---
 doc/module-system/module-system.chapter.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index eaeda870def6..6ea9f4a4116f 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -127,7 +127,7 @@ They originate from these sources:
   - `options`,
   - `_class`,
   - `_prefix`,
-2. Attributes from the [`specialArgs`] which were passed to [`evalModules`] or `submoduleWith`. These are application-specific.
+2. Attributes from the [`specialArgs`] argument passed to [`evalModules`] or `submoduleWith`. These are application-specific.
 3. Attributes from the `_module.args` option value. These are application-specific and can be provided by any module.
 
 The prior two categories are available while evaluating the `imports`, whereas
@@ -152,11 +152,13 @@ The [expected class](#module-system-lib-evalModules-param-class) of the loaded m
 
 ### `_prefix` {#module-system-module-argument-_prefix}
 
-The location under which the module is evaluated. This is used to improve error reporting and find the implicit `name` module argument in submodules.
+The location under which the module is evaluated.
+This is used to improve error reporting and to find the implicit `name` module argument in submodules.
+It is exposed as a module argument due to how the module system is implemented, which cannot be avoided without breaking compatibility.
 
 It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree.
 For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
-Any dependencies on `_prefix` should be replaced with explicit options, whose default definitions can be provided by the module that imports them.
+Instead of depending on `_prefix` use explicit options, whose default definitions can be provided by the module that imports them.
 
 [`evalModules`]: #module-system-lib-evalModules
 [`specialArgs`]: #module-system-lib-evalModules-param-specialArgs

From 736327d6ca401e4bbcc8272d9604ec0a4cfe2630 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 May 2025 18:39:42 +0200
Subject: [PATCH 06/67] doc/module-system: Adjust markdown syntax

---
 doc/module-system/module-system.chapter.md | 48 ++++++++++------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 6ea9f4a4116f..8c27aea15ffc 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -122,43 +122,39 @@ Module arguments are the attribute values passed to modules when they are evalua
 
 They originate from these sources:
 1. Built-in arguments
-  - `lib`,
-  - `config`,
-  - `options`,
-  - `_class`,
-  - `_prefix`,
+    - `lib`,
+    - `config`,
+    - `options`,
+    - `_class`,
+    - `_prefix`,
 2. Attributes from the [`specialArgs`] argument passed to [`evalModules`] or `submoduleWith`. These are application-specific.
 3. Attributes from the `_module.args` option value. These are application-specific and can be provided by any module.
 
 The prior two categories are available while evaluating the `imports`, whereas
 the last category is only available after the `imports` have been resolved.
 
-### `lib` {#module-system-module-argument-lib}
+[`lib`]{#module-system-module-argument-lib} [🔗](#module-system-module-argument-lib)
+: A reference to the Nixpkgs library.
 
-A reference to the Nixpkgs library.
+[`config`]{#module-system-module-argument-config} [🔗](#module-system-module-argument-config)
+: All option values.
+  Unlike the `evalModules` [`config` return attribute](#module-system-lib-evalModules-return-value-config), this includes `_module`.
 
-### `config` {#module-system-module-argument-config}
+[`options`]{#module-system-module-argument-options} [🔗](#module-system-module-argument-options)
+: All evaluated option declarations.
 
-All option values.
-Unlike the `evalModules` [`config` return attribute](#module-system-lib-evalModules-return-value-config), this includes `_module`.
+[`_class`]{#module-system-module-argument-_class} [🔗](#module-system-module-argument-_class)
+: The [expected class](#module-system-lib-evalModules-param-class) of the loaded modules.
 
-### `options` {#module-system-module-argument-options}
+[`_prefix`]{#module-system-module-argument-_prefix} [🔗](#module-system-module-argument-_prefix)
+: The location under which the module is evaluated.
+  This is used to improve error reporting and to find the implicit `name` module argument in submodules.
+  It is exposed as a module argument due to how the module system is implemented, which cannot be avoided without breaking compatibility.
 
-All evaluated option declarations.
-
-### `_class` {#module-system-module-argument-_class}
-
-The [expected class](#module-system-lib-evalModules-param-class) of the loaded modules.
-
-### `_prefix` {#module-system-module-argument-_prefix}
-
-The location under which the module is evaluated.
-This is used to improve error reporting and to find the implicit `name` module argument in submodules.
-It is exposed as a module argument due to how the module system is implemented, which cannot be avoided without breaking compatibility.
-
-It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree.
-For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
-Instead of depending on `_prefix` use explicit options, whose default definitions can be provided by the module that imports them.
+  It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree.
+  For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
+  Instead of depending on `_prefix` use explicit options, whose default definitions can be provided by the module that imports them.
 
+<!-- markdown link aliases -->
 [`evalModules`]: #module-system-lib-evalModules
 [`specialArgs`]: #module-system-lib-evalModules-param-specialArgs

From 840f68ebe86891bcf520a58fdd65a406a597abf0 Mon Sep 17 00:00:00 2001
From: Julia Brunenberg <julia@jjim.de>
Date: Sat, 19 Apr 2025 12:49:22 +0200
Subject: [PATCH 07/67] x2gokdriveclient: init at version
 0.0.0.1-unstable-2024-09-10

adding KDrive client package to enable use of KDrive in x2goclient

SRC Tar: https://code.x2go.org/releases/source/x2gokdriveclient/
SRC git: https://code.x2go.org/gitweb?p=x2gokdriveclient.git;a=summary
---
 maintainers/maintainer-list.nix               |  6 ++
 .../remote/x2gokdriveclient/default.nix       | 78 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 86 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/x2gokdriveclient/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5bec0a55cd5c..fb6685a6d931 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12397,6 +12397,12 @@
     githubId = 62934740;
     keys = [ { fingerprint = "E9C6 44C7 F6AA A865 4CB9  2723 22C8 B0CE B9AC 4AFF"; } ];
   };
+  juliabru = {
+    name = "Julia Brunenberg";
+    email = "julia@jjim.de";
+    github = "juliadin";
+    githubId = 7837969;
+  };
   JulianFP = {
     name = "Julian Partanen";
     github = "JulianFP";
diff --git a/pkgs/applications/networking/remote/x2gokdriveclient/default.nix b/pkgs/applications/networking/remote/x2gokdriveclient/default.nix
new file mode 100644
index 000000000000..8435f3820c1b
--- /dev/null
+++ b/pkgs/applications/networking/remote/x2gokdriveclient/default.nix
@@ -0,0 +1,78 @@
+{
+  stdenv,
+  lib,
+  fetchgit,
+  qt5,
+  qtbase,
+  qtx11extras,
+  qttools,
+  zlib,
+  gnumake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "x2gokdriveclient";
+  version = "0.0.0.1-unstable-2024-09-10";
+
+  src = fetchgit {
+    #url = "https://code.x2go.org/git/x2gokdriveclient.git";
+
+    # in reference to https://github.com/NixOS/nixpkgs/tree/master/pkgs#sources
+    # I am aware that this is bad practice. The HTTPS url above responds with a 500 and is hopelessly
+    # overloaded. the X2Go project doesn't seem to maintain a good and healthy code repository on github
+    # either.
+    url = "git://code.x2go.org/x2gokdriveclient.git";
+    rev = "ed53784a236ef4fe00adce726be492c4bf227d73";
+    hash = "sha256-hWPM0bye4I34T7y2ipZOULY2+ehVanmTj4V80+lc+iw=";
+  };
+
+  buildInputs = [
+    qtbase
+    qtx11extras
+    qttools
+    zlib
+  ];
+
+  nativeBuildInputs = [
+    qt5.wrapQtAppsHook
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "SHELL=/bin/bash" "SHELL=$SHELL" \
+      --replace-fail "MAKEOVERRIDES" "NOMAKEOVERRIDES " \
+      --replace-fail ".MAKEFLAGS" ".NOFLAGS " \
+      --replace-fail "qmake" "${qtbase.dev}/bin/qmake" \
+      --replace-fail "-o root -g root" ""
+    substituteInPlace \
+      VERSION.x2gokdriveclient \
+      x2gokdriveclient.spec \
+      man/man1/x2gokdriveclient.1 \
+      --replace-fail "0.0.0.2" "${finalAttrs.version}"
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "ETCDIR=$(out)/etc"
+    "build_client"
+    "build_man"
+  ];
+
+  installTargets = [
+    "install_client"
+    "install_man"
+  ];
+
+  qtWrapperArgs = [
+    "--set QT_QPA_PLATFORM xcb"
+  ];
+
+  meta = with lib; {
+    description = "Graphical NoMachine NX3 remote desktop client (KDrive client)";
+    mainProgram = "x2gokdriveclient";
+    homepage = "https://x2go.org/";
+    maintainers = with maintainers; [ juliabru ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24c056e43231..a278372950a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14556,6 +14556,8 @@ with pkgs;
 
   x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
 
+  x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };
+
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
 
   xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {

From 19086768fe376d149616d608096053c34472e839 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 7 Jun 2025 00:52:13 +0200
Subject: [PATCH 08/67] lib.derivations: avoid common double-warn with
 warnOnInstantiate

Before:

    $ nix-build . -A opensycl
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    /nix/store/8g0lfv82s0sprmqgfj146ggkb7bn3rm6-adaptivecpp-25.02.0

    $ nix-instantiate . -A opensycl
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
    /nix/store/b8q5xp94s4n7zfn7as5a9xjvylh6y3pi-adaptivecpp-25.02.0.drv

After:

    $ nix-build . -A opensycl
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    /nix/store/8g0lfv82s0sprmqgfj146ggkb7bn3rm6-adaptivecpp-25.02.0

    $ nix-instantiate . -A opensycl
    trace: evaluation warning: 'opensycl' has been renamed to 'adaptivecpp'
    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
    /nix/store/b8q5xp94s4n7zfn7as5a9xjvylh6y3pi-adaptivecpp-25.02.0.drv
---
 lib/derivations.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/derivations.nix b/lib/derivations.nix
index 3a8c683da3c0..574b01695d86 100644
--- a/lib/derivations.nix
+++ b/lib/derivations.nix
@@ -216,8 +216,9 @@ in
   /**
     Wrap a derivation such that instantiating it produces a warning.
 
-    All attributes apart from `meta`, `name`, and `type` (which are used by
-    `nix search`) will be wrapped in `lib.warn`.
+    All attributes will be wrapped with `lib.warn` except from `.meta`, `.name`,
+    and `.type` which are used by `nix search`, and `.outputName` which avoids
+    double warnings with `nix-instantiate` and `nix-build`.
 
     # Inputs
 
@@ -246,6 +247,7 @@ in
         "meta"
         "name"
         "type"
+        "outputName"
       ];
     in
     drv // mapAttrs (_: lib.warn msg) drvToWrap;

From 5ebd9d28810503f5fa980b73f5c030f15aec590b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9za=20Ahsendorf?= <gezaahs@gmail.com>
Date: Sat, 14 Jun 2025 11:25:25 +0200
Subject: [PATCH 09/67] maintainers: add dynamicgoose

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d70b31081b98..7c6f123f686c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6955,6 +6955,12 @@
     githubId = 277927;
     name = "Dylan Taylor";
   };
+  dynamicgoose = {
+    email = "gezaahs@gmail.com";
+    github = "dynamicgoose";
+    githubId = 75172915;
+    name = "Géza Ahsendorf";
+  };
   dysinger = {
     email = "tim@dysinger.net";
     github = "dysinger";

From bfae1bafcac9e8840c0b735a3ad7dd44b0797b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jun 2025 16:28:04 -0700
Subject: [PATCH 10/67] rocmPackages.migraphx: override oneDNN

---
 .../development/rocm-modules/6/migraphx/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix
index 5501e6044b61..54620d320076 100644
--- a/pkgs/development/rocm-modules/6/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/6/migraphx/default.nix
@@ -20,7 +20,7 @@
   nlohmann_json,
   msgpack,
   sqlite,
-  oneDNN_2,
+  oneDNN,
   blaze,
   texliveSmall,
   doxygen,
@@ -51,6 +51,15 @@ let
       ]
     )
   );
+  oneDNN' = oneDNN.overrideAttrs rec {
+    version = "2.7.5";
+    src = fetchFromGitHub {
+      owner = "oneapi-src";
+      repo = "oneDNN";
+      tag = "v${version}";
+      hash = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
+    };
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "migraphx";
@@ -105,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     nlohmann_json
     msgpack
     sqlite
-    oneDNN_2
+    oneDNN'
     blaze
     python3Packages.pybind11
     python3Packages.onnx

From 34d1760db3c0d46ebb99955fae7fceea36f4ec05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 02:46:07 +0000
Subject: [PATCH 11/67] glaze: 5.4.0 -> 5.5.0

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index ca125c5cf043..df822b3ce1d0 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "5.4.0";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${final.version}";
-    hash = "sha256-AG6fnax9UZEhGtAUc8bgGijk8q7ge6lDTb0XjqL+kks=";
+    hash = "sha256-HC8R1wyNySVhuTZczdbiHkQ8STTXA/1GJLKdTXN9VAo=";
   };
 
   nativeBuildInputs = [ cmake ];

From 7971ba1d3790ab12777ab32362808db363d47949 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 3 Jun 2025 19:04:49 +0200
Subject: [PATCH 12/67] maintainers: add transcaffeine

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 459af64996ca..f0eec3e14dfe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25536,6 +25536,17 @@
     github = "tpwrules";
     githubId = 208010;
   };
+  transcaffeine = {
+    name = "transcaffeine";
+    email = "transcaffeine@finally.coffee";
+    github = "transcaffeine";
+    githubId = 139544537;
+    keys = [
+      {
+        fingerprint = "5E0A 9CB3 9806 57CB 9AB9  4AE6 790E AEC8 F99A B41F";
+      }
+    ];
+  };
   traverseda = {
     email = "traverse.da@gmail.com";
     github = "traverseda";

From af56f66ea846fb2e049be68f9a420ddc412c3d80 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 20:31:16 +0200
Subject: [PATCH 13/67] fediwall{,-unwrapped}: init at 1.4.0

---
 .../by-name/fe/fediwall-unwrapped/package.nix | 38 +++++++++++++++++++
 pkgs/by-name/fe/fediwall/package.nix          | 25 ++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/fe/fediwall-unwrapped/package.nix
 create mode 100644 pkgs/by-name/fe/fediwall/package.nix

diff --git a/pkgs/by-name/fe/fediwall-unwrapped/package.nix b/pkgs/by-name/fe/fediwall-unwrapped/package.nix
new file mode 100644
index 000000000000..445db9bd3e5c
--- /dev/null
+++ b/pkgs/by-name/fe/fediwall-unwrapped/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+}:
+
+let
+  version = "1.4.0";
+in
+buildNpmPackage {
+  pname = "fediwall";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "defnull";
+    repo = "fediwall";
+    tag = "v${version}";
+    hash = "sha256-aEY6mO7Es+H6CNE4shj/jz47nUeEIxGijKbUscIp0pM=";
+  };
+
+  npmDepsHash = "sha256-0VQ/CBqpQNqjg3lug+AQfFVbh0KhEaGwd+cEakBr/Dc=";
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Social media wall for the Fediverse";
+    homepage = "https://fediwall.social";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ transcaffeine ];
+  };
+}
diff --git a/pkgs/by-name/fe/fediwall/package.nix b/pkgs/by-name/fe/fediwall/package.nix
new file mode 100644
index 000000000000..1d35b9c2c5b3
--- /dev/null
+++ b/pkgs/by-name/fe/fediwall/package.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  stdenv,
+  fediwall-unwrapped,
+  conf ? { },
+}:
+
+if (conf == { }) then
+  fediwall-unwrapped
+else
+  stdenv.mkDerivation {
+    pname = "fediwall";
+    inherit (fediwall-unwrapped) version meta;
+
+    dontUnpack = true;
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out
+      ln -s ${fediwall-unwrapped}/* $out
+      echo ${lib.escapeShellArg (builtins.toJSON conf)} \
+          > "$out/wall-config.json"
+      runHook postInstall
+    '';
+  }

From ba7d1fec08cd32f5dd902b345ac66a94e91212cb Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 24 May 2025 21:14:52 +0200
Subject: [PATCH 14/67] nixos/fediwall: init

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/fediwall.nix  | 128 ++++++++++++++++++
 3 files changed, 131 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/fediwall.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 9a236172dfe8..e5e3ef1ca4aa 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -17,6 +17,8 @@
 
 - [Pi-hole](https://pi-hole.net/), a DNS sinkhole for advertisements based on Dnsmasq. Available as [services.pihole-ftl](#opt-services.pihole-ftl.enable), and [services.pihole-web](#opt-services.pihole-web.enable) for the web GUI and API.
 
+- [Fediwall](https://fediwall.social), a web application for live displaying toots from mastodon, inspired by mastowall. Available as [services.fediwall](#opt-services.fediwall.enable).
+
 - [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable).
 
 - Options under [networking.getaddrinfo](#opt-networking.getaddrinfo.enable) are now allowed to declaratively configure address selection and sorting behavior of `getaddrinfo` in dual-stack networks.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8b9c38d4ee71..d6a6e7d372df 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1543,6 +1543,7 @@
   ./services/web-apps/eintopf.nix
   ./services/web-apps/engelsystem.nix
   ./services/web-apps/ethercalc.nix
+  ./services/web-apps/fediwall.nix
   ./services/web-apps/fider.nix
   ./services/web-apps/filebrowser.nix
   ./services/web-apps/filesender.nix
diff --git a/nixos/modules/services/web-apps/fediwall.nix b/nixos/modules/services/web-apps/fediwall.nix
new file mode 100644
index 000000000000..1c223324b6c2
--- /dev/null
+++ b/nixos/modules/services/web-apps/fediwall.nix
@@ -0,0 +1,128 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+let
+  cfg = config.services.fediwall;
+  pkg = cfg.package.override { conf = cfg.settings; };
+  format = pkgs.formats.json { };
+in
+{
+  options.services.fediwall = {
+    enable = lib.mkEnableOption "fediwall, a social media wall for the fediverse";
+    package = lib.mkPackageOption pkgs "fediwall" { };
+    hostName = lib.mkOption {
+      type = lib.types.str;
+      default = config.networking.fqdnOrHostName;
+      defaultText = lib.literalExpression "config.networking.fqdnOrHostName";
+      example = "fediwall.example.org";
+      description = "The hostname to serve fediwall on.";
+    };
+    settings = lib.mkOption {
+      default = { };
+      description = ''
+        Fediwall configuration. See
+        https://github.com/defnull/fediwall/blob/main/public/wall-config.json.example
+        for information on supported values.
+      '';
+      type = lib.types.submodule {
+        freeformType = format.type;
+        options = {
+          servers = lib.mkOption {
+            type = with lib.types; listOf str;
+            default = [ "mastodon.social" ];
+            description = "Servers to load posts from";
+          };
+          tags = lib.mkOption {
+            type = with lib.types; listOf str;
+            default = [ ];
+            example = lib.literalExpression "[ \"cats\" \"dogs\"]";
+            description = "Tags to follow";
+          };
+          loadPublic = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Load public posts";
+          };
+          loadFederated = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Load federated posts";
+          };
+          loadTrends = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Load trending posts";
+          };
+          hideSensitive = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Hide sensitive (potentially NSFW) posts";
+          };
+          hideBots = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Hide posts from bot accounts";
+          };
+          hideReplies = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Hide replies";
+          };
+          hideBoosts = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Hide boosts";
+          };
+          showMedia = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Show media in posts";
+          };
+          playVideos = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Autoplay videos in posts";
+          };
+        };
+      };
+    };
+    nginx = lib.mkOption {
+      type = lib.types.submodule (
+        lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { }
+      );
+      default = { };
+      example = lib.literalExpression ''
+        {
+          serverAliases = [
+            "fedi.''${config.networking.domain}"
+          ];
+          # Enable TLS and use let's encrypt for ACME
+          forceSSL = true;
+          enableACME = true;
+        }
+      '';
+      description = "Allows customizing the nginx virtualHost settings";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.nginx = {
+      enable = lib.mkDefault true;
+      virtualHosts."${cfg.hostName}" = lib.mkMerge [
+        cfg.nginx
+        {
+          root = lib.mkForce "${pkg}";
+          locations = {
+            "/" = {
+              index = "index.html";
+            };
+          };
+        }
+      ];
+    };
+  };
+}

From 7854e95e4a94a1968d7271c971cdaec5952fc5f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 18 Jun 2025 00:41:57 +0200
Subject: [PATCH 15/67] python313Packages.holidays: 0.74 -> 0.75

Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.74...refs/tags/v0.75

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.75
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index c1ffa46c7724..ff6409bd328e 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.74";
+  version = "0.75";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-lc8yNZ7ZFBjIPiIlT7uCvHX81uMstTGv0Rsbx8RUGh0=";
+    hash = "sha256-xlDCIQb1XeMi+uNIkqMgm1t+fDSuQlqgOx57LnAuyVo=";
   };
 
   build-system = [

From 3addbfc1eb2167e9460177e697a6d701e45f3a94 Mon Sep 17 00:00:00 2001
From: Philipp Schuster <philipp.schuster@cyberus-technology.de>
Date: Mon, 16 Jun 2025 17:27:14 +0200
Subject: [PATCH 16/67] libvirt: 11.0.0 -> 11.4.0

Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
---
 ...n-install-prefix-for-building-on-nix.patch | 53 ++++++++-----------
 pkgs/by-name/li/libvirt/package.nix           |  4 +-
 .../python-modules/libvirt/default.nix        |  4 +-
 pkgs/top-level/perl-packages.nix              |  4 +-
 4 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
index 5345dffc0445..cc4981130eeb 100644
--- a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+++ b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
@@ -402,10 +402,10 @@ index 3b859ea7b4..ccddb3e805 100644
    ]
  endif
 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
-index b9257c816d..98701755d8 100644
+index 09d9fac02c..ee0c74ceec 100644
 --- a/src/security/apparmor/meson.build
 +++ b/src/security/apparmor/meson.build
-@@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles
+@@ -20,16 +20,16 @@ foreach name : apparmor_gen_profiles
      output: name,
      configuration: apparmor_gen_profiles_conf,
      install: true,
@@ -413,39 +413,25 @@ index b9257c816d..98701755d8 100644
 +    install_dir: install_prefix + apparmor_dir,
    )
  endforeach
- 
-@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
-     command: apparmor_gen_cmd,
-     capture: true,
-     install: true,
--    install_dir: apparmor_dir / 'abstractions',
-+    install_dir: install_prefix + apparmor_dir / 'abstractions',
-   )
- endforeach
- 
+
+ install_data(
+   [ 'libvirt-qemu', 'libvirt-lxc' ],
+-  install_dir: apparmor_dir / 'abstractions',
++  install_dir: install_prefix + apparmor_dir / 'abstractions',
+ )
+
  install_data(
    [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
 -  install_dir: apparmor_dir / 'libvirt',
 +  install_dir: install_prefix + apparmor_dir / 'libvirt',
  )
- 
- if not conf.has('WITH_APPARMOR_3')
-@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
-   # files in order to limit the amount of filesystem clutter.
-   install_data(
-     'usr.lib.libvirt.virt-aa-helper.local',
--    install_dir: apparmor_dir / 'local',
-+    install_dir: install_prefix + apparmor_dir / 'local',
-     rename: 'usr.lib.libvirt.virt-aa-helper',
-   )
- endif
 diff --git a/src/storage/meson.build b/src/storage/meson.build
 index 404d6a6941..fb4e67a0a8 100644
 --- a/src/storage/meson.build
 +++ b/src/storage/meson.build
 @@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE')
    }
- 
+
    virt_install_dirs += [
 -    confdir / 'storage',
 -    confdir / 'storage' / 'autostart',
@@ -455,20 +441,27 @@ index 404d6a6941..fb4e67a0a8 100644
 +    install_prefix + runstatedir / 'libvirt' / 'storage',
    ]
  endif
- 
+
 diff --git a/tools/meson.build b/tools/meson.build
-index 1bb84be0be..e04a4e986d 100644
+index a099148d3c..d0d6510f17 100644
 --- a/tools/meson.build
 +++ b/tools/meson.build
-@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL')
+@@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL')
      install_rpath: libvirt_rpath,
    )
- 
+
 -  install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
 +  install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
+
+   # Install the sysuser config for the setgid binary
+   install_data(
+     'libvirt-login-shell.sysusers.conf',
+-    install_dir: sysusersdir,
++    install_dir: install_prefix + sysusersdir,
+     rename: [ 'libvirt-login-shell.conf' ],
+   )
  endif
- 
- if host_machine.system() == 'windows'
+
 diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build
 index e9f312fa25..95d5d8fe0b 100644
 --- a/tools/ssh-proxy/meson.build
diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index 496834f8cf5e..5d987089f704 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -115,14 +115,14 @@ assert enableZfs -> isLinux;
 stdenv.mkDerivation rec {
   pname = "libvirt";
   # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "11.0.0";
+  version = "11.4.0";
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-QxyOc/RbWZnjA4XIDNK7xZqBcP2ciHsOlszaa5pl6XA=";
+    hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI=";
   };
 
   patches =
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index c8f59352cab4..891965e2e941 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "11.0.0";
+  version = "11.4.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     tag = "v${version}";
-    hash = "sha256-c6viZTQFpLB+k/f45m/AZe+ggDxQbGjQgD51yCuyepc=";
+    hash = "sha256-jI14/lBuqSqI8mnTa7dqa+B+6tU2erW6wlT8E0eTgtY=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6d9f31dc446f..7396e66144e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -32337,12 +32337,12 @@ with self;
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "11.0.0";
+    version = "11.2.0";
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-perl";
       tag = "v${version}";
-      hash = "sha256-k1fpVLWbFgZOUvCPLN6EpYgSfpwig5mHiWMRo8iRvZc=";
+      hash = "sha256-e/Zb9ox/ehfybpxiCAsEl97T1vjBNpRYJK/kmehPHsY=";
     };
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [

From f17a5df1902736f17529a2c838e1560819cf599f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 18 Jun 2025 13:42:39 +0200
Subject: [PATCH 17/67] python313Packages.pymysensors: 0.24.1 -> 0.25.2

Diff: theolind/pymysensors@0.24.1...0.25.2
---
 .../python-modules/pymysensors/default.nix    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index d5bff10a57a7..d4e296216ede 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -8,37 +8,37 @@
   getmac,
   intelhex,
   paho-mqtt,
+  pyserial-asyncio-fast,
   pyserial,
-  pyserial-asyncio,
   pytest-sugar,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
   voluptuous,
 }:
 
 buildPythonPackage rec {
   pname = "pymysensors";
-  version = "0.24.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "0.25.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theolind";
     repo = "pymysensors";
-    rev = version;
-    hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo=";
+    tag = version;
+    hash = "sha256-ndvn3mQ4fchL4NiUQLpYn7HMKeuEBT09HQvnJy14jPI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     awesomeversion
     click
     crcmod
     getmac
     intelhex
     pyserial
-    pyserial-asyncio
+    pyserial-asyncio-fast
     voluptuous
   ];
 
@@ -56,9 +56,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python API for talking to a MySensors gateway";
-    mainProgram = "pymysensors";
     homepage = "https://github.com/theolind/pymysensors";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/theolind/pymysensors/releases/tag/${src.tag}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "pymysensors";
   };
 }

From 7aa82f5b9881306da8d6bada94f52eab5ed4525e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Jun 2025 13:39:13 +0000
Subject: [PATCH 18/67] forgejo: 11.0.1 -> 11.0.2

https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/11.0.2.md
https://codeberg.org/forgejo/forgejo/releases/tag/v11.0.2
---
 pkgs/by-name/fo/forgejo/lts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index c31929fb7e62..94a23757ba5b 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.1";
-  hash = "sha256-hsJfJOJ6mTIGGV+0YwSA9SYsLXxI1VTXzc+SyXJJ69Q=";
-  npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg=";
-  vendorHash = "sha256-8fa6l89+6NhVsi6VuTvQs35E3HuiBFxM8NUQ/jzlzV0=";
+  version = "11.0.2";
+  hash = "sha256-myg6BGoCJaX7YbQAFSRwX0KtX/TFLKJOUuirqtQcN8Q=";
+  npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
+  vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From 6ecce07cc74304b7a0ef344ddd14a443bb182c72 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Wed, 18 Jun 2025 23:10:24 +0900
Subject: [PATCH 19/67] rpcs3: remove me as maintainer

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

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index d45d14703673..607f0728b6d7 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -162,7 +162,6 @@ stdenv.mkDerivation {
       abbradar
       neonfuz
       ilian
-      zane
     ];
     license = licenses.gpl2Only;
     platforms = [

From e7cddde7a47bb8806ed4bf0a2686db2c815dd15b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Jun 2025 23:59:58 +0800
Subject: [PATCH 20/67] pantheon.switchboard-plug-keyboard: 8.0.2 -> 8.1.0

https://github.com/elementary/settings-keyboard/compare/8.0.2...8.1.0
---
 .../pantheon/apps/switchboard-plugs/keyboard/default.nix    | 6 ++++--
 .../apps/switchboard-plugs/keyboard/fix-paths.patch         | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 032758e1fb27..bf6b223048df 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -8,6 +8,7 @@
   ninja,
   pkg-config,
   vala,
+  elementary-settings-daemon,
   libadwaita,
   libgee,
   gettext,
@@ -25,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
-  version = "8.0.2";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-keyboard";
     rev = version;
-    sha256 = "sha256-j2D6NSwHTZQJaHm664fHF4VkcExpYwoq/J3SXus30nw=";
+    sha256 = "sha256-8lgoR7nYqUJfLr9UhqnFJWw9x9l97RxgIkAwodHgrzI=";
   };
 
   patches = [
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    elementary-settings-daemon # io.elementary.settings-daemon.applications
     gnome-settings-daemon # media-keys
     granite7
     gsettings-desktop-schemas
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
index 47f29161c472..e88453433c07 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
@@ -6,8 +6,8 @@ index bd461685..b6371096 100644
  
          onscreen_keyboard_settings.clicked.connect (() => {
              try {
--                var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, NONE);
-+                var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE);
+-                var appinfo = GLib.AppInfo.create_from_commandline ("onboard-settings", null, NONE);
++                var appinfo = GLib.AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE);
                  appinfo.launch (null, null);
              } catch (Error e) {
                  critical ("Unable to launch onboard-settings: %s", e.message);

From 9c89c281f300f5572b0563fc51ad58a1c35907f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 18 Jun 2025 10:04:10 -0700
Subject: [PATCH 21/67] python3Packages.aiowebdav2: 0.4.5 -> 0.4.6

Diff: https://github.com/jpbede/aiowebdav2/compare/refs/tags/v0.4.5...refs/tags/v0.4.6

Changelog: https://github.com/jpbede/aiowebdav2/releases/tag/v0.4.6
---
 pkgs/development/python-modules/aiowebdav2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiowebdav2/default.nix b/pkgs/development/python-modules/aiowebdav2/default.nix
index dc3efd6b9b95..4c600fe7a306 100644
--- a/pkgs/development/python-modules/aiowebdav2/default.nix
+++ b/pkgs/development/python-modules/aiowebdav2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aiowebdav2";
-  version = "0.4.5";
+  version = "0.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "aiowebdav2";
     tag = "v${version}";
-    hash = "sha256-/oQuXFPWgJIfyw7qyvrD95U6E9/GORLR/K4F/46CIY0=";
+    hash = "sha256-9/idSk6vao8vfTlPJ6Cwk7UeqwTAr7ebFLw4ka6mA6c=";
   };
 
   build-system = [ poetry-core ];

From 15e844249de19634164d5117ecd7bef26a9915b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 18 Jun 2025 10:06:46 -0700
Subject: [PATCH 22/67] python3Packages.aioamazondevices: 3.1.2 -> 3.1.12

Diff: https://github.com/chemelli74/aioamazondevices/compare/refs/tags/v3.1.2...refs/tags/v3.1.12

Changelog: https://github.com/chemelli74/aioamazondevices/blob/v3.1.12/CHANGELOG.md
---
 pkgs/development/python-modules/aioamazondevices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 97d51d48b29c..f9c3347fffb2 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "3.1.2";
+  version = "3.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-oW9QRRTriopWzRJ9ZrDjIgviT/cVk2x6gaHXHmzYXMs=";
+    hash = "sha256-nilYImyK057/yO/pnnhM9S+vRcslLLKTsYIzGNFM2UQ=";
   };
 
   build-system = [ poetry-core ];

From a816ae73593323627ae29f005cb1620ddcf5b697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 18 Jun 2025 10:12:23 -0700
Subject: [PATCH 23/67] python3Packages.stem: 1.8.3-unstable-2024-02-13 ->
 1.8.3

Diff: https://github.com/torproject/stem/compare/9a9c7d43a7fdcde6d4a9cf95b831fb5e5923a160...refs/tags/1.8.3

Changelog: https://github.com/torproject/stem/blob/refs/tags/1.8.3/docs/change_log.rst
---
 .../python-modules/stem/default.nix           | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index fd7cf8c9d6bf..21924aee174f 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -1,9 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
+  fetchurl,
   setuptools,
   cryptography,
   mock,
@@ -12,28 +11,35 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.8.3-unstable-2024-02-13";
-
-  disabled = pythonOlder "3.6";
-
+  version = "1.8.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "torproject";
     repo = "stem";
-    rev = "9a9c7d43a7fdcde6d4a9cf95b831fb5e5923a160";
-    hash = "sha256-Oc73Jx31SLzuhT9Iym5HHszKfflKZ+3aky5flXudvmI=";
+    tag = version;
+    hash = "sha256-FK7ldpOGEQ+VYLgwL7rGSGNtD/2iz11b0YOa78zNGDk=";
   };
 
   patches = [
-    # fixes deprecated test assertion, assertRaisesRegexp in python 3
-    (fetchpatch {
-      url = "https://github.com/trishtzy/stem/commit/d5012a1039f05c69ebe832723ce96ecbe8f79fe1.patch";
-      hash = "sha256-ozOTx4/c86sW/9Ss5eZ6ZxX63ByJT5x7JF6wBBd+VFY=";
+    (fetchurl {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/python-stem/-/raw/729ce635a4dbf519bab0cd4195d507b0b9bf6c9a/fix-build-cryptography.patch";
+      hash = "sha256-RTh3RVpDaNRFrSoAEfMVAO1VPWmnhdd5W+M0N9AEr24=";
+    })
+    (fetchurl {
+      name = "cryptography-42-compat.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/python-stem/-/raw/main/9f1fa4ac.patch";
+      hash = "sha256-2pj5eeurGN9HC02U2gZibt8gNWHYU92tlETZlbaT35A=";
     })
   ];
 
-  nativeBuildInputs = [ setuptools ];
+  postPatch = ''
+    # https://github.com/torproject/stem/pull/155
+    substituteInPlace stem/util/test_tools.py test/integ/*/*.py test/unit/*/*.py test/unit/version.py \
+      --replace-quiet assertRaisesRegexp assertRaisesRegex
+  '';
+
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
     cryptography
@@ -48,13 +54,13 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
-    changelog = "https://github.com/torproject/stem/blob/${src.rev}/docs/change_log.rst";
+  meta = {
+    changelog = "https://github.com/torproject/stem/blob/${src.tag}/docs/change_log.rst";
     description = "Controller library that allows applications to interact with Tor";
     mainProgram = "tor-prompt";
     downloadPage = "https://github.com/torproject/stem";
     homepage = "https://stem.torproject.org/";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From f596809779fa6d31ff24909d743ddfc8a3675cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jun 2025 16:28:53 -0700
Subject: [PATCH 24/67] oneDNN_2: drop

---
 pkgs/by-name/on/oneDNN_2/package.nix | 53 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/on/oneDNN_2/package.nix

diff --git a/pkgs/by-name/on/oneDNN_2/package.nix b/pkgs/by-name/on/oneDNN_2/package.nix
deleted file mode 100644
index 5bd3c88a75ea..000000000000
--- a/pkgs/by-name/on/oneDNN_2/package.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  cmake,
-  fetchFromGitHub,
-  lib,
-  stdenv,
-}:
-
-# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
-# just recently been renamed again to oneDNN. See here for details:
-# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
-stdenv.mkDerivation (finalAttrs: {
-  pname = "oneDNN";
-  version = "2.7.5";
-
-  src = fetchFromGitHub {
-    owner = "oneapi-src";
-    repo = "oneDNN";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  # Tests fail on some Hydra builders, because they do not support SSE4.2.
-  doCheck = false;
-
-  # Fixup bad cmake paths
-  postInstall = ''
-    substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \
-      --replace "\''${PACKAGE_PREFIX_DIR}/" ""
-
-    substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \
-      --replace "\''${_IMPORT_PREFIX}/" ""
-  '';
-
-  meta = {
-    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}";
-    description = "oneAPI Deep Neural Network Library (oneDNN)";
-    homepage = "https://01.org/oneDNN";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      alexarice
-      bhipple
-    ];
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9473f94ffcda..0935f37650c2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1412,6 +1412,7 @@ mapAliases {
   odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
   offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
+  oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
   opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20

From c81cc831e35f522e2ada52a7243f522fa5c1bc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 12 Jun 2025 16:56:22 +0200
Subject: [PATCH 25/67] deno: 2.3.5 -> 2.3.6

---
 pkgs/by-name/de/deno/package.nix | 59 +++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 0357da7f37f5..2b4dbc877788 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -3,6 +3,7 @@
   lib,
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
   rustPlatform,
   cmake,
   yq,
@@ -21,6 +22,7 @@
   nodejs,
   git,
   python3,
+  esbuild,
 }:
 
 let
@@ -28,18 +30,26 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.3.5";
+  version = "2.3.6";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-lu3r1v3iB9NIruooRrV9NawUnKqufqlYJQe+Aumgn8E=";
+    hash = "sha256-l3cWnv2cEmoeecYj38eMIlgqlRjDbtQuc6Q3DmOJoqE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XJy7+cARYEX8tAPXLHJnEwXyZIwPaqhM7ZUzoem1Wo0=";
+  cargoHash = "sha256-alvn+d7XTYrw8KXw+k+++J3CsBwAUbQQlh24/EOEzwY=";
+  cargoPatches = [
+    (fetchpatch {
+      name = "fix-sigsegv-on-x86_64-unknown-linux-gnu-targets";
+      url = "https://github.com/denoland/deno/commit/400a9565c335b51d78c8909f4dbf1dbd4fb5e5d8.patch";
+      hash = "sha256-dTIw7P6sB6Esf+lSe/gc3cX54GkzLWF5X55yxP/QYoo=";
+      includes = [ "cli/Cargo.toml" ];
+    })
+  ];
 
   patches = [
     ./tests-replace-hardcoded-paths.patch
@@ -82,11 +92,42 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
   env.RUSTY_V8_ARCHIVE = librusty_v8;
 
-  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Unset the env var defined by bintools-wrapper because it triggers Deno's sandbox protection in some tests.
-    # ref: https://github.com/denoland/deno/pull/25271
-    unset LD_DYLD_PATH
-  '';
+  # Many tests depend on prebuilt binaries being present at `./third_party/prebuilt`.
+  # We provide nixpkgs binaries for these for all platforms, but the test runner itself only handles
+  # these four arch+platform combinations.
+  doCheck =
+    stdenv.hostPlatform.isDarwin
+    || (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64));
+
+  preCheck =
+    # Provide esbuild binary at `./third_party/prebuilt/` just like upstream:
+    # https://github.com/denoland/deno_third_party/tree/master/prebuilt
+    # https://github.com/denoland/deno/blob/main/tests/util/server/src/servers/npm_registry.rs#L402
+    let
+      platform =
+        if stdenv.hostPlatform.isLinux then
+          "linux64"
+        else if stdenv.hostPlatform.isDarwin then
+          "mac"
+        else
+          throw "Unsupported platform";
+      arch =
+        if stdenv.hostPlatform.isAarch64 then
+          "aarch64"
+        else if stdenv.hostPlatform.isx86_64 then
+          "x64"
+        else
+          throw "Unsupported architecture";
+    in
+    ''
+      mkdir -p ./third_party/prebuilt/${platform}
+      cp ${lib.getExe esbuild} ./third_party/prebuilt/${platform}/esbuild-${arch}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Unset the env var defined by bintools-wrapper because it triggers Deno's sandbox protection in some tests.
+      # ref: https://github.com/denoland/deno/pull/25271
+      unset LD_DYLD_PATH
+    '';
 
   cargoTestFlags = [
     "--lib" # unit tests
@@ -119,6 +160,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
       # Flaky
       "--skip=init::init_subcommand_serve"
+      "--skip=serve::deno_serve_parallel"
+      "--skip=js_unit_tests::stat_test" # timing-sensitive
 
       # Test hangs, needs investigation
       "--skip=repl::pty_complete_imports_no_panic_empty_specifier"

From d88d2735a6ee4e276699f3ecd4f601efc11aff52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Tue, 17 Jun 2025 19:24:30 +0200
Subject: [PATCH 26/67] deno: skip more flaky or unreliable tests

---
 pkgs/by-name/de/deno/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 2b4dbc877788..b23cd1616f13 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -162,9 +162,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "--skip=init::init_subcommand_serve"
       "--skip=serve::deno_serve_parallel"
       "--skip=js_unit_tests::stat_test" # timing-sensitive
+      "--skip=repl::pty_complete_imports"
+      "--skip=repl::pty_complete_expression"
 
       # Test hangs, needs investigation
       "--skip=repl::pty_complete_imports_no_panic_empty_specifier"
+
+      # Use of VSOCK, might not be available on all platforms
+      "--skip=js_unit_tests::serve_test"
+      "--skip=js_unit_tests::fetch_test"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Expects specific shared libraries from macOS to be linked

From 4317273c0ddbd3ac9b3bdf9fc5f26ee0b09d229c Mon Sep 17 00:00:00 2001
From: Alexander Lampalzer <sascha@localhost.systems>
Date: Wed, 18 Jun 2025 22:12:54 +0200
Subject: [PATCH 27/67] ptouch-driver: 1.7 -> 1.7.1

---
 pkgs/by-name/pt/ptouch-driver/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix
index 149215771fbe..f29332253e25 100644
--- a/pkgs/by-name/pt/ptouch-driver/package.nix
+++ b/pkgs/by-name/pt/ptouch-driver/package.nix
@@ -5,7 +5,6 @@
   cups,
   cups-filters,
   foomatic-db-engine,
-  fetchpatch,
   ghostscript,
   libpng,
   libxml2,
@@ -16,24 +15,15 @@
 
 stdenv.mkDerivation rec {
   pname = "ptouch-driver";
-  version = "1.7";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "philpem";
     repo = "printer-driver-ptouch";
     rev = "v${version}";
-    hash = "sha256-3ZotSHn7lERp53hAzx47Ct/k565rEoensCcltwX/Xls=";
+    hash = "sha256-MVvtfos2ze6uXFg8sEH1UlJ9gg4iq91dLK0k0xuTE1Y=";
   };
 
-  patches = [
-    # Fixes some invalid XML file that otherwise causes a build failure
-    (fetchpatch {
-      name = "fix-brother-ql-600.patch";
-      url = "https://github.com/philpem/printer-driver-ptouch/commit/b3c53b3bc4dd98ed172f2c79405c7c09b3b3836a.patch";
-      hash = "sha256-y5bHKFeRXx8Wdl1++l4QNGgiY41LY5uzrRdOlaZyF9I=";
-    })
-  ];
-
   buildInputs = [
     cups
     cups-filters

From ae6c6763dad155548f83c1af74ea8b71a055803d Mon Sep 17 00:00:00 2001
From: taikx4
 <taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion>
Date: Wed, 18 Jun 2025 21:29:38 +0100
Subject: [PATCH 28/67] phpExtensions.gnupg: 1.5.1 -> 1.5.3

---
 .../development/php-packages/gnupg/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix
index 75c08e10f8c0..ab3e4f28caf3 100644
--- a/pkgs/development/php-packages/gnupg/default.nix
+++ b/pkgs/development/php-packages/gnupg/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "1.5.1";
+  version = "1.5.3";
 in
 buildPecl {
   inherit version;
@@ -20,7 +20,7 @@ buildPecl {
     repo = "php-gnupg";
     rev = "gnupg-${version}";
     fetchSubmodules = true;
-    hash = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI=";
+    hash = "sha256-F9Rq+mmUhvXfIuoifqRM/ZIMYszCF93cvv13Vt/A5Mo=";
   };
 
   buildInputs = [ gpgme ];
@@ -28,19 +28,19 @@ buildPecl {
 
   postPhpize = ''
     substituteInPlace configure \
-      --replace '/usr/bin/file' '${file}/bin/file' \
-      --replace 'SEARCH_PATH="/usr/local /usr /opt"' 'SEARCH_PATH="${gpgme.dev}"'
+      --replace-fail '/usr/bin/file' '${file}/bin/file' \
+      --replace-fail 'SEARCH_PATH="/usr/local /usr /opt /opt/homebrew"' 'SEARCH_PATH="${gpgme.dev}"'
   '';
 
   postConfigure = ''
     substituteInPlace Makefile \
-      --replace 'run-tests.php' 'run-tests.php -q --offline'
+      --replace-fail 'run-tests.php' 'run-tests.php -q --offline'
     substituteInPlace tests/gnupg_res_init_file_name.phpt \
-      --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
-      --replace 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})'
+      --replace-fail '/usr/bin/gpg' '${gnupg}/bin/gpg' \
+      --replace-fail 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})'
     substituteInPlace tests/gnupg_oo_init_file_name.phpt \
-      --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
-      --replace 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})'
+      --replace-fail '/usr/bin/gpg' '${gnupg}/bin/gpg' \
+      --replace-fail 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})'
   '';
 
   doCheck = true;

From bdd34c75446441b9ca084707978026da6b8d49c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 00:09:20 +0000
Subject: [PATCH 29/67] pantheon.elementary-bluetooth-daemon: 1.0.1 -> 1.1.0

---
 .../pantheon/services/elementary-bluetooth-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
index e17e6494cd09..853f03b8633d 100644
--- a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-bluetooth-daemon";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "bluetooth-daemon";
     rev = finalAttrs.version;
-    hash = "sha256-XRskwLtQKlG96fpIxNZKWG7kn3HR0ngjAUwyn7fnxdY=";
+    hash = "sha256-Qr4hg2OY7l/LpGB+/yfIXCnjCXsjQLFZX9f4CoYRtLo=";
   };
 
   nativeBuildInputs = [

From 7ecea9d514f6cf12354ec32deb93624f9c088ac1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Jun 2025 02:47:20 +0200
Subject: [PATCH 30/67] python3Packages.django-prometheus: 2.3.1 -> 2.4.0

https://github.com/django-commons/django-prometheus/releases/tag/v2.4.0
---
 .../django-prometheus/default.nix             | 28 +++++++-------
 .../drop-untestable-database-backends.patch   | 38 -------------------
 2 files changed, 15 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch

diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index 3e2c03771bf4..d07951e64222 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+  setuptools,
   prometheus-client,
   pytest-django,
   pytestCheckHook,
@@ -10,25 +10,27 @@
 
 buildPythonPackage rec {
   pname = "django-prometheus";
-  version = "2.3.1";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "2.4.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "korfuri";
+    owner = "django-commons";
     repo = "django-prometheus";
-    rev = "v${version}";
-    hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8=";
+    tag = "v${version}";
+    hash = "sha256-cKkpsV3w2SUvQuSBm0MlTsomdrU4h7CS5L+nKFvrKA8=";
   };
 
-  patches = [ ./drop-untestable-database-backends.patch ];
-
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools >= 67.7.2, < 72.0.0" setuptools
+
     substituteInPlace setup.py \
-      --replace '"pytest-runner"' ""
+      --replace-fail '"pytest-runner"' ""
   '';
 
-  propagatedBuildInputs = [ prometheus-client ];
+  build-system = [ setuptools ];
+
+  dependencies = [ prometheus-client ];
 
   pythonImportsCheck = [ "django_prometheus" ];
 
@@ -38,9 +40,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/korfuri/django-prometheus/releases/tag/v${version}";
+    changelog = "https://github.com/django-commons/django-prometheus/releases/tag/v${version}";
     description = "Django middlewares to monitor your application with Prometheus.io";
-    homepage = "https://github.com/korfuri/django-prometheus";
+    homepage = "https://github.com/django-commons/django-prometheus";
     license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
   };
diff --git a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch
deleted file mode 100644
index 41f1229c5e59..000000000000
--- a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py
-index cdd167f..5c6073b 100644
---- a/django_prometheus/tests/end2end/testapp/settings.py
-+++ b/django_prometheus/tests/end2end/testapp/settings.py
-@@ -53,33 +53,6 @@ DATABASES = {
-         "ENGINE": "django_prometheus.db.backends.sqlite3",
-         "NAME": "db.sqlite3",
-     },
--    # Comment this to not test django_prometheus.db.backends.postgres.
--    "postgresql": {
--        "ENGINE": "django_prometheus.db.backends.postgresql",
--        "NAME": "postgres",
--        "USER": "postgres",
--        "PASSWORD": "",
--        "HOST": "localhost",
--        "PORT": "5432",
--    },
--    # Comment this to not test django_prometheus.db.backends.postgis.
--    "postgis": {
--        "ENGINE": "django_prometheus.db.backends.postgis",
--        "NAME": "postgis",
--        "USER": "postgres",
--        "PASSWORD": "",
--        "HOST": "localhost",
--        "PORT": "5432",
--    },
--    # Comment this to not test django_prometheus.db.backends.mysql.
--    "mysql": {
--        "ENGINE": "django_prometheus.db.backends.mysql",
--        "NAME": "django_prometheus_1",
--        "USER": "root",
--        "PASSWORD": "",
--        "HOST": "127.0.0.1",
--        "PORT": "3306",
--    },
-     # The following databases are used by test_db.py only
-     "test_db_1": {
-         "ENGINE": "django_prometheus.db.backends.sqlite3",

From c3a33a8230a4571d7df94ca931079ff677c02614 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 19 Jun 2025 10:08:59 +0900
Subject: [PATCH 31/67] glab: 1.59.2 -> 1.60.2

https://gitlab.com/gitlab-org/cli/-/releases/v1.60.0
https://gitlab.com/gitlab-org/cli/-/releases/v1.60.1
https://gitlab.com/gitlab-org/cli/-/releases/v1.60.2

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/gl/glab/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 9a46053b9600..015ba6da0cda 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.59.2";
+  version = "1.60.2";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YJ22nIB97MWeiv8anx4W3vugbNyBOC0oHRQ5Fihmt2k=";
+    hash = "sha256-uZHQ11tnxyccolFm5NcHuGMRZqS2Xqaq/GhU7glOjGk=";
   };
 
-  vendorHash = "sha256-yJ9E6zJqDgSDLT+IbVHFvb6rGJQnrqgWHtgkGsO8Gb4=";
+  vendorHash = "sha256-9iBH13P8QTRPlD5UlTbdRH3wht/UNrCwhRC9HwzQ+I8=";
 
   ldflags = [
     "-s"

From 6bcb9f25f91cfa4331f24710f308633bba48cf90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 03:40:16 +0000
Subject: [PATCH 32/67] hydralauncher: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index 2047121946c0..95ec3dbece6c 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "3.6.0";
+  version = "3.6.1";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-7qXVBS4HTLdvmMfyhE5EoHblovqKmIJuh7FSl5lo224=";
+    hash = "sha256-NKQzOPujPEIPKq3GAphkNijOq9tVAyUy2yCOKZaJHbE=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

From b5aeb79d8aa8a28c3f58f6726f227169ee0a3da2 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Thu, 19 Jun 2025 11:58:53 +0800
Subject: [PATCH 33/67] python3Packages.django-mcp-server: fix
 pythonImportsCheck, removed unused input

---
 .../python-modules/django-mcp-server/default.nix           | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/django-mcp-server/default.nix b/pkgs/development/python-modules/django-mcp-server/default.nix
index c97b4e37bb04..225473cd7d23 100644
--- a/pkgs/development/python-modules/django-mcp-server/default.nix
+++ b/pkgs/development/python-modules/django-mcp-server/default.nix
@@ -8,11 +8,6 @@
   mcp,
   uritemplate,
   poetry-core,
-  pytestCheckHook,
-  pytest,
-  httpx,
-  asgiref,
-  anyio,
 }:
 
 buildPythonPackage rec {
@@ -42,7 +37,7 @@ buildPythonPackage rec {
     export DJANGO_SETTINGS_MODULE=mcpexample.mcpexample.settings
   '';
 
-  pythonImportsCheck = "mcp_server";
+  pythonImportsCheck = [ "mcp_server" ];
 
   doCheck = false; # Needs to run both test server and client simultaneously
 

From 888f523682c1e74f13366faad02f48d915d15339 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 18 Jun 2025 23:28:42 -0500
Subject: [PATCH 34/67] grimblast: 0.1-unstable-2025-05-18 ->
 0.1-unstable-2025-06-14

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/gr/grimblast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix
index 51f533ccc4f3..108aa2a2633a 100644
--- a/pkgs/by-name/gr/grimblast/package.nix
+++ b/pkgs/by-name/gr/grimblast/package.nix
@@ -18,13 +18,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "grimblast";
-  version = "0.1-unstable-2025-05-18";
+  version = "0.1-unstable-2025-06-14";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "910dad4c5755c1735d30da10c96d9086aa2a608d";
-    hash = "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=";
+    rev = "9d4963e7394485ba4735779519c59275901de6ab";
+    hash = "sha256-nlmU6lpm8zGe6EnexauHr9Y/4AknE4j+ATcyjIsO1jw=";
   };
 
   strictDeps = true;

From 9ef039f3edda7dffc905539891329a78e3c8c870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 05:19:20 +0000
Subject: [PATCH 35/67] juju: 3.6.6 -> 3.6.7

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

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 4ec26bd4d5fc..352c49a86c62 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.6";
+  version = "3.6.7";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-6LMeeWusowwN1Afma+oRrWIYi7BeEH8NRquE8GAx+iQ=";
+    hash = "sha256-FJ6LZcsokno+VTj+mXO0YD8Q9qC5qG3CgXqnrPNokRY=";
   };
 
-  vendorHash = "sha256-/BejA4Wn+SbKQHDqA7hanVaTKzaInLNOMSlesy714VI=";
+  vendorHash = "sha256-blzjN9UknamoffR5Kpd1HmGhB+bWb+zL0SnzelW40M0=";
 
   subPackages = [
     "cmd/juju"

From abc9b18038ae082c05ad2c0cbab1506fa2ec4d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Wed, 18 Jun 2025 20:38:31 +0200
Subject: [PATCH 36/67] deno: disable LTO on Linux and x86_64-darwin

---
 pkgs/by-name/de/deno/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index b23cd1616f13..a9388f6ad64e 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -56,10 +56,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./tests-darwin-differences.patch
     ./tests-no-chown.patch
   ];
-  postPatch = ''
-    # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
-    tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml
-  '';
+  postPatch =
+    ''
+      # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
+      tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml
+    ''
+    +
+      lib.optionalString
+        (stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64))
+        ''
+          # LTO crashes with the latest Rust + LLVM combination.
+          # https://github.com/rust-lang/rust/issues/141737
+          # TODO: remove this once LLVM is upgraded to 20.1.7
+          tomlq -ti '.profile.release.lto = false' Cargo.toml
+        '';
 
   buildInputs = [
     libffi

From 23f44b10529ad53516b4403e03ebeb4780dfcc07 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Jun 2025 10:13:46 +0200
Subject: [PATCH 37/67] python3Packages.apache-beam: relax numpy

---
 pkgs/development/python-modules/apache-beam/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index fc18c23e33ad..e311ec87d973 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -83,6 +83,8 @@ buildPythonPackage rec {
     # See https://github.com/NixOS/nixpkgs/issues/156957
     "dill"
 
+    "numpy"
+
     "protobuf"
 
     # As of apache-beam v2.45.0, the requirement is pyarrow<10.0.0,>=0.15.1, but

From 598d5c29f8b1bb7d094d9965ab25819c963e50a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 08:34:47 +0000
Subject: [PATCH 38/67] llama-cpp: 5608 -> 5702

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index a8b32d9a2a6c..5841e1aac8b5 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -72,13 +72,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "5608";
+  version = "5702";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-q3jw/x9GSI2Yp0DSM53g/jMuTeVakLfY9VsoJxq9who=";
+    hash = "sha256-EyDuM7eZzmNUvqwVUKYuUNlXbFF+G8x/+4mL/3YsHCc=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 74b75681ca33a6d2c9e4d64dfeacffeae08c4453 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Jun 2025 11:54:09 +0200
Subject: [PATCH 39/67] python3Packages.apache-beam: skip failing tests

---
 pkgs/development/python-modules/apache-beam/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index e311ec87d973..007814559cf5 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -340,7 +340,14 @@ buildPythonPackage rec {
     ];
 
   disabledTests =
-    lib.optionals stdenv.hostPlatform.isDarwin [
+    [
+      # IndexError: list index out of range
+      "test_only_sample_exceptions"
+
+      # AssertionError: False is not true
+      "test_samples_all_with_both_experiments"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       #  PermissionError: [Errno 13] Permission denied: '/tmp/...'
       "test_cache_manager_uses_local_ib_cache_root"
       "test_describe_all_recordings"

From 8ab44fec3709c629e54216b126ddc7dc8a28bc4d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 19 Jun 2025 11:54:47 +0200
Subject: [PATCH 40/67] workflows/labels: fix pull_request event trigger

When the job is run with the pull_request trigger for validation of
changes to the workflow itself, we need to run everything that can be
run without privileges - but not more.

We tried to do so for the three actions/labeler steps, but failed to set
up the condition correctly. We also need to exit early for our
JavaScript based labeler, just before making the mutation requests.
---
 .github/workflows/labels.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 2a632be28b57..0ca429421891 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -212,6 +212,11 @@ jobs:
                   if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
                   if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')
 
+                  if (context.eventName == 'pull_request') {
+                    core.info('Skipping labeling on a pull_request event (no privileges).')
+                    return
+                  }
+
                   // Remove the ones not needed anymore
                   await Promise.all(
                     before.filter(name => !after.includes(name))
@@ -247,12 +252,12 @@ jobs:
         name: Labels from touched files
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
+          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml # default
@@ -262,12 +267,12 @@ jobs:
         name: Labels from touched files (no sync)
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
+          (github.event.pull_request.head.repo.owner.login != 'NixOS' || !(
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-no-sync.yml
@@ -280,12 +285,12 @@ jobs:
         # the backport labels.
         if: |
           github.event_name == 'pull_request_target' &&
-          github.event.pull_request.head.repo.owner.login == 'NixOS' && (
+          (github.event.pull_request.head.repo.owner.login == 'NixOS' && (
             github.head_ref == 'haskell-updates' ||
             github.head_ref == 'python-updates' ||
             github.head_ref == 'staging-next' ||
             startsWith(github.head_ref, 'staging-next-')
-          )
+          ))
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-development-branches.yml

From 4f6c942f7a68ee2c05832531d42370c6268e7ff1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Jun 2025 11:59:28 +0200
Subject: [PATCH 41/67] python3Packages.ray: 2.47.0 -> 2.47.1

Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.47.1
---
 .../python-modules/ray/default.nix            | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index 071d44901775..f0d1dc4f5d11 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -64,7 +64,7 @@
 
 let
   pname = "ray";
-  version = "2.47.0";
+  version = "2.47.1";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -85,28 +85,28 @@ buildPythonPackage rec {
       # Results are in ./ray-hashes.nix
       hashes = {
         x86_64-linux = {
-          cp310 = "sha256-2bwLK5qXR5dBsFoO5AyngXDxoxICnwyz7GOcopdaLBQ=";
-          cp311 = "sha256-mXjmK+MSTNGlSP2MoxTj/7j5Xzj+4r2Y/eOMdTkDnj4=";
-          cp312 = "sha256-jTJr34I2TOkQx+BUFqIQ8IFCEGc6J1+1wA97ZayuVVE=";
-          cp313 = "sha256-NfixG1EV5TCL/9id19yagkpNxdyP8L2Le2BUN/Wo42g=";
+          cp310 = "sha256-hKlrRyAXWgAAUhpI63qpFfO0Gbtc1hctje4AXD8juBM=";
+          cp311 = "sha256-SJYSKWFLK1alNb5RDIq8dumamqf6GVtclJvQxsaa9Ao=";
+          cp312 = "sha256-Pq6u7Du+LKZJPlMMMEc9hLhYCnrDJWu5GD2MY971qS8=";
+          cp313 = "sha256-JSpHHor7kYsQXNv/tMvrsBQ7qtdaBsj/zeJ6wxdXnMs=";
         };
         aarch64-linux = {
-          cp310 = "sha256-gNBbc3pYggQNyUnZqzdOQuH1MHotKvIvWoapEzAsYZw=";
-          cp311 = "sha256-rYHcke+f7mR0mSXeVHtLcRZ1cCkyb9WASYqzR7P/70w=";
-          cp312 = "sha256-QpLtKSVLeTyLGXRwRetE4PotXyElmxe6tj5D4Jl7edA=";
-          cp313 = "sha256-4+jlADusJGgYYzAVX+u7sKZo2lBa+paYCEUUYKVcxI4=";
+          cp310 = "sha256-b8ffhle432hLd8LRtkMTetdFqhwSreNHQ/BsynkAPfA=";
+          cp311 = "sha256-21/2UukDXwPGXhdCpwa3ZRn26KZ0TMAFOWBTrIdm/EY=";
+          cp312 = "sha256-zU5+tHVIc2S1IJljsXzv7ct/vTqBb9tt736lM+vXJCQ=";
+          cp313 = "sha256-1u1tGC4l1vdxedx3vJenScgXZbE8tnGkbbMgMCk4lmM=";
         };
         x86_64-darwin = {
-          cp310 = "sha256-CFXvVo2pab2XCLCVKYhPb7HZYlyTSjFMRQ8MXiQqkT4=";
-          cp311 = "sha256-I5ByFBG+nVoKicH02AvcSMOjZgWjjamn9bWkYmE8XSE=";
-          cp312 = "sha256-S6cA3Uth7iWNeQBk0XbU29ibNj89MneLLK3s1A16PHI=";
-          cp313 = "sha256-bCYYiU0/LJg6E9na71kjxLMk6V0zrGH3+iA7vtRO/5U=";
+          cp310 = "sha256-fAOh42bTqGilX4wvco9c41rIXd8JOsgdDBo1vxwlw3c=";
+          cp311 = "sha256-/uuh5xXP2HN9OtzSAY0M2rt8YIT6Swk+Y45sfULzyVY=";
+          cp312 = "sha256-5tnHjlOsicq7xAVq7P7FPFBsaS4xMq+drpQdYYDvRi8=";
+          cp313 = "sha256-5XiSn1iz8MWcdUSpbYZOJieCOLdV0TzRmueYBwyEjlc=";
         };
         aarch64-darwin = {
-          cp310 = "sha256-G2ODPZcJl3f2cqh/H0NEaPrTtLTHIRAljNF3nk7uun4=";
-          cp311 = "sha256-pPDYfOr5GMUcXo3U1ZRVk02xjF8YRRYrnJWP5S6sXT4=";
-          cp312 = "sha256-WRm9UuWkaR/mXqZ+3OuCcwg4+sF7woSsLRlu7G9SURg=";
-          cp313 = "sha256-fExn+Jw2AkrnQFXh0zNvdp2gQrGQSoiDQJfZaPe5DuU=";
+          cp310 = "sha256-NqMJMOjSZecI35bzf28fVIT0uXCQ1QWRL5kuBFpp0xA=";
+          cp311 = "sha256-pkDUR+Dmz2P4W5IgyIPsArsrjkCpwdhO+gEnlcdpumg=";
+          cp312 = "sha256-MiBJxFRs9n5e/a2Qw3HFUIrLsZPlqq9AOBA8bFzh9Xg=";
+          cp313 = "sha256-jNYl1GnOFTkeXx9E3fjdMLI4D5F2A/oBcmYSKaywAR8=";
         };
       };
     in

From e5e29a0108882f38fc81602b4f054147fe155a74 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 19 Jun 2025 18:24:23 +0800
Subject: [PATCH 42/67] sing-box: 1.11.13 -> 1.11.14

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 79f8481ad63f..7bf3abce085b 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.13";
+  version = "1.11.14";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pq5ElVDNJTeT4h6ZrupnKlCydxfJ2wAxk/9eZblT4d4=";
+    hash = "sha256-GgFsTLMyrNsYT9GUlnXnSzynIa2D2ECtcYvKMfvndkA=";
   };
 
-  vendorHash = "sha256-/awpe9v+J1O0DKMvi6CNAgJ0mFJaWoXPHzRAk98nQ+Y=";
+  vendorHash = "sha256-ULfPmVQ2Ngr1ujeCmUPOOaqxyQmbgqH1w6P9TwvjhSo=";
 
   tags = [
     "with_quic"

From 6cfe9ec0fbf123916154aad433a9813d4442408d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 14:46:00 +0300
Subject: [PATCH 43/67] kdePackages.extra-cmake-modules: don't pull in qdoc

---
 .../extra-cmake-modules/default.nix           |  4 ++++
 .../extra-cmake-modules/no-qdoc.patch         | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch

diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
index a7711db03ddf..ce9b5e6df4f8 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -6,6 +6,10 @@
 mkKdeDerivation {
   pname = "extra-cmake-modules";
 
+  # Don't depend on qdoc (leaks everywhere, causes random cross issues), we don't install the docs anyway
+  # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/534
+  patches = [ ./no-qdoc.patch ];
+
   outputs = [ "out" ];
 
   propagatedNativeBuildInputs = [
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch b/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch
new file mode 100644
index 000000000000..aac013520510
--- /dev/null
+++ b/pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch
@@ -0,0 +1,20 @@
+diff --git a/modules/ECMGenerateQDoc.cmake b/modules/ECMGenerateQDoc.cmake
+index b6d64783314de790a5444c3c0d125b8e455883d9..68c570506fdc118ddef6249bce78051569298b4c 100644
+--- a/modules/ECMGenerateQDoc.cmake
++++ b/modules/ECMGenerateQDoc.cmake
+@@ -55,8 +55,13 @@ add_custom_target(generate_qch)
+ add_custom_target(install_qch_docs)
+ 
+ function(ecm_generate_qdoc target qdocconf_file)
+-    find_package(Qt6Tools CONFIG REQUIRED)
+-    find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED)
++    find_package(Qt6Tools CONFIG QUIET)
++    find_package(Qt6 OPTIONAL_COMPONENTS ToolsTools CONFIG QUIET)
++
++    if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND)
++        message(STATUS "Qt6Tools or Qt6ToolsTools not found, not generating API documentation")
++        return()
++    endif()
+ 
+     if (NOT TARGET ${target})
+         message(FATAL_ERROR "${target} is not a target")

From 4454b79e369e4bbe6a926e0434bae94d78b49538 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Jun 2025 13:51:19 +0200
Subject: [PATCH 44/67] python3Packages.vllm: relax setuptools

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

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 33f3ef4369c7..61e2634cdad7 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -283,7 +283,8 @@ buildPythonPackage rec {
   postPatch = ''
     # pythonRelaxDeps does not cover build-system
     substituteInPlace pyproject.toml \
-      --replace-fail "torch ==" "torch >="
+      --replace-fail "torch ==" "torch >=" \
+      --replace-fail "setuptools>=77.0.3,<80.0.0" "setuptools"
 
     # Ignore the python version check because it hard-codes minor versions and
     # lags behind `ray`'s python interpreter support

From cdb5859977c13d6f142e40cf4d17e4cce55fbf8d Mon Sep 17 00:00:00 2001
From: Wulpey <wulpine@proton.me>
Date: Thu, 29 May 2025 16:41:44 +0300
Subject: [PATCH 45/67] maintainers: add wulpine

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 82ec8c217134..5e07ee8279cd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27115,6 +27115,13 @@
     githubId = 13378502;
     name = "Wulfsta";
   };
+  wulpine = {
+    name = "Wulpey";
+    email = "wulpine@proton.me";
+    matrix = "@wulpine:matrix.org";
+    github = "wulpine";
+    githubId = 59339992;
+  };
   wunderbrick = {
     name = "Andrew Phipps";
     email = "lambdafuzz@tutanota.com";

From bb94f544b050f58565e613a8174f230486149019 Mon Sep 17 00:00:00 2001
From: Wulpey <wulpine@proton.me>
Date: Thu, 29 May 2025 17:39:23 +0300
Subject: [PATCH 46/67] python312Packages.osrparse: init at 7.0.1

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

diff --git a/pkgs/development/python-modules/osrparse/default.nix b/pkgs/development/python-modules/osrparse/default.nix
new file mode 100644
index 000000000000..2100dc311790
--- /dev/null
+++ b/pkgs/development/python-modules/osrparse/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hypothesis,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "osrparse";
+  version = "7.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kszlim";
+    repo = "osu-replay-parser";
+    tag = "v${version}";
+    hash = "sha256-MBE4z1SDkr0YA5ommF+WZyR2N67Y1/xmDhxrTrUhQJk=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "osrparse" ];
+
+  meta = {
+    description = "Parser for osr (osu! replays) file format";
+    homepage = "https://github.com/kszlim/osu-replay-parser";
+    changelog = "https://github.com/kszlim/osu-replay-parser/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wulpine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a067aa7bf69a..62cf9e9b47a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10891,6 +10891,8 @@ self: super: with self; {
 
   osqp = callPackage ../development/python-modules/osqp { };
 
+  osrparse = callPackage ../development/python-modules/osrparse { };
+
   oss2 = callPackage ../development/python-modules/oss2 { };
 
   ossfs = callPackage ../development/python-modules/ossfs { };

From 5e1e35996b9056b48aeb583a35accdbf9d9c543e Mon Sep 17 00:00:00 2001
From: Wulpey <wulpine@proton.me>
Date: Thu, 29 May 2025 17:54:53 +0300
Subject: [PATCH 47/67] python312Packages.typing-utils: init at 0.1.0

---
 .../python-modules/typing-utils/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/typing-utils/default.nix

diff --git a/pkgs/development/python-modules/typing-utils/default.nix b/pkgs/development/python-modules/typing-utils/default.nix
new file mode 100644
index 000000000000..fef5f3bdc435
--- /dev/null
+++ b/pkgs/development/python-modules/typing-utils/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "typing-utils";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bojiang";
+    repo = "typing_utils";
+    tag = "v${version}";
+    hash = "sha256-eXVGpe1wCH1JG+7ZP0evlxhw189GrrRzTwNDCALn3JI=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "typing_utils" ];
+
+  meta = {
+    description = "Utils to inspect Python type annotations";
+    homepage = "https://github.com/bojiang/typing_utils";
+    changelog = "https://github.com/bojiang/typing_utils/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ wulpine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62cf9e9b47a5..44d43f43b73e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18637,6 +18637,8 @@ self: super: with self; {
 
   typing-inspection = callPackage ../development/python-modules/typing-inspection { };
 
+  typing-utils = callPackage ../development/python-modules/typing-utils { };
+
   typing-validation = callPackage ../development/python-modules/typing-validation { };
 
   typish = callPackage ../development/python-modules/typish { };

From 5130436b3665386b7951e1b033f8d0f1f73a6445 Mon Sep 17 00:00:00 2001
From: Wulpey <wulpine@proton.me>
Date: Thu, 29 May 2025 18:17:39 +0300
Subject: [PATCH 48/67] python312Packages.ossapi: init at 5.2.1

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

diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix
new file mode 100644
index 000000000000..894ae6dcf01b
--- /dev/null
+++ b/pkgs/development/python-modules/ossapi/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  aiohttp,
+  osrparse,
+  requests,
+  requests-oauthlib,
+  setuptools,
+  typing-utils,
+}:
+
+buildPythonPackage rec {
+  pname = "ossapi";
+  version = "5.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tybug";
+    repo = "ossapi";
+    tag = "v${version}";
+    hash = "sha256-eCq+NbDYoJ5y1ZC4RfVJUTYcT9AOLU1mtgpZkcSYZG8=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRelaxDeps = [ "osrparse" ];
+
+  dependencies = [
+    osrparse
+    requests
+    requests-oauthlib
+    typing-utils
+  ];
+
+  optional-dependencies = {
+    async = [ aiohttp ];
+  };
+
+  # Tests require Internet access and an osu! API key
+  doCheck = false;
+
+  pythonImportsCheck = [ "ossapi" ];
+
+  meta = {
+    description = "Python wrapper for the osu! API";
+    homepage = "https://github.com/tybug/ossapi";
+    changelog = "https://github.com/tybug/ossapi/releases/tag/${src.tag}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ wulpine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44d43f43b73e..806b6489a407 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10895,6 +10895,8 @@ self: super: with self; {
 
   oss2 = callPackage ../development/python-modules/oss2 { };
 
+  ossapi = callPackage ../development/python-modules/ossapi { };
+
   ossfs = callPackage ../development/python-modules/ossfs { };
 
   osxphotos = callPackage ../development/python-modules/osxphotos { };

From 5e3c0b8ab39f8fb491ad4aa99e708cdc114040b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9za=20Ahsendorf?= <gezaahs@gmail.com>
Date: Sat, 14 Jun 2025 11:26:19 +0200
Subject: [PATCH 49/67] illuminanced: init at 1.0.2

Package Request #348320. Release notes: https://github.com/mikhail-m1/illuminanced/releases/tag/1.0.2
---
 pkgs/by-name/il/illuminanced/package.nix | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/il/illuminanced/package.nix

diff --git a/pkgs/by-name/il/illuminanced/package.nix b/pkgs/by-name/il/illuminanced/package.nix
new file mode 100644
index 000000000000..4151fd7b58e4
--- /dev/null
+++ b/pkgs/by-name/il/illuminanced/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "illuminanced";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "mikhail-m1";
+    repo = "illuminanced";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-ZEVma0uj9rsWB+vfUL7w3dHxI/ppBCG23TirGE+RREk=";
+  };
+
+  cargoHash = "sha256-kPWoQ6rE4wBjmqQLNPY4UWJt/AOgr+eVKY0ZK7B4K1A=";
+
+  preBuild = ''
+    substituteInPlace src/main.rs \
+      --replace-fail /usr/local/etc/illuminanced.toml $out/share/illuminanced/illuminanced.toml
+  '';
+
+  postInstall = ''
+    install -Dm0644 illuminanced.toml $out/share/illuminanced/illuminanced.toml
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Ambient Light Sensor Daemon for Linux";
+    homepage = "https://github.com/mikhail-m1/illuminanced";
+    changelog = "https://github.com/mikhail-m1/illuminanced/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      dynamicgoose
+    ];
+    mainProgram = "illuminanced";
+    platforms = lib.platforms.linux;
+  };
+})

From d353bd94f7bbbb30206a33092607fbdba549ceb7 Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 19:52:05 -0400
Subject: [PATCH 50/67] maintainers: add omarjatoi

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2e29fd89dc3d..d5f3c09588e6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18622,6 +18622,11 @@
     githubId = 4728903;
     name = "Owen Lynch";
   };
+  omarjatoi = {
+    github = "omarjatoi";
+    githubId = 9091609;
+    name = "Omar Jatoi";
+  };
   omasanori = {
     github = "omasanori";
     githubId = 167209;

From 082e0967fc8b9cad006c01d3cb4e17b045bda7b0 Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 19:53:01 -0400
Subject: [PATCH 51/67] claude-code: add omarjatoi to maintainers

---
 pkgs/by-name/cl/claude-code/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 33b3efdb1307..9cfc469fec0a 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -40,7 +40,10 @@ buildNpmPackage rec {
     homepage = "https://github.com/anthropics/claude-code";
     downloadPage = "https://www.npmjs.com/package/@anthropic-ai/claude-code";
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.malo ];
+    maintainers = with lib.maintainers; [
+      malo
+      omarjatoi
+    ];
     mainProgram = "claude";
   };
 }

From 2cd4e1c09a2bc5cdedf38dfe19c04d5bd8a58cb2 Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Wed, 18 Jun 2025 15:10:01 -0400
Subject: [PATCH 52/67] claude-code: 1.0.24 -> 1.0.29

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index f94bf3a4040b..f201f3d6f686 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.24"
+        "@anthropic-ai/claude-code": "^1.0.29"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.24.tgz",
-      "integrity": "sha512-4S6ly2297ngNlto7IFZeEicS9u0yRDhocOzndWFovGBb+iUoEPKdZa/rhVk/tcyCADL6S+mMkiGQOlqFDrN3JQ==",
+      "version": "1.0.29",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.29.tgz",
+      "integrity": "sha512-ZHw84ZJTxtG/jTLioTkF2ck+whQEKQvCrYvjP+nZnVFirOPV0QwpJyhKsdHFUufnbO4lqACs4dNNnhy0IlKTzQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 9cfc469fec0a..2226e22589f2 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.24";
+  version = "1.0.29";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-12nmnVM0/+rhWrkIQXttASKPZgGQMvrzWF/JDwR7If4=";
+    hash = "sha256-IQnDrtHeK1F7+yKtPXvfhb6iZq6IKQsn8p7WY8s3jgg=";
   };
 
-  npmDepsHash = "sha256-0jrARMOuJCU5MEigk0iYspUUHCB6APbCxPpqcp+5ktA=";
+  npmDepsHash = "sha256-Lhzl/Wgvn42ODu18jd0CIuCXziSX25C9ec7yNxdPi2w=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8d1484af41510e479f57921fd9eb65f8f7c99aae Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 18 Jun 2025 23:17:06 -0500
Subject: [PATCH 53/67] vimPlugins.blink-pairs: 0.2.0 -> 0.3.0

Changelog: https://github.com/Saghen/blink.pairs/blob/v0.3.0/CHANGELOG.md
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/blink-pairs/default.nix     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
index d469e1ee8dbd..cdb06f1ca764 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
@@ -8,13 +8,13 @@
   nix-update-script,
 }:
 let
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.pairs";
     tag = "v${version}";
-    hash = "sha256-fOOo+UnrbQJFWyqjpiFwhytlPoPRnUlGswQdZb3/ws0=";
+    hash = "sha256-RTY/uGviyHlO+ZmLwOC5BabKr+kRDAXGZNdS9fVRPWA=";
   };
 
   blink-pairs-lib = rustPlatform.buildRustPackage {
@@ -22,7 +22,9 @@ let
     inherit version src;
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-vkybRuym1yibaw943Gs9luYLdYEp4tgvA8e4maATiTY=";
+    cargoHash = "sha256-j+zk0UMjvaVgsdF5iaRVO4Puf/XtGu08Cs92jKPaM1g=";
+
+    env.RUSTC_BOOTSTRAP = 1;
 
     nativeBuildInputs = [
       pkg-config

From f9fcefd27ab42705d025d4435b6d7d6b84983a9b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 18 Jun 2025 23:32:15 -0500
Subject: [PATCH 54/67] btrfs-assistant: 2.1.1 -> 2.2

https: //gitlab.com/btrfs-assistant/btrfs-assistant/-/blob/main/changelog?ref_type=heads#L3
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/bt/btrfs-assistant/package.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index fce0bd8fc6eb..e6db481d4174 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  bash,
   btrfs-progs,
   cmake,
   coreutils,
@@ -17,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "btrfs-assistant";
-  version = "2.1.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     owner = "btrfs-assistant";
     repo = "btrfs-assistant";
     rev = finalAttrs.version;
-    hash = "sha256-I4nbQmHwk84qN1SngKzKnPtQN5Dz1QSSEpHJxV8wkJw=";
+    hash = "sha256-hFWYT+YIgnqBigpPkGdsLj6rcg4CjJffAyXlR23QP0Y=";
   };
 
   nativeBuildInputs = [
@@ -43,18 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
   ] ++ lib.optionals enableSnapper [ snapper ];
 
-  prePatch =
-    ''
-      substituteInPlace src/util/System.cpp \
-        --replace-fail '/bin/bash' "${lib.getExe bash}"
-
-      substituteInPlace src/main.cpp \
-        --replace-fail 'if (!qEnvironmentVariableIsEmpty("DISPLAY"))' ' if(!qEnvironmentVariableIsEmpty("DISPLAY") || !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY"))'
-    ''
-    + lib.optionalString enableSnapper ''
-      substituteInPlace src/main.cpp \
-        --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
-    '';
+  prePatch = lib.optionalString enableSnapper ''
+    substituteInPlace src/main.cpp \
+      --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}"
+  '';
 
   postPatch =
     ''

From ce9550f2e96981349534d1b25a3d306a42170341 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 13:25:05 +0000
Subject: [PATCH 55/67] scalingo: 1.34.0 -> 1.35.0

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

diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index 8300ad167c36..c833b17a24ea 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "scalingo";
-  version = "1.34.0";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "cli";
     rev = version;
-    hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk=";
+    hash = "sha256-3a3YlnSMPfWhYqeP12tx1BAe+hfzaYgPfFAz/rU2cMU=";
   };
 
   vendorHash = null;

From dc50b96e8a4c0e2810dabe3b387cc9cb561068bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 27 Feb 2025 21:29:16 +0100
Subject: [PATCH 56/67] python3Packages.guestfs: build and use from
 pkgs.libguestfs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Robert Schütz <github@dotlambda.de>
---
 pkgs/by-name/li/libguestfs/package.nix        |  5 +++
 .../python-modules/guestfs/default.nix        | 40 -------------------
 pkgs/top-level/python-packages.nix            |  6 ++-
 3 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/guestfs/default.nix

diff --git a/pkgs/by-name/li/libguestfs/package.nix b/pkgs/by-name/li/libguestfs/package.nix
index a8285960a55a..229183b0dd4c 100644
--- a/pkgs/by-name/li/libguestfs/package.nix
+++ b/pkgs/by-name/li/libguestfs/package.nix
@@ -35,6 +35,7 @@
   jansson,
   getopt,
   perlPackages,
+  python3,
   ocamlPackages,
   libtirpc,
   appliance ? null,
@@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
       gperf
       makeWrapper
       pkg-config
+      python3
+      python3.pkgs.pycodestyle
       qemu
       zstd
     ]
@@ -103,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     numactl
     libapparmor
     perlPackages.ModuleBuild
+    python3
     libtirpc
     zstd
     ocamlPackages.ocamlbuild
@@ -120,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-install-daemon"
     "--disable-appliance"
     "--with-distro=NixOS"
+    "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
     "--with-readline"
     "CPPFLAGS=-I${lib.getDev libxml2}/include/libxml2"
     "INSTALL_OCAMLLIB=${placeholder "out"}/lib/ocaml"
diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix
deleted file mode 100644
index 020809959b5f..000000000000
--- a/pkgs/development/python-modules/guestfs/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  pythonAtLeast,
-  buildPythonPackage,
-  fetchurl,
-  libguestfs,
-  qemu,
-}:
-
-buildPythonPackage rec {
-  pname = "guestfs";
-  version = "1.40.2";
-  format = "setuptools";
-
-  # FIXME: "error: implicit declaration of function 'PyEval_ThreadsInitialized'"
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2343777
-  disabled = pythonAtLeast "3.13";
-
-  src = fetchurl {
-    url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz";
-    hash = "sha256-GCKwkhrIXPz0hPrwe3YrhlEr6TuDYQivDzpMlZ+CAzI=";
-  };
-
-  propagatedBuildInputs = [
-    libguestfs
-    qemu
-  ];
-
-  # no tests
-  doCheck = false;
-  pythonImportsCheck = [ "guestfs" ];
-
-  meta = with lib; {
-    homepage = "https://libguestfs.org/guestfs-python.3.html";
-    description = "Use libguestfs from Python";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ grahamc ];
-    inherit (libguestfs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a067aa7bf69a..af02bc2e08ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6228,7 +6228,11 @@ self: super: with self; {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  guestfs = callPackage ../development/python-modules/guestfs { qemu = pkgs.qemu; };
+  guestfs = toPythonModule (
+    pkgs.libguestfs.override {
+      python3 = python;
+    }
+  );
 
   guidance = callPackage ../development/python-modules/guidance { };
 

From 55fd771b14ccdcd105263e73b3dbd791e18b16d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 13:56:50 +0000
Subject: [PATCH 57/67] stylelint: 16.20.0 -> 16.21.0

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

diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix
index 5805a7e68e5d..2a4aad71385d 100644
--- a/pkgs/by-name/st/stylelint/package.nix
+++ b/pkgs/by-name/st/stylelint/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
   pname = "stylelint";
-  version = "16.20.0";
+  version = "16.21.0";
 
   src = fetchFromGitHub {
     owner = "stylelint";
     repo = "stylelint";
     tag = version;
-    hash = "sha256-BgKutswOkgcTFTeLfocVtyC9P0Yr0dLyN4Gi/jrZWrw=";
+    hash = "sha256-qlD4voKQN/O9PDkXSJZZCGkoD+L0d9f78gGHKfkDkhQ=";
   };
 
-  npmDepsHash = "sha256-cAjPOo3KSMGwmCIBTX5x2xIUUqaba6shybAFqKAtQHs=";
+  npmDepsHash = "sha256-mvbYuaBuoF2ri14svCeT7BJX7qHnKZz+cpMlAwabRDI=";
 
   dontNpmBuild = true;
 

From 3f200cf2f5b2e4202b55f2e39f7c9c8bb847f41e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 14:44:31 +0300
Subject: [PATCH 58/67] Revert "kdePackages.extra-cmake-modules: propagate qdoc
 by default"

This reverts commit 618789b27f061672d1a3b4897d41b2d44869575a.
---
 pkgs/by-name/di/digikam/package.nix              |  5 -----
 .../frameworks/extra-cmake-modules/default.nix   |  8 ++------
 pkgs/kde/frameworks/karchive/default.nix         |  6 +++++-
 pkgs/kde/frameworks/kauth/default.nix            |  7 ++++++-
 pkgs/kde/frameworks/kbookmarks/default.nix       |  7 ++++++-
 pkgs/kde/frameworks/kcodecs/default.nix          |  2 ++
 pkgs/kde/frameworks/kcompletion/default.nix      |  7 ++++++-
 pkgs/kde/frameworks/kconfig/default.nix          |  2 ++
 pkgs/kde/frameworks/kcoreaddons/default.nix      |  2 ++
 pkgs/kde/frameworks/kdbusaddons/default.nix      |  7 ++++++-
 pkgs/kde/frameworks/kdnssd/default.nix           |  2 ++
 pkgs/kde/frameworks/kglobalaccel/default.nix     |  7 ++++++-
 pkgs/kde/frameworks/kholidays/default.nix        |  2 ++
 pkgs/kde/frameworks/kirigami/default.nix         |  8 +++++---
 pkgs/kde/frameworks/kitemviews/default.nix       |  7 ++++++-
 pkgs/kde/frameworks/kjobwidgets/default.nix      |  7 ++++++-
 pkgs/kde/frameworks/knotifications/default.nix   |  2 ++
 .../frameworks/kstatusnotifieritem/default.nix   |  7 ++++++-
 pkgs/kde/frameworks/ktexteditor/default.nix      |  2 --
 pkgs/kde/frameworks/ktextwidgets/default.nix     |  2 --
 pkgs/kde/frameworks/kuserfeedback/default.nix    |  6 +++++-
 pkgs/kde/frameworks/kwidgetsaddons/default.nix   |  7 ++++++-
 pkgs/kde/frameworks/kwindowsystem/default.nix    |  2 ++
 pkgs/kde/frameworks/prison/default.nix           |  4 +---
 .../frameworks/qqc2-desktop-style/default.nix    |  2 ++
 pkgs/kde/frameworks/solid/default.nix            |  2 ++
 pkgs/kde/frameworks/sonnet/default.nix           |  6 +++++-
 .../frameworks/syntax-highlighting/default.nix   |  6 +++++-
 pkgs/kde/gear/akonadi/default.nix                |  2 ++
 pkgs/kde/gear/analitza/default.nix               |  2 ++
 pkgs/kde/gear/angelfish/default.nix              |  1 -
 pkgs/kde/gear/arianna/default.nix                |  7 -------
 pkgs/kde/gear/audiotube/default.nix              |  1 -
 pkgs/kde/gear/blinken/default.nix                |  3 ---
 pkgs/kde/gear/cantor/default.nix                 |  2 --
 pkgs/kde/gear/elisa/default.nix                  |  3 ---
 pkgs/kde/gear/falkon/default.nix                 |  2 ++
 pkgs/kde/gear/ghostwriter/default.nix            |  7 +------
 pkgs/kde/gear/gwenview/default.nix               |  6 +-----
 pkgs/kde/gear/itinerary/default.nix              |  3 ---
 pkgs/kde/gear/k3b/default.nix                    |  1 -
 pkgs/kde/gear/kaccounts-providers/default.nix    |  6 +-----
 pkgs/kde/gear/kalgebra/default.nix               |  2 --
 pkgs/kde/gear/kalzium/default.nix                |  3 ---
 pkgs/kde/gear/kasts/default.nix                  |  6 +-----
 pkgs/kde/gear/kcachegrind/default.nix            |  3 +++
 pkgs/kde/gear/kclock/default.nix                 |  2 --
 pkgs/kde/gear/kdeconnect-kde/default.nix         |  8 +-------
 pkgs/kde/gear/kdegraphics-mobipocket/default.nix |  1 -
 pkgs/kde/gear/kdenlive/default.nix               |  1 -
 pkgs/kde/gear/kdepim-runtime/default.nix         |  2 --
 pkgs/kde/gear/kdev-python/default.nix            |  4 +---
 pkgs/kde/gear/kdevelop/default.nix               |  7 ++++---
 pkgs/kde/gear/kgraphviewer/default.nix           |  6 +-----
 pkgs/kde/gear/khelpcenter/default.nix            | 16 +++++-----------
 pkgs/kde/gear/kimagemapeditor/default.nix        |  2 --
 pkgs/kde/gear/kirigami-gallery/default.nix       |  6 +++++-
 pkgs/kde/gear/klettres/default.nix               |  3 ---
 pkgs/kde/gear/kmime/default.nix                  |  2 ++
 pkgs/kde/gear/kmousetool/default.nix             |  3 ---
 pkgs/kde/gear/kmouth/default.nix                 |  2 --
 pkgs/kde/gear/koko/default.nix                   |  6 +-----
 pkgs/kde/gear/konqueror/default.nix              |  6 +-----
 pkgs/kde/gear/konquest/default.nix               |  3 ---
 pkgs/kde/gear/konsole/default.nix                |  2 --
 pkgs/kde/gear/konversation/default.nix           |  6 +++++-
 pkgs/kde/gear/krecorder/default.nix              |  2 --
 pkgs/kde/gear/ksirk/default.nix                  |  1 -
 pkgs/kde/gear/ktorrent/default.nix               |  2 --
 pkgs/kde/gear/ktuberling/default.nix             |  2 --
 pkgs/kde/gear/kunifiedpush/default.nix           |  2 --
 pkgs/kde/gear/kwave/default.nix                  |  6 +-----
 pkgs/kde/gear/kweather/default.nix               |  3 ---
 pkgs/kde/gear/kweathercore/default.nix           |  1 -
 pkgs/kde/gear/kwordquiz/default.nix              |  3 ---
 pkgs/kde/gear/libkdepim/default.nix              |  7 ++++++-
 pkgs/kde/gear/libksieve/default.nix              |  2 --
 pkgs/kde/gear/marble/default.nix                 |  5 -----
 pkgs/kde/gear/massif-visualizer/default.nix      |  6 +-----
 pkgs/kde/gear/merkuro/default.nix                |  2 --
 pkgs/kde/gear/messagelib/default.nix             |  1 -
 pkgs/kde/gear/okular/default.nix                 |  6 +-----
 pkgs/kde/gear/parley/default.nix                 |  6 ------
 pkgs/kde/gear/skanpage/default.nix               |  5 -----
 pkgs/kde/gear/step/default.nix                   |  2 ++
 pkgs/kde/gear/tokodon/default.nix                |  6 +-----
 pkgs/kde/misc/kdiagram/default.nix               |  6 +++++-
 pkgs/kde/misc/kirigami-addons/default.nix        |  3 ++-
 pkgs/kde/misc/klevernotes/default.nix            |  2 --
 pkgs/kde/misc/ktextaddons/default.nix            |  4 ----
 pkgs/kde/misc/phonon-vlc/default.nix             |  2 ++
 pkgs/kde/misc/phonon/default.nix                 |  6 +++++-
 pkgs/kde/plasma/discover/default.nix             |  6 +-----
 pkgs/kde/plasma/kdeplasma-addons/default.nix     |  1 -
 pkgs/kde/plasma/krdp/default.nix                 |  8 ++------
 pkgs/kde/plasma/kscreen/default.nix              |  5 +----
 pkgs/kde/plasma/kwin-x11/default.nix             |  6 ++++--
 pkgs/kde/plasma/kwin/default.nix                 |  3 ---
 pkgs/kde/plasma/layer-shell-qt/default.nix       |  6 +-----
 pkgs/kde/plasma/libkscreen/default.nix           |  2 ++
 pkgs/kde/plasma/plasma-dialer/default.nix        |  6 +-----
 pkgs/kde/plasma/plasma-integration/default.nix   |  2 --
 pkgs/kde/plasma/plasma-mobile/default.nix        |  8 +-------
 pkgs/kde/plasma/plasma-nm/default.nix            |  6 +-----
 pkgs/kde/plasma/plasma-workspace/default.nix     |  5 +----
 pkgs/kde/plasma/spectacle/default.nix            |  5 -----
 .../plasma/xdg-desktop-portal-kde/default.nix    |  6 +-----
 107 files changed, 181 insertions(+), 269 deletions(-)

diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix
index 70485f72621d..9c0d01fd5838 100644
--- a/pkgs/by-name/di/digikam/package.nix
+++ b/pkgs/by-name/di/digikam/package.nix
@@ -94,11 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     kdePackages.wrapQtAppsHook
     wrapGAppsHook3
-
-    kdePackages.qtmultimedia
-    kdePackages.qtnetworkauth
-    kdePackages.qtscxml
-    kdePackages.qtwebengine
   ];
 
   # Based on <https://www.digikam.org/api/index.html#externaldeps>,
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
index ce9b5e6df4f8..83d91106b6a5 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   python3,
-  qttools,
 }:
 mkKdeDerivation {
   pname = "extra-cmake-modules";
@@ -12,13 +11,10 @@ mkKdeDerivation {
 
   outputs = [ "out" ];
 
+  # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
+  # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
   propagatedNativeBuildInputs = [
-    # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
-    # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
     python3
-
-    # Most packages require QDoc to generate docs, even if they're not installed
-    (qttools.override { withClang = true; })
   ];
 
   setupHook = ./ecm-hook.sh;
diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix
index 53aaa1dfa0b5..d9d15c9592a8 100644
--- a/pkgs/kde/frameworks/karchive/default.nix
+++ b/pkgs/kde/frameworks/karchive/default.nix
@@ -1,11 +1,15 @@
 {
   mkKdeDerivation,
+  qttools,
   pkg-config,
   xz,
 }:
 mkKdeDerivation {
   pname = "karchive";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    qttools
+    pkg-config
+  ];
   extraBuildInputs = [ xz ];
 }
diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix
index 390bf1da4100..4ed23d29fd1c 100644
--- a/pkgs/kde/frameworks/kauth/default.nix
+++ b/pkgs/kde/frameworks/kauth/default.nix
@@ -1,8 +1,13 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kauth";
 
   # Late resolve paths so things end up in their own prefix
   # FIXME(later): discuss with upstream
   patches = [ ./fix-paths.patch ];
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix
index 2d93db76edf5..e52786637ff1 100644
--- a/pkgs/kde/frameworks/kbookmarks/default.nix
+++ b/pkgs/kde/frameworks/kbookmarks/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kbookmarks";
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix
index 66c0ae45cb0e..c2649fe03dec 100644
--- a/pkgs/kde/frameworks/kcodecs/default.nix
+++ b/pkgs/kde/frameworks/kcodecs/default.nix
@@ -1,11 +1,13 @@
 {
   mkKdeDerivation,
+  qttools,
   gperf,
 }:
 mkKdeDerivation {
   pname = "kcodecs";
 
   extraNativeBuildInputs = [
+    qttools
     gperf
   ];
 }
diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix
index c21ebcf00a37..922182e9280b 100644
--- a/pkgs/kde/frameworks/kcompletion/default.nix
+++ b/pkgs/kde/frameworks/kcompletion/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kcompletion";
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix
index 57844a4ef4f0..451ec7db5d28 100644
--- a/pkgs/kde/frameworks/kconfig/default.nix
+++ b/pkgs/kde/frameworks/kconfig/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kconfig";
 
+  extraNativeBuildInputs = [ qttools ];
   extraPropagatedBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix
index 38f05b94d7a8..adeec792b9dd 100644
--- a/pkgs/kde/frameworks/kcoreaddons/default.nix
+++ b/pkgs/kde/frameworks/kcoreaddons/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   shared-mime-info,
   qtdeclarative,
 }:
@@ -9,6 +10,7 @@ mkKdeDerivation {
   hasPythonBindings = true;
 
   extraNativeBuildInputs = [
+    qttools
     shared-mime-info
   ];
   extraBuildInputs = [ qtdeclarative ];
diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix
index 86412e584169..c75df4132c0b 100644
--- a/pkgs/kde/frameworks/kdbusaddons/default.nix
+++ b/pkgs/kde/frameworks/kdbusaddons/default.nix
@@ -1,5 +1,10 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kdbusaddons";
+
+  extraNativeBuildInputs = [ qttools ];
   meta.mainProgram = "kquitapp6";
 }
diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix
index 3f2d6cc5df49..ce22856035e3 100644
--- a/pkgs/kde/frameworks/kdnssd/default.nix
+++ b/pkgs/kde/frameworks/kdnssd/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   avahi,
 }:
 mkKdeDerivation {
   pname = "kdnssd";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ avahi ];
 }
diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix
index d0d45184885c..10d40753ae30 100644
--- a/pkgs/kde/frameworks/kglobalaccel/default.nix
+++ b/pkgs/kde/frameworks/kglobalaccel/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kglobalaccel";
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix
index 21284ae13d94..966ca350c6fd 100644
--- a/pkgs/kde/frameworks/kholidays/default.nix
+++ b/pkgs/kde/frameworks/kholidays/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kholidays";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix
index b93c82f3a393..83edf8c52654 100644
--- a/pkgs/kde/frameworks/kirigami/default.nix
+++ b/pkgs/kde/frameworks/kirigami/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   mkKdeDerivation,
   qtsvg,
+  qttools,
   qtdeclarative,
   qt5compat,
   qqc2-desktop-style,
@@ -16,11 +17,12 @@ let
   unwrapped = mkKdeDerivation {
     pname = "kirigami";
 
-    extraNativeBuildInputs = [ qtsvg ];
+    extraNativeBuildInputs = [
+      qtsvg
+      qttools
+    ];
     extraBuildInputs = [ qtdeclarative ];
-
     extraPropagatedBuildInputs = [ qt5compat ];
-    propagatedNativeBuildInputs = [ qt5compat ];
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix
index f1d42fec3715..487d63092c00 100644
--- a/pkgs/kde/frameworks/kitemviews/default.nix
+++ b/pkgs/kde/frameworks/kitemviews/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kitemviews";
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix
index d4bcc28c550d..4fd488aa5ad8 100644
--- a/pkgs/kde/frameworks/kjobwidgets/default.nix
+++ b/pkgs/kde/frameworks/kjobwidgets/default.nix
@@ -1,7 +1,12 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kjobwidgets";
 
+  extraNativeBuildInputs = [ qttools ];
+
   # FIXME: depends on kcoreaddons typesystem info, we need
   # a Shiboken wrapper to propagate this properly.
   extraCmakeFlags = [ "-DBUILD_PYTHON_BINDINGS=OFF" ];
diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix
index 240f35716a2d..b331da36140f 100644
--- a/pkgs/kde/frameworks/knotifications/default.nix
+++ b/pkgs/kde/frameworks/knotifications/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
   libcanberra,
 }:
@@ -8,6 +9,7 @@ mkKdeDerivation {
 
   hasPythonBindings = true;
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [
     qtdeclarative
     libcanberra
diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
index 86cd9263aa20..422446630451 100644
--- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
+++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
@@ -1,6 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kstatusnotifieritem";
 
   hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix
index 2aec466ec92e..e7c470c99d09 100644
--- a/pkgs/kde/frameworks/ktexteditor/default.nix
+++ b/pkgs/kde/frameworks/ktexteditor/default.nix
@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "ktexteditor";
 
-  extraNativeBuildInputs = [ qtspeech ];
-
   extraBuildInputs = [
     qtdeclarative
     qtspeech
diff --git a/pkgs/kde/frameworks/ktextwidgets/default.nix b/pkgs/kde/frameworks/ktextwidgets/default.nix
index 78d041d38c95..a90de215c598 100644
--- a/pkgs/kde/frameworks/ktextwidgets/default.nix
+++ b/pkgs/kde/frameworks/ktextwidgets/default.nix
@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "ktextwidgets";
 
-  extraNativeBuildInputs = [ qtspeech ];
-
   extraBuildInputs = [
     qtspeech
     qttools
diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix
index c441c1cc8b89..7379061982b5 100644
--- a/pkgs/kde/frameworks/kuserfeedback/default.nix
+++ b/pkgs/kde/frameworks/kuserfeedback/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   qtsvg,
 }:
 mkKdeDerivation {
@@ -10,5 +11,8 @@ mkKdeDerivation {
     "-DENABLE_CONSOLE=0"
     "-DENABLE_CLI=0"
   ];
-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qttools
+    qtsvg
+  ];
 }
diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix
index 4784d4696ea9..65cc84cf938f 100644
--- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix
+++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix
@@ -1,6 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "kwidgetsaddons";
 
   hasPythonBindings = true;
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix
index fb4349a53654..5ae167b1cc9a 100644
--- a/pkgs/kde/frameworks/kwindowsystem/default.nix
+++ b/pkgs/kde/frameworks/kwindowsystem/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   qtdeclarative,
   qtwayland,
   pkg-config,
@@ -8,6 +9,7 @@ mkKdeDerivation {
   pname = "kwindowsystem";
 
   extraNativeBuildInputs = [
+    qttools
     pkg-config
   ];
   extraBuildInputs = [
diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix
index 5723075389ca..4cde20f930b0 100644
--- a/pkgs/kde/frameworks/prison/default.nix
+++ b/pkgs/kde/frameworks/prison/default.nix
@@ -8,11 +8,9 @@
 mkKdeDerivation {
   pname = "prison";
 
-  propagatedNativeBuildInputs = [ qtmultimedia ];
-  extraPropagatedBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtdeclarative
+    qtmultimedia
     qrencode
     libdmtx
   ];
diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
index 469f4b23f1b9..45f22d8fa5d3 100644
--- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
+++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
@@ -1,11 +1,13 @@
 {
   mkKdeDerivation,
   qtdeclarative,
+  qttools,
   kirigami,
 }:
 mkKdeDerivation {
   pname = "qqc2-desktop-style";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [
     qtdeclarative
     kirigami.unwrapped
diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix
index 51c4be689aeb..6b767e9d43f7 100644
--- a/pkgs/kde/frameworks/solid/default.nix
+++ b/pkgs/kde/frameworks/solid/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   bison,
   flex,
   libimobiledevice,
@@ -13,6 +14,7 @@ mkKdeDerivation {
   ];
 
   extraNativeBuildInputs = [
+    qttools
     bison
     flex
   ];
diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix
index 329f532a710c..fbeb8b10d555 100644
--- a/pkgs/kde/frameworks/sonnet/default.nix
+++ b/pkgs/kde/frameworks/sonnet/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   qtdeclarative,
+  qttools,
   pkg-config,
   aspell,
   hunspell,
@@ -8,7 +9,10 @@
 mkKdeDerivation {
   pname = "sonnet";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    qttools
+    pkg-config
+  ];
   extraBuildInputs = [
     qtdeclarative
     aspell
diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix
index 0b92eb7eccdc..7985dcb95702 100644
--- a/pkgs/kde/frameworks/syntax-highlighting/default.nix
+++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix
@@ -1,12 +1,16 @@
 {
   mkKdeDerivation,
   qtdeclarative,
+  qttools,
   perl,
 }:
 mkKdeDerivation {
   pname = "syntax-highlighting";
 
   extraBuildInputs = [ qtdeclarative ];
-  extraNativeBuildInputs = [ perl ];
+  extraNativeBuildInputs = [
+    qttools
+    perl
+  ];
   meta.mainProgram = "ksyntaxhighlighter6";
 }
diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix
index 843055db79d3..6225b7e9cfda 100644
--- a/pkgs/kde/gear/akonadi/default.nix
+++ b/pkgs/kde/gear/akonadi/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   mkKdeDerivation,
+  qttools,
   accounts-qt,
   kaccounts-integration,
   shared-mime-info,
@@ -35,6 +36,7 @@ mkKdeDerivation {
     ];
 
   extraNativeBuildInputs = [
+    qttools
     shared-mime-info
   ];
 
diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix
index 971c2f78f74d..4402ab1d5300 100644
--- a/pkgs/kde/gear/analitza/default.nix
+++ b/pkgs/kde/gear/analitza/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   qt5compat,
   qtsvg,
+  qttools,
   qtdeclarative,
   eigen,
 }:
@@ -11,6 +12,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     qt5compat
     qtsvg
+    qttools
   ];
   extraBuildInputs = [
     qtdeclarative
diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index d18ca798d832..49c578b1c3d3 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -23,7 +23,6 @@ mkKdeDerivation rec {
     rustPlatform.cargoSetupHook
     cargo
     rustc
-    qtwebengine
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix
index a974f6429fa2..247da11b6d3d 100644
--- a/pkgs/kde/gear/arianna/default.nix
+++ b/pkgs/kde/gear/arianna/default.nix
@@ -9,12 +9,6 @@
 mkKdeDerivation {
   pname = "arianna";
 
-  extraNativeBuildInputs = [
-    qthttpserver
-    qtwebchannel
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qthttpserver
     qtsvg
@@ -22,6 +16,5 @@ mkKdeDerivation {
     qtwebengine
     kitemmodels
   ];
-
   meta.mainProgram = "arianna";
 }
diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix
index ae79dc7ae25a..b27ab60155a5 100644
--- a/pkgs/kde/gear/audiotube/default.nix
+++ b/pkgs/kde/gear/audiotube/default.nix
@@ -27,7 +27,6 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [
     ps.pybind11
-    qtmultimedia
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix
index bcde9b5a8a82..885384e3f71b 100644
--- a/pkgs/kde/gear/blinken/default.nix
+++ b/pkgs/kde/gear/blinken/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "blinken";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
-
   meta.mainProgram = "blinken";
 }
diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix
index 159ae9946c9b..6269359ae178 100644
--- a/pkgs/kde/gear/cantor/default.nix
+++ b/pkgs/kde/gear/cantor/default.nix
@@ -19,9 +19,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtwebengine
   ];
-
   extraBuildInputs = [
     qtsvg
     qttools
diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix
index 9162502e8460..ee280ae93198 100644
--- a/pkgs/kde/gear/elisa/default.nix
+++ b/pkgs/kde/gear/elisa/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "elisa";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     libvlc
   ];
-
   meta.mainProgram = "elisa";
 }
diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix
index d5d3ffa3797d..a4fad195a7b0 100644
--- a/pkgs/kde/gear/falkon/default.nix
+++ b/pkgs/kde/gear/falkon/default.nix
@@ -3,12 +3,14 @@
   extra-cmake-modules,
   qtwebchannel,
   qtwebengine,
+  qttools,
   python3Packages,
 }:
 mkKdeDerivation {
   pname = "falkon";
 
   extraNativeBuildInputs = [
+    qttools
     qtwebchannel
     qtwebengine
   ];
diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix
index 8493e180266c..1bcb0e004050 100644
--- a/pkgs/kde/gear/ghostwriter/default.nix
+++ b/pkgs/kde/gear/ghostwriter/default.nix
@@ -16,12 +16,7 @@
 mkKdeDerivation {
   pname = "ghostwriter";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebchannel
-    qtwebengine
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtsvg
     qttools
diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix
index f237c341ea45..68a93a36738b 100644
--- a/pkgs/kde/gear/gwenview/default.nix
+++ b/pkgs/kde/gear/gwenview/default.nix
@@ -15,11 +15,7 @@
 mkKdeDerivation {
   pname = "gwenview";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtsvg
     qtwayland
diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix
index 07b338520eb2..0b2292a2ada3 100644
--- a/pkgs/kde/gear/itinerary/default.nix
+++ b/pkgs/kde/gear/itinerary/default.nix
@@ -15,14 +15,11 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtpositioning
   ];
-
   extraBuildInputs = [
     qtlocation
     qtpositioning
     libical
   ];
-
   meta.mainProgram = "itinerary";
 }
diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix
index 0d30264167cb..06b4630863f1 100644
--- a/pkgs/kde/gear/k3b/default.nix
+++ b/pkgs/kde/gear/k3b/default.nix
@@ -27,7 +27,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtwebengine
   ];
 
   # FIXME: Musicbrainz 2.x???, musepack
diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix
index ac11b02a3bc5..bf0ecf678302 100644
--- a/pkgs/kde/gear/kaccounts-providers/default.nix
+++ b/pkgs/kde/gear/kaccounts-providers/default.nix
@@ -7,11 +7,7 @@
 mkKdeDerivation {
   pname = "kaccounts-providers";
 
-  extraNativeBuildInputs = [
-    intltool
-    qtwebengine
-  ];
-
+  extraNativeBuildInputs = [ intltool ];
   extraBuildInputs = [
     qtdeclarative
     qtwebengine
diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix
index db6b5ba77b8e..1b3cd47fc93e 100644
--- a/pkgs/kde/gear/kalgebra/default.nix
+++ b/pkgs/kde/gear/kalgebra/default.nix
@@ -8,8 +8,6 @@
 mkKdeDerivation {
   pname = "kalgebra";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtsvg
     qtwebengine
diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix
index f8e5672a7bcd..7cdcd1efec63 100644
--- a/pkgs/kde/gear/kalzium/default.nix
+++ b/pkgs/kde/gear/kalzium/default.nix
@@ -14,15 +14,12 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     ocaml
-    qtscxml
   ];
-
   extraBuildInputs = [
     eigen
     openbabel
     qtsvg
     qtscxml
   ];
-
   meta.mainProgram = "kalzium";
 }
diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix
index 9d56452c3d7a..f95ea1c80892 100644
--- a/pkgs/kde/gear/kasts/default.nix
+++ b/pkgs/kde/gear/kasts/default.nix
@@ -9,11 +9,7 @@
 mkKdeDerivation {
   pname = "kasts";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtmultimedia
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtsvg
     qtmultimedia
diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix
index c161a0ec5b9c..d657c059ca22 100644
--- a/pkgs/kde/gear/kcachegrind/default.nix
+++ b/pkgs/kde/gear/kcachegrind/default.nix
@@ -1,11 +1,14 @@
 {
   lib,
   mkKdeDerivation,
+  qttools,
   graphviz,
 }:
 mkKdeDerivation {
   pname = "kcachegrind";
 
+  extraNativeBuildInputs = [ qttools ];
+
   qtWrapperArgs = [
     "--suffix PATH : ${lib.makeBinPath [ graphviz ]}"
   ];
diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix
index 0ea54cf45b88..56ec55e885da 100644
--- a/pkgs/kde/gear/kclock/default.nix
+++ b/pkgs/kde/gear/kclock/default.nix
@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "kclock";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia
diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix
index eaba370102c7..d81c487e452f 100644
--- a/pkgs/kde/gear/kdeconnect-kde/default.nix
+++ b/pkgs/kde/gear/kdeconnect-kde/default.nix
@@ -26,13 +26,7 @@ mkKdeDerivation {
     echo "${sshfs}" > $out/nix-support/depends
   '';
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtconnectivity
-    qtmultimedia
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtconnectivity
     qtmultimedia
diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
index 84cf2576d704..56596b0537f6 100644
--- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
+++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kdegraphics-mobipocket";
 
-  extraNativeBuildInputs = [ qt5compat ];
   extraBuildInputs = [ qt5compat ];
 }
diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix
index a7b9aa7f6764..eaddc66b65f2 100644
--- a/pkgs/kde/gear/kdenlive/default.nix
+++ b/pkgs/kde/gear/kdenlive/default.nix
@@ -32,7 +32,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
-    qtnetworkauth
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix
index 42cd2a751a51..e3cd581afcd5 100644
--- a/pkgs/kde/gear/kdepim-runtime/default.nix
+++ b/pkgs/kde/gear/kdepim-runtime/default.nix
@@ -18,9 +18,7 @@ mkKdeDerivation {
     pkg-config
     shared-mime-info
     libxslt
-    qtnetworkauth
   ];
-
   # FIXME: libkolabxml
   extraBuildInputs = [
     qtnetworkauth
diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix
index b175af1d7194..23901bb4d78e 100644
--- a/pkgs/kde/gear/kdev-python/default.nix
+++ b/pkgs/kde/gear/kdev-python/default.nix
@@ -1,6 +1,4 @@
-{
-  mkKdeDerivation,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kdev-python";
 }
diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix
index e4def55487c7..5a2b02b41530 100644
--- a/pkgs/kde/gear/kdevelop/default.nix
+++ b/pkgs/kde/gear/kdevelop/default.nix
@@ -23,6 +23,10 @@ mkKdeDerivation {
     shared-mime-info
   ];
 
+  extraPropagatedBuildInputs = [
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qttools
     apr
@@ -34,9 +38,6 @@ mkKdeDerivation {
     subversion
   ];
 
-  propagatedNativeBuildInputs = [ qtwebengine ];
-  extraPropagatedBuildInputs = [ qtwebengine ];
-
   extraCmakeFlags = [
     "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include"
     "-DAPR_CONFIG_PATH=${apr.dev}/bin"
diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix
index 96cf05526b15..560d4685921a 100644
--- a/pkgs/kde/gear/kgraphviewer/default.nix
+++ b/pkgs/kde/gear/kgraphviewer/default.nix
@@ -9,11 +9,7 @@
 mkKdeDerivation {
   pname = "kgraphviewer";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qt5compat
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qt5compat
     qtsvg
diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix
index 1e849647e803..795ec3b4aeb3 100644
--- a/pkgs/kde/gear/khelpcenter/default.nix
+++ b/pkgs/kde/gear/khelpcenter/default.nix
@@ -10,22 +10,16 @@
 mkKdeDerivation {
   pname = "khelpcenter";
 
-  patches = [
-    (replaceVars ./use_nix_paths_for_mansearch_utilities.patch {
-      inherit man-db;
-    })
-  ];
-
-  extraNativeBuildInputs = [
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtwebengine
     xapian
     python3
     kio-extras
   ];
-
+  patches = [
+    (replaceVars ./use_nix_paths_for_mansearch_utilities.patch {
+      inherit man-db;
+    })
+  ];
   meta.mainProgram = "khelpcenter";
 }
diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix
index af57c792bdc2..9341cf5ab4db 100644
--- a/pkgs/kde/gear/kimagemapeditor/default.nix
+++ b/pkgs/kde/gear/kimagemapeditor/default.nix
@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "kimagemapeditor";
 
-  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
-
   meta.mainProgram = "kimagemapeditor";
 }
diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix
index f99fd3e1fca6..bb739046baca 100644
--- a/pkgs/kde/gear/kirigami-gallery/default.nix
+++ b/pkgs/kde/gear/kirigami-gallery/default.nix
@@ -1,9 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  qttools,
 }:
 mkKdeDerivation {
   pname = "kirigami-gallery";
 
-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qtsvg
+    qttools
+  ];
 }
diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix
index c8aed6950e08..70dd2dbcec72 100644
--- a/pkgs/kde/gear/klettres/default.nix
+++ b/pkgs/kde/gear/klettres/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "klettres";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
-
   meta.mainProgram = "klettres";
 }
diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix
index 4f1fcbea3500..300185643481 100644
--- a/pkgs/kde/gear/kmime/default.nix
+++ b/pkgs/kde/gear/kmime/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   ki18n,
 }:
 mkKdeDerivation {
   pname = "kmime";
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ ki18n ];
 }
diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix
index c07a0c4ebd0c..7eca9ab12c73 100644
--- a/pkgs/kde/gear/kmousetool/default.nix
+++ b/pkgs/kde/gear/kmousetool/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "kmousetool";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtmultimedia
     xorg.libXt
   ];
-
   meta.mainProgram = "kmousetool";
 }
diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix
index 60235bea24f3..098f8a5ec33f 100644
--- a/pkgs/kde/gear/kmouth/default.nix
+++ b/pkgs/kde/gear/kmouth/default.nix
@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "kmouth";
 
-  extraNativeBuildInputs = [ qtspeech ];
   extraBuildInputs = [ qtspeech ];
-
   meta.mainProgram = "kmouth";
 }
diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix
index a2a5b443c49d..613f2981fe52 100644
--- a/pkgs/kde/gear/koko/default.nix
+++ b/pkgs/kde/gear/koko/default.nix
@@ -37,11 +37,7 @@ mkKdeDerivation {
     ./optional-runtime-dependencies.patch
   ];
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtpositioning
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtmultimedia
     qtpositioning
diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix
index 61bcd13ec059..5bd29359e979 100644
--- a/pkgs/kde/gear/konqueror/default.nix
+++ b/pkgs/kde/gear/konqueror/default.nix
@@ -6,11 +6,7 @@
 mkKdeDerivation {
   pname = "konqueror";
 
-  extraNativeBuildInputs = [
-    hunspell
-    qtwebengine
-  ];
-
+  extraNativeBuildInputs = [ hunspell ];
   extraBuildInputs = [ qtwebengine ];
 
   extraCmakeFlags = [
diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix
index 61569d7aeaf1..3b7cfbf59e54 100644
--- a/pkgs/kde/gear/konquest/default.nix
+++ b/pkgs/kde/gear/konquest/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "konquest";
 
-  extraNativeBuildInputs = [ qtscxml ];
-
   extraBuildInputs = [
     qtscxml
     qtsvg
   ];
-
   meta.mainProgram = "konquest";
 }
diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix
index a1c225e723b5..0e95e6a045a8 100644
--- a/pkgs/kde/gear/konsole/default.nix
+++ b/pkgs/kde/gear/konsole/default.nix
@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "konsole";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qt5compat
     qtmultimedia
diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix
index e2e59d5d2303..b78bb62f62fc 100644
--- a/pkgs/kde/gear/konversation/default.nix
+++ b/pkgs/kde/gear/konversation/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   qtmultimedia,
   qt5compat,
 }:
@@ -7,7 +8,10 @@ mkKdeDerivation {
   pname = "konversation";
 
   extraBuildInputs = [ qt5compat ];
-  extraNativeBuildInputs = [ qtmultimedia ];
+  extraNativeBuildInputs = [
+    qtmultimedia
+    qttools
+  ];
 
   meta.mainProgram = "konversation";
 }
diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix
index 5b6a973c9c3e..04d9d4c05826 100644
--- a/pkgs/kde/gear/krecorder/default.nix
+++ b/pkgs/kde/gear/krecorder/default.nix
@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "krecorder";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
-
   meta.mainProgram = "krecorder";
 }
diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix
index 3e96b6eb60d6..2123d3d54abf 100644
--- a/pkgs/kde/gear/ksirk/default.nix
+++ b/pkgs/kde/gear/ksirk/default.nix
@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "ksirk";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
 }
diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix
index 359e80872fbe..ae1d8aedfdf3 100644
--- a/pkgs/kde/gear/ktorrent/default.nix
+++ b/pkgs/kde/gear/ktorrent/default.nix
@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "ktorrent";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtwebengine
     taglib
diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix
index 4d953b535760..278f7f823d3d 100644
--- a/pkgs/kde/gear/ktuberling/default.nix
+++ b/pkgs/kde/gear/ktuberling/default.nix
@@ -5,8 +5,6 @@
 mkKdeDerivation {
   pname = "ktuberling";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
-
   meta.mainProgram = "ktuberling";
 }
diff --git a/pkgs/kde/gear/kunifiedpush/default.nix b/pkgs/kde/gear/kunifiedpush/default.nix
index 97822e31e225..ccecbca0f2a3 100644
--- a/pkgs/kde/gear/kunifiedpush/default.nix
+++ b/pkgs/kde/gear/kunifiedpush/default.nix
@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "kunifiedpush";
 
-  extraNativeBuildInputs = [ qtwebsockets ];
-
   extraBuildInputs = [
     qtwebsockets
     kdeclarative
diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix
index bb2fcea752bd..e7fbff9937ca 100644
--- a/pkgs/kde/gear/kwave/default.nix
+++ b/pkgs/kde/gear/kwave/default.nix
@@ -19,11 +19,7 @@
 mkKdeDerivation {
   pname = "kwave";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtmultimedia
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtmultimedia
 
diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix
index a77d37b9c9ba..20d4c8a1e670 100644
--- a/pkgs/kde/gear/kweather/default.nix
+++ b/pkgs/kde/gear/kweather/default.nix
@@ -7,13 +7,10 @@
 mkKdeDerivation {
   pname = "kweather";
 
-  extraNativeBuildInputs = [ qtcharts ];
-
   extraBuildInputs = [
     qtsvg
     qtcharts
     kholidays
   ];
-
   meta.mainProgram = "kweather";
 }
diff --git a/pkgs/kde/gear/kweathercore/default.nix b/pkgs/kde/gear/kweathercore/default.nix
index 852e97237490..ca45515dfdb8 100644
--- a/pkgs/kde/gear/kweathercore/default.nix
+++ b/pkgs/kde/gear/kweathercore/default.nix
@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kweathercore";
 
-  extraNativeBuildInputs = [ qtpositioning ];
   extraBuildInputs = [ qtpositioning ];
 }
diff --git a/pkgs/kde/gear/kwordquiz/default.nix b/pkgs/kde/gear/kwordquiz/default.nix
index d2a11b4c8d96..ad57c8e2d71b 100644
--- a/pkgs/kde/gear/kwordquiz/default.nix
+++ b/pkgs/kde/gear/kwordquiz/default.nix
@@ -6,12 +6,9 @@
 mkKdeDerivation {
   pname = "kwordquiz";
 
-  extraNativeBuildInputs = [ qtmultimedia ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia
   ];
-
   meta.mainProgram = "kwordquiz";
 }
diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix
index 6c39a9db3ef5..fc9d3f3d637c 100644
--- a/pkgs/kde/gear/libkdepim/default.nix
+++ b/pkgs/kde/gear/libkdepim/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qttools,
+}:
 mkKdeDerivation {
   pname = "libkdepim";
+
+  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix
index 187ef29419e6..e36d8995687e 100644
--- a/pkgs/kde/gear/libksieve/default.nix
+++ b/pkgs/kde/gear/libksieve/default.nix
@@ -6,8 +6,6 @@
 mkKdeDerivation {
   pname = "libksieve";
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtwebengine
     cyrus_sasl
diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix
index 3cf83babad2a..9c3723815d51 100644
--- a/pkgs/kde/gear/marble/default.nix
+++ b/pkgs/kde/gear/marble/default.nix
@@ -6,7 +6,6 @@
   shared-mime-info,
 
   qtpositioning,
-  qtserialport,
   qtsvg,
   qttools,
   qtwebengine,
@@ -26,14 +25,10 @@ mkKdeDerivation {
     perl
     pkg-config
     shared-mime-info
-    qtpositioning
-    qtserialport
-    qtwebengine
   ];
 
   extraBuildInputs = [
     qtpositioning
-    qtserialport
     qtsvg
     qttools
     qtwebengine
diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix
index 18253915a8ab..04b958217e74 100644
--- a/pkgs/kde/gear/massif-visualizer/default.nix
+++ b/pkgs/kde/gear/massif-visualizer/default.nix
@@ -7,13 +7,9 @@
 mkKdeDerivation {
   pname = "massif-visualizer";
 
-  extraNativeBuildInputs = [
-    shared-mime-info
-    qt5compat
-  ];
-
   extraBuildInputs = [
     qt5compat
     qtsvg
   ];
+  extraNativeBuildInputs = [ shared-mime-info ];
 }
diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix
index c45635087f88..a6a2c70c5732 100644
--- a/pkgs/kde/gear/merkuro/default.nix
+++ b/pkgs/kde/gear/merkuro/default.nix
@@ -7,8 +7,6 @@
 mkKdeDerivation {
   pname = "merkuro";
 
-  extraNativeBuildInputs = [ qtlocation ];
-
   extraBuildInputs = [
     qtlocation
     qtsvg
diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix
index e68c343ff1b7..db8f4e04f045 100644
--- a/pkgs/kde/gear/messagelib/default.nix
+++ b/pkgs/kde/gear/messagelib/default.nix
@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "messagelib";
 
-  propagatedNativeBuildInputs = [ qtwebengine ];
   extraPropagatedBuildInputs = [ qtwebengine ];
 }
diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix
index d64404b4ed8f..b6048d9611d4 100644
--- a/pkgs/kde/gear/okular/default.nix
+++ b/pkgs/kde/gear/okular/default.nix
@@ -14,11 +14,7 @@
 mkKdeDerivation {
   pname = "okular";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtspeech
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtspeech
     qtsvg
diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix
index 437f85c97cc3..e2a275c4c02c 100644
--- a/pkgs/kde/gear/parley/default.nix
+++ b/pkgs/kde/gear/parley/default.nix
@@ -7,16 +7,10 @@
 mkKdeDerivation {
   pname = "parley";
 
-  extraNativeBuildInputs = [
-    qtmultimedia
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtsvg
     qtmultimedia
     qtwebengine
   ];
-
   meta.mainProgram = "parley";
 }
diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix
index 69b622bc264b..4c9e10422098 100644
--- a/pkgs/kde/gear/skanpage/default.nix
+++ b/pkgs/kde/gear/skanpage/default.nix
@@ -8,15 +8,10 @@
 mkKdeDerivation {
   pname = "skanpage";
 
-  extraNativeBuildInputs = [
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qtwebengine
     (tesseract5.override { enableLanguages = tesseractLanguages; })
     leptonica
   ];
-
   meta.mainProgram = "skanpage";
 }
diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix
index 4c5283bde774..983755d21139 100644
--- a/pkgs/kde/gear/step/default.nix
+++ b/pkgs/kde/gear/step/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  qttools,
   qtsvg,
   pkg-config,
   eigen,
@@ -11,6 +12,7 @@ mkKdeDerivation {
   pname = "step";
 
   extraNativeBuildInputs = [
+    qttools
     qtsvg
     pkg-config
     shared-mime-info
diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix
index c38d4eec3aad..467ebc2837e6 100644
--- a/pkgs/kde/gear/tokodon/default.nix
+++ b/pkgs/kde/gear/tokodon/default.nix
@@ -10,11 +10,7 @@
 mkKdeDerivation {
   pname = "tokodon";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebsockets
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtmultimedia
     qtsvg
diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix
index ac99319ca255..48355004b761 100644
--- a/pkgs/kde/misc/kdiagram/default.nix
+++ b/pkgs/kde/misc/kdiagram/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkKdeDerivation,
   fetchurl,
+  qttools,
   qtsvg,
 }:
 mkKdeDerivation rec {
@@ -13,7 +14,10 @@ mkKdeDerivation rec {
     hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0=";
   };
 
-  extraNativeBuildInputs = [ qtsvg ];
+  extraNativeBuildInputs = [
+    qttools
+    qtsvg
+  ];
 
   meta.license = [ lib.licenses.gpl2Only ];
 }
diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix
index ec7cd7b09ea8..98ccc2931470 100644
--- a/pkgs/kde/misc/kirigami-addons/default.nix
+++ b/pkgs/kde/misc/kirigami-addons/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   qtdeclarative,
   qt5compat,
+  qttools,
 }:
 mkKdeDerivation rec {
   pname = "kirigami-addons";
@@ -14,9 +15,9 @@ mkKdeDerivation rec {
     hash = "sha256-AAKK5N+Z4lBRg0XqKNnN9J1wDprKxIJzS7UThNoR+UU=";
   };
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ qtdeclarative ];
   extraPropagatedBuildInputs = [ qt5compat ];
-  propagatedNativeBuildInputs = [ qt5compat ];
 
   meta.license = with lib.licenses; [
     bsd2
diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix
index 7a5f32c99868..2a7c14b9cefd 100644
--- a/pkgs/kde/misc/klevernotes/default.nix
+++ b/pkgs/kde/misc/klevernotes/default.nix
@@ -16,8 +16,6 @@ mkKdeDerivation rec {
     hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I=";
   };
 
-  extraNativeBuildInputs = [ qtwebengine ];
-
   extraBuildInputs = [
     qtsvg
     qtwebengine
diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index 1a2676043358..7296d8b22fe7 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -16,10 +16,6 @@ mkKdeDerivation rec {
     hash = "sha256-2YRlBaUvl72mTq0ZMDK8KVc+wxSB9HO+PFhvW4Mh7Nw=";
   };
 
-  extraNativeBuildInputs = [
-    qtspeech
-  ];
-
   extraBuildInputs = [
     qtspeech
     qttools
diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix
index 8823be7d9376..88f278d92986 100644
--- a/pkgs/kde/misc/phonon-vlc/default.nix
+++ b/pkgs/kde/misc/phonon-vlc/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkKdeDerivation,
   fetchurl,
+  qttools,
   libvlc,
 }:
 mkKdeDerivation rec {
@@ -13,6 +14,7 @@ mkKdeDerivation rec {
     hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU=";
   };
 
+  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ libvlc ];
 
   cmakeFlags = [
diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix
index a9644f4c29d8..76e57f30b3a5 100644
--- a/pkgs/kde/misc/phonon/default.nix
+++ b/pkgs/kde/misc/phonon/default.nix
@@ -7,6 +7,7 @@
   pkg-config,
   libpulseaudio,
   qt5compat,
+  qttools,
 }:
 mkKdeDerivation rec {
   pname = "phonon";
@@ -24,7 +25,10 @@ mkKdeDerivation rec {
     qt5compat
   ];
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qttools
+  ];
 
   cmakeFlags = [
     "-DPHONON_BUILD_QT5=0"
diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix
index d95dbe4e2532..6bac06517954 100644
--- a/pkgs/kde/plasma/discover/default.nix
+++ b/pkgs/kde/plasma/discover/default.nix
@@ -15,11 +15,7 @@ mkKdeDerivation {
     ./qml-deps.patch
   ];
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebview
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwebview
     discount
diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix
index 6b23d5c1a326..e23fdacdf158 100644
--- a/pkgs/kde/plasma/kdeplasma-addons/default.nix
+++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix
@@ -5,6 +5,5 @@
 mkKdeDerivation {
   pname = "kdeplasma-addons";
 
-  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
 }
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 2c1860db1d88..7f1d1bd89a69 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -16,13 +16,9 @@ mkKdeDerivation {
     })
   ];
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
-    freerdp
     qtwayland
+    freerdp
   ];
 }
diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix
index 35c7c5d722e9..2f91e980bbfa 100644
--- a/pkgs/kde/plasma/kscreen/default.nix
+++ b/pkgs/kde/plasma/kscreen/default.nix
@@ -9,10 +9,7 @@
 mkKdeDerivation {
   pname = "kscreen";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtsensors
-  ];
+  extraNativeBuildInputs = [ pkg-config ];
 
   extraBuildInputs = [
     qtsensors
diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix
index 917ef8ea0d54..9573bbecb954 100644
--- a/pkgs/kde/plasma/kwin-x11/default.nix
+++ b/pkgs/kde/plasma/kwin-x11/default.nix
@@ -1,7 +1,9 @@
 {
   mkKdeDerivation,
   pkg-config,
+  qt5compat,
   qtsensors,
+  qttools,
   qtwayland,
   xorg,
   libcanberra,
@@ -24,12 +26,12 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     python3
-    qtsensors
-    qtwayland
   ];
 
   extraBuildInputs = [
+    qt5compat
     qtsensors
+    qttools
     qtwayland
 
     libgbm
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index b923c448e72f..a7aef2545865 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -40,10 +40,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     python3
-    qtsensors
-    qtwayland
   ];
-
   extraBuildInputs = [
     qtquick3d
     qtsensors
diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix
index 0a5a12bac047..009b2633b6f7 100644
--- a/pkgs/kde/plasma/layer-shell-qt/default.nix
+++ b/pkgs/kde/plasma/layer-shell-qt/default.nix
@@ -6,10 +6,6 @@
 mkKdeDerivation {
   pname = "layer-shell-qt";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [ qtwayland ];
 }
diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix
index dd00b0738975..fa969f46a537 100644
--- a/pkgs/kde/plasma/libkscreen/default.nix
+++ b/pkgs/kde/plasma/libkscreen/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   qtwayland,
+  qttools,
   jq,
   wayland,
 }:
@@ -8,6 +9,7 @@ mkKdeDerivation {
   pname = "libkscreen";
 
   extraNativeBuildInputs = [
+    qttools
     qtwayland
     jq
     wayland
diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix
index 766b83c2590d..ca5a7cc22182 100644
--- a/pkgs/kde/plasma/plasma-dialer/default.nix
+++ b/pkgs/kde/plasma/plasma-dialer/default.nix
@@ -9,11 +9,7 @@
 mkKdeDerivation {
   pname = "plasma-dialer";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwayland
     callaudiod
diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix
index e3831018b00f..55c1bb7ee10a 100644
--- a/pkgs/kde/plasma/plasma-integration/default.nix
+++ b/pkgs/kde/plasma/plasma-integration/default.nix
@@ -61,8 +61,6 @@ mkKdeDerivation {
     "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui"
   ];
 
-  extraNativeBuildInputs = [ qtwayland ];
-
   extraBuildInputs = [
     qtwayland
     xorg.libXcursor
diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix
index 870da8b6e8b4..18de7ba8e59a 100644
--- a/pkgs/kde/plasma/plasma-mobile/default.nix
+++ b/pkgs/kde/plasma/plasma-mobile/default.nix
@@ -8,17 +8,11 @@
 mkKdeDerivation {
   pname = "plasma-mobile";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtsensors
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtsensors
     qtwayland
   ];
-
   postFixup = ''
     substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \
       --replace-fail \
diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix
index de21dbed07b3..3662452bad7b 100644
--- a/pkgs/kde/plasma/plasma-nm/default.nix
+++ b/pkgs/kde/plasma/plasma-nm/default.nix
@@ -16,11 +16,7 @@ mkKdeDerivation {
     })
   ];
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwebengine
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwebengine
     mobile-broadband-provider-info
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index cd5aa2615644..90b76badce64 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -43,12 +43,9 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     spirv-tools
-    qtlocation
-    qtpositioning
-    qtwayland
   ];
-
   extraBuildInputs = [
+    qtlocation
     qtpositioning
     qtsvg
     qtwayland
diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix
index 4c76b11eb58b..c5c71a1beaa2 100644
--- a/pkgs/kde/plasma/spectacle/default.nix
+++ b/pkgs/kde/plasma/spectacle/default.nix
@@ -7,11 +7,6 @@
 mkKdeDerivation {
   pname = "spectacle";
 
-  extraNativeBuildInputs = [
-    qtwayland
-    qtmultimedia
-  ];
-
   extraBuildInputs = [
     qtwayland
     qtmultimedia
diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
index cf6aaad08e53..0614c0c191d5 100644
--- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
+++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
@@ -7,11 +7,7 @@
 mkKdeDerivation {
   pname = "xdg-desktop-portal-kde";
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qtwayland
-  ];
-
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwayland
     cups

From dc7662a050d85e5f48c3ac4343f33a89d6cfc3dc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 17:25:56 +0300
Subject: [PATCH 59/67] snx-rs: clean up

Literally none of this is actually necessary.
---
 pkgs/by-name/sn/snx-rs/package.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 2c42c4dfdedc..bff98d0f0b97 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -2,19 +2,11 @@
   fetchFromGitHub,
   glib,
   gtk4,
-  iproute2,
   kdePackages,
   lib,
-  libappindicator,
-  libappindicator-gtk2,
-  libappindicator-gtk3,
-  libayatana-appindicator,
-  libsoup_3,
   openssl,
   pkg-config,
-  qt6,
   rustPlatform,
-  webkitgtk_4_1,
   wrapGAppsHook4,
   graphene,
   nix-update-script,
@@ -34,9 +26,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   nativeBuildInputs = [
-    iproute2
     pkg-config
-    qt6.wrapQtAppsHook
     wrapGAppsHook4
   ];
 
@@ -44,13 +34,7 @@ rustPlatform.buildRustPackage rec {
     glib
     gtk4
     kdePackages.kstatusnotifieritem
-    libappindicator
-    libappindicator-gtk2
-    libappindicator-gtk3
-    libayatana-appindicator
-    libsoup_3
     openssl
-    webkitgtk_4_1
     graphene
   ];
 
@@ -70,12 +54,6 @@ rustPlatform.buildRustPackage rec {
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
   versionCheckProgramArg = "--version";
 
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  dontWrapGApps = true;
-
   meta = {
     description = "Open source Linux client for Checkpoint VPN tunnels";
     homepage = "https://github.com/ancwrd1/snx-rs";

From 1f3536ecbb08874d588faf1affec0660596341da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 14:37:50 +0000
Subject: [PATCH 60/67] 
 home-assistant-custom-lovelace-modules.universal-remote-card: 4.5.5 -> 4.6.0

---
 .../universal-remote-card/package.nix                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index bd98c5014608..b2eb22718dcd 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -6,18 +6,18 @@
 
 buildNpmPackage rec {
   pname = "universal-remote-card";
-  version = "4.5.5";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-qAJ7+xiSN04MhAkoWqITg+lrk9uHkN1BKtgPpv3UHSo=";
+    hash = "sha256-CiJJDMOl50QrMIdPIDLJa259FZSjyUhmwiZN29/oBsM=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-XDCP/X/JdMI8/vuMbd+BRxkwsQT1RCSPZi7aXoh08yM=";
+  npmDepsHash = "sha256-Hv4TcUqwSGjA1OpAdd0RY0v+F9oTMIHgVm54sPjyrpQ=";
 
   installPhase = ''
     runHook preInstall

From 4868c12f4002e4bea45ca255677b86cddf4cf744 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Fri, 20 Jun 2025 00:09:23 +0900
Subject: [PATCH 61/67] ocamlPackages.encore: 0.8 -> 0.8.1 (#414532)

* ocamlPackages.encore: 0.8 -> 0.8.1
Diff: https://github.com/mirage/encore/compare/v0.8...v0.8.1
Changelog: https://github.com/mirage/encore/releases/tag/v0.8.1

* ocamlPackages.encore: modernized derivation
- Removed duneVersion
- Added longDescription and changelog
---
 .../development/ocaml-modules/encore/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix
index e360b0004a6a..0932d3cdf726 100644
--- a/pkgs/development/ocaml-modules/encore/default.nix
+++ b/pkgs/development/ocaml-modules/encore/default.nix
@@ -10,17 +10,15 @@
 
 buildDunePackage rec {
   pname = "encore";
-  version = "0.8";
+  version = "0.8.1";
 
-  minimalOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.07";
 
   src = fetchurl {
-    url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
-    sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
+    url = "https://github.com/mirage/encore/releases/download/v${version}/encore-${version}.tbz";
+    hash = "sha256-qg6heSBc6OSfb7vZxEi4rrKh+nx+ffnsCfVvhVR3yY0=";
   };
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [
     angstrom
     fmt
@@ -32,6 +30,12 @@ buildDunePackage rec {
   meta = {
     homepage = "https://github.com/mirage/encore";
     description = "Library to generate encoder/decoder which ensure isomorphism";
+    longDescription = ''
+      Encore is a little library to provide an interface to generate an angstrom decoder and
+      an internal encoder from a shared description. The goal is to ensure a dual isomorphism
+      between them.
+    '';
+    changelog = "https://raw.githubusercontent.com/mirage/encore/refs/tags/v${version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };

From af88182f955607a601e55a5b311ff81b0eb822b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 15:51:21 +0000
Subject: [PATCH 62/67] chatmcp: 0.0.62 -> 0.0.66

---
 pkgs/by-name/ch/chatmcp/package.nix       |  4 +-
 pkgs/by-name/ch/chatmcp/pubspec.lock.json | 84 +++++++++++++++++------
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix
index 6845e544df82..e74f4915fa5e 100644
--- a/pkgs/by-name/ch/chatmcp/package.nix
+++ b/pkgs/by-name/ch/chatmcp/package.nix
@@ -14,13 +14,13 @@
 
 flutter332.buildFlutterApplication rec {
   pname = "chatmcp";
-  version = "0.0.62";
+  version = "0.0.66";
 
   src = fetchFromGitHub {
     owner = "daodao97";
     repo = "chatmcp";
     tag = "v${version}";
-    hash = "sha256-DEq1LECqlvl3P4ib3RyHK3VLbcTh8PXJtbWwK/0R5dA=";
+    hash = "sha256-X4cndztMEncAwosSg2RaK3trvupwumcPpMb94D6JEcE=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/ch/chatmcp/pubspec.lock.json b/pkgs/by-name/ch/chatmcp/pubspec.lock.json
index 6042d3543290..db84ee24c8d4 100644
--- a/pkgs/by-name/ch/chatmcp/pubspec.lock.json
+++ b/pkgs/by-name/ch/chatmcp/pubspec.lock.json
@@ -194,11 +194,11 @@
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "cli_config": {
       "dependency": "transitive",
@@ -264,11 +264,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a",
+        "sha256": "aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.14.0"
+      "version": "1.14.1"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -320,6 +320,16 @@
       "source": "hosted",
       "version": "3.1.0"
     },
+    "dev_build": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dev_build",
+        "sha256": "fda8a54458b2a873a84e0cd1513f4323a1fb0599ed5455245359bc0398bad9ee",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2+11"
+    },
     "event_bus": {
       "dependency": "direct main",
       "description": {
@@ -374,11 +384,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964",
+        "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.9"
+      "version": "10.2.0"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -580,11 +590,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.3"
+      "version": "0.14.4"
     },
     "flutter_lints": {
       "dependency": "direct dev",
@@ -626,11 +636,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_popup",
-        "sha256": "63cbae63fb15f81be1b533cc53306d3835305e314e8ce99c62b98d45ab685261",
+        "sha256": "08e554be1173f4e7bb5eda2ae2e5addd565873026a3ac9b64c38ea86dfd4dc9d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.7"
+      "version": "3.3.9"
     },
     "flutter_svg": {
       "dependency": "direct main",
@@ -804,15 +814,15 @@
       "source": "hosted",
       "version": "4.9.0"
     },
-    "jsonc": {
+    "json_serializable": {
       "dependency": "direct main",
       "description": {
-        "name": "jsonc",
-        "sha256": "326a3c5c774a77c3c4e327f359e0268bff34135d0c16078beee6d921c49a16ed",
+        "name": "json_serializable",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.3"
+      "version": "6.9.5"
     },
     "keyboard_dismisser": {
       "dependency": "direct main",
@@ -1134,6 +1144,16 @@
       "source": "hosted",
       "version": "6.0.2"
     },
+    "process_run": {
+      "dependency": "transitive",
+      "description": {
+        "name": "process_run",
+        "sha256": "6ec839cdd3e6de4685318e7686cd4abb523c3d3a55af0e8d32a12ae19bc66622",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.4"
+    },
     "provider": {
       "dependency": "direct main",
       "description": {
@@ -1390,6 +1410,16 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "source_helper": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_helper",
+        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.5"
+    },
     "source_map_stack_trace": {
       "dependency": "transitive",
       "description": {
@@ -1464,11 +1494,21 @@
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi",
-        "sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1",
+        "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.5"
+      "version": "2.3.6"
+    },
+    "sqflite_common_ffi_web": {
+      "dependency": "direct main",
+      "description": {
+        "name": "sqflite_common_ffi_web",
+        "sha256": "983cf7b33b16e6bc086c8e09f6a1fae69d34cdb167d7acaf64cbd3515942d4e6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -1714,11 +1754,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1774,11 +1814,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
@@ -1824,11 +1864,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "window_manager": {
       "dependency": "direct main",

From b88538e07142af7f0423af6efc05fe99a3f9834c Mon Sep 17 00:00:00 2001
From: midischwarz12 <midischwarz@proton.me>
Date: Wed, 18 Jun 2025 18:08:39 -0500
Subject: [PATCH 63/67] maintainers: rename midirhee12 -> midischwarz12

---
 maintainers/maintainer-list.nix            | 8 ++++----
 pkgs/by-name/in/inter-nerdfont/package.nix | 2 +-
 pkgs/by-name/xc/xcursor-pro/package.nix    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2e29fd89dc3d..4a523853d1d5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16292,11 +16292,11 @@
     name = "midchildan";
     keys = [ { fingerprint = "FEF0 AE2D 5449 3482 5F06  40AA 186A 1EDA C5C6 3F83"; } ];
   };
-  midirhee12 = {
-    email = "midirhee@proton.me";
-    github = "midirhee12";
+  midischwarz12 = {
+    email = "midischwarz@proton.me";
+    github = "midischwarz12";
     githubId = 38054771;
-    name = "midirhee12";
+    name = "midischwarz12";
   };
   mig4ng = {
     email = "mig4ng@gmail.com";
diff --git a/pkgs/by-name/in/inter-nerdfont/package.nix b/pkgs/by-name/in/inter-nerdfont/package.nix
index 69373f16064a..b6fe0cbe9237 100644
--- a/pkgs/by-name/in/inter-nerdfont/package.nix
+++ b/pkgs/by-name/in/inter-nerdfont/package.nix
@@ -39,6 +39,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "NerdFont patch of the Inter font";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.midirhee12 ];
+    maintainers = [ lib.maintainers.midischwarz12 ];
   };
 })
diff --git a/pkgs/by-name/xc/xcursor-pro/package.nix b/pkgs/by-name/xc/xcursor-pro/package.nix
index b14879d067ac..bf413b8c6d6d 100644
--- a/pkgs/by-name/xc/xcursor-pro/package.nix
+++ b/pkgs/by-name/xc/xcursor-pro/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       lactose
-      midirhee12
+      midischwarz12
     ];
   };
 })

From 1d03a031d0aa7e0e8b48075678f50cd3e31f1c1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Jun 2025 16:39:48 +0000
Subject: [PATCH 64/67] qownnotes: 25.6.0 -> 25.6.2

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 1ebe81f1ca28..7dcb89a1b1f4 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -17,11 +17,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.6.0";
+  version = "25.6.2";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RUW8fWPJxTq7Ya+uZ6xGg7URHc+ojuBs9g++UXrK9I0=";
+    hash = "sha256-JzUAZe0ktpn2ri2pO5780kOCLjCpRMzswOK4FaJAXe0=";
   };
 
   nativeBuildInputs =

From 06d87a365839cef8563e23e081e20816b84190c1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:01 +0300
Subject: [PATCH 65/67] linux_6_15: 6.15.2 -> 6.15.3

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 6c7ddb2bbea1..6bffd2c4edd9 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.2",
-        "hash": "sha256:0n28a43nv94vvdkllw5gky9dznymk4myf1jlphfid3jhdimcsn1l"
+        "version": "6.15.3",
+        "hash": "sha256:1c35ima9zklzi0hhmw2xmii6agj3kkycm845fg6xjf2lja4hrd8j"
     }
 }

From e7bfb32fabc872d02e29456aa9225f823034a3a3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:06 +0300
Subject: [PATCH 66/67] linux_6_12: 6.12.33 -> 6.12.34

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 6bffd2c4edd9..ccb76e637e4c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -24,8 +24,8 @@
         "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
-        "version": "6.12.33",
-        "hash": "sha256:0m52a9mnwc919fsyiyn1gafnrr2mz7w8s7v4n05s40r61xipb9f0"
+        "version": "6.12.34",
+        "hash": "sha256:0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7"
     },
     "6.13": {
         "version": "6.13.12",

From d5406b851a87342591b44e5681ed5be65f526f80 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 19 Jun 2025 19:52:10 +0300
Subject: [PATCH 67/67] linux_6_6: 6.6.93 -> 6.6.94

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index ccb76e637e4c..9aa6f46d5121 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
     },
     "6.6": {
-        "version": "6.6.93",
-        "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
+        "version": "6.6.94",
+        "hash": "sha256:0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi"
     },
     "6.12": {
         "version": "6.12.34",