From 70f70049999dced622574b89aaf6f9abd920d75e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 1 Aug 2025 13:46:29 +0000
Subject: [PATCH 01/19] zafiro-icons: migrate to by-name and switch to
 libsForQt5

---
 .../za/zafiro-icons/package.nix}              | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{data/icons/zafiro-icons/default.nix => by-name/za/zafiro-icons/package.nix} (79%)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/by-name/za/zafiro-icons/package.nix
similarity index 79%
rename from pkgs/data/icons/zafiro-icons/default.nix
rename to pkgs/by-name/za/zafiro-icons/package.nix
index 44858afeb9e3..27147a4c3c8c 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/by-name/za/zafiro-icons/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  breeze-icons,
+  libsForQt5,
   gnome-icon-theme,
   numix-icon-theme,
   numix-icon-theme-circle,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zafiro-icons";
   version = "1.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
+    repo = "zafiro-icons";
+    tag = finalAttrs.version;
+    hash = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     numix-icon-theme
     numix-icon-theme-circle
@@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Icon pack flat with light colors";
     homepage = "https://github.com/zayronxio/Zafiro-icons";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..900f4a33fedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11637,10 +11637,6 @@ with pkgs;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
 
-  zafiro-icons = callPackage ../data/icons/zafiro-icons {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
   zeal = zeal-qt5;
   zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {

From bb704e81aa0399b156a6fb4c120d024eb4c32bda Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 23 Jul 2025 09:02:02 -0500
Subject: [PATCH 02/19] pricehist: migrate to by-name

pricehist: refactor package definitions and meta

pricehist: add suggested changes
---
 .../pr/pricehist/package.nix}                 | 30 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 21 deletions(-)
 rename pkgs/{tools/misc/pricehist/default.nix => by-name/pr/pricehist/package.nix} (63%)

diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/by-name/pr/pricehist/package.nix
similarity index 63%
rename from pkgs/tools/misc/pricehist/default.nix
rename to pkgs/by-name/pr/pricehist/package.nix
index cf5eb82a00ec..16a5c29fc227 100644
--- a/pkgs/tools/misc/pricehist/default.nix
+++ b/pkgs/by-name/pr/pricehist/package.nix
@@ -1,18 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitLab,
-  requests,
-  lxml,
-  cssselect,
-  curlify,
-  poetry-core,
-  pytest-mock,
-  responses,
-  pytestCheckHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pricehist";
   version = "1.4.7";
   format = "pyproject";
@@ -20,32 +12,32 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "chrisberkhout";
     repo = "pricehist";
-    rev = version;
+    tag = version;
     hash = "sha256-SBRJxNnA+nOxO6h97WZZHwhxoXeNtb5+rDayn4Hw6so=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     requests
     lxml
     cssselect
     curlify
+  ];
+
+  build-system = with python3Packages; [
     poetry-core
   ];
 
-  nativeBuildInputs = [
-  ];
-
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     responses
     pytest-mock
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats";
     homepage = "https://gitlab.com/chrisberkhout/pricehist";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "pricehist";
-    maintainers = with maintainers; [ chrpinedo ];
+    maintainers = with lib.maintainers; [ chrpinedo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..f66b69534fd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1125,8 +1125,6 @@ with pkgs;
     withUsdView = true;
   };
 
-  pricehist = python3Packages.callPackage ../tools/misc/pricehist { };
-
   py7zr = with python3Packages; toPythonApplication py7zr;
 
   qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };

From 8559510d8d2e130edb86958cb56cf8ae746fb168 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 26 Jul 2025 07:32:17 -0500
Subject: [PATCH 03/19] ktextaddons: migrate to by-name

ktextaddons: refactor for by-name
---
 .../kt/ktextaddons/package.nix}               | 30 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 18 deletions(-)
 rename pkgs/{development/libraries/ktextaddons/default.nix => by-name/kt/ktextaddons/package.nix} (58%)

diff --git a/pkgs/development/libraries/ktextaddons/default.nix b/pkgs/by-name/kt/ktextaddons/package.nix
similarity index 58%
rename from pkgs/development/libraries/ktextaddons/default.nix
rename to pkgs/by-name/kt/ktextaddons/package.nix
index a0ce40842593..ba772e95f50f 100644
--- a/pkgs/development/libraries/ktextaddons/default.nix
+++ b/pkgs/by-name/kt/ktextaddons/package.nix
@@ -1,30 +1,28 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   cmake,
-  extra-cmake-modules,
-  karchive,
-  kconfigwidgets,
-  kcoreaddons,
-  ki18n,
-  kxmlgui,
-  qtkeychain,
+  libsForQt5,
 }:
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ktextaddons";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/ktextaddons/ktextaddons-${finalAttrs.version}.tar.xz";
     hash = "sha256-mB7Hh2Ljrg8D2GxDyHCa1s6CVmg5DDkhwafEqtSqUeM=";
   };
 
   nativeBuildInputs = [
     cmake
+  ]
+  ++ (with libsForQt5; [
     extra-cmake-modules
-  ];
-  buildInputs = [
+    wrapQtAppsHook
+  ]);
+
+  buildInputs = with libsForQt5; [
     karchive
     kconfigwidgets
     kcoreaddons
@@ -33,10 +31,10 @@ mkDerivation rec {
     qtkeychain
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Various text handling addons for KDE applications";
     homepage = "https://invent.kde.org/libraries/ktextaddons/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..a8b60395b183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8459,8 +8459,6 @@ with pkgs;
   };
   libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency
 
-  ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons { };
-
   l-smash = callPackage ../development/libraries/l-smash {
     stdenv = gccStdenv;
   };

From 1cbeff3b97285ed2b08332ff6aaa523e0d90c365 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:59:46 +0000
Subject: [PATCH 04/19] libretro.stella: 0-unstable-2025-06-26 ->
 0-unstable-2025-07-28

---
 pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 748f6d250486..89334982a8e4 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2025-06-26";
+  version = "0-unstable-2025-07-28";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "c6ce6e80e87c828701629980e8a7119f3b08c5ab";
-    hash = "sha256-403Z0W9OQYbb8+O8kSWbpHkqywVhXbqqIyfsGlgEi+M=";
+    rev = "211b4902d5b4440b0aa567dade4eebf77cd868aa";
+    hash = "sha256-l2b2Lu9l5CwmfDsJazOdQ9mowxfAqJY4SEgtDxCnYxY=";
   };
 
   makefile = "Makefile";

From 8e41855fcdea5a4c9e6915fc39cc4c93126b7b74 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 2 Aug 2025 12:46:20 +0000
Subject: [PATCH 05/19] gp-saml-gui: migrate to by-name

gp-saml-gui: refactor buildPythonPackage and meta
---
 .../gp/gp-saml-gui/package.nix}               | 30 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename pkgs/{tools/networking/gp-saml-gui/default.nix => by-name/gp/gp-saml-gui/package.nix} (67%)

diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/by-name/gp/gp-saml-gui/package.nix
similarity index 67%
rename from pkgs/tools/networking/gp-saml-gui/default.nix
rename to pkgs/by-name/gp/gp-saml-gui/package.nix
index f297f189851f..a33f5e505b14 100644
--- a/pkgs/tools/networking/gp-saml-gui/default.nix
+++ b/pkgs/by-name/gp/gp-saml-gui/package.nix
@@ -2,16 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPythonPackage,
+  python3Packages,
   webkitgtk_4_1,
   wrapGAppsHook3,
   glib-networking,
   gobject-introspection,
   openconnect,
-  pygobject3,
-  requests,
 }:
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "gp-saml-gui";
   version = "0.1+20240731-${lib.strings.substring 0 7 src.rev}";
   format = "setuptools";
@@ -20,7 +18,7 @@ buildPythonPackage rec {
     owner = "dlenski";
     repo = "gp-saml-gui";
     rev = "c46af04b3a6325b0ecc982840d7cfbd1629b6d43";
-    sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
+    hash = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
   };
 
   buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking;
@@ -31,12 +29,16 @@ buildPythonPackage rec {
     glib-networking
   ];
 
-  propagatedBuildInputs = [
-    requests
-    pygobject3
-    openconnect
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  dependencies =
+    with python3Packages;
+    [
+      requests
+      pygobject3
+    ]
+    ++ [
+      openconnect
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -44,11 +46,11 @@ buildPythonPackage rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactively authenticate to GlobalProtect VPNs that require SAML";
     mainProgram = "gp-saml-gui";
     homepage = "https://github.com/dlenski/gp-saml-gui";
-    license = licenses.gpl3Only;
-    maintainers = [ maintainers.pallix ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ pallix ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..3256fd5c8850 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1085,8 +1085,6 @@ with pkgs;
     }
   );
 
-  gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
-
   inherit (callPackages ../tools/networking/ivpn/default.nix { })
     ivpn
     ivpn-service

From 24e7bdb2cb046027c13ceecd909891bdd9de997d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 14:44:01 +0000
Subject: [PATCH 06/19] libretro.beetle-pce-fast: 0-unstable-2025-07-18 ->
 0-unstable-2025-08-01

---
 .../emulators/libretro/cores/beetle-pce-fast.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 25e53ba1f3de..d39d929f85df 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2025-07-18";
+  version = "0-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";
-    hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";
+    rev = "c95e401e1dd37522b6d84d0017702cfece2be840";
+    hash = "sha256-xCjavWWWyNTnJyzCr+N2l3On2iflg+HzXCxOxLZvSew=";
   };
 
   makefile = "Makefile";

From fd9c7557a9016d6efe021761b0362503c3a942df Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 2 Aug 2025 11:42:13 -0400
Subject: [PATCH 07/19] open-policy-agent: disable flaky test

This was first observed in https://github.com/NixOS/nixpkgs/pull/415552#issuecomment-2980863449.

Since this test failed for me 3 of 4 times on Linux (2/2 on GitHub Actions, 1/2 on OfBorg),
probably better to disable it.
---
 pkgs/by-name/op/open-policy-agent/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 51aee9311bcf..6138c0e579f3 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -53,6 +53,9 @@ buildGoModule (finalAttrs: {
         # This test depends on the metrics available in go not changing. This is a bit
         # too unstable for us updating go independently.
         "TestJSONSerialization"
+
+        # Flaky
+        "TestGraphQLParseSchemaAlloc"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Skip tests that require network, not available in the darwin sandbox

From 97ec891580b7e038b8982f36bf1c201a84b9565e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:14:28 +0000
Subject: [PATCH 08/19] cura-appimage: 5.10.1 -> 5.10.2

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

diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index 43ffd4aa2403..8034c1065e79 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.10.1";
+  version = "5.10.2";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-c89GkgfOSY4hriY66GUCgBYiiJJspM9Fg07lne+KXgw=";
+    hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
   };
 
   appimageContents = appimageTools.extract {

From 0d4ab9b08cc4697aa0cf06af245ab6d17f9231a9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 20 Jul 2025 08:19:28 +0200
Subject: [PATCH 09/19] screen: disable tests on loongarch64

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

diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix
index 930b70a81d96..308c4ef1921f 100644
--- a/pkgs/by-name/sc/screen/package.nix
+++ b/pkgs/by-name/sc/screen/package.nix
@@ -35,8 +35,10 @@ stdenv.mkDerivation rec {
   ];
 
   # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS
-  # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
-  doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM;
+  # With pkgsLLVM / on loongarch64-linux:
+  #   tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
+  doCheck =
+    !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM && !stdenv.hostPlatform.isLoongArch64;
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/screen/";

From f3245b67d085b83a796c5c107dfa500b48906ac1 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Tue, 29 Jul 2025 22:30:07 -0500
Subject: [PATCH 10/19] wahay: init at 0.2

Co-authored-by: Mikael Voss <mvs@nyantec.com>
---
 pkgs/by-name/wa/wahay/package.nix | 98 +++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 pkgs/by-name/wa/wahay/package.nix

diff --git a/pkgs/by-name/wa/wahay/package.nix b/pkgs/by-name/wa/wahay/package.nix
new file mode 100644
index 000000000000..5edf516cf744
--- /dev/null
+++ b/pkgs/by-name/wa/wahay/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  gnumake,
+  pkg-config,
+  gtk3,
+  rubyPackages,
+  tor,
+  mumble,
+  installShellFiles,
+  wrapGAppsHook3,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "wahay";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "digitalautonomy";
+    repo = "wahay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-59gVGDElIs+OQ/ELwOFjz6YqG18iHqoa2yYF2Ddi0/o=";
+  };
+
+  vendorHash = "sha256-w8lUnvy5dPMHWbzyyTq9Q/kE/4vSuOHffaY9CeasvQ0=";
+
+  buildInputs = [
+    gtk3
+  ];
+
+  nativeBuildInputs = [
+    gnumake
+    pkg-config
+    rubyPackages.sass
+    installShellFiles
+    wrapGAppsHook3
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  postPatch = ''
+    # Avoid Git invocation: Remove assignments starting with ‘$(shell git’
+    sed -E -i \
+      -e '/^\w+\s*[+:]?=\s*\$\(shell\s+git\>/d' \
+      Makefile
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make TAG_VERSION=v${finalAttrs.version} \
+         BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" \
+         build
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    installBin bin/wahay
+    installManPage packaging/ubuntu/ubuntu/usr/share/man/man1/wahay.1.gz
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${
+        lib.escapeShellArg (
+          lib.makeBinPath [
+            tor
+            mumble
+          ]
+        )
+      }
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Decentralized encrypted conference call application";
+    homepage = "https://wahay.org/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dvn0 ];
+    mainProgram = "wahay";
+  };
+})

From bbc8067bcf93029fe1a9bb4cee7c66c8749a9957 Mon Sep 17 00:00:00 2001
From: Joyuv <givanilsonmariz7@outlook.com>
Date: Sat, 2 Aug 2025 21:13:21 -0300
Subject: [PATCH 11/19] fallout2-ce: fix patch hash

---
 pkgs/games/fallout-ce/fallout2-ce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix
index a1b4f28b1971..396ffb1394dc 100644
--- a/pkgs/games/fallout-ce/fallout2-ce.nix
+++ b/pkgs/games/fallout-ce/fallout2-ce.nix
@@ -20,7 +20,7 @@ callPackage ./build.nix rec {
     # Fix case-sensitive filesystems issue when save/load games
     (fetchpatch2 {
       url = "https://github.com/alexbatalov/fallout2-ce/commit/d843a662b3ceaf01ac363e9abb4bfceb8b805c36.patch";
-      sha256 = "sha256-u4E9+DE6sGYikIGwKDmSBj3ErCfIo6YzIw2eMiqXw/E=";
+      sha256 = "sha256-r4sfl1JolWRNd2xcf4BMCxZw3tbN21UJW4TdyIbQzgs=";
     })
   ];
 

From 0f56042556eef90c0ffcde1a36974d2a7085bd98 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 14:51:39 +0200
Subject: [PATCH 12/19] inspircd: 3.18.0 -> 4.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://docs.inspircd.org/4/breaking-changes/
https://docs.inspircd.org/4/overview/

https://docs.inspircd.org/4/change-log/#inspircd-401
https://docs.inspircd.org/4/change-log/#inspircd-410
https://docs.inspircd.org/4/change-log/#inspircd-420
https://docs.inspircd.org/4/change-log/#inspircd-430
https://docs.inspircd.org/4/change-log/#inspircd-440
https://docs.inspircd.org/4/change-log/#inspircd-450
https://docs.inspircd.org/4/change-log/#inspircd-460
https://docs.inspircd.org/4/change-log/#inspircd-470

Packaging-relevant changes:

- inspircd no longer has the start subcommand, but needs to be invoked
  directly.
- New extra modules: log_syslog and log_json
- Removed extra modules: regex_tre, regex_pcre, ssl_mbedtls
  You probably should not use them anymore, but they can be
  obtained via the module manager in theory — though I doubt it works
  with Nix (another item for the todo list, I guess):
  https://docs.inspircd.org/4/module-manager/
---
 doc/release-notes/rl-2511.section.md           |  2 ++
 nixos/modules/services/networking/inspircd.nix |  2 +-
 pkgs/by-name/in/inspircd/package.nix           | 17 +++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index bb8943416017..332ae0b71aa1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -47,6 +47,8 @@
   The binary name remains `webfontkitgenerator`.
   The `webfontkitgenerator` package is an alias to `webfont-bundler`.
 
+- `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/).
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
index 5ae169dd4155..315a327bc36e 100644
--- a/nixos/modules/services/networking/inspircd.nix
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -59,7 +59,7 @@ in
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
-          ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid
+          ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
         '';
         DynamicUser = true;
       };
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index caf666705e90..add41960449f 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -31,6 +31,7 @@ let
 
   # compatible if libc is compatible
   libcModules = [
+    "log_syslog"
     "regex_posix"
     "sslrehashsignal"
   ];
@@ -50,12 +51,11 @@ let
       # GPLv2 compatible dependencies
       "argon2"
       "ldap"
+      "log_json"
       "mysql"
       "pgsql"
-      "regex_pcre"
       "regex_pcre2"
       "regex_re2"
-      "regex_tre"
       "sqlite3"
       "ssl_gnutls"
     ]
@@ -74,15 +74,13 @@ in
   openldap,
   libpq,
   libmysqlclient,
-  pcre,
   pcre2,
-  tre,
   re2,
   sqlite,
   gnutls,
   libmaxminddb,
   openssl,
-  mbedtls,
+  yyjson,
   # For a full list of module names, see https://docs.inspircd.org/packaging/
   extraModules ? compatibleModules lib stdenv,
 }:
@@ -104,12 +102,12 @@ let
       )
     ];
     ldap = [ openldap ];
+    log_json = [ yyjson ];
+    log_syslog = [ ];
     mysql = [ libmysqlclient ];
     pgsql = [ libpq ];
-    regex_pcre = [ pcre ];
     regex_pcre2 = [ pcre2 ];
     regex_re2 = [ re2 ];
-    regex_tre = [ tre ];
     sqlite3 = [ sqlite ];
     ssl_gnutls = [ gnutls ];
     # depends on stdenv.cc.libc
@@ -119,7 +117,6 @@ let
     regex_stdlib = [ ];
     # GPLv2 incompatible
     geo_maxmind = [ libmaxminddb ];
-    ssl_mbedtls = [ mbedtls ];
     ssl_openssl = [ openssl ];
   };
 
@@ -151,13 +148,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "3.18.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${version}";
-    sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
+    sha256 = "sha256-/LiniV5moKGX7K6Hfzq1mxEBZ+sqnScQxT0AApiBPaA=";
   };
 
   outputs = [

From 0515216cefe35b8ed9b68cd65afad66d66b5faea Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 15:41:05 +0200
Subject: [PATCH 13/19] nixos/inspircd: sync with upstream systemd.service file

We could in theory just re-use the upstream one, but it sets User=root
which I'm not entirely comfortable with. Instead, add the settings we
were missing from that file here. Sadly, upstream doesn't configure a
syscall filter or similar.
---
 nixos/modules/services/networking/inspircd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
index 315a327bc36e..dbc587e0a4f1 100644
--- a/nixos/modules/services/networking/inspircd.nix
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -53,14 +53,22 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.inspircd = {
       description = "InspIRCd - the stable, high-performance and modular Internet Relay Chat Daemon";
+      unitConfig.Documentation = "https://docs.inspircd.org";
       wantedBy = [ "multi-user.target" ];
-      requires = [ "network.target" ];
+
+      after = [
+        "network.target"
+        "network-online.target"
+      ];
+      wants = [ "network-online.target" ];
 
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
           ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
         '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "on-failure";
         DynamicUser = true;
       };
     };

From e960e6e1dc689e2b5fe9e3ee824fc12860d9f27c Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 2 Aug 2025 20:39:44 +0200
Subject: [PATCH 14/19] inspircd: 4.7.0 -> 4.8.0

https://docs.inspircd.org/4/change-log/#inspircd-480

- The build system now allows using the system provided versions of
  utf8cpp and http-parser which is great for us.

- Pass --disable-ownership which means we will no longer have to know
  the user to which will run inspircd at build time (we didn't know that
  before, so we had to pass --uid 0 and --gid 0 (which always exist),
  but having .service files which hardcode User=root isn't great even
  though the user could configure inspircd to use setuid(2)).
---
 pkgs/by-name/in/inspircd/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index add41960449f..38c995ee32a4 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -70,6 +70,8 @@ in
   nixosTests,
   perl,
   pkg-config,
+  http-parser,
+  utf8cpp,
   libargon2,
   openldap,
   libpq,
@@ -148,13 +150,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${version}";
-    sha256 = "sha256-/LiniV5moKGX7K6Hfzq1mxEBZ+sqnScQxT0AApiBPaA=";
+    sha256 = "sha256-fMfsNbkp9M8KiuhwOEFmPjowZ4JLP4IpX6LRO9aLHzY=";
   };
 
   outputs = [
@@ -172,7 +174,18 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (lib.elem "pgsql" extraModules) [
     libpq.pg_config
   ];
-  buildInputs = extraInputs;
+
+  # Disable use of the vendored versions of these libraries
+  env = {
+    SYSTEM_HTTP_PARSER = "1";
+    SYSTEM_UTFCPP = "1";
+  };
+
+  buildInputs = [
+    http-parser
+    utf8cpp
+  ]
+  ++ extraInputs;
 
   configurePhase = ''
     runHook preConfigure
@@ -189,8 +202,7 @@ stdenv.mkDerivation rec {
     ./configure \
       --disable-auto-extras \
       --distribution-label nixpkgs${version} \
-      --uid 0 \
-      --gid 0 \
+      --disable-ownership \
       --binary-dir  ${placeholder "bin"}/bin \
       --config-dir  /etc/inspircd \
       --data-dir    ${placeholder "lib"}/lib/inspircd \

From 53479e04c4adffeb4fb09870f2515ff488c9df2d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 24 Jul 2025 08:58:23 -0500
Subject: [PATCH 15/19] plater: migrate to by-name

plater: refactor package definitions and meta

plater: unstable-2020-07-30 -> unstable-2025-03-24

plater: 2020-07-30 -> 1.0.0-unstable-2025-03-24

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 .../pl/plater/package.nix}                    | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 18 deletions(-)
 rename pkgs/{applications/misc/plater/default.nix => by-name/pl/plater/package.nix} (61%)

diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/by-name/pl/plater/package.nix
similarity index 61%
rename from pkgs/applications/misc/plater/default.nix
rename to pkgs/by-name/pl/plater/package.nix
index 80cd745f8b9a..800c9299d8ca 100644
--- a/pkgs/applications/misc/plater/default.nix
+++ b/pkgs/by-name/pl/plater/package.nix
@@ -1,38 +1,37 @@
 {
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitHub,
   lib,
   libGLU,
   makeDesktopItem,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "plater";
-  version = "2020-07-30";
+  version = "1.0.0-unstable-2025-03-24";
 
   src = fetchFromGitHub {
     owner = "Rhoban";
     repo = "Plater";
-    rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47";
-    sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4";
+    rev = "6c4f924504979095b1b45cf8fd81b1e38f0f8642";
+    hash = "sha256-+iL5Gl7k4lPikRwkyhaXSEcFYmhXV4ubAvP3iTBXDO8=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     libGLU
-    qtbase
+    qt5.qtbase
   ];
 
   desktopItem = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
+    name = "plater";
+    exec = "plater";
+    icon = "plater";
     desktopName = "Ideamaker";
     genericName = meta.description;
     categories = [
@@ -47,11 +46,11 @@ mkDerivation rec {
     cp $src/gui/img/plater.png $out/share/pixmaps/${pname}.png
   '';
 
-  meta = with lib; {
+  meta = {
     description = "3D-printer parts placer and plate generator";
     homepage = "https://github.com/Rhoban/Plater";
-    maintainers = with maintainers; [ lovesegfault ];
-    platforms = platforms.linux;
-    license = licenses.cc-by-nc-30;
+    maintainers = with lib.maintainers; [ lovesegfault ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.cc-by-nc-30;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..b97c9e135b21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13340,8 +13340,6 @@ with pkgs;
 
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
-  plater = libsForQt5.callPackage ../applications/misc/plater { };
-
   plexamp = callPackage ../applications/audio/plexamp { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };

From 09325145c0e1cbd93b778b904cf0bf419821cb05 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 25 Jul 2025 09:20:33 -0500
Subject: [PATCH 16/19] olive-editor: migrate to by-name

olive-editor: refactor package definitions and meta
---
 .../ol/olive-editor/package.nix}              | 21 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{applications/video/olive-editor/default.nix => by-name/ol/olive-editor/package.nix} (89%)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/by-name/ol/olive-editor/package.nix
similarity index 89%
rename from pkgs/applications/video/olive-editor/default.nix
rename to pkgs/by-name/ol/olive-editor/package.nix
index 787062bd3178..1be1af06b3b9 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -9,14 +9,11 @@
   opencolorio,
   ffmpeg_6,
   cmake,
-  wrapQtAppsHook,
   openimageio,
   openexr,
   portaudio,
   imath,
-  qtwayland,
-  qtmultimedia,
-  qttools,
+  qt6,
 }:
 
 let
@@ -71,7 +68,7 @@ stdenv.mkDerivation {
     pkg-config
     which
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -82,18 +79,18 @@ stdenv.mkDerivation {
     imath
     openexr
     portaudio
-    qtwayland
-    qtmultimedia
-    qttools
+    qt6.qtwayland
+    qt6.qtmultimedia
+    qt6.qttools
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Professional open-source NLE video editor";
     homepage = "https://www.olivevideoeditor.org/";
     downloadPage = "https://www.olivevideoeditor.org/download.php";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.balsoft ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ balsoft ];
+    platforms = lib.platforms.unix;
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
     mainProgram = "olive-editor";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..76a0bccf355a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3888,8 +3888,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { };
-
   ome_zarr = with python3Packages; toPythonApplication ome-zarr;
 
   onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };

From b56e34b54022a864ede429d7f78c6662d7f29b36 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 26 Jul 2025 08:34:59 -0500
Subject: [PATCH 17/19] awsume: migrate to by-name

awsume: refactor package definitions

awsume: fix python path

Use python3 from build instead of host

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 .../aw/awsume/package.nix}                    | 29 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 20 deletions(-)
 rename pkgs/{tools/admin/awsume/default.nix => by-name/aw/awsume/package.nix} (55%)

diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/by-name/aw/awsume/package.nix
similarity index 55%
rename from pkgs/tools/admin/awsume/default.nix
rename to pkgs/by-name/aw/awsume/package.nix
index 85cecfa4659b..2a31bff4f1c4 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/by-name/aw/awsume/package.nix
@@ -1,18 +1,11 @@
 {
   lib,
-  python,
   installShellFiles,
-  buildPythonApplication,
   fetchFromGitHub,
-  boto3,
-  colorama,
-  psutil,
-  pluggy,
-  pyyaml,
-  setuptools,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "awsume";
   version = "4.5.5";
   format = "setuptools";
@@ -20,15 +13,15 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trek10inc";
     repo = "awsume";
-    rev = version;
-    sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
+    tag = version;
+    hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
   };
 
   AWSUME_SKIP_ALIAS_SETUP = 1;
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     colorama
     boto3
     psutil
@@ -45,20 +38,20 @@ buildPythonApplication rec {
 
   postInstall = ''
     installShellCompletion --cmd awsume \
-      --bash <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
-      --fish <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
+      --bash <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
+      --zsh <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
+      --fish <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
 
     rm -f $out/bin/awsume.bat
   '';
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Utility for easily assuming AWS IAM roles from the command line";
     homepage = "https://github.com/trek10inc/awsume";
-    license = [ licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "awsume";
-    maintainers = [ maintainers.nilp0inter ];
+    maintainers = with lib.maintainers; [ nilp0inter ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..985d33c2f7b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1614,8 +1614,6 @@ with pkgs;
 
   autoflake = with python3.pkgs; toPythonApplication autoflake;
 
-  awsume = python3Packages.callPackage ../tools/admin/awsume { };
-
   aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
 
   azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;

From a26223668fd0830249592ed6cacad4c89cbf4f19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 02:54:07 +0000
Subject: [PATCH 18/19] qownnotes: 25.7.8 -> 25.7.9

---
 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 264c54b95217..f3cf89c0ef7c 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -18,11 +18,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.7.8";
+  version = "25.7.9";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NPejWX8/Wekbp6ht1i0MayC6R/9TBykQ2cqXAsqR1CY=";
+    hash = "sha256-rcBuGkoRel998i34e1kO8h/lqMZtgKnAipKGEF6xrhs=";
   };
 
   nativeBuildInputs = [

From b16813baa89e3bf87c62d459e6c8b2c3da57a369 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sun, 3 Aug 2025 06:52:10 +0200
Subject: [PATCH 19/19] root: 6.36.00 -> 6.36.02 (#424032)

* Update to the newest ROOT patch release.

  * Disable `tmva-pymva`, since it doesn't work with recent TensorFlow
    versions anyway

  * Don't set `gnuinstall=ON` for the ROOT build, because we were
    overriding the install paths anyway to what they were with
    `gnuinstall=OFF`
---
 pkgs/by-name/ro/root/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index b380e4be2258..73dfb559ac31 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -52,7 +52,7 @@
 
 stdenv.mkDerivation rec {
   pname = "root";
-  version = "6.36.00";
+  version = "6.36.02";
 
   passthru = {
     tests = import ./tests { inherit callPackage; };
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-lK/I3vkoQmeaEwonUhvmbiq9qjdiCIjmHYKKQ/xLAaI=";
+    hash = "sha256-UQ1nezOsfKSKoNcSvbiNg1of9qN074bxoeFo+ieetHA=";
   };
 
   clad_src = fetchFromGitHub {
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     patchRcPathFish
     patchRcPathPosix
     pcre2
-    python3.pkgs.numpy
+    python3
     tbb
     xrootd
     xxHash
@@ -162,18 +162,15 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCLAD_SOURCE_DIR=${clad_src}"
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DClang_DIR=${clang}/lib/cmake/clang"
     "-Dbuiltin_clang=OFF"
     "-Dbuiltin_llvm=OFF"
     "-Dfail-on-missing=ON"
     "-Dfftw3=ON"
     "-Dfitsio=OFF"
-    "-Dgnuinstall=ON"
     "-Dmathmore=ON"
     "-Dsqlite=OFF"
+    "-Dtmva-pymva=OFF"
     "-Dvdt=OFF"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [