From 8e42061bcbce45b344e8eb63b4e4dac84238cc80 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 24 Apr 2025 07:50:24 +0200
Subject: [PATCH 01/76] quickemu: add passthru.updateScript

---
 pkgs/by-name/qu/quickemu/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index cfd3838c9c51..16e66cf6a681 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   stdenv,
   makeWrapper,
+  gitUpdater,
   cdrtools,
   curl,
   gawk,
@@ -98,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; };
+  passthru = {
+    tests = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = gitUpdater { };
+  };
 
   meta = {
     description = "Quickly create and run optimised Windows, macOS and Linux virtual machines";

From 6c13a5acbca45e038097d301c9ad16c49cc95c36 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 24 Apr 2025 07:53:49 +0200
Subject: [PATCH 02/76] quickemu: 4.9.6 -> 4.9.7

Signed-off-by: Steffen Vogel <post@steffenvogel.de>
---
 pkgs/by-name/qu/quickemu/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index 16e66cf6a681..23f969073caa 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -58,13 +58,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickemu";
-  version = "4.9.6";
+  version = "4.9.7";
 
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickemu";
     rev = finalAttrs.version;
-    hash = "sha256-VaA39QNZNaomvSBMzJMjYN0KOTwWw2798KE8VnM+1so=";
+    hash = "sha256-sCoCcN6950pH33bRZsLoLc1oSs5Qfpj9Bbywn/uA6Bc=";
   };
 
   postPatch = ''
@@ -85,12 +85,12 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1
-    install -Dm755 -t "$out/bin" chunkcheck quickemu quickget quickreport windowskey
+    installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.5
+    install -Dm755 -t "$out/bin" chunkcheck quickemu quickget quickreport
 
     # spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection
     # is enabled, the wrapped spice-client-glib-usb-acl-helper is used
-    for f in chunkcheck quickget quickemu quickreport windowskey; do
+    for f in chunkcheck quickget quickemu quickreport; do
       wrapProgram $out/bin/$f \
         --prefix PATH : "${lib.makeBinPath runtimePaths}" \
         --suffix PATH : "${lib.makeBinPath [ spice-gtk ]}"

From 3902b08d8be2a1d21f5565e4a5541acf81f9c24e Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 15 Apr 2025 15:17:32 -0400
Subject: [PATCH 03/76] libslirp: fix DNS resolution on MacOS

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 .../li/libslirp/fix-dns-for-darwin.patch      | 46 +++++++++++++++++++
 pkgs/by-name/li/libslirp/package.nix          |  6 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/li/libslirp/fix-dns-for-darwin.patch

diff --git a/pkgs/by-name/li/libslirp/fix-dns-for-darwin.patch b/pkgs/by-name/li/libslirp/fix-dns-for-darwin.patch
new file mode 100644
index 000000000000..f6e1a8c1b519
--- /dev/null
+++ b/pkgs/by-name/li/libslirp/fix-dns-for-darwin.patch
@@ -0,0 +1,46 @@
+From 735904142f95d0500c0eae6bf763e4ad24b6b9fd Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed, 26 Mar 2025 08:42:35 +0100
+Subject: [PATCH] apple: Fix getting IPv4 DNS server address when IPv4 and IPv4
+ are interleaved
+
+When getting an IPv4 DNS server address, if libresolv returns
+
+IPv4
+IPv6
+IPv4
+IPv6
+
+(or just IPv4 and IPv6)
+
+we would still have found == 1 on the second iteration and thus take the
+IPv6 even if it's not the proper af. We can as well just completely ignore
+the non-matching af entries.
+
+Fixes #85
+---
+ src/slirp.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/slirp.c b/src/slirp.c
+index bccee53..62a018a 100644
+--- a/src/slirp.c
++++ b/src/slirp.c
+@@ -289,9 +289,12 @@ static int get_dns_addr_libresolv(int af, void *pdns_addr, void *cached_addr,
+     found = 0;
+     DEBUG_MISC("IP address of your DNS(s):");
+     for (int i = 0; i < count; i++) {
+-        if (af == servers[i].sin.sin_family) {
+-            found++;
++        if (af != servers[i].sin.sin_family) {
++            continue;
+         }
++
++        found++;
++
+         if (af == AF_INET) {
+             addr = &servers[i].sin.sin_addr;
+         } else { // af == AF_INET6
+-- 
+GitLab
+
diff --git a/pkgs/by-name/li/libslirp/package.nix b/pkgs/by-name/li/libslirp/package.nix
index 1070b00f8195..98a73e4109fe 100644
--- a/pkgs/by-name/li/libslirp/package.nix
+++ b/pkgs/by-name/li/libslirp/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Eqdw6epFkLv4Dnw/s1pcKW0P70ApZwx/J2VkCwn50Ew=";
   };
 
+  patches = [
+    # https://gitlab.freedesktop.org/slirp/libslirp/-/commit/735904142f95d0500c0eae6bf763e4ad24b6b9fd
+    # Vendorized due to frequent instability of the upstream repository.
+    ./fix-dns-for-darwin.patch
+  ];
+
   separateDebugInfo = true;
 
   nativeBuildInputs = [

From f90236a8f2c33cc8814428ac4cda1e77e43c2375 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 15 Apr 2025 15:17:51 -0400
Subject: [PATCH 04/76] linux-builder: remove DNS hack for libslirp

libslirp DNS issues on MacOS are now fixed. The override to use 8.8.8.8
as DNS server for linux-builder is not needed anymore.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 nixos/modules/profiles/nix-builder-vm.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix
index 1f5eff8f133f..439d7a4430f2 100644
--- a/nixos/modules/profiles/nix-builder-vm.nix
+++ b/nixos/modules/profiles/nix-builder-vm.nix
@@ -111,14 +111,6 @@ in
       };
     };
 
-    # DNS fails for QEMU user networking (SLiRP) on macOS.  See:
-    #
-    # https://github.com/utmapp/UTM/issues/2353
-    #
-    # This works around that by using a public DNS server other than the DNS
-    # server that QEMU provides (normally 10.0.2.3)
-    networking.nameservers = [ "8.8.8.8" ];
-
     # The linux builder is a lightweight VM for remote building; not evaluation.
     nix.channel.enable = false;
 

From 8c7f0a16b70a270ca9edc01c8b5a5eefb0d2f0ce Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Tue, 13 May 2025 20:40:03 +0900
Subject: [PATCH 05/76] opensplat: patch for torch 2.6

---
 pkgs/by-name/op/opensplat/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix
index e54210130682..2fd337091b11 100644
--- a/pkgs/by-name/op/opensplat/package.nix
+++ b/pkgs/by-name/op/opensplat/package.nix
@@ -16,6 +16,7 @@
   cudaSupport ? config.cudaSupport,
   cudaPackages,
   autoAddDriverRunpath,
+  fetchpatch2,
 }:
 let
   version = "1.1.4";
@@ -35,6 +36,13 @@ stdenv'.mkDerivation {
     hash = "sha256-u2UmD0O3sUWELYb4CjQE19i4HUjLMcaWqOinQH0PPTM=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/pierotofy/OpenSplat/commit/7fb96e86a43ac6cfd3eb3a7f6be190c5f2dbeb73.patch";
+      hash = "sha256-hWJWU/n1pRAAbExAYUap6CoSjIu2dzCToUmacSSpa0I=";
+    })
+  ];
+
   nativeBuildInputs =
     [
       cmake

From 86adc4bf3e0d45ada9914667878721f04266d553 Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Thu, 22 May 2025 23:41:13 +0800
Subject: [PATCH 06/76] djview: move to pkgs/by-name

---
 .../djview/default.nix => by-name/dj/djview/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/graphics/djview/default.nix => by-name/dj/djview/package.nix} (100%)

diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/by-name/dj/djview/package.nix
similarity index 100%
rename from pkgs/applications/graphics/djview/default.nix
rename to pkgs/by-name/dj/djview/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d775e24bc64a..4788211ab2f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12149,7 +12149,6 @@ with pkgs;
 
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
-  djview = callPackage ../applications/graphics/djview { };
   djview4 = djview;
 
   dmenu = callPackage ../applications/misc/dmenu { };

From 9fedd72fb8cae009524034b236057fb320b75e8b Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Thu, 22 May 2025 23:37:30 +0800
Subject: [PATCH 07/76] djview: unbreak for darwin

See: https://github.com/macports/macports-ports/blob/ff1d085109367bc578520638e4a4eca757f261d3/aqua/djview/Portfile
---
 pkgs/by-name/dj/djview/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/dj/djview/package.nix b/pkgs/by-name/dj/djview/package.nix
index bf8ccce9fe00..557c70912e13 100644
--- a/pkgs/by-name/dj/djview/package.nix
+++ b/pkgs/by-name/dj/djview/package.nix
@@ -52,16 +52,27 @@ stdenv.mkDerivation rec {
     "--with-x"
     "--with-tiff"
     "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac";
+  ];
+
+  postInstall =
+    let
+      Applications = "$out/Applications";
+    in
+    lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p ${Applications}
+      cp -a src/djview.app -t ${Applications}
+    '';
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin";
+    description = "Portable DjVu viewer (Qt5)";
     mainProgram = "djview";
     homepage = "https://djvu.sourceforge.net/djview4.html";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ Anton-Latukha ];
+    maintainers = with maintainers; [
+      Anton-Latukha
+      bryango
+    ];
     longDescription = ''
       The portable DjVu viewer (Qt5) and browser (nsdejavu) plugin.
 

From 95ab3116e6581efb55fd8d3867f4a72bb0c0c65b Mon Sep 17 00:00:00 2001
From: fumnanya <fmowete@outlook.com>
Date: Thu, 22 May 2025 08:15:23 +0100
Subject: [PATCH 08/76] yaak: added darwin support

---
 pkgs/by-name/ya/yaak/package.nix | 56 ++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index a9e64db116a2..8a60aa181891 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -19,6 +19,7 @@
   perl,
   makeWrapper,
   nix-update-script,
+  stdenv,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -54,15 +55,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = [
-    glib
-    gtk3
-    openssl
-    webkitgtk_4_1
-    pango
-    cairo
-    pixman
-  ];
+  buildInputs =
+    [
+      glib
+      gtk3
+      openssl
+      pango
+      cairo
+      pixman
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      webkitgtk_4_1
+    ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
@@ -74,13 +78,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' ""
   '';
 
-  preBuild = ''
-    mkdir -p src-tauri/vendored/node
-    ln -s ${nodejs}/bin/node src-tauri/vendored/node/yaaknode-x86_64-unknown-linux-gnu
-    mkdir -p src-tauri/vendored/protoc
-    ln -s ${protobuf}/bin/protoc src-tauri/vendored/protoc/yaakprotoc-x86_64-unknown-linux-gnu
-    ln -s ${protobuf}/include src-tauri/vendored/protoc/include
-  '';
+  preBuild =
+    let
+      archPlatforms =
+        {
+          "aarch64-darwin" = "aarch64-apple-darwin";
+          "x86_64-darwin" = "x86_64-apple-darwin";
+          "aarch64-linux" = "aarch64-unknown-linux-gnu";
+          "x86_64-linux" = "x86_64-unknown-linux-gnu";
+        }
+        .${stdenv.hostPlatform.system};
+    in
+    ''
+      mkdir -p src-tauri/vendored/node
+      ln -s ${nodejs}/bin/node src-tauri/vendored/node/yaaknode-${archPlatforms}
+      mkdir -p src-tauri/vendored/protoc
+      ln -s ${protobuf}/bin/protoc src-tauri/vendored/protoc/yaakprotoc-${archPlatforms}
+      ln -s ${protobuf}/include src-tauri/vendored/protoc/include
+    '';
 
   # Permission denied (os error 13)
   # write to src-tauri/vendored/protoc/include
@@ -90,7 +105,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = "popd";
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapProgram $out/bin/yaak-app \
       --inherit-argv0 \
       --set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
@@ -105,6 +120,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ redyf ];
     mainProgram = "yaak";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 })

From 69c0260d343e473a52cef6a04cb59045350cb394 Mon Sep 17 00:00:00 2001
From: fumnanya <fmowete@outlook.com>
Date: Thu, 22 May 2025 08:16:28 +0100
Subject: [PATCH 09/76] yaak: fix version in final build

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

diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index 8a60aa181891..d5fb84a8348d 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -72,7 +72,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src-tauri/tauri.conf.json \
-      --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false'
+      --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \
+      --replace-fail '"0.0.0"' '"${finalAttrs.version}"'
     substituteInPlace package.json \
       --replace-fail '"bootstrap:vendor-node": "node scripts/vendor-node.cjs",' "" \
       --replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' ""

From cd30ac6e6d9429aaec4e631f4444bd9ed1187785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= <c@rey.foo>
Date: Wed, 28 May 2025 12:39:55 -0700
Subject: [PATCH 10/76] maintainers: add stackptr

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4e700fe1e9e3..93d11fb42ed6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23498,6 +23498,12 @@
     github = "braaandon";
     githubId = 86573128;
   };
+  stackptr = {
+    name = "Corey Johns";
+    email = "corey@zx.dev";
+    github = "stackptr";
+    githubId = 4542907;
+  };
   stackshadow = {
     email = "stackshadow@evilbrain.de";
     github = "stackshadow";

From 0b843987c92498af2d3a230b3a0d992a098fbc1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 12:11:56 +0000
Subject: [PATCH 11/76] kind: 0.27.0 -> 0.29.0

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

diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix
index 9cbad3d0c47a..b5cc225021dd 100644
--- a/pkgs/by-name/ki/kind/package.nix
+++ b/pkgs/by-name/ki/kind/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "kind";
-  version = "0.27.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "kubernetes-sigs";
     repo = "kind";
-    hash = "sha256-J0M/enjufNmEMm43zo5fi5hL1LfaemNwR6nCClVCJNA=";
+    hash = "sha256-Dv4I50LQcr8fOaCCdaKkz+pHIG05UBQAdDs7gGngm4Y=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule rec {
     ./kernel-module-path.patch
   ];
 
-  vendorHash = "sha256-dwdDVN/B1bv8cYZYcXxSlGgO46ljBZfXuivPXmvo28c=";
+  vendorHash = "sha256-QFDQkl1QuIc0fUK0raVxmPT7AF6fsKlQ4F0dzOM9fcw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 11617fbd2e4404fd798b7f95c6c7075026488f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= <c@rey.foo>
Date: Wed, 28 May 2025 12:41:21 -0700
Subject: [PATCH 12/76] scroll-reverser: init at 1.9

---
 pkgs/by-name/sc/scroll-reverser/package.nix | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/sc/scroll-reverser/package.nix

diff --git a/pkgs/by-name/sc/scroll-reverser/package.nix b/pkgs/by-name/sc/scroll-reverser/package.nix
new file mode 100644
index 000000000000..df6875e0f672
--- /dev/null
+++ b/pkgs/by-name/sc/scroll-reverser/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "scroll-reverser";
+  version = "1.9";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20250427052440/https://pilotmoon.com/downloads/ScrollReverser-${finalAttrs.version}.zip";
+    hash = "sha256-CWHbtvjvTl7dQyvw3W583UIZ2LrIs7qj9XavmkK79YU=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    unzip -d "$out/Applications" $src
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Tool to reverse the direction of scrolling";
+    homepage = "https://pilotmoon.com/scrollreverser/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      stackptr
+    ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})

From 2d5f476a03e7ff1f61c278366b1aaa27690c03d1 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 26 May 2025 23:30:50 +0800
Subject: [PATCH 13/76] kagen: init at 1.1.0

---
 pkgs/by-name/ka/kagen/package.nix | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 pkgs/by-name/ka/kagen/package.nix

diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
new file mode 100644
index 000000000000..ec780e878a8f
--- /dev/null
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch2,
+  cmake,
+  pkg-config,
+  mpi,
+  cgal,
+  boost,
+  gmp,
+  mpfr,
+  sparsehash,
+  imagemagick,
+  gtest,
+  ctestCheckHook,
+  mpiCheckPhaseHook,
+  withExamples ? false,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kagen";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "KarlsruheGraphGeneration";
+    repo = "kagen";
+    tag = "v${finalAttrs.version}";
+    # use vendor libmorton and xxHash
+    fetchSubmodules = true;
+    hash = "sha256-FSlTNOQgwPGOn4mIVIgFejvU0dpyydomHYJOKPz1UjU=";
+  };
+
+  patches = [
+    # replace asm by builtin function to ensure compatibility with arm64
+    (fetchpatch2 {
+      url = "https://github.com/KarlsruheGraphGeneration/KaGen/commit/cab9d5dc6cc256972e52675ad9c385524d40ecd9.patch?full_index=1";
+      hash = "sha256-DCsuwUiE98UKZMxlUI9p36/wq486uHHrUphrIVqM+Cc=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail "FetchContent_MakeAvailable(googletest)" "find_package(GTest REQUIRED)"\
+      --replace-fail "set_property(DIRECTORY" "#set_property(DIRECTORY"
+
+    substituteInPlace kagen/CMakeLists.txt \
+      --replace-fail "OBJECT" ""
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    mpi
+    cgal
+    sparsehash
+    imagemagick
+    # should be propagated by cgal
+    boost
+    gmp
+    mpfr
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "KAGEN_BUILD_EXAMPLES" withExamples)
+    (lib.cmakeBool "KAGEN_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
+  doCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [
+    gtest
+    ctestCheckHook
+    mpiCheckPhaseHook
+  ];
+
+  disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # flaky tests on aarch64-darwin
+    "test_rgg2d.2cores"
+    "test_rgg2d.4cores"
+  ];
+
+  postInstall = ''
+    cmake --install . --component tools
+  '';
+
+  meta = {
+    description = "Communication-free Massively Distributed Graph Generators";
+    homepage = "https://github.com/KarlsruheGraphGeneration/KaGen";
+    changelog = "https://github.com/KarlsruheGraphGeneration/KaGen/releases/tag/v${finalAttrs.version}";
+    mainProgram = "KaGen";
+    license = with lib.licenses; [
+      bsd2
+      mit
+      # boost license
+      lib.licenses.boost
+    ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ qbisi ];
+  };
+})

From a57b0045b98d0e1d2a952f8c8e8b1193b77ba90d Mon Sep 17 00:00:00 2001
From: Sheikh <50134239+cybardev@users.noreply.github.com>
Date: Sun, 1 Jun 2025 05:06:58 -0300
Subject: [PATCH 14/76] maintainers: add cybardev

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a38e1a8227d8..cae447da3ded 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5336,6 +5336,11 @@
     githubId = 16950437;
     name = "cwyc";
   };
+  cybardev = {
+    name = "Sheikh";
+    github = "cybardev";
+    githubId = 50134239;
+  };
   cybershadow = {
     name = "Vladimir Panteleev";
     email = "nixpkgs@cy.md";

From a3bca8eac965f207143fb7c78b01420e314e1f74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 16:35:58 +0000
Subject: [PATCH 15/76] chatbox: 1.12.3 -> 1.13.2

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

diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index 86f55dcc6050..0dc9142d7183 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.12.3";
+  version = "1.13.2";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-/jrieUFKGSZT59e0q42rmUeDslHWgEPga/7jg8375sw=";
+    hash = "sha256-90Nni9HhDLmyw22q2eRTvwOowMjYuY+olyLCV6cRGq8=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From fa9dd4bf4ca3cae97edeb84f10dfdd6fbbbc85b7 Mon Sep 17 00:00:00 2001
From: cybardev <50134239+cybardev@users.noreply.github.com>
Date: Sun, 1 Jun 2025 20:08:13 -0300
Subject: [PATCH 16/76] maintainers: add QuiNzX

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cae447da3ded..a86a27f84432 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20369,6 +20369,11 @@
     githubId = 39039420;
     name = "Quinn Dougherty";
   };
+  QuiNzX = {
+    name = "QuiNz-";
+    github = "QuiNzX";
+    githubId = 76129478;
+  };
   quodlibetor = {
     email = "quodlibetor@gmail.com";
     github = "quodlibetor";

From b92f1fdc226d6c099efc064f182dd23e884acc00 Mon Sep 17 00:00:00 2001
From: cybardev <50134239+cybardev@users.noreply.github.com>
Date: Sun, 1 Jun 2025 05:18:04 -0300
Subject: [PATCH 17/76] pyrefly: init at 0.17.1

Co-authored-by: QuiNzX <76129478+QuiNzX@users.noreply.github.com>
---
 pkgs/by-name/py/pyrefly/package.nix | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/py/pyrefly/package.nix

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
new file mode 100644
index 000000000000..2b30b5e125b3
--- /dev/null
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  python3,
+  fetchPypi,
+  versionCheckHook,
+  nix-update-script,
+  rustPlatform,
+  maturin,
+}:
+python3.pkgs.buildPythonApplication rec {
+  pname = "pyrefly";
+  version = "0.17.1";
+  pyproject = true;
+
+  # fetch from PyPI instead of GitHub, since source repo does not have Cargo.lock
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-w4ivRtmApXiXQT95GI4vvYBop7yxdbbkpW+YTyFtgXM=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-Op5ueVkzZTiJ1zeBGVi8oeLcfSzXMYfk5zEg4OGyA5g=";
+  };
+
+  build-system = [ maturin ];
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ versionCheckHook ];
+
+  # requires unstable rust features
+  env.RUSTC_BOOTSTRAP = 1;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast type checker and IDE for Python";
+    homepage = "https://github.com/facebook/pyrefly";
+    license = lib.licenses.mit;
+    mainProgram = "pyrefly";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
+      cybardev
+      QuiNzX
+    ];
+  };
+}

From d05a1115416aba5d3ba6f64598b0659d4327a9cc Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 3 Jun 2025 01:41:43 -0600
Subject: [PATCH 18/76] anubis{,-xess}: 1.18.0 -> 1.19.1

https://github.com/TecharoHQ/anubis/releases/tag/v1.19.1
Diff: https://github.com/TecharoHQ/anubis/compare/v1.18.0...v1.19.1
---
 pkgs/by-name/an/anubis-xess/package.nix | 2 +-
 pkgs/by-name/an/anubis/package.nix      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/anubis-xess/package.nix b/pkgs/by-name/an/anubis-xess/package.nix
index 0b6a83cbaf2a..8165cf1e0c37 100644
--- a/pkgs/by-name/an/anubis-xess/package.nix
+++ b/pkgs/by-name/an/anubis-xess/package.nix
@@ -4,7 +4,7 @@ buildNpmPackage {
   pname = "${anubis.pname}-xess";
   inherit (anubis) version src;
 
-  npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
+  npmDepsHash = "sha256-wI8XCUGq3aI20B++RAT3lc/nBrDMEmE9+810lewzXa0=";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 39393f755aaa..ef79b6d9a8ee 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.18.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg=";
+    hash = "sha256-aWdkPNwTD+ooaE0PazcOaama7k1a8n5pRxr8X6wm4zs=";
   };
 
-  vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg=";
+  vendorHash = "sha256-wJOGYOWFKep2IFzX+Hia9m1jPG+Rskg8Np9WfEc+TUY=";
 
   nativeBuildInputs = [
     esbuild

From 58d3bc9e062dd824bdb5ff618e560eef7e927414 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 16:09:15 +0000
Subject: [PATCH 19/76] matrix-conduit: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 73330660f105..841d9eb1795e 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-conduit";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "conduit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cLPfgRchYLJXA13Xr1Yg3v+O/7SvxWYIAxaKvnsm7HM=";
+    hash = "sha256-1EY1YTkNnjRIMOvsjowx57PquYMrkv2+8kolD1z19ls=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-i/x6V/0WgMUuZoG8znREmAnLqw/9lYPk4F5i2SA5mmo=";
+  cargoHash = "sha256-IoqCv7ee+vvo0DLpZS4pLn5gBnOC9FyWMxjgWASCdOk=";
 
   # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
   preBuild = ''

From 5491d4aed2a02d10e2b576634ae3d042eca97775 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:44:42 +0000
Subject: [PATCH 20/76] wallabag: 2.6.12 -> 2.6.13

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

diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 8507debfb3f9..aa9dcb0f1018 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "wallabag";
-  version = "2.6.12";
+  version = "2.6.13";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   # Release tarball includes vendored files
   src = fetchurl {
     url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
-    hash = "sha256-o6IbFhDac6BUNjYqhRQXWoNVwkqkRLSYyhYoOz+IG80=";
+    hash = "sha256-GnnXAnn8jqndy3GCrovuS5dddzZbS/RnX8JL5yNVppY=";
   };
 
   patches = [

From 7fe16a7df1b57e95c0375868ce74c2551fc06525 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:47:06 +0200
Subject: [PATCH 21/76] python3Packages.torch: 2.7.0 -> 2.7.1

Diff: https://github.com/pytorch/pytorch/compare/v2.7.0...v2.7.1

Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.7.1
---
 pkgs/development/python-modules/torch/source/default.nix | 2 +-
 pkgs/development/python-modules/torch/source/src.nix     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 46f0e7c1697a..b4a414b48d9d 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -268,7 +268,7 @@ in
 buildPythonPackage rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   stdenv = stdenv';
diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix
index c4a716112b34..af0a47b4fd93 100644
--- a/pkgs/development/python-modules/torch/source/src.nix
+++ b/pkgs/development/python-modules/torch/source/src.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   runCommand,
 }:
-assert version == "2.7.0";
+assert version == "2.7.1";
 (rec {
   src_asmjit = fetchFromGitHub {
     owner = "asmjit";
@@ -430,8 +430,8 @@ assert version == "2.7.0";
   src_pytorch = fetchFromGitHub {
     owner = "pytorch";
     repo = "pytorch";
-    rev = "v2.7.0";
-    hash = "sha256-ReXyzy+OuYxEQwU+t2WL3+jqd7ItdW6w8MiS0f9t+aY=";
+    rev = "v2.7.1";
+    hash = "sha256-p/SkVM6N4XGr44WB9ZaMLu6nfJGcaKHfb1hDY6qbZBw=";
   };
   src_sleef = fetchFromGitHub {
     owner = "shibatch";

From b3def483ce7bbe4f470bc1f53c444fe760af8db5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:48:01 +0200
Subject: [PATCH 22/76] python3Packages.torchaudio: 2.7.0 -> 2.7.1

Diff: https://github.com/pytorch/audio/compare/refs/tags/v2.7.0...refs/tags/v2.7.1

Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.1
---
 pkgs/development/python-modules/torchaudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index b68d1e982e2a..44902a279cdf 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -77,7 +77,7 @@ let
 in
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   stdenv = torch.stdenv;
@@ -86,7 +86,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = "audio";
     tag = "v${version}";
-    hash = "sha256-/5XIVj0jLE7+A1LZxA3bFH3mdwNIcrV4XMOa4xznr/w=";
+    hash = "sha256-T1V+/Oho6Dblh3ah5PljpxKcndy2e1dAlVxC3ay4AM0=";
   };
 
   patches = [

From 30ce5ddfa8c3ebc721812486f94dd2db8bcba1f9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:48:46 +0200
Subject: [PATCH 23/76] python3Packages.torchvision: 0.22.0 -> 0.22.1

Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.22.0...refs/tags/v0.22.1

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

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index bfb3f8bbd28d..6fc4d61d209e 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -29,7 +29,7 @@ let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
 
   pname = "torchvision";
-  version = "0.22.0";
+  version = "0.22.1";
 in
 buildPythonPackage {
   inherit pname version;
@@ -40,7 +40,7 @@ buildPythonPackage {
     owner = "pytorch";
     repo = "vision";
     tag = "v${version}";
-    hash = "sha256-+70Rhfma4dM5tRlYNz0cuuTIxRbYf6dsnAhvkw7a5kM=";
+    hash = "sha256-KYIhd0U2HdvNt/vjQ8wA/6l/ZCF8wBm4NrOMgBtoWG4=";
   };
 
   nativeBuildInputs = [

From ec91045f959682707fd4e33974613df87230b06e Mon Sep 17 00:00:00 2001
From: squat <lserven@gmail.com>
Date: Fri, 6 Jun 2025 00:37:17 +0200
Subject: [PATCH 24/76] pamtester: refactor enable on Darwin

It would be great to be able to test PAM service modules on Darwin
systems. This commit enables pamtester on Darwin. I think the only
reason this wasn't already enabled is purely historical.
There is a viable PAM package for Darwin, namely OpenPAM and the
upstream docs for pamtester mention Darwin.
Building on my nix-darwin system works and the binary works as expected.

Signed-off-by: squat <lserven@gmail.com>
---
 pkgs/by-name/pa/pamtester/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/pamtester/package.nix b/pkgs/by-name/pa/pamtester/package.nix
index 42a716524925..294ef8fb5f3d 100644
--- a/pkgs/by-name/pa/pamtester/package.nix
+++ b/pkgs/by-name/pa/pamtester/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     mainProgram = "pamtester";
     homepage = "https://pamtester.sourceforge.net/";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From 79d5d6d6e248525a14b8b93d086905883f37a03a Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 6 Jun 2025 11:45:58 +0200
Subject: [PATCH 25/76] x2t: add tests

And also clean up the build in some places, notably linking in
our libicu 'nicely' instead of relying on patchelf.
---
 pkgs/by-name/x2/x2t/package.nix | 221 +++++++++++++++++++++-----------
 1 file changed, 147 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix
index 3878c3b35671..6a46fbe4a8cd 100644
--- a/pkgs/by-name/x2/x2t/package.nix
+++ b/pkgs/by-name/x2/x2t/package.nix
@@ -27,6 +27,12 @@ let
     mkdir $BUILDRT/Common/3dParty/icu/linux_64
     ln -s ${icu}/lib $BUILDRT/Common/3dParty/icu/linux_64/build
   '';
+  icuQmakeFlags = [
+    "QMAKE_LFLAGS+=-Wl,--no-undefined"
+    "QMAKE_LFLAGS+=-licuuc"
+    "QMAKE_LFLAGS+=-licudata"
+    "QMAKE_LFLAGS+=-L${icu}/lib"
+  ];
   # see core/Common/3dParty/html/fetch.sh
   katana-parser-src = fetchFromGitHub {
     owner = "jasenhuang";
@@ -34,6 +40,13 @@ let
     rev = "be6df458d4540eee375c513958dcb862a391cdd1";
     hash = "sha256-SYJFLtrg8raGyr3zQIEzZDjHDmMmt+K0po3viipZW5c=";
   };
+  # see build_tools scripts/core_common/modules/googletest.py
+  googletest-src = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    tag = "v1.13.0";
+    hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ=";
+  };
   # 'latest' version
   # (see build_tools scripts/core_common/modules/hyphen.py)
   hyphen-src = fetchFromGitHub {
@@ -83,11 +96,12 @@ let
   #qmakeFlags = [ "CONFIG+=debug" ];
   qmakeFlags = [ ];
   dontStrip = false;
+  core-rev = "d257c68d5fdd71a33776a291914f2c856426c259";
   core = fetchFromGitHub {
     owner = "ONLYOFFICE";
     repo = "core";
     # rev that the 'core' submodule in documentserver points at
-    rev = "d257c68d5fdd71a33776a291914f2c856426c259";
+    rev = core-rev;
     hash = "sha256-EXeqG8MJWS1asjFihnuMnDSHeKt2x+Ui+8MYK50AnSY=";
   };
   buildCoreComponent =
@@ -95,7 +109,9 @@ let
     stdenv.mkDerivation (
       finalAttrs:
       {
-        name = "onlyoffice-core-${rootdir}";
+        pname = "onlyoffice-core-${rootdir}";
+        # Could be neater, but these are intermediate derivations anyway
+        version = core-rev;
         src = core;
         sourceRoot = "${finalAttrs.src.name}/${rootdir}";
         dontWrapQtApps = true;
@@ -107,7 +123,7 @@ let
           export SRCRT=$(pwd)
           cd $(echo "${rootdir}" | sed -s "s/[^/]*/../g")
           export BUILDRT=$(pwd)
-          ln -s ../source ../core
+          ln -s $(pwd)/../source ../core
           chmod -R u+w .
         '';
         postPatch = ''
@@ -128,12 +144,20 @@ let
     );
   buildCoreTests =
     rootdir: attrs:
-    (buildCoreComponent (rootdir + "/test") (
+    (buildCoreComponent rootdir (
       {
         doCheck = true;
+        qmakeFlags = qmakeFlags ++ icuQmakeFlags;
         checkPhase = ''
           runHook preCheck
-          ./build/linux_64/test
+          TEST=$(find . -type f -name test)
+          if [ -f "$TEST" ]; then
+              $TEST
+          else
+              echo "Test executable not found"
+              find .
+              exit 1
+          fi
           runHook postCheck
         '';
         installPhase = ''
@@ -147,6 +171,7 @@ let
       # icu needs c++20 for include/unicode/localpointer.h
       ./common-cpp20.patch
     ];
+    qmakeFlags = qmakeFlags ++ icuQmakeFlags;
     preConfigure = ''
       source ${fixIcu}
 
@@ -156,6 +181,40 @@ let
         UnicodeConverter.cpp \
         --replace-fail "TRUE" "true"
     '';
+    passthru.tests = buildCoreTests "UnicodeConverter/test" {
+      buildInputs = [
+        unicodeConverter
+        kernel
+      ];
+      qmakeFlags = qmakeFlags ++ icuQmakeFlags;
+      preConfigure = ''
+        source ${fixIcu}
+        echo -e "\ninclude(../../Common/3dParty/icu/icu.pri)" >> test.pro
+      '';
+      checkPhase = ''
+        # Many of the tests do not appear to produce the 'expected' output,
+        # but it's not obvious whether this an error in the behaviour
+        # or in the test expectations:
+        TESTS=$(ls testfiles/*_utf8.txt | grep -v "/0_" | grep -v "/11_" | grep -v "/17_" | grep -v "/18_" | grep -v "/20_" | grep -v "/21_" | grep -v "/22_" | grep -v "/23_" | grep -v "/24_" | grep -v "/25_" | grep -v "/26_" | grep -v "/27_" | grep -v "/29_" | grep -v "/30_" | grep -v "/31_" | grep -v "/33_" | grep -v "/35_" | grep -v "/41_" | grep -v "/42_" | grep -v "/43_" | cut -d "/" -f 2 | cut -d "_" -f 1 | sort | uniq)
+
+        # This test expects the test input exactly here:
+        mkdir -p $out/bin
+        cp $(find ./core_build -name test) $out/bin
+        cp -r testfiles $out
+        $out/bin/test
+
+        for test in $TESTS; do
+          echo "Checking test $test"
+          diff $out/testfiles/''${test}_utf8.txt $out/testfiles/''${test}_test_utf8.txt >/dev/null
+        done
+      '';
+      installPhase = ''
+        # TODO: this produces files in $out/testfiles. It looks like this should
+        # test that the files are identical, which they are not - but it is not
+        # obvious the test is 'wrong' :/
+        #md5sum $out/testfiles/*
+      '';
+    };
   };
   kernel = buildCoreComponent "Common" {
     patches = [
@@ -164,31 +223,7 @@ let
     buildInputs = [
       unicodeConverter
     ];
-  };
-  unicodeConverterTests = buildCoreComponent "UnicodeConverter/test" {
-    buildInputs = [
-      unicodeConverter
-      kernel
-      icu
-    ];
-    preConfigure = ''
-      source ${fixIcu}
-
-      # adds includes but not build the lib?
-      echo -e "\ninclude(../../Common/3dParty/icu/icu.pri)" >> test.pro
-    '';
-    postBuild = ''
-      patchelf --add-rpath ${icu}/lib $(find ./core_build -name test)
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      cp $(find ./core_build -name test) $out/bin
-      cp -r testfiles $out
-      # TODO: this produces files in $out/testfiles. It looks like this should
-      # test that the files are identical, which they are not - but it is not
-      # obvious the test is 'wrong' :/
-      $out/bin/test
-    '';
+    qmakeFlags = qmakeFlags ++ icuQmakeFlags;
   };
   graphics = buildCoreComponent "DesktopEditor/graphics/pro" {
     patches = [
@@ -209,6 +244,19 @@ let
 
       ln -s ${hyphen-src} $BUILDRT/Common/3dParty/hyphen/hyphen
     '';
+    passthru.tests = lib.attrsets.genAttrs [ "alphaMask" "graphicsLayers" "TestPICT" ] (
+      test:
+      buildCoreTests "DesktopEditor/graphics/tests/${test}" {
+        preConfigure = ''
+          source ${fixIcu}
+        '';
+        buildInputs = [
+          graphics
+          kernel
+          unicodeConverter
+        ];
+      }
+    );
   };
   network = buildCoreComponent "Common/Network" {
     buildInputs = [
@@ -283,6 +331,17 @@ let
       runHook postInstall
     '';
     doCheck = true;
+    passthru.tests = buildCoreTests "Apple/test" {
+      buildInputs = [
+        unicodeConverter
+        kernel
+        iworkfile
+      ];
+      qmakeFlags = qmakeFlags ++ icuQmakeFlags;
+      preConfigure = ''
+        source ${fixIcu}
+      '';
+    };
   };
   vbaformatlib = buildCoreComponent "MsBinaryFile/Projects/VbaFormatLib/Linux" {
     buildInputs = [ boost ];
@@ -321,6 +380,24 @@ let
       kernel
       graphics
     ];
+    passthru.tests = buildCoreTests "DocxRenderer/test" {
+      buildInputs = [
+        unicodeConverter
+        kernel
+        network
+        graphics
+        pdffile
+        djvufile
+        xpsfile
+        docxrenderer
+      ];
+      preConfigure = ''
+        # (not as patch because of line endings)
+        sed -i '47 a #include <limits>' $BUILDRT/Common/OfficeFileFormatChecker2.cpp
+
+        source ${fixIcu}
+      '';
+    };
   };
   xpsfile = buildCoreComponent "XpsFile" {
     buildInputs = [
@@ -355,15 +432,19 @@ let
       # needed for c++ 20 for nodejs_23
       ./common-pole-c20.patch
     ];
-    qmakeFlags = qmakeFlags ++ [
-      # c++1z for nodejs_22.libv8 (20 seems to produce errors around 'is_void_v' there)
-      # c++ 20 for nodejs_23.libv8
-      "CONFIG+=c++2a"
-      # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000
-      # which is not page-aligned, so disable memory limitation for now
-      "QMAKE_CXXFLAGS+=-DV8_VERSION_121_PLUS"
-      "QMAKE_CXXFLAGS+=-DDISABLE_MEMORY_LIMITATION"
-    ];
+    qmakeFlags =
+      qmakeFlags
+      ++ icuQmakeFlags
+      ++ [
+        # c++1z for nodejs_22.libv8 (20 seems to produce errors around 'is_void_v' there)
+        # c++ 20 for nodejs_23.libv8
+        "CONFIG+=c++2a"
+        # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000
+        # which is not page-aligned, so disable memory limitation for now
+        "QMAKE_CXXFLAGS+=-DV8_VERSION_121_PLUS"
+        "QMAKE_CXXFLAGS+=-DDISABLE_MEMORY_LIMITATION"
+        "QMAKE_LFLAGS+=-licui18n"
+      ];
     preConfigure = ''
       cd $BUILDRT
 
@@ -393,6 +474,15 @@ let
 
       cd $BUILDRT/DesktopEditor/doctrenderer
     '';
+    passthru.tests = lib.attrsets.genAttrs [ "embed/external" "embed/internal" "js_internal" "json" ] (
+      test:
+      buildCoreTests "DesktopEditor/doctrenderer/test/${test}" {
+        buildInputs = [ doctrenderer ];
+        preConfigure = ''
+          ln -s ${googletest-src} $BUILDRT/Common/3dParty/googletest/googletest
+        '';
+      }
+    );
   };
   htmlfile2 = buildCoreComponent "HtmlFile2" {
     buildInputs = [
@@ -421,10 +511,13 @@ let
       graphics
       boost
     ];
+    qmakeFlags = qmakeFlags ++ [
+      "QMAKE_LFLAGS+=-Wl,--no-undefined"
+    ];
     preConfigure = ''
       ln -s ${gumbo-parser-src} $BUILDRT/Common/3dParty/html/gumbo-parser
     '';
-    passthru.tests.run = buildCoreTests "Fb2File" {
+    passthru.tests.run = buildCoreTests "Fb2File/test" {
       buildInputs = [
         fb2file
         kernel
@@ -432,9 +525,6 @@ let
       preConfigure = ''
         source ${fixIcu}
       '';
-      postBuild = ''
-        patchelf --add-rpath ${icu}/lib build/*/*
-      '';
       checkPhase = ''
         for i in ../examples/*.fb2; do
           cp $i build/linux_64/res.fb2
@@ -449,6 +539,7 @@ let
       kernel
       graphics
     ];
+    qmakeFlags = qmakeFlags ++ icuQmakeFlags;
     preConfigure = ''
       source ${fixIcu}
     '';
@@ -459,8 +550,6 @@ let
       mkdir -p $out/bin
       cp $BUILDRT/build/bin/*/* $BUILDRT/build/bin/*/*/* $out/bin
 
-      patchelf --add-rpath ${icu}/lib $out/bin/allfontsgen
-
       runHook postInstall
     '';
   };
@@ -484,18 +573,12 @@ let
       --output-web=$out/fonts
   '';
 in
-stdenv.mkDerivation (finalAttrs: {
+buildCoreComponent "X2tConverter/build/Qt" {
   pname = "x2t";
   # x2t is not 'directly' versioned, so we version it after the version
   # of documentserver it's pulled into as a submodule
   version = "8.3.2";
 
-  src = core;
-
-  nativeBuildInputs = [
-    pkg-config
-    qt5.full
-  ];
   buildInputs = [
     unicodeConverter
     kernel
@@ -526,34 +609,23 @@ stdenv.mkDerivation (finalAttrs: {
     vbaformatlib
     odfformatlib
   ];
-  dontStrip = true;
-  buildPhase = ''
-    runHook preBuild
-
-    BUILDRT=$(pwd)
+  qmakeFlags = qmakeFlags ++ icuQmakeFlags ++ [ "X2tConverter.pro" ];
+  preConfigure = ''
     source ${fixIcu}
 
     # (not as patch because of line endings)
-    sed -i '47 a #include <limits>' Common/OfficeFileFormatChecker2.cpp
+    sed -i '47 a #include <limits>' $BUILDRT/Common/OfficeFileFormatChecker2.cpp
 
     substituteInPlace \
-      ./Test/Applications/TestDownloader/mainwindow.h \
+      $BUILDRT/Test/Applications/TestDownloader/mainwindow.h \
       --replace-fail "../core" ""
-
-    echo "== X2tConverter =="
-    cd X2tConverter/build/Qt
-    qmake "CONFIG+=debug" -o Makefile X2tConverter.pro
-    make -j$NIX_BUILD_CORES
-    cd ../../..
-
-    runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/bin
-    cp ./build/bin/linux_64/*/x2t $out/bin
+    find $BUILDRT/build -type f -exec cp {} $out/bin \;
 
     mkdir -p $out/etc
     cat >$out/etc/DoctRenderer.config <<EOF
@@ -567,13 +639,15 @@ stdenv.mkDerivation (finalAttrs: {
           </Settings>
     EOF
 
-    patchelf --add-rpath ${icu}/lib $out/bin/x2t
-
     runHook postInstall
   '';
   passthru.tests = {
-    unicodeConverter = unicodeConverterTests;
-    fb2file = fb2file.tests.run;
+    unicodeConverter = unicodeConverter.tests;
+    fb2file = fb2file.tests;
+    graphics = graphics.tests;
+    iworkfile = iworkfile.tests;
+    docxrenderer = docxrenderer.tests;
+    doctrenderer = doctrenderer.tests;
     x2t = runCommand "x2t-test" { } ''
       (${x2t}/bin/x2t || true) | grep "OOX/binary file converter." && mkdir -p $out
     '';
@@ -584,7 +658,6 @@ stdenv.mkDerivation (finalAttrs: {
       allfonts
       unicodeConverter
       kernel
-      unicodeConverterTests
       graphics
       network
       docxformatlib
@@ -605,4 +678,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ raboof ];
     platforms = lib.platforms.all;
   };
-})
+}

From 09b33ed3c0951cd0fb18765163b89db44bf73e5f Mon Sep 17 00:00:00 2001
From: Nikita Krasnov <nikita.nikita.krasnov@gmail.com>
Date: Fri, 6 Jun 2025 13:23:13 +0300
Subject: [PATCH 26/76] ISSUE_TEMPLATE: fix missing image

---
 .github/ISSUE_TEMPLATE/01_bug_report.yml             | 6 +++---
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml      | 6 +++---
 .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml       | 6 +++---
 .github/ISSUE_TEMPLATE/04_build_failure.yml          | 6 +++---
 .github/ISSUE_TEMPLATE/05_update_request.yml         | 6 +++---
 .github/ISSUE_TEMPLATE/06_module_request.yml         | 6 +++---
 .github/ISSUE_TEMPLATE/07_backport_request.yml       | 6 +++---
 .github/ISSUE_TEMPLATE/08_documentation_request.yml  | 6 +++---
 .github/ISSUE_TEMPLATE/09_unreproducible_package.yml | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index 504ff9573d77..1e37bdfc77b7 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index e99882bb3bcc..4e301bfd7c5b 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
index d22e9fa7a897..1e7583cfde46 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index 03b4065b2389..4f9c3b74bf76 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
index 0fc3c0cd2362..56c58a87eea4 100644
--- a/.github/ISSUE_TEMPLATE/05_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/05_update_request.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
index bb800bc0e087..99bc038f4853 100644
--- a/.github/ISSUE_TEMPLATE/06_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_module_request.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/07_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml
index b0c5deba3247..b7e887bd60d1 100644
--- a/.github/ISSUE_TEMPLATE/07_backport_request.yml
+++ b/.github/ISSUE_TEMPLATE/07_backport_request.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/08_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
index cfa3df26acf8..7ba486590770 100644
--- a/.github/ISSUE_TEMPLATE/08_documentation_request.yml
+++ b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>
diff --git a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
index b554f6f48ef9..052c54e928ae 100644
--- a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
+++ b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
@@ -9,9 +9,9 @@ body:
         <p align="center">
           <a href="https://nixos.org">
             <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
+              <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
             </picture>
           </a>
         </p>

From 5fc3dd02d83d123357048bd33846fe691c6bed91 Mon Sep 17 00:00:00 2001
From: Nikita Krasnov <nikita.nikita.krasnov@gmail.com>
Date: Fri, 6 Jun 2025 16:20:22 +0300
Subject: [PATCH 27/76] ISSUE_TEMPLATE: remove alert blocks that don't render

Markdown alert blocks are not rendered inside dropdown description.
---
 .github/ISSUE_TEMPLATE/01_bug_report.yml        | 3 +--
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml | 3 +--
 .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml  | 3 +--
 .github/ISSUE_TEMPLATE/04_build_failure.yml     | 6 +++---
 .github/ISSUE_TEMPLATE/05_update_request.yml    | 6 +++---
 .github/ISSUE_TEMPLATE/06_module_request.yml    | 3 +--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index 1e37bdfc77b7..60caafa8cdd9 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -30,8 +30,7 @@ body:
       description: |
         What version of Nixpkgs are you using?
 
-        > [!IMPORTANT]
-        > If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
+        If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
       options:
         - "Please select a version."
         - "- Unstable (25.11)"
diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index 4e301bfd7c5b..0fdc999af63f 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -30,8 +30,7 @@ body:
       description: |
         What version of Nixpkgs are you using?
 
-        > [!IMPORTANT]
-        > If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
+        If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
       options:
         - "Please select a version."
         - "- Unstable (25.11)"
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
index 1e7583cfde46..17f4bd340f59 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
@@ -30,8 +30,7 @@ body:
       description: |
         What version of Nixpkgs are you using?
 
-        > [!IMPORTANT]
-        > If you are using an older version, please [update to the latest stable version](https://nixos.org/download) and check if the issue persists before continuing this bug report.
+        If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
       options:
         - "Please select a version."
         - "- Unstable (25.11)"
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index 4f9c3b74bf76..085928f4f6a1 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -30,9 +30,9 @@ body:
       description: |
         In what version of Nixpkgs did the build failure occur?
 
-        > [!IMPORTANT]
-        > If you are using an older version, please update to the latest stable version and check if the build failure persists before continuing this report.
-        > If you are purposefully trying to build an ancient version of a package in an older Nixpkgs, please coordinate with the [NixOS Archivists](https://matrix.to/#/#archivists:nixos.org).
+        If you are using an older version, please update to the latest stable version and check if the build failure persists before continuing this report.
+
+        If you are purposefully trying to build an ancient version of a package in an older Nixpkgs, please coordinate with the [NixOS Archivists](https://matrix.to/#/#archivists:nixos.org).
       options:
         - "Please select a version."
         - "- Unstable (25.11)"
diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
index 56c58a87eea4..0c4d6f8b4ef0 100644
--- a/.github/ISSUE_TEMPLATE/05_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/05_update_request.yml
@@ -30,9 +30,9 @@ body:
       description: |
         What version of Nixpkgs are you using?
 
-        > [!IMPORTANT]
-        > If you are using an older or stable version, please update to the latest **unstable** version and check if the package is still out of date.
-        > If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead.
+        If you are using an older or stable version, please update to the latest **unstable** version and check if the package is still out of date.
+
+        If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead.
       options:
         - "Please select a version."
         - "- Unstable (25.11)"
diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
index 99bc038f4853..02683a81a812 100644
--- a/.github/ISSUE_TEMPLATE/06_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_module_request.yml
@@ -30,8 +30,7 @@ body:
       description: |
         What version of Nixpkgs are you using?
 
-        > [!IMPORTANT]
-        > If you are using an older or stable version, please update to the latest **unstable** version and check if the module still does not exist before continuing this request.
+        If you are using an older or stable version, please update to the latest **unstable** version and check if the module still does not exist before continuing this request.
       options:
         - "Please select a version."
         - "- Unstable (25.11)"

From 28bc042c2fbd95ad844f3d3b883cd3cabfed1552 Mon Sep 17 00:00:00 2001
From: Nikita Krasnov <nikita.nikita.krasnov@gmail.com>
Date: Fri, 6 Jun 2025 15:49:50 +0300
Subject: [PATCH 28/76] ISSUE_TEMPLATE: add missing line breaks

---
 .github/ISSUE_TEMPLATE/01_bug_report.yml             | 4 +++-
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml      | 4 +++-
 .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml       | 4 +++-
 .github/ISSUE_TEMPLATE/04_build_failure.yml          | 4 +++-
 .github/ISSUE_TEMPLATE/05_update_request.yml         | 4 +++-
 .github/ISSUE_TEMPLATE/06_module_request.yml         | 4 +++-
 .github/ISSUE_TEMPLATE/07_backport_request.yml       | 8 ++++++--
 .github/ISSUE_TEMPLATE/08_documentation_request.yml  | 4 +++-
 .github/ISSUE_TEMPLATE/09_unreproducible_package.yml | 1 +
 9 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index 60caafa8cdd9..c44935ceaf25 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a bug against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it failing to launch on ARM Linux, your title would be as follows:
-        > `hello: fails to launch on aarch64-linux`
+        > ```
+        > hello: fails to launch on aarch64-linux
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index 0fdc999af63f..5389f6b5108c 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a bug against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it failing to launch on Apple Silicon, your title would be as follows:
-        > `hello: fails to launch on aarch64-darwin`
+        > ```
+        > hello: fails to launch on aarch64-darwin
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
index 17f4bd340f59..2e8c3db66047 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a bug against the [`systemd-boot`](https://search.nixos.org/options?channel=unstable&show=boot.loader.systemd-boot.enable&from=0&size=1) module about it failing to install [`memtest86`](https://search.nixos.org/options?channel=unstable&show=boot.loader.systemd-boot.memtest86.enable&from=0&size=1), your title would be as follows:
-        > `nixos/systemd-boot: fails to install memtest86`
+        > ```
+        > nixos/systemd-boot: fails to install memtest86
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index 085928f4f6a1..806a22b93061 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a build failure against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package, your title would be as follows:
-        > `Build failure: hello`
+        > ```
+        > Build failure: hello
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
index 0c4d6f8b4ef0..6500aa2605c4 100644
--- a/.github/ISSUE_TEMPLATE/05_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/05_update_request.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs is 1.0.0, but the latest version upstream is 1.0.1, your title would be as follows:
-        > `Update Request: hello 1.0.0 → 1.0.1`
+        > ```
+        > Update Request: hello 1.0.0 → 1.0.1
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
index 02683a81a812..b794d18c673a 100644
--- a/.github/ISSUE_TEMPLATE/06_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_module_request.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing a request against the missing `hello` module, your title would be as follows:
-        > `Module Request: nixos/hello`
+        > ```
+        > Module Request: nixos/hello
+        > ```
 
         ---
   - type: "dropdown"
diff --git a/.github/ISSUE_TEMPLATE/07_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml
index b7e887bd60d1..238d75084b98 100644
--- a/.github/ISSUE_TEMPLATE/07_backport_request.yml
+++ b/.github/ISSUE_TEMPLATE/07_backport_request.yml
@@ -18,14 +18,18 @@ body:
 
         > [!CAUTION]
         > **Before you begin:** Be advised that backports are subject to the [release suitability guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
-        > Stable releases of Nixpkgs do not receive breaking changes, which include major package updates that have incompatible API changes and break backwards compatibility. In the [Semantic Versioning standard](https://semver.org/), this is the first version number. (1.X.X)
+        >
+        > Stable releases of Nixpkgs do not receive breaking changes, which include major package updates that have incompatible API changes and break backwards compatibility. In the [Semantic Versioning standard](https://semver.org/), this is the first version number (1.X.X).
+        >
         > Generally, only minor package updates, such as security patches, bug fixes and feature additions (but not removals!) will be considered for backporting. Please read the rules above carefully before filing this backport request.
 
         Welcome to Nixpkgs. Please replace the **`Backport to Stable: PACKAGENAME OLDVERSION → NEWVERSION`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)), the current version of the package in Nixpkgs Stable and the current version of the package in Nixpkgs Unstable.
 
         > [!TIP]
         > For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs Unstable is 1.0.1, but the current version in Nixpkgs Stable is 1.0.0, your title would be as follows:
-        > `Backport to Stable: hello 1.0.0 → 1.0.1`
+        > ```
+        > Backport to Stable: hello 1.0.0 → 1.0.1
+        > ```
 
         ---
   - type: "input"
diff --git a/.github/ISSUE_TEMPLATE/08_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
index 7ba486590770..92eb86739f64 100644
--- a/.github/ISSUE_TEMPLATE/08_documentation_request.yml
+++ b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
@@ -20,7 +20,9 @@ body:
 
         > [!TIP]
         > For instance, if you were filing an issue against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it not having any NixOS-specific documentation, your title would be as follows:
-        > `Missing Documentation: hello`
+        > ```
+        > Missing Documentation: hello
+        > ```
 
         ---
   - type: "textarea"
diff --git a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
index 052c54e928ae..0542e74fa17b 100644
--- a/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
+++ b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
@@ -20,6 +20,7 @@ body:
 
         > [!NOTE]
         > This form is for reporting unreproducible packages. For more information, see the [Reproducible Builds Status](https://reproducible.nixos.org/) page.
+        >
         > To report a package that fails to build entirely, please use the "Build Failure" form instead.
 
         ---

From fa6c2e77ee44bfa3d7da0b0f72c95340807c1cf8 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 7 Jun 2025 12:02:25 -0700
Subject: [PATCH 29/76] base16-schemes: modernize

---
 pkgs/by-name/ba/base16-schemes/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ba/base16-schemes/package.nix b/pkgs/by-name/ba/base16-schemes/package.nix
index 5534fc67a7e5..8f06bc92eccc 100644
--- a/pkgs/by-name/ba/base16-schemes/package.nix
+++ b/pkgs/by-name/ba/base16-schemes/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  ...
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "base16-schemes";
@@ -24,10 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "All the color schemes for use in base16 packages";
-    homepage = finalAttrs.src.meta.homepage;
-    maintainers = [ maintainers.DamienCassou ];
-    license = licenses.mit;
+    homepage = "https://github.com/tinted-theming/schemes";
+    maintainers = [ lib.maintainers.DamienCassou ];
+    license = lib.licenses.mit;
   };
 })

From 05cfa02e24267c16b0bbc2e858ae5deac7b13627 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 7 Jun 2025 12:05:12 -0700
Subject: [PATCH 30/76] base16-schemes: unstable-2025-04-18 ->
 0-unstable-2025-06-04

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

diff --git a/pkgs/by-name/ba/base16-schemes/package.nix b/pkgs/by-name/ba/base16-schemes/package.nix
index 8f06bc92eccc..6edb3a44086d 100644
--- a/pkgs/by-name/ba/base16-schemes/package.nix
+++ b/pkgs/by-name/ba/base16-schemes/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "base16-schemes";
-  version = "unstable-2025-04-18";
+  version = "0-unstable-2025-06-04";
 
   src = fetchFromGitHub {
     owner = "tinted-theming";
     repo = "schemes";
-    rev = "28c26a621123ad4ebd5bbfb34ab39421c0144bdd";
-    hash = "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=";
+    rev = "de3eeb6add0a6051bfc717684e36c8c9a78a1812";
+    hash = "sha256-C8VZuwzaQfNYbQQcc0Fh4RS+1nqc6j+IOy80NGmV4IQ=";
   };
 
   installPhase = ''

From a64351a4d502e4063be87ad5fdfeb4704f3d049f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 09:39:59 +0000
Subject: [PATCH 31/76] memos: 0.24.3 -> 0.24.4

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

diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index 7a0ca3298dc1..f5285035ad3a 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -14,12 +14,12 @@
   protoc-gen-validate,
 }:
 let
-  version = "0.24.3";
+  version = "0.24.4";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4=";
+    hash = "sha256-Vimc9Z6X1+UBm2UnNnlsYqXEnOV3JcEPm9SD3obKkLc=";
   };
 
   memos-protobuf-gen = stdenvNoCC.mkDerivation {
@@ -61,7 +61,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
-      hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k=";
+      hash = "sha256-AyQYY1vtBB6DTcieC7nw5aOOVuwESJSDs8qU6PGyaTw=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
@@ -92,7 +92,7 @@ buildGoModule {
     memos-protobuf-gen
     ;
 
-  vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o=";
+  vendorHash = "sha256-EzVgQpWJJA7EUKdnnnCIvecaOXg856f/WQyfV/WuWFU=";
 
   preBuild = ''
     rm -rf server/router/frontend/dist

From 439c6da79ba8407140895fa5fb66db5d6f42f829 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 11:31:05 +0000
Subject: [PATCH 32/76] github-runner: 2.324.0 -> 2.325.0

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

diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 1178318630aa..13f2de4dda02 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.324.0";
+  version = "2.325.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ssjVM1Ujgp5JgeKZ7Tmngyy4V/bFcxTfakbPhnp6Co=";
+    hash = "sha256-Ic/+bdEfipyOB7jA+SXBuyET6ERu6ox+SdlLy4mbuqw=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From fef6e7ba573004c275af4cf2ef7025a8432dc4e5 Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:54:22 +0300
Subject: [PATCH 33/76] burpsuite: 2025.5.1 -> 2025.5.2

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

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 6ef5e96180b6..cc6260a7a9e6 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.5.1";
+  version = "2025.5.2";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-1AXAVXselQKqKsjTRJVN3rBQpSReTH3d0ulIahp9QCc=";
+        hash = "sha256-Ln4krhqaxkRAHesnXobjlgNiHfL7ShGanex0aMeJu3o=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-zX5QJz996WgKvDA6p5dRtmbZTRsgCl0URn302MkhVew=";
+        hash = "sha256-QfjhZR6AJ7909DbLgkjso5uh1lfucd1LLJHS38FeJXw=";
       };
 
   src = fetchurl {

From 30638c660395d00213c8347ef86d38ca93ee9f50 Mon Sep 17 00:00:00 2001
From: Matteo Bongiovanni <MatteoBongiovanni@proton.me>
Date: Mon, 9 Jun 2025 21:47:26 +0200
Subject: [PATCH 34/76] maintainers: add matteobongio

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 58cf591b197f..3bb0a800a8f4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15442,6 +15442,11 @@
     githubId = 952712;
     name = "Matt Christ";
   };
+  matteobongio = {
+    github = "matteobongio";
+    githubId = 155063357;
+    name = "Matteo Bongiovanni";
+  };
   matteopacini = {
     email = "m@matteopacini.me";
     github = "matteo-pacini";

From a87b5d93deda1ae26f1c415b5016ce2684142113 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 9 Jun 2025 16:35:29 -0600
Subject: [PATCH 35/76] nixosTests.anubis: fix test

---
 nixos/tests/anubis.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index e5f643ed1cca..630fe6203d61 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -99,7 +99,7 @@
     machine.succeed('curl -f http://basic.localhost | grep "it works"')
     machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
     machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
-    machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge | grep challenge')
+    machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge -d "redir=/" | grep challenge')
 
     # TCP mode
     machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')

From 1f7bc4955242e6b8e1cfc1fef81b80fdff44bbf4 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 9 Jun 2025 16:35:57 -0600
Subject: [PATCH 36/76] nixosTests.anubis: add ryand56 as maintainer

---
 nixos/tests/anubis.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index 630fe6203d61..05771339f4aa 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -4,6 +4,7 @@
   meta.maintainers = with lib.maintainers; [
     soopyc
     nullcube
+    ryand56
   ];
 
   nodes.machine =

From a8e4e067e6ee57a5439cfd6aecade9cdb9cda999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 00:37:04 +0000
Subject: [PATCH 37/76] bore-cli: 0.5.3 -> 0.6.0

---
 pkgs/tools/networking/bore-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix
index 0c1d01f877b7..a6fa21bb39fb 100644
--- a/pkgs/tools/networking/bore-cli/default.nix
+++ b/pkgs/tools/networking/bore-cli/default.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bore-cli";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "ekzhang";
     repo = "bore";
     rev = "v${version}";
-    hash = "sha256-jQeSwzlMJsZz80SAb/HN4Xyazd50VIxly8K7kSOcLPU=";
+    hash = "sha256-Jr6jZKsMhSpWVNpmhozI5DLONbwfIpcXwSlcbC9lLRM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uaSnH3pLpgASjauNWE94cpLxeAmVPqa/VUksR12hnGM=";
+  cargoHash = "sha256-CLnwzgDbHy6nTfVathycObArtEsF8tpMNoh19/uQqGA=";
 
   # tests do not find grcov path correctly
   meta = with lib; {

From cffe081cffaebdf02ff5de9344eee4bd5a503c2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 00:58:04 +0000
Subject: [PATCH 38/76] scooter: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index 0b9f4eeea61e..cac351608edf 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scooter";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
     rev = "v${version}";
-    hash = "sha256-GlqGAzOkW6Jy7qGblfkMfCtzNwjOY/ZmGktqU4uUe90=";
+    hash = "sha256-/wl6xbAXfPUTSI38htgkWC3IlsxtFbPOpBHqcSVBGPk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mh4FoFZ012yXbCr9Ts57crc+1JrcA2cdnZzqjKUspq8=";
+  cargoHash = "sha256-kPweKXAitvODNoKTr2iB+qM9qMWGoKEQCxpkgrpnewY=";
 
   # Many tests require filesystem writes which fail in Nix sandbox
   doCheck = false;

From b92bff56f93ac415f1c2aae7137928642f26fc57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 02:38:43 +0000
Subject: [PATCH 39/76] factoriolab: 3.14.0 -> 3.15.0

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

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index d97ba8802228..fb2e7d0610fc 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-tGjjZ4s7P+r9yYEjQkxY1RdLuuIwgCQlPOcOayWPygo=";
+    hash = "sha256-HWt3BxW2nBgnJ+BzsL+JpFfrLht2Yl/Btbre6EfM9F4=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From 27bb1e699c247d6e72d54e4db5fcde5c9e0d4aef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 03:20:07 +0000
Subject: [PATCH 40/76] regal: 0.34.0 -> 0.34.1

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

diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index 12cbc9dcf09d..0ff3de418003 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   name = "regal";
-  version = "0.34.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "StyraInc";
     repo = "regal";
     rev = "v${version}";
-    hash = "sha256-o/vJh7ZZBNjoOmqlj6VhksJKc5EyK3kRtsmkApmE6zo=";
+    hash = "sha256-gdoQ+u9YbwTq28b3gYsNA0SxYFigeKK2JUd0paz8WYQ=";
   };
 
-  vendorHash = "sha256-TeGrqwLgxr4w9Ig/5mekyff6T5xlvKUHQoxqwferWew=";
+  vendorHash = "sha256-FycDMCfvpUkW7KcTLMUBOjbU4JnKCJrWQalNKSY1RkM=";
 
   ldflags = [
     "-s"

From 016add8eff37f86244f923d28dca2cb62b711745 Mon Sep 17 00:00:00 2001
From: Matteo Bongiovanni <MatteoBongiovanni@proton.me>
Date: Mon, 9 Jun 2025 21:48:33 +0200
Subject: [PATCH 41/76] goplantuml: init at 1.6.2

---
 pkgs/by-name/go/goplantuml/package.nix | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/go/goplantuml/package.nix

diff --git a/pkgs/by-name/go/goplantuml/package.nix b/pkgs/by-name/go/goplantuml/package.nix
new file mode 100644
index 000000000000..e901168a4a9d
--- /dev/null
+++ b/pkgs/by-name/go/goplantuml/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "goplantuml";
+  version = "1.6.2";
+  src = fetchFromGitHub {
+    owner = "jfeliu007";
+    repo = "goplantuml";
+    tag = "v${version}";
+    hash = "sha256-OnCAqws27e7WsXKmw0clH9Qek+6LNeu2UGD9sKaV4+I=";
+  };
+  vendorHash = null;
+  meta = {
+    changelog = "https://github.com/jfeliu007/goplantuml/releases/tag/v${version}";
+    description = "PlantUML Class Diagram Generator for golang projects";
+    homepage = "https://github.com/jfeliu007/goplantuml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      matteobongio
+    ];
+    mainProgram = "goplantuml";
+  };
+
+}

From 63cb3bc53de28033b652aa47a6f020c7fce1479b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 10 Jun 2025 10:53:40 -0400
Subject: [PATCH 42/76] firebird_2_5: drop

End-of-life, unused, and has not built [since 2025-01-15](https://hydra.nixos.org/job/nixpkgs/trunk/firebird_2_5.x86_64-linux/all).
---
 pkgs/servers/firebird/default.nix | 28 ----------------------------
 pkgs/top-level/aliases.nix        |  1 +
 pkgs/top-level/all-packages.nix   |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 1612f518a795..dca4bf5146d1 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -55,34 +55,6 @@ let
   };
 in
 rec {
-
-  firebird_2_5 = stdenv.mkDerivation (
-    base
-    // rec {
-      version = "2.5.9";
-
-      src = fetchFromGitHub {
-        owner = "FirebirdSQL";
-        repo = "firebird";
-        rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
-        sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM=";
-      };
-
-      configureFlags = base.configureFlags ++ [ "--with-system-icu" ];
-
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out
-        cp -r gen/firebird/* $out
-        runHook postInstall
-      '';
-
-      meta = base.meta // {
-        platforms = [ "x86_64-linux" ];
-      };
-    }
-  );
-
   firebird_3 = stdenv.mkDerivation (
     base
     // rec {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2ec215065942..4774e9ae1cd9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -668,6 +668,7 @@ mapAliases {
   finger_bsd = bsd-finger;
   fingerd_bsd = bsd-fingerd;
   fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
+  firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
   firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead.";
   firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead.";
   firefox-wayland = firefox; # Added 2022-11-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43a415524988..0906afb6dcee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10321,7 +10321,6 @@ with pkgs;
   inherit (callPackages ../servers/firebird { })
     firebird_4
     firebird_3
-    firebird_2_5
     firebird
     ;
 

From 8fd670331851b181a87629123e59443bef220ed6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 27 May 2025 15:22:30 +0200
Subject: [PATCH 43/76] python312Packages.pylance: 0.27.2 -> 0.29.0

Diff:
https://github.com/lancedb/lance/compare/refs/tags/v0.27.2...refs/tags/v0.29.0

Changelog: https://github.com/lancedb/lance/releases/tag/v0.29.0
---
 pkgs/development/python-modules/pylance/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 3ddeb5624036..1f9faf26245c 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.27.2";
+  version = "0.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-fk32CnWH9wVKfTgT2Es6+tnvB+rPzkA8in0J726JHx0=";
+    hash = "sha256-lEGxutBKbRFqr9Uhdv2oOXCdb8Y2quqLoSoJ0F+F3h0=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -51,7 +51,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-N7ODbv+q9xX8lb4vvUzMGTul/whNw+dVrBp/YcEaREI=";
+    hash = "sha256-NZeFgEWkiDewWI5R+lpBsMTU7+7L7oaHefSGAS+CoFU=";
   };
 
   nativeBuildInputs = [
@@ -103,6 +103,7 @@ buildPythonPackage rec {
       # Writes to read-only build directory
       "test_add_data_storage_version"
       "test_fix_data_storage_version"
+      "test_fts_backward_v0_27_0"
 
       # AttributeError: 'SessionContext' object has no attribute 'register_table_provider'
       "test_table_loading"
@@ -110,6 +111,9 @@ buildPythonPackage rec {
       # subprocess.CalledProcessError: Command ... returned non-zero exit status 1.
       # ModuleNotFoundError: No module named 'lance'
       "test_tracing"
+
+      # Flaky (AssertionError)
+      "test_index_cache_size"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
       # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]...

From dc3f6c7ce24e3ba863acb87dcabaf8b58de70664 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Tue, 10 Jun 2025 16:14:10 +0000
Subject: [PATCH 44/76] heroic-unwrapped: 2.17.1 -> 2.17.2

Changelog: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v2.17.2
---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 944936fbe444..1722a58ebafa 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.17.1";
+  version = "2.17.2";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE=";
+    hash = "sha256-oJIs+tsE0PUbX+2pyvH7gPdFuevN8sfrXASu0SxDkBU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 107c6ae07d7094068cc1b84c85d1dabe24fa854f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 18:03:46 +0000
Subject: [PATCH 45/76] heptabase: 1.56.1 -> 1.58.1

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

diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index c82bde882e7c..5bd605458e16 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.56.1";
+  version = "1.58.1";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-OPLE0OhTZfDVPODd/vCfpqpqBGGBQlzONcfDgkVhEic=";
+    hash = "sha256-U1fFFLXSjBuhiTUAPgqMzvWhtJg9Qc9B5m1uaGjwyEU=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 5956edf9bba270cc199daecdc4427fbc3ccfcdbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 18:48:03 +0000
Subject: [PATCH 46/76] trickest-cli: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 2189f9175021..be9c68543242 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "trickest-cli";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "trickest";
     repo = "trickest-cli";
     tag = "v${version}";
-    hash = "sha256-EyUeYlWQWCGmCoQpuYXa9h93rXmTRmtSqIDrQRrTQgA=";
+    hash = "sha256-43rLYXvAIr3wWImNLSHI/2g8AyxD557ZivWpC3he60o=";
   };
 
   vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";

From cb49520977bb3de05e232f35ba2b60b9d98e7c05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 19:41:55 +0000
Subject: [PATCH 47/76] got: 0.112 -> 0.113

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

diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 345e1e367c5c..5a78a0b44dcd 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.112";
+  version = "0.113";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4zZpT+kREr+MgEpXTkb3luFTh5PpMd18TAoEE2cq/Yk=";
+    hash = "sha256-KUaKG5o1+iq6kygHWVvADQEKxUGSOQRo91oK02TFbwE=";
   };
 
   nativeBuildInputs = [

From 988601eb6f68fab2a403891c390b2a48048b26fe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Jun 2025 21:49:04 +0200
Subject: [PATCH 48/76] python3Packages.optax: 0.2.4 -> 0.2.5

Diff: https://github.com/deepmind/optax/compare/refs/tags/v0.2.4...refs/tags/v0.2.5

Changelog: https://github.com/deepmind/optax/releases/tag/v0.2.5
---
 pkgs/development/python-modules/optax/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix
index e8b265fe8512..760962ed9be2 100644
--- a/pkgs/development/python-modules/optax/default.nix
+++ b/pkgs/development/python-modules/optax/default.nix
@@ -12,7 +12,6 @@
   jax,
   jaxlib,
   numpy,
-  etils,
 
   # tests
   callPackage,
@@ -20,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "optax";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "optax";
     tag = "v${version}";
-    hash = "sha256-7UPWeo/Q9/tjewaM7HN8/e7U1U1QzAliuk95+9GOi0E=";
+    hash = "sha256-EGQeRYSxHdENqB3QPZFsjqwh4LYT5CF8E1K3fKFedPg=";
   };
 
   outputs = [
@@ -40,11 +39,10 @@ buildPythonPackage rec {
   dependencies = [
     absl-py
     chex
-    etils
     jax
     jaxlib
     numpy
-  ] ++ etils.optional-dependencies.epy;
+  ];
 
   postInstall = ''
     mkdir $testsout

From eacdca782bca618cfeb194e173898377ee1e544c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Jun 2025 21:59:03 +0200
Subject: [PATCH 49/76] python3Packages.cvxpy: fix hash

---
 pkgs/development/python-modules/cvxpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index c5b779eb01d0..a4324d13d1bb 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${version}";
-    hash = "sha256-xbynw/9jUI41H7tYcARqqw5X+Cr8jDBMwxM6E9thpp0=";
+    hash = "sha256-dn29rAm0f0cgUFtnHSykBE2p/U/EPorozjuuLWuH/Tw=";
   };
 
   # we need to patch out numpy version caps from upstream

From 0f5e504f9ee067b19149c808639b8bbd568f8252 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 21:59:31 +0200
Subject: [PATCH 50/76] workflows: use bash shell explicitly

This forces better error handling as described in [1].

Without this change, bash would *not* run with `-o pipefail`, which
means some errors go unnoticed. By naming `bash` explicitly, `-o
pipefail` is enabled.

1:
https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#defaultsrunshell
---
 .github/workflows/backport.yml           | 4 ++++
 .github/workflows/check-cherry-picks.yml | 4 ++++
 .github/workflows/check-format.yml       | 4 ++++
 .github/workflows/check-shell.yml        | 4 ++++
 .github/workflows/codeowners-v2.yml      | 4 ++++
 .github/workflows/edited.yml             | 4 ++++
 .github/workflows/eval-aliases.yml       | 4 ++++
 .github/workflows/eval.yml               | 4 ++++
 .github/workflows/labels.yml             | 4 ++++
 .github/workflows/lib-tests.yml          | 4 ++++
 .github/workflows/manual-nixos-v2.yml    | 4 ++++
 .github/workflows/manual-nixpkgs-v2.yml  | 4 ++++
 .github/workflows/nix-parse-v2.yml       | 4 ++++
 .github/workflows/nixpkgs-vet.yml        | 4 ++++
 .github/workflows/no-channel.yml         | 4 ++++
 .github/workflows/periodic-merge-24h.yml | 4 ++++
 .github/workflows/periodic-merge-6h.yml  | 4 ++++
 .github/workflows/periodic-merge.yml     | 4 ++++
 .github/workflows/reviewers.yml          | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index ea184fb914a4..68d833b01e06 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -14,6 +14,10 @@ permissions:
   issues: write
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   backport:
     name: Backport Pull Request
diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 77aafd9f0ff2..618c1cf9ffed 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -17,6 +17,10 @@ concurrency:
 permissions:
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check:
     name: cherry-pick-check
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 616d8e574592..ef1e3e1a7456 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixos:
     name: fmt-check
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 03649bfd934d..37eddde22529 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -15,6 +15,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   shell-check:
     strategy:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index a857b1542263..84bbbc980633 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -35,6 +35,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 env:
   OWNERS_FILE: ci/OWNERS
   # Don't do anything on draft PRs
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index 5d93f5b8ce18..186bd9cb8a0c 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   base:
     name: Trigger jobs
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 451656a103ab..913341d6c814 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   eval-aliases:
     name: Eval nixpkgs with aliases enabled
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bb99c0dfbc68..711932b6a02b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   prepare:
     name: Prepare
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 5cdec70b62ce..1e485a6df89b 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -17,6 +17,10 @@ permissions:
   issues: write # needed to create *new* labels
   pull-requests: write
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   labels:
     name: label-pr
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index 710356d8b771..4a22a5e2dfdc 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -15,6 +15,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixpkgs-lib-tests:
     name: nixpkgs-lib-tests
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index 6d0b050fb3f8..f2728da91c93 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -24,6 +24,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixos:
     name: nixos-manual-build
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index 7fa628959c64..f68fae524e90 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -16,6 +16,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   nixpkgs:
     name: nixpkgs-manual-build
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index 201a9c8b48ca..bd920bd1e7a0 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -12,6 +12,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   tests:
     name: nix-files-parseable-check
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index e8694cc68979..df0ce2401c4c 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -20,6 +20,10 @@ permissions: {}
 # We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
 # There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check:
     name: nixpkgs-vet
diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml
index 9371f9b44f13..d02d422d5d71 100644
--- a/.github/workflows/no-channel.yml
+++ b/.github/workflows/no-channel.yml
@@ -8,6 +8,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   fail:
     if: |
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 43ac1545a265..f56142b722b8 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -16,6 +16,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   periodic-merge:
     if: github.repository_owner == 'NixOS'
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 8ec7afa27564..e056d7634a5d 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -16,6 +16,10 @@ on:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   periodic-merge:
     if: github.repository_owner == 'NixOS'
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 0f686b2f96e5..046a0d2fb4dd 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -12,6 +12,10 @@ on:
         required: true
         type: string
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   merge:
     runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index bf205a8b3890..655471ffec60 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -22,6 +22,10 @@ concurrency:
 
 permissions: {}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   request:
     name: Request

From 530f896efa9bc593b3573b54e74035be476a628d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 21:22:37 +0200
Subject: [PATCH 51/76] workflows/reviewers: fix downloading eval results when
 undrafting

To actually download the eval results and then proceed to ping
maintainers after undrafting, the run-id must be specified explicitly.

Because we didn't run with `-o pipefail` up to the last commit, we
didn't notice that this workflow was silently failing with this error:

  jq: error: Could not open file comparison/maintainers.json: No such
file or directory
---
 .github/workflows/reviewers.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 655471ffec60..71d0bcb27382 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -62,6 +62,7 @@ jobs:
       # In the more special case, when a PR is undrafted an eval run will have started already.
       - name: Wait for comparison to be done
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        id: eval
         with:
           script: |
             const run_id = (await github.rest.actions.listWorkflowRuns({
@@ -72,6 +73,8 @@ jobs:
               head_sha: context.payload.pull_request.head.sha
             })).data.workflow_runs[0].id
 
+            core.setOutput('run-id', run_id)
+
             // Waiting 120 * 5 sec = 10 min. max.
             // The extreme case is an Eval run that just started when the PR is undrafted.
             // Eval takes max 5-6 minutes, normally.
@@ -90,6 +93,8 @@ jobs:
       - name: Download the comparison results
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
+          run-id: ${{ steps.eval.outputs.run-id }}
+          github-token: ${{ github.token }}
           pattern: comparison
           path: comparison
           merge-multiple: true

From 07173e1bfd4a9f447ee8fed040bcafd794e45208 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 10 Jun 2025 22:01:20 +0200
Subject: [PATCH 52/76] workflows/nixpkgs-vet: remove outdated comment

We are using a concurrency group by now.
---
 .github/workflows/nixpkgs-vet.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index df0ce2401c4c..0843117e14c7 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -17,9 +17,6 @@ concurrency:
 
 permissions: {}
 
-# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
-# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
-
 defaults:
   run:
     shell: bash

From f13654fe8a4cb1dccf47064cf0742dd277d3892e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 10 Jun 2025 16:28:50 -0700
Subject: [PATCH 53/76] formats: extract things needed from lib in the let
 binding

It's more vertical space but it ought to be more performant.
---
 pkgs/pkgs-lib/formats.nix | 103 +++++++++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 36 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index dc5118c537a1..096000cba925 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -1,7 +1,39 @@
 { lib, pkgs }:
 let
+  inherit (lib)
+    concatStringsSep
+    escape
+    flatten
+    id
+    isAttrs
+    isFloat
+    isInt
+    isList
+    isString
+    mapAttrs
+    mapAttrsToList
+    mkOption
+    optionalAttrs
+    optionalString
+    pipe
+    types
+    singleton
+    warn
+    ;
+
+  inherit (lib.generators)
+    mkValueStringDefault
+    toGitINI
+    toINI
+    toINIWithGlobalSection
+    toKeyValue
+    toLua
+    mkLuaInline
+    ;
+
   inherit (lib.types)
     attrsOf
+    atom
     bool
     coercedTo
     either
@@ -15,6 +47,7 @@ let
     oneOf
     path
     str
+    submodule
     ;
 
   # Attributes added accidentally in https://github.com/NixOS/nixpkgs/pull/335232 (2024-08-18)
@@ -40,7 +73,7 @@ let
           ;
       };
 in
-lib.optionalAttrs pkgs.config.allowAliases aliases
+optionalAttrs allowAliases aliases
 // rec {
 
   /*
@@ -188,7 +221,7 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
           }:
           let
             singleIniAtomOr =
-              if atomsCoercedToLists then coercedTo singleIniAtom lib.singleton else either singleIniAtom;
+              if atomsCoercedToLists then coercedTo singleIniAtom singleton else either singleIniAtom;
           in
           if listsAsDuplicateKeys then
             singleIniAtomOr (listOf singleIniAtom)
@@ -212,9 +245,9 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
         maybeToList =
           listToValue:
           if listToValue != null then
-            lib.mapAttrs (key: val: if lib.isList val then listToValue val else val)
+            mapAttrs (key: val: if isList val then listToValue val else val)
           else
-            lib.id;
+            id;
       in
       {
         ini =
@@ -239,14 +272,14 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
           in
           {
 
-            type = lib.types.attrsOf (iniSection atom);
+            type = attrsOf (iniSection atom);
             lib.types.atom = atom;
 
             generate =
               name: value:
-              lib.pipe value [
-                (lib.mapAttrs (_: maybeToList listToValue))
-                (lib.generators.toINI (
+              pipe value [
+                (mapAttrs (_: maybeToList listToValue))
+                (toINI (
                   removeAttrs args [
                     "listToValue"
                     "atomsCoercedToLists"
@@ -277,14 +310,14 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
             };
           in
           {
-            type = lib.types.submodule {
+            type = submodule {
               options = {
-                sections = lib.mkOption rec {
-                  type = lib.types.attrsOf (iniSection atom);
+                sections = mkOption rec {
+                  type = attrsOf (iniSection atom);
                   default = { };
                   description = type.description;
                 };
-                globalSection = lib.mkOption rec {
+                globalSection = mkOption rec {
                   type = iniSection atom;
                   default = { };
                   description = "global " + type.description;
@@ -300,14 +333,14 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
                 ...
               }:
               pkgs.writeText name (
-                lib.generators.toINIWithGlobalSection
+                toINIWithGlobalSection
                   (removeAttrs args [
                     "listToValue"
                     "atomsCoercedToLists"
                   ])
                   {
                     globalSection = maybeToList listToValue globalSection;
-                    sections = lib.mapAttrs (_: maybeToList listToValue) sections;
+                    sections = mapAttrs (_: maybeToList listToValue) sections;
                   }
               );
           };
@@ -327,7 +360,7 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
           {
             type = attrsOf (attrsOf (either atom (attrsOf atom)));
             lib.types.atom = atom;
-            generate = name: value: pkgs.writeText name (lib.generators.toGitINI value);
+            generate = name: value: pkgs.writeText name (toGitINI value);
           };
 
       }
@@ -343,7 +376,7 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
   # optional config options.
   systemd =
     let
-      mkValueString = lib.generators.mkValueStringDefault { };
+      mkValueString = mkValueStringDefault { };
       mkKeyValue = k: v: if v == null then "# ${k} is unset" else "${k} = ${mkValueString v}";
     in
     ini {
@@ -379,12 +412,12 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
 
           atom =
             if listsAsDuplicateKeys then
-              coercedTo singleAtom lib.singleton (listOf singleAtom)
+              coercedTo singleAtom singleton (listOf singleAtom)
               // {
                 description = singleAtom.description + " or a list of them for duplicate keys";
               }
             else if listToValue != null then
-              coercedTo singleAtom lib.singleton (nonEmptyListOf singleAtom)
+              coercedTo singleAtom singleton (nonEmptyListOf singleAtom)
               // {
                 description = singleAtom.description + " or a non-empty list of them";
               }
@@ -399,13 +432,11 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
         let
           transformedValue =
             if listToValue != null then
-              lib.mapAttrs (key: val: if lib.isList val then listToValue val else val) value
+              mapAttrs (key: val: if isList val then listToValue val else val) value
             else
               value;
         in
-        pkgs.writeText name (
-          lib.generators.toKeyValue (removeAttrs args [ "listToValue" ]) transformedValue
-        );
+        pkgs.writeText name (toKeyValue (removeAttrs args [ "listToValue" ]) transformedValue);
 
     };
 
@@ -543,18 +574,18 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
           "true"
         else if value == false then
           "false"
-        else if lib.isInt value || lib.isFloat value then
+        else if isInt value || isFloat value then
           toString value
-        else if lib.isString value then
+        else if isString value then
           string value
-        else if lib.isAttrs value then
+        else if isAttrs value then
           attrs value
-        else if lib.isList value then
+        else if isList value then
           list value
         else
           abort "formats.elixirConf: should never happen (value = ${value})";
 
-      escapeElixir = lib.escape [
+      escapeElixir = escape [
         "\\"
         "#"
         "\""
@@ -568,11 +599,11 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
         else
           let
             toKeyword = name: value: "${name}: ${toElixir value}";
-            keywordList = lib.concatStringsSep ", " (lib.mapAttrsToList toKeyword set);
+            keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set);
           in
           "[" + keywordList + "]";
 
-      listContent = values: lib.concatStringsSep ", " (map toElixir values);
+      listContent = values: concatStringsSep ", " (map toElixir values);
 
       list = values: "[" + (listContent values) + "]";
 
@@ -593,7 +624,7 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
         set:
         let
           toEntry = name: value: "${toElixir name} => ${toElixir value}";
-          entries = lib.concatStringsSep ", " (lib.mapAttrsToList toEntry set);
+          entries = concatStringsSep ", " (mapAttrsToList toEntry set);
         in
         "%{${entries}}";
 
@@ -605,13 +636,13 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
           keyConfig =
             rootKey: key: value:
             "config ${rootKey}, ${key}, ${toElixir value}";
-          keyConfigs = rootKey: values: lib.mapAttrsToList (keyConfig rootKey) values;
-          rootConfigs = lib.flatten (lib.mapAttrsToList keyConfigs values);
+          keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values;
+          rootConfigs = flatten (mapAttrsToList keyConfigs values);
         in
         ''
           import Config
 
-          ${lib.concatStringsSep "\n" rootConfigs}
+          ${concatStringsSep "\n" rootConfigs}
         '';
     in
     {
@@ -715,7 +746,7 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
               # Wrap standard types, since anything in the Elixir configuration
               # can be raw Elixir
             }
-            // lib.mapAttrs (_name: type: elixirOr type) lib.types;
+            // mapAttrs (_name: type: elixirOr type) types;
         };
 
       generate =
@@ -771,12 +802,12 @@ lib.optionalAttrs pkgs.config.allowAliases aliases
               inherit columnWidth;
               inherit indentWidth;
               indentType = if indentUsingTabs then "Tabs" else "Spaces";
-              value = lib.generators.toLua { inherit asBindings multiline; } value;
+              value = toLua { inherit asBindings multiline; } value;
               passAsFile = [ "value" ];
               preferLocalBuild = true;
             }
             ''
-              ${lib.optionalString (!asBindings) ''
+              ${optionalString (!asBindings) ''
                 echo -n 'return ' >> $out
               ''}
               cat $valuePath >> $out

From a822df313f4d687d897767f5612f860398dfd41e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 10 Jun 2025 16:29:36 -0700
Subject: [PATCH 54/76] formats: extract things needed from pkgs in the let
 binding

This is an attempt to solve the NixOS manual failures seen in https://github.com/NixOS/nixpkgs/pull/415662
---
 pkgs/pkgs-lib/formats.nix | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 096000cba925..9113d8ec3307 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -52,26 +52,26 @@ let
 
   # Attributes added accidentally in https://github.com/NixOS/nixpkgs/pull/335232 (2024-08-18)
   # Deprecated in https://github.com/NixOS/nixpkgs/pull/415666 (2025-06)
-  aliases =
-    lib.mapAttrs (name: lib.warn "`formats.${name}` is deprecated; use `lib.types.${name}` instead.")
-      {
-        inherit
-          attrsOf
-          bool
-          coercedTo
-          either
-          float
-          int
-          listOf
-          luaInline
-          mkOptionType
-          nonEmptyListOf
-          nullOr
-          oneOf
-          path
-          str
-          ;
-      };
+  allowAliases = pkgs.config.allowAliases or false;
+  aliasWarning = name: warn "`formats.${name}` is deprecated; use `lib.types.${name}` instead.";
+  aliases = mapAttrs aliasWarning {
+    inherit
+      attrsOf
+      bool
+      coercedTo
+      either
+      float
+      int
+      listOf
+      luaInline
+      mkOptionType
+      nonEmptyListOf
+      nullOr
+      oneOf
+      path
+      str
+      ;
+  };
 in
 optionalAttrs allowAliases aliases
 // rec {

From b3b4fccfea9e08d6d28ccda68c4f9c98cc42dec3 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 10 Jun 2025 16:37:54 -0700
Subject: [PATCH 55/76] doc: do-nothing change to trigger a nixpkgs-manual
 rebuild

---
 doc/doc-support/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index 023be3a3a116..aefc301ec81c 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -57,10 +57,8 @@ stdenvNoCC.mkDerivation (
       substituteInPlace ./languages-frameworks/python.section.md \
         --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")"
 
-      cat \
-        ./functions/library.md.in \
-        ${lib-docs}/index.md \
-        > ./functions/library.md
+      cat ./functions/library.md.in ${lib-docs}/index.md > ./functions/library.md
+
       substitute ./manual.md.in ./manual.md \
         --replace-fail '@MANUAL_VERSION@' '${lib.version}'
 

From d76623e694a1f9fbd467dbe0e5766eb4e5c82527 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 00:36:05 +0000
Subject: [PATCH 56/76] python3Packages.reolink-aio: 0.13.4 -> 0.13.5

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

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 5ae40b5523f1..ee0484dbcad8 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.13.4";
+  version = "0.13.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-/r7aMZqX7JxvG/3FVXLABPP9zDOWhEmWaxzgIsb5SAk=";
+    hash = "sha256-a1F2hSRGR6IGS9KaOEChcyY2vKluQSAeSZ7cAIshZCY=";
   };
 
   build-system = [ setuptools ];

From bb09733a36366c6a2bf7dd242ec18673f4b60bdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 00:49:33 +0000
Subject: [PATCH 57/76] unrar: 7.1.6 -> 7.1.7

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

diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index f8abd48da089..20aab1bed077 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.1.6";
+  version = "7.1.7";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-2Ur4J+BUWB7SaSwFzMSDwALFMelhB7r1tlvW2fcTWXg=";
+    hash = "sha256-vh8/VS8YmHijDIsbmD0OIO2AIqpLAS2U1pv392TFqdw=";
   };
 
   sourceRoot = finalAttrs.src.name;

From 00ee397920400b1395515c2a08b1d0e30cfe9b5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 05:26:38 +0000
Subject: [PATCH 58/76] python3Packages.model-checker: 0.9.20 -> 0.9.21

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 63e48787ae25..8a8b9ac28301 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.9.20";
+  version = "0.9.21";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-n5wLf5iZ+pMXpXAy1K+SVC1fszCi0lr9LsqqEn8KU0w=";
+    hash = "sha256-13pGiFrh2EtgSpBZbwWRZh+W9n18Qrikrsc/MBhbBAM=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From e47dd7adf951de4c65f4696f207e2e45c101dae9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 11 Jun 2025 13:34:37 +0800
Subject: [PATCH 59/76] python313Packages.paddlex: fix

---
 pkgs/development/python-modules/paddlex/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index 68f196c3dcf1..a60c3e1d8534 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -17,6 +17,7 @@
   ruamel-yaml,
   typing-extensions,
   ujson,
+  distutils,
 }:
 
 let
@@ -34,6 +35,10 @@ let
 
     build-system = [ setuptools ];
 
+    dependencies = [ distutils ];
+
+    pythonImportsCheck = [ "GPUtil" ];
+
     meta = {
       homepage = "https://github.com/anderskm/gputil";
       license = lib.licenses.mit;

From 7497bf8d925acb45fe3b2f24e1ee0fa34155438e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Jun 2025 22:00:52 +0200
Subject: [PATCH 60/76] python3Packages.islpy: 2025.2 -> 2025.2.2

Diff:
https://github.com/inducer/islpy/compare/refs/tags/v2025.2...refs/tags/v2025.2.2

Changelog: https://github.com/inducer/islpy/releases/tag/v2025.2.2
---
 pkgs/development/python-modules/islpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix
index a996731db987..c109cd9a0d97 100644
--- a/pkgs/development/python-modules/islpy/default.nix
+++ b/pkgs/development/python-modules/islpy/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "islpy";
-  version = "2025.2";
+  version = "2025.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "islpy";
     tag = "v${version}";
-    hash = "sha256-RMqqnhW8MibGhAhJZF/EjycFJ7E3j4aur0a6UaPyeIs=";
+    hash = "sha256-P/DHWMjBANkfqvg9ilBonOTMsvmm5NefMWLdroB2azg=";
   };
 
   build-system = [

From 063ba6e513b9b7f7902005bb9f34d13d20ca628e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 06:43:51 +0000
Subject: [PATCH 61/76] bibiman: 0.11.6 -> 0.12.3

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

diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix
index 5cecc77e6938..405b26b18b10 100644
--- a/pkgs/by-name/bi/bibiman/package.nix
+++ b/pkgs/by-name/bi/bibiman/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bibiman";
-  version = "0.11.6";
+  version = "0.12.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "lukeflo";
     repo = "bibiman";
     tag = "v${version}";
-    hash = "sha256-nyONqQmS8MvgMrq6XIuMjc8FkP9wKQu+EVnQUcSAjEo=";
+    hash = "sha256-gjVfJyedZZhSavarBXmpG3jj7mb3706NPKB9oEVhol0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fdUCrf6gdZZtrL93GQMnA+4ZJ8qkjsBKJJN5u4VKE1w=";
+  cargoHash = "sha256-YtpnKgTIAsDXK6pl/TvU54euOdkbUcyCH4RADYWXkls=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From b316c7473036c4c3cd2a1733ce336d469a1855f9 Mon Sep 17 00:00:00 2001
From: CnTeng <rxsnakepi@gmail.com>
Date: Tue, 10 Jun 2025 23:59:31 +0800
Subject: [PATCH 62/76] zotero: fix cubeb init

---
 pkgs/by-name/zo/zotero/linux.nix | 62 +++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index b82dd88bb6b3..8bcd771ca251 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -7,7 +7,6 @@
   fetchurl,
   wrapGAppsHook3,
   makeDesktopItem,
-  alsa-lib,
   atk,
   cairo,
   dbus-glib,
@@ -20,6 +19,14 @@
   libgbm,
   pango,
   pciutils,
+  alsaSupport ? true,
+  alsa-lib,
+  jackSupport ? true,
+  libjack2,
+  pulseSupport ? true,
+  libpulseaudio,
+  sndioSupport ? true,
+  sndio,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,30 +41,35 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook3 ];
 
   libPath =
-    lib.makeLibraryPath [
-      alsa-lib
-      atk
-      cairo
-      dbus-glib
-      gdk-pixbuf
-      glib
-      gtk3
-      libGL
-      libva
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libXtst
-      xorg.libxcb
-      libgbm
-      pango
-      pciutils
-    ]
+    lib.makeLibraryPath (
+      [
+        atk
+        cairo
+        dbus-glib
+        gdk-pixbuf
+        glib
+        gtk3
+        libGL
+        libva
+        xorg.libX11
+        xorg.libXcomposite
+        xorg.libXcursor
+        xorg.libXdamage
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXi
+        xorg.libXrandr
+        xorg.libXtst
+        xorg.libxcb
+        libgbm
+        pango
+        pciutils
+      ]
+      ++ lib.optional alsaSupport alsa-lib
+      ++ lib.optional jackSupport libjack2
+      ++ lib.optional pulseSupport libpulseaudio
+      ++ lib.optional sndioSupport sndio
+    )
     + ":"
     + lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
 

From 0fdde694dab82a6be4873c479af13abfc745a680 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 07:23:16 +0000
Subject: [PATCH 63/76] hyprshell: 4.1.1 -> 4.2.1

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

diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index b68be2b18faa..b5491abd696c 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprshell";
-  version = "4.1.1";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
     repo = "hyprswitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eSTeNVHkfUS6qlN1pWWpMVeT+jjacithCHOpOhRKanA=";
+    hash = "sha256-SLLc1NCH8fvql1aSI9Uddt+oZoJVjv19UoLPPLoW/Vs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-NzyK46zmHWxFaTS9mzFC7kBUMys1sjmcWaZUcwLusEk=";
+  cargoHash = "sha256-GCMsTCIQO3YSRu5kVyQwoH0tCHx2F+7PBZdhu35FhhQ=";
 
   nativeBuildInputs = [
     wrapGAppsHook4

From c401d5047e098061b7e2db9b92a14f76e81c97e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 07:39:29 +0000
Subject: [PATCH 64/76] python3Packages.garminconnect: 0.2.26 -> 0.2.28

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

diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index 72e5c7656c76..23b99708a471 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.26";
+  version = "0.2.28";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     tag = version;
-    hash = "sha256-Tvou4GLOjn+ZJvY8fSpi7gspXl16SsELBUCwcZrU8HI=";
+    hash = "sha256-dx1MqsZRDjz0U8RU2idW5GiJBQaSyXPxnEDPk0XkLCI=";
   };
 
   pythonRelaxDeps = [
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Garmin Connect Python API wrapper";
     homepage = "https://github.com/cyberjunky/python-garminconnect";
-    changelog = "https://github.com/cyberjunky/python-garminconnect/releases/tag/${version}";
+    changelog = "https://github.com/cyberjunky/python-garminconnect/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 6f4743e6a009a7e3262cd70286148aa5e2255db1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 23 May 2025 22:42:45 +0200
Subject: [PATCH 65/76] pr-tracker: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix
index f929f5fdde32..3b74dcbceb81 100644
--- a/pkgs/by-name/pr/pr-tracker/package.nix
+++ b/pkgs/by-name/pr/pr-tracker/package.nix
@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pr-tracker";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchzip {
     url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
-    hash = "sha256-l+bji9uJp8n4//wbbbu8vd3rDICr/XEpDs1ukHxQMcA=";
+    hash = "sha256-Trn+ogRNR23j2S+82ZqeWIZriUZ/Lv7khGBo0aiYutU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D8O1lFoTJOQmFsjql4qIZqA5+iCnESydDDBJiDpBnzs=";
+  cargoHash = "sha256-63Y/BXmFRbrTUBtUNP1iEk+cvSxDJG/bp8mBWQbQsh0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From d611b6e04d55bd06c0107b712c55724ab93cedfe Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Tue, 10 Jun 2025 10:05:28 +0200
Subject: [PATCH 66/76] lm_sensors: support reading config from /etc/sensors.d

---
 pkgs/by-name/lm/lm_sensors/package.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/lm/lm_sensors/package.nix b/pkgs/by-name/lm/lm_sensors/package.nix
index 9fcabb816a74..729419116d66 100644
--- a/pkgs/by-name/lm/lm_sensors/package.nix
+++ b/pkgs/by-name/lm/lm_sensors/package.nix
@@ -15,8 +15,8 @@
 let
   version = "3.6.0";
   tag = "V" + lib.replaceStrings [ "." ] [ "-" ] version;
-in
 
+in
 stdenv.mkDerivation {
   pname = "lm-sensors";
   inherit version;
@@ -45,13 +45,20 @@ stdenv.mkDerivation {
     "doc"
   ];
 
-  # Upstream build system have knob to enable and disable building of static
-  # library, shared library is built unconditionally.
-  postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
-    sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d'
-    substituteInPlace prog/sensors/Module.mk \
-      --replace-fail 'lib/$(LIBSHBASENAME)' ""
-  '';
+  postPatch =
+    # This allows sensors to continue reading the sensors3.conf as provided by
+    # upstream and also look for config fragments in /etc/sensors.d
+    ''
+      substituteInPlace lib/init.c \
+        --replace-fail 'ETCDIR "/sensors.d"' '"/etc/sensors.d"'
+    ''
+    # Upstream build system have knob to enable and disable building of static
+    # library, shared library is built unconditionally.
+    + lib.optionalString stdenv.hostPlatform.isStatic ''
+      sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d'
+      substituteInPlace prog/sensors/Module.mk \
+        --replace-fail 'lib/$(LIBSHBASENAME)' ""
+    '';
 
   nativeBuildInputs = [
     bison

From 5985d3fcec332458cfe86b5d7a9ba2ce63b42c26 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:39:30 +0200
Subject: [PATCH 67/76] flyctl: remove myself from maintainers

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

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 7b47ed95911a..045a4154b49a 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -77,7 +77,6 @@ buildGoModule rec {
       jsierles
       techknowlogick
       RaghavSood
-      teutat3s
     ];
     mainProgram = "flyctl";
   };

From dc4136f474e1f935a0a77900355dc03148623907 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 11 Jun 2025 11:17:19 +0200
Subject: [PATCH 68/76] python3Packages.acres: 0.3.0 -> 0.5.0

Diff: https://github.com/nipreps/acres/compare/refs/tags/0.3.0...refs/tags/0.5.0

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

diff --git a/pkgs/development/python-modules/acres/default.nix b/pkgs/development/python-modules/acres/default.nix
index d047470873ef..b897e24d946b 100644
--- a/pkgs/development/python-modules/acres/default.nix
+++ b/pkgs/development/python-modules/acres/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "acres";
-  version = "0.3.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "acres";
     tag = version;
-    hash = "sha256-/OuQgi/17Pz9q2GX7MZftUJzod7M9Le4CPOROudFDfk=";
+    hash = "sha256-D2w/xGlt0ApQ1Il9pzHPcL1s3CmCCOdgRpvUw/LI3gA=";
   };
 
   build-system = [

From 9434ad383c80abf48820f6f79fe8666fd7358f14 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 11 Jun 2025 11:33:45 +0200
Subject: [PATCH 69/76] deluge: 2.1.1 -> 2.2.0 (#408303)

https://git.deluge-torrent.org/deluge/tree/CHANGELOG.md\?h\=deluge-2.2.0
---
 pkgs/applications/networking/p2p/deluge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 99309c0a0989..7be43c9fa944 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -21,11 +21,11 @@ let
     { pname, withGUI }:
     pypkgs.buildPythonPackage rec {
       inherit pname;
-      version = "2.1.1";
+      version = "2.2.0";
 
       src = fetchurl {
         url = "http://download.deluge-torrent.org/source/${lib.versions.majorMinor version}/deluge-${version}.tar.xz";
-        hash = "sha256-do3TGYAuQkN6s3lOvnW0lxQuCO1bD7JQO61izvRC3/c=";
+        hash = "sha256-ubonK1ukKq8caU5sKWKKuBbMGnAKN7rAiqy1JXFgas0=";
       };
 
       propagatedBuildInputs =

From 82a27777cdeaaecfd87bdeef4d79be2ea92f1944 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jun 2025 09:39:15 +0000
Subject: [PATCH 70/76] prometheus-chrony-exporter: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
index 49b2d5bb5506..879b2286c444 100644
--- a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "prometheus-chrony-exporter";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "superq";
     repo = "chrony_exporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W7MWshRuQdbxLm0XKkTHXN+pjwoX7wnCtjaeXyszr/Q=";
+    hash = "sha256-8iuWL6/urv8sf86Z8ySGx+2zzDPqOj7OcYcTubL9LK8=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
   ];
 
-  vendorHash = "sha256-3zL7BrCdMVnt7F1FiZ2eQnKVhmCeW3aYKKX9v01ms/k=";
+  vendorHash = "sha256-TAj7tYDFKPsPCHpWT4UQ3oZkUcLbL4iliXghwZqwuC8=";
 
   passthru.updateScript = nix-update-script { };
 

From 9b1400ac99907af3aef7cdc8e9dcb3b5a40b4873 Mon Sep 17 00:00:00 2001
From: Felix Kimmel <felix.kimmel@web.de>
Date: Sun, 8 Jun 2025 16:05:34 +0200
Subject: [PATCH 71/76] pulsemeeter: init at 1.2.14

---
 pkgs/by-name/pu/pulsemeeter/package.nix      | 61 ++++++++++++++++++++
 pkgs/by-name/pu/pulsemeeter/version-test.nix | 33 +++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/by-name/pu/pulsemeeter/package.nix
 create mode 100644 pkgs/by-name/pu/pulsemeeter/version-test.nix

diff --git a/pkgs/by-name/pu/pulsemeeter/package.nix b/pkgs/by-name/pu/pulsemeeter/package.nix
new file mode 100644
index 000000000000..ad05055892ad
--- /dev/null
+++ b/pkgs/by-name/pu/pulsemeeter/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  libpulseaudio,
+  libappindicator,
+  gobject-introspection,
+  wrapGAppsHook3,
+  callPackage,
+  bash,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "pulsemeeter";
+  version = "1.2.14";
+
+  src = fetchFromGitHub {
+    owner = "theRealCarneiro";
+    repo = "pulsemeeter";
+    tag = "v${version}";
+    hash = "sha256-QTXVE5WvunsjLS8I1rgX34BW1mT1UY+cRxURwXiQp5A=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    pulsectl
+    pygobject3
+  ];
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    libappindicator
+    libpulseaudio
+    bash
+  ];
+
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+  ];
+
+  dontWrapGApps = true;
+
+  passthru.tests.version = callPackage ./version-test.nix { inherit version; };
+
+  meta = {
+    description = "Frontend of pulseaudio's routing capabilities, mimicking voicemeeter's workflow";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/theRealCarneiro/pulsemeeter";
+    maintainers = with lib.maintainers; [
+      therobot2105
+    ];
+    mainProgram = "pulsemeeter";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/pu/pulsemeeter/version-test.nix b/pkgs/by-name/pu/pulsemeeter/version-test.nix
new file mode 100644
index 000000000000..4561918f144c
--- /dev/null
+++ b/pkgs/by-name/pu/pulsemeeter/version-test.nix
@@ -0,0 +1,33 @@
+{
+  pkgs,
+  version,
+}:
+pkgs.testers.runNixOSTest {
+  name = "pulsemeeter-version";
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      services.pulseaudio.enable = true;
+      services.pulseaudio.systemWide = true;
+      users.users.alice = {
+        isNormalUser = true;
+        password = "foo";
+        extraGroups = [
+          "wheel"
+          "pulse-access"
+        ];
+        packages = with pkgs; [
+          pulsemeeter
+        ];
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("default.target")
+    machine.succeed("su -- root -c 'systemctl start pulseaudio'")
+    machine.succeed("su -- alice -c 'mkdir -p /home/alice/.config/pulsemeeter'")
+    version = machine.execute("su -- alice -c 'pulsemeeter -s | head -n 4 | tail -n 1'")
+    assert version == (0, 'Pulsemeeter version: \x1b[1m${version}\x1b[0m\n')
+  '';
+}

From 1f24ea564924114db0a1d47aec8f32ac3cac7b22 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 9 Jun 2025 14:32:33 +0530
Subject: [PATCH 72/76] tailspin: 4.0.0 -> 5.4.5

Diff: https://github.com/bensadeh/tailspin/compare/refs/tags/4.0.0...5.4.5
Changelog: https://github.com/bensadeh/tailspin/blob/5.4.5/CHANGELOG.md
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/by-name/ta/tailspin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix
index 79c6a87bfd85..1bb493d36e7a 100644
--- a/pkgs/by-name/ta/tailspin/package.nix
+++ b/pkgs/by-name/ta/tailspin/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tailspin";
-  version = "4.0.0";
+  version = "5.4.5";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "tailspin";
     tag = finalAttrs.version;
-    hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA=";
+    hash = "sha256-Cl1S183iAyFPa3KijHCn/CyRXQBluphNMQFAgdIOzuM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QkdnmeXor2K0c5m/TV5hYl1oSPWpykPfZy/ZRqFUt1s=";
+  cargoHash = "sha256-2p4jkta6w2vje169KCHw0ErC7FweLabF6B7ZIkTmNBI=";
 
   postPatch = ''
     substituteInPlace tests/utils.rs --replace-fail \

From 19b476ebef184fed2dc672e5650b60f85803635e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 11 Jun 2025 12:14:54 +0200
Subject: [PATCH 73/76] various: remove domenkozar from maintainers (#415576)

---
 doc/languages-frameworks/python.section.md                      | 1 -
 nixos/tests/bittorrent.nix                                      | 1 -
 nixos/tests/jenkins.nix                                         | 1 -
 nixos/tests/munin.nix                                           | 2 +-
 nixos/tests/printing.nix                                        | 1 -
 nixos/tests/quake3.nix                                          | 2 +-
 pkgs/applications/networking/p2p/deluge/default.nix             | 1 -
 pkgs/applications/window-managers/i3/lock.nix                   | 1 -
 pkgs/by-name/au/autojump/package.nix                            | 1 -
 pkgs/by-name/cb/cbatticon/package.nix                           | 2 +-
 pkgs/by-name/dd/dd_rescue/package.nix                           | 1 -
 pkgs/by-name/dd/ddrescue/package.nix                            | 1 -
 pkgs/by-name/du/dunst/package.nix                               | 1 -
 pkgs/by-name/el/elm-land/package.nix                            | 1 -
 pkgs/by-name/ex/extundelete/package.nix                         | 2 +-
 pkgs/by-name/gi/gitg/package.nix                                | 1 -
 pkgs/by-name/gn/gnucash/package.nix                             | 1 -
 pkgs/by-name/ha/haveged/package.nix                             | 2 +-
 pkgs/by-name/i3/i3minator/package.nix                           | 2 +-
 pkgs/by-name/ka/kazam/package.nix                               | 2 +-
 pkgs/by-name/pa/pa_applet/package.nix                           | 2 +-
 pkgs/by-name/pa/patray/package.nix                              | 2 +-
 pkgs/by-name/pl/planetary_annihilation/package.nix              | 2 +-
 pkgs/by-name/re/resilio-sync/package.nix                        | 1 -
 pkgs/by-name/si/sigal/package.nix                               | 1 -
 pkgs/by-name/ss/sshuttle/package.nix                            | 1 -
 pkgs/by-name/ss/sslmate/package.nix                             | 2 +-
 pkgs/by-name/th/thinkfan/package.nix                            | 1 -
 pkgs/by-name/ti/tig/package.nix                                 | 1 -
 pkgs/by-name/un/unclutter/package.nix                           | 2 +-
 pkgs/by-name/wg/wgetpaste/package.nix                           | 1 -
 pkgs/by-name/xa/xarchiver/package.nix                           | 2 +-
 pkgs/by-name/xa/xawtv/package.nix                               | 2 +-
 pkgs/by-name/ye/yelp-tools/package.nix                          | 2 +-
 pkgs/development/compilers/elm/packages/ghc9_6/default.nix      | 1 -
 pkgs/development/compilers/ghc/8.10.7-binary.nix                | 1 -
 pkgs/development/python-modules/argh/default.nix                | 2 +-
 pkgs/development/python-modules/bcrypt/3.nix                    | 2 +-
 pkgs/development/python-modules/bcrypt/default.nix              | 2 +-
 pkgs/development/python-modules/beaker/default.nix              | 2 +-
 pkgs/development/python-modules/beautifulsoup4/default.nix      | 2 +-
 pkgs/development/python-modules/certbot/default.nix             | 2 +-
 pkgs/development/python-modules/chameleon/default.nix           | 2 +-
 pkgs/development/python-modules/chardet/default.nix             | 2 +-
 pkgs/development/python-modules/clint/default.nix               | 2 +-
 pkgs/development/python-modules/colander/default.nix            | 2 +-
 pkgs/development/python-modules/deform/default.nix              | 2 +-
 pkgs/development/python-modules/feedparser/default.nix          | 2 +-
 pkgs/development/python-modules/html5lib/default.nix            | 1 -
 pkgs/development/python-modules/jsonschema/default.nix          | 2 +-
 pkgs/development/python-modules/mako/default.nix                | 2 +-
 pkgs/development/python-modules/markupsafe/default.nix          | 2 +-
 pkgs/development/python-modules/munkres/default.nix             | 2 +-
 pkgs/development/python-modules/musicbrainzngs/default.nix      | 2 +-
 pkgs/development/python-modules/pbkdf2/default.nix              | 2 +-
 pkgs/development/python-modules/peppercorn/default.nix          | 2 +-
 pkgs/development/python-modules/pg8000/default.nix              | 2 +-
 pkgs/development/python-modules/pilkit/default.nix              | 2 +-
 pkgs/development/python-modules/progressbar/default.nix         | 2 +-
 pkgs/development/python-modules/pycparser/default.nix           | 2 +-
 pkgs/development/python-modules/pynzb/default.nix               | 2 +-
 pkgs/development/python-modules/pyramid-beaker/default.nix      | 2 +-
 pkgs/development/python-modules/pyramid-chameleon/default.nix   | 2 +-
 pkgs/development/python-modules/pyramid-exclog/default.nix      | 2 +-
 pkgs/development/python-modules/pyramid-jinja2/default.nix      | 2 +-
 pkgs/development/python-modules/pyramid/default.nix             | 2 +-
 pkgs/development/python-modules/pyrss2gen/default.nix           | 2 +-
 pkgs/development/python-modules/pytest/7.nix                    | 1 -
 pkgs/development/python-modules/pyxdg/default.nix               | 2 +-
 pkgs/development/python-modules/rbtools/default.nix             | 2 +-
 pkgs/development/python-modules/repoze-lru/default.nix          | 2 +-
 .../python-modules/repoze-sphinx-autointerface/default.nix      | 2 +-
 pkgs/development/python-modules/speedtest-cli/default.nix       | 1 -
 pkgs/development/python-modules/statsd/default.nix              | 2 +-
 pkgs/development/python-modules/translationstring/default.nix   | 2 +-
 pkgs/development/python-modules/unidecode/default.nix           | 2 +-
 pkgs/development/python-modules/venusian/default.nix            | 2 +-
 pkgs/development/python-modules/waitress/default.nix            | 2 +-
 pkgs/development/python-modules/wsgiproxy2/default.nix          | 2 +-
 pkgs/development/python-modules/zope-copy/default.nix           | 2 +-
 pkgs/development/python-modules/zope-deprecation/default.nix    | 2 +-
 pkgs/development/python2-modules/markupsafe/default.nix         | 2 +-
 pkgs/development/python2-modules/pytest/default.nix             | 1 -
 pkgs/games/spring/default.nix                                   | 1 -
 pkgs/games/spring/springlobby.nix                               | 1 -
 pkgs/tools/networking/dd-agent/datadog-agent.nix                | 1 -
 pkgs/tools/networking/dd-agent/datadog-process-agent.nix        | 2 +-
 pkgs/tools/networking/networkmanager/default.nix                | 1 -
 88 files changed, 59 insertions(+), 88 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index e670702e08fa..86841b302bf1 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -136,7 +136,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pytest-dev/pytest";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      domenkozar
       lovek323
       madjar
       lsix
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index b62eddc4f663..812238b222b4 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -39,7 +39,6 @@ in
   name = "bittorrent";
   meta = with pkgs.lib.maintainers; {
     maintainers = [
-      domenkozar
       rob
       bobvanderlinden
     ];
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 7a8e4ea4d0b4..dcfd5a03bab6 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -10,7 +10,6 @@
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       bjornfor
-      domenkozar
     ];
   };
 
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index fad3f2b52fae..fe4a7627f615 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -5,7 +5,7 @@
 {
   name = "munin";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ domenkozar ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 890bc207a326..f7e414100ed7 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -14,7 +14,6 @@ in
   name = "printing";
   meta = with lib.maintainers; {
     maintainers = [
-      domenkozar
       matthewbauer
     ];
   };
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 67867796be56..8171b09dbd65 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -31,7 +31,7 @@ let
 in
 {
   name = "quake3";
-  meta.maintainers = with lib.maintainers; [ domenkozar ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   node.pkgsReadOnly = false;
 
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 7be43c9fa944..9472c7b0aa0e 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -108,7 +108,6 @@ let
         homepage = "https://deluge-torrent.org";
         license = licenses.gpl3Plus;
         maintainers = with maintainers; [
-          domenkozar
           ebzzry
         ];
         platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 7eb1bfe94713..0713f5ecfbe7 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
     homepage = "https://i3wm.org/i3lock/";
     maintainers = with maintainers; [
       malyn
-      domenkozar
     ];
     mainProgram = "i3lock";
     license = licenses.bsd3;
diff --git a/pkgs/by-name/au/autojump/package.nix b/pkgs/by-name/au/autojump/package.nix
index d0a60a4abbb5..f64ec83caf48 100644
--- a/pkgs/by-name/au/autojump/package.nix
+++ b/pkgs/by-name/au/autojump/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [
-      domenkozar
       yurrriq
     ];
   };
diff --git a/pkgs/by-name/cb/cbatticon/package.nix b/pkgs/by-name/cb/cbatticon/package.nix
index f5050e42624f..31eec833e0c8 100644
--- a/pkgs/by-name/cb/cbatticon/package.nix
+++ b/pkgs/by-name/cb/cbatticon/package.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/valr/cbatticon";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/dd/dd_rescue/package.nix b/pkgs/by-name/dd/dd_rescue/package.nix
index e4db2fcefc0b..89cd111b46fc 100644
--- a/pkgs/by-name/dd/dd_rescue/package.nix
+++ b/pkgs/by-name/dd/dd_rescue/package.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
     description = "Tool to copy data from a damaged block device";
     maintainers = with maintainers; [
       raskin
-      domenkozar
     ];
     platforms = platforms.linux;
     homepage = "http://www.garloff.de/kurt/linux/ddrescue/";
diff --git a/pkgs/by-name/dd/ddrescue/package.nix b/pkgs/by-name/dd/ddrescue/package.nix
index f00dd7d0ef69..b0f40fe7abff 100644
--- a/pkgs/by-name/dd/ddrescue/package.nix
+++ b/pkgs/by-name/dd/ddrescue/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
 
     platforms = platforms.all;
     maintainers = with maintainers; [
-      domenkozar
       fpletz
     ];
   };
diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index ad4823d534a3..d3507eb51972 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     mainProgram = "dunst";
     maintainers = with lib.maintainers; [
-      domenkozar
       gepbird
     ];
     # NOTE: 'unix' or even 'all' COULD work too, I'm not sure
diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix
index fbdce8928623..92c09252b378 100644
--- a/pkgs/by-name/el/elm-land/package.nix
+++ b/pkgs/by-name/el/elm-land/package.nix
@@ -63,7 +63,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/elm-land/elm-land";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
-      domenkozar
       zupo
     ];
     mainProgram = "elm-land";
diff --git a/pkgs/by-name/ex/extundelete/package.nix b/pkgs/by-name/ex/extundelete/package.nix
index 41872f866421..a51282564837 100644
--- a/pkgs/by-name/ex/extundelete/package.nix
+++ b/pkgs/by-name/ex/extundelete/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     homepage = "https://extundelete.sourceforge.net/";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = [ ];
     mainProgram = "extundelete";
   };
 }
diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix
index d641024dcb1b..ebf6f2f21194 100644
--- a/pkgs/by-name/gi/gitg/package.nix
+++ b/pkgs/by-name/gi/gitg/package.nix
@@ -95,7 +95,6 @@ stdenv.mkDerivation rec {
     description = "GNOME GUI client to view git repositories";
     mainProgram = "gitg";
     maintainers = with lib.maintainers; [
-      domenkozar
       Luflosi
     ];
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index 0e131cfa6e8e..d47ecd67ed2b 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -188,7 +188,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
-      domenkozar
       rski
       nevivurn
     ];
diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix
index 9a79a483b442..ece3d8154d63 100644
--- a/pkgs/by-name/ha/haveged/package.nix
+++ b/pkgs/by-name/ha/haveged/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jirka-h/haveged";
     changelog = "https://raw.githubusercontent.com/jirka-h/haveged/v${version}/ChangeLog";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
     badPlatforms = lib.platforms.darwin; # fails to build since v1.9.15
   };
diff --git a/pkgs/by-name/i3/i3minator/package.nix b/pkgs/by-name/i3/i3minator/package.nix
index 2c56f1d521f2..1fc08fabd4ae 100644
--- a/pkgs/by-name/i3/i3minator/package.nix
+++ b/pkgs/by-name/i3/i3minator/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://github.com/carlesso/i3minator";
     license = lib.licenses.wtfpl;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/ka/kazam/package.nix b/pkgs/by-name/ka/kazam/package.nix
index bc27946cf461..f838e3d6a409 100644
--- a/pkgs/by-name/ka/kazam/package.nix
+++ b/pkgs/by-name/ka/kazam/package.nix
@@ -68,7 +68,7 @@ python3Packages.buildPythonApplication {
     homepage = "https://github.com/niknah/kazam";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = [ ];
     mainProgram = "kazam";
   };
 }
diff --git a/pkgs/by-name/pa/pa_applet/package.nix b/pkgs/by-name/pa/pa_applet/package.nix
index 37e377ac6b61..1b77499133bd 100644
--- a/pkgs/by-name/pa/pa_applet/package.nix
+++ b/pkgs/by-name/pa/pa_applet/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     description = "";
     mainProgram = "pa-applet";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pa/patray/package.nix b/pkgs/by-name/pa/patray/package.nix
index 27b286896253..b17928eec9ca 100644
--- a/pkgs/by-name/pa/patray/package.nix
+++ b/pkgs/by-name/pa/patray/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Yet another tray pulseaudio frontend";
     homepage = "https://github.com/pohmelie/patray";
     license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     mainProgram = "patray";
   };
 }
diff --git a/pkgs/by-name/pl/planetary_annihilation/package.nix b/pkgs/by-name/pl/planetary_annihilation/package.nix
index 4419612af2ff..6b43eb641d83 100644
--- a/pkgs/by-name/pl/planetary_annihilation/package.nix
+++ b/pkgs/by-name/pl/planetary_annihilation/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     description = "Next-generation RTS that takes the genre to a planetary scale";
     license = lib.licenses.unfree;
     platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = [ ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
 }
diff --git a/pkgs/by-name/re/resilio-sync/package.nix b/pkgs/by-name/re/resilio-sync/package.nix
index 33791b088e5a..6520c5033f4a 100644
--- a/pkgs/by-name/re/resilio-sync/package.nix
+++ b/pkgs/by-name/re/resilio-sync/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      domenkozar
       thoughtpolice
       cwoac
     ];
diff --git a/pkgs/by-name/si/sigal/package.nix b/pkgs/by-name/si/sigal/package.nix
index a588678931c9..1eea93cc1fb9 100644
--- a/pkgs/by-name/si/sigal/package.nix
+++ b/pkgs/by-name/si/sigal/package.nix
@@ -58,7 +58,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "http://sigal.saimon.org/";
     license = licenses.mit;
     maintainers = with maintainers; [
-      domenkozar
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix
index 29687cbb2752..e17517008d44 100644
--- a/pkgs/by-name/ss/sshuttle/package.nix
+++ b/pkgs/by-name/ss/sshuttle/package.nix
@@ -73,7 +73,6 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/sshuttle/sshuttle/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [
-      domenkozar
       carlosdagos
     ];
   };
diff --git a/pkgs/by-name/ss/sslmate/package.nix b/pkgs/by-name/ss/sslmate/package.nix
index 19987e1d08f7..d6640e9e7234 100644
--- a/pkgs/by-name/ss/sslmate/package.nix
+++ b/pkgs/by-name/ss/sslmate/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://sslmate.com";
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = [ ];
     description = "Easy to buy, deploy, and manage your SSL certs";
     mainProgram = "sslmate";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 6d7360a69f30..39e62d816acd 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     homepage = "https://github.com/vmatare/thinkfan";
     maintainers = with lib.maintainers; [
-      domenkozar
       rnhmjoj
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix
index 4926e7afeb63..184040d7ef9f 100644
--- a/pkgs/by-name/ti/tig/package.nix
+++ b/pkgs/by-name/ti/tig/package.nix
@@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
     description = "Text-mode interface for git";
     maintainers = with maintainers; [
       bjornfor
-      domenkozar
       qknight
       globin
       ma27
diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix
index d586ec94eca0..de1802a14f69 100644
--- a/pkgs/by-name/un/unclutter/package.nix
+++ b/pkgs/by-name/un/unclutter/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
           unclutter -idle 1 &
     '';
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
     license = lib.licenses.publicDomain;
     mainProgram = "unclutter";
diff --git a/pkgs/by-name/wg/wgetpaste/package.nix b/pkgs/by-name/wg/wgetpaste/package.nix
index e08de62dd14a..0a2b34490864 100644
--- a/pkgs/by-name/wg/wgetpaste/package.nix
+++ b/pkgs/by-name/wg/wgetpaste/package.nix
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [
       qknight
-      domenkozar
     ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix
index 9d64e42147de..01e335f72aa0 100644
--- a/pkgs/by-name/xa/xarchiver/package.nix
+++ b/pkgs/by-name/xa/xarchiver/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
     homepage = "https://github.com/ib/xarchiver";
-    maintainers = [ lib.maintainers.domenkozar ];
+    maintainers = [ ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
     mainProgram = "xarchiver";
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 5486b7b6e261..2dbf97f5f723 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     description = "TV application for Linux with apps and tools such as a teletext browser";
     license = lib.licenses.gpl2;
     homepage = "https://www.kraxel.org/blog/linux/xawtv/";
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ye/yelp-tools/package.nix b/pkgs/by-name/ye/yelp-tools/package.nix
index f71510c4ff5a..94823e582b89 100644
--- a/pkgs/by-name/ye/yelp-tools/package.nix
+++ b/pkgs/by-name/ye/yelp-tools/package.nix
@@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/GNOME/yelp-tools";
     description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     teams = [ teams.gnome ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
index e3e030c7610d..de02f002e67e 100644
--- a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
+++ b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
@@ -31,7 +31,6 @@ pkgs.haskell.packages.ghc96.override {
           homepage = "https://elm-lang.org/";
           license = lib.licenses.bsd3;
           maintainers = with lib.maintainers; [
-            domenkozar
             turbomack
           ];
         }) (self.callPackage ./elm { });
diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 40becff83767..8a2f357175c1 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -530,7 +530,6 @@ stdenv.mkDerivation {
     platforms = builtins.attrNames ghcBinDists.${distSetName};
     maintainers = with lib.maintainers; [
       prusnak
-      domenkozar
     ];
     teams = [ lib.teams.haskell ];
   };
diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix
index a4ab8087a612..38b84a9e8ca9 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/pkgs/development/python-modules/argh/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/neithere/argh";
     description = "Unobtrusive argparse wrapper with natural syntax";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bcrypt/3.nix b/pkgs/development/python-modules/bcrypt/3.nix
index 7d0f4235277c..127dc70b136d 100644
--- a/pkgs/development/python-modules/bcrypt/3.nix
+++ b/pkgs/development/python-modules/bcrypt/3.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Modern password hashing for your software and your servers";
     homepage = "https://github.com/pyca/bcrypt/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index fa49f45058fd..adf6a65b4565 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     description = "Modern password hashing for your software and your servers";
     homepage = "https://github.com/pyca/bcrypt/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index 2bfc919ecb5f..1b37178ff23a 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     description = "Session and Caching library with WSGI Middleware";
     homepage = "https://github.com/bbangert/beaker";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
     knownVulnerabilities = [ "CVE-2013-7489" ];
   };
 }
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index a0fbb4ade834..e27e5b2829d4 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     description = "HTML and XML parser";
     homepage = "http://crummy.com/software/BeautifulSoup/bs4/";
     license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 1b420e616534..70ad22558a2f 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -89,7 +89,7 @@ buildPythonPackage rec {
     description = "ACME client that can obtain certs and extensibly update server configurations";
     platforms = platforms.unix;
     mainProgram = "certbot";
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     license = with licenses; [ asl20 ];
   };
 }
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index c9f81816ae0b..ae26fb90e5b8 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/malthe/chameleon";
     homepage = "https://chameleon.readthedocs.io";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
index c4759f316d8e..de5aa8adab55 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/pkgs/development/python-modules/chardet/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     mainProgram = "chardetect";
     homepage = "https://github.com/chardet/chardet";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix
index 87bc6568c587..ac949f4d5ce7 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/pkgs/development/python-modules/clint/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kennethreitz/clint";
     description = "Python Command Line Interface Tools";
     license = licenses.isc;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
index e3ddb2cf3c31..58ee3652343a 100644
--- a/pkgs/development/python-modules/colander/default.nix
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Simple schema-based serialization and deserialization library";
     homepage = "https://github.com/Pylons/colander";
     license = licenses.free; # http://repoze.org/LICENSE.txt
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index 27dbd22ea703..db38184d19ab 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
       lib.licenses.bsd3
       lib.licenses.cc-by-30
     ];
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix
index 3d1bd3f4ee3b..0d2035d6c719 100644
--- a/pkgs/development/python-modules/feedparser/default.nix
+++ b/pkgs/development/python-modules/feedparser/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kurtmckee/feedparser";
     changelog = "https://feedparser.readthedocs.io/en/latest/changelog.html";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix
index 0d294f93b7a6..fb6e80b44995 100644
--- a/pkgs/development/python-modules/html5lib/default.nix
+++ b/pkgs/development/python-modules/html5lib/default.nix
@@ -53,7 +53,6 @@ buildPythonPackage rec {
     '';
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      domenkozar
       prikhi
     ];
   };
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index 1cbae4a0b4ef..80cda616d935 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -96,7 +96,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-jsonschema/jsonschema";
     changelog = "https://github.com/python-jsonschema/jsonschema/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     mainProgram = "jsonschema";
   };
 }
diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix
index f2d95cfff5d3..86fa97e44e3c 100644
--- a/pkgs/development/python-modules/mako/default.nix
+++ b/pkgs/development/python-modules/mako/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     changelog = "https://docs.makotemplates.org/en/latest/changelog.html";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 8eed9be71ce7..96cee74b4ab8 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Implements a XML/HTML/XHTML Markup safe string";
     homepage = "https://palletsprojects.com/p/markupsafe/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
index 1ba6a8213954..36866f6b78a7 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     homepage = "http://bmc.github.com/munkres/";
     description = "Munkres algorithm for the Assignment Problem";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix
index 5c3acc24846b..facb63de6f08 100644
--- a/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = "https://python-musicbrainzngs.readthedocs.org/";
     description = "Python bindings for musicbrainz NGS webservice";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix
index 138a9489ac32..acfc09e9f30e 100644
--- a/pkgs/development/python-modules/pbkdf2/default.nix
+++ b/pkgs/development/python-modules/pbkdf2/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix
index 1fb8d48a05e5..a45f778e398d 100644
--- a/pkgs/development/python-modules/peppercorn/default.nix
+++ b/pkgs/development/python-modules/peppercorn/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for converting a token stream into a data structure for use in web form posts";
     homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/";
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 2607688f4cf5..cc83363b3743 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/tlocke/pg8000";
     changelog = "https://github.com/tlocke/pg8000#release-notes";
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix
index a69b688ad538..976edf8ec8b5 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/pkgs/development/python-modules/pilkit/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Collection of utilities and processors for the Python Imaging Library";
     homepage = "https://github.com/matthewwithanm/pilkit/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix
index beae027d52d4..b40ab23100ea 100644
--- a/pkgs/development/python-modules/progressbar/default.nix
+++ b/pkgs/development/python-modules/progressbar/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.python.org/pypi/progressbar";
     description = "Text progressbar library for python";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index 4372afb0efe1..2cd7f4e5445f 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "C parser in Python";
     homepage = "https://github.com/eliben/pycparser";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix
index 52d94c093f67..9c6b592e0ac7 100644
--- a/pkgs/development/python-modules/pynzb/default.nix
+++ b/pkgs/development/python-modules/pynzb/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ericflo/pynzb";
     description = "Unified API for parsing NZB files";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix
index 87e9a30932cb..054ac4b8b17a 100644
--- a/pkgs/development/python-modules/pyramid-beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid-beaker/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/";
     # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt
     # license = licenses.mpl20;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix
index dadd0e534a3f..90c1c8a1344d 100644
--- a/pkgs/development/python-modules/pyramid-chameleon/default.nix
+++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Chameleon template compiler for pyramid";
     homepage = "https://github.com/Pylons/pyramid_chameleon";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-exclog/default.nix b/pkgs/development/python-modules/pyramid-exclog/default.nix
index b88777f8692d..aeace75fd630 100644
--- a/pkgs/development/python-modules/pyramid-exclog/default.nix
+++ b/pkgs/development/python-modules/pyramid-exclog/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Package which logs to a Python logger when an exception is raised by a Pyramid application";
     homepage = "https://docs.pylonsproject.org/";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-jinja2/default.nix b/pkgs/development/python-modules/pyramid-jinja2/default.nix
index f15a3623ee23..310c9caaa438 100644
--- a/pkgs/development/python-modules/pyramid-jinja2/default.nix
+++ b/pkgs/development/python-modules/pyramid-jinja2/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Jinja2 template bindings for the Pyramid web framework";
     homepage = "https://github.com/Pylons/pyramid_jinja2";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index c930fefd524f..5f41e53d2e89 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://trypyramid.com/";
     changelog = "https://github.com/Pylons/pyramid/blob/${version}/CHANGES.rst";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix
index f07f054cbce6..89cdf037896b 100644
--- a/pkgs/development/python-modules/pyrss2gen/default.nix
+++ b/pkgs/development/python-modules/pyrss2gen/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     homepage = "http://www.dalkescientific.om/Python/PyRSS2Gen.html";
     description = "Library for generating RSS 2.0 feeds";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix
index 3abbffcf3d9d..cbed444a7264 100644
--- a/pkgs/development/python-modules/pytest/7.nix
+++ b/pkgs/development/python-modules/pytest/7.nix
@@ -108,7 +108,6 @@ let
       homepage = "https://docs.pytest.org";
       changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
       maintainers = with maintainers; [
-        domenkozar
         lovek323
         madjar
         lsix
diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix
index 035715c297a1..4b5be4303e8b 100644
--- a/pkgs/development/python-modules/pyxdg/default.nix
+++ b/pkgs/development/python-modules/pyxdg/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "http://freedesktop.org/wiki/Software/pyxdg";
     description = "Contains implementations of freedesktop.org standards";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index 3ce319fe3786..e39600d2eb93 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -82,6 +82,6 @@ buildPythonPackage rec {
     description = "RBTools is a set of command line tools for working with Review Board and RBCommons";
     mainProgram = "rbt";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/repoze-lru/default.nix b/pkgs/development/python-modules/repoze-lru/default.nix
index 1fbfd2994736..1178d9c1e977 100644
--- a/pkgs/development/python-modules/repoze-lru/default.nix
+++ b/pkgs/development/python-modules/repoze-lru/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "http://www.repoze.org/";
     changelog = "https://github.com/repoze/repoze.lru/blob/${version}/CHANGES.rst";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix
index ca7c14c1e2d9..17bb5a08a129 100644
--- a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix
+++ b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "Auto-generate Sphinx API docs from Zope interfaces";
     changelog = "https://github.com/repoze/repoze.sphinx.autointerface/blob/${version}/CHANGES.rst";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     # https://github.com/repoze/repoze.sphinx.autointerface/issues/21
     broken = versionAtLeast sphinx.version "7.2";
   };
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
index 3a995087f7d0..2b9954d3305b 100644
--- a/pkgs/development/python-modules/speedtest-cli/default.nix
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -25,7 +25,6 @@ buildPythonPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       makefu
-      domenkozar
     ];
   };
 }
diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
index b524a0f2d7c0..72b34c80524d 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   pytestFlagsArray = [ "statsd/tests.py" ];
 
   meta = with lib; {
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
     description = "Simple statsd client";
     license = licenses.mit;
     homepage = "https://github.com/jsocol/pystatsd";
diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix
index 1110c6c58e91..662e5d4d816e 100644
--- a/pkgs/development/python-modules/translationstring/default.nix
+++ b/pkgs/development/python-modules/translationstring/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     homepage = "https://pylonsproject.org/";
     description = "Utility library for i18n relied on by various Repoze and Pyramid packages";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index aa19b4478861..53b16a0c12f6 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/avian2/unidecode";
     changelog = "https://github.com/avian2/unidecode/blob/unidecode-${version}/ChangeLog";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index 439bc5f58b23..d4008c979e49 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Library for deferring decorator actions";
     homepage = "https://pylonsproject.org/";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix
index 42751f8fec90..3b6973490026 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/pkgs/development/python-modules/waitress/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Waitress WSGI server";
     mainProgram = "waitress-serve";
     license = licenses.zpl21;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix
index 25c66e98cf6d..d3fb8a3296cc 100644
--- a/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/pkgs/development/python-modules/wsgiproxy2/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "HTTP proxying tools for WSGI apps";
     homepage = "https://wsgiproxy2.readthedocs.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix
index f44ae81ab072..7e75966b7082 100644
--- a/pkgs/development/python-modules/zope-copy/default.nix
+++ b/pkgs/development/python-modules/zope-copy/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zopefoundation/zope.copy";
     changelog = "https://github.com/zopefoundation/zope.copy/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.zpl21;
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix
index 70ab6d639f6f..fca9f968a1ea 100644
--- a/pkgs/development/python-modules/zope-deprecation/default.nix
+++ b/pkgs/development/python-modules/zope-deprecation/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Zope Deprecation Infrastructure";
     changelog = "https://github.com/zopefoundation/zope.deprecation/blob/${version}/CHANGES.rst";
     license = lib.licenses.zpl21;
-    maintainers = with lib.maintainers; [ domenkozar ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/markupsafe/default.nix b/pkgs/development/python2-modules/markupsafe/default.nix
index 7bff587591e1..dc1eededf2d3 100644
--- a/pkgs/development/python2-modules/markupsafe/default.nix
+++ b/pkgs/development/python2-modules/markupsafe/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     description = "Implements a XML/HTML/XHTML Markup safe string";
     homepage = "http://dev.pocoo.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 
 }
diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix
index a6abb8075316..e66e44097de5 100644
--- a/pkgs/development/python2-modules/pytest/default.nix
+++ b/pkgs/development/python2-modules/pytest/default.nix
@@ -95,7 +95,6 @@ buildPythonPackage rec {
     homepage = "https://docs.pytest.org";
     description = "Framework for writing tests";
     maintainers = with maintainers; [
-      domenkozar
       lovek323
       madjar
       lsix
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 410de8382c93..b2c127e188bc 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -98,7 +98,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       qknight
-      domenkozar
       sorki
     ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index dc3ae4ef6d7a..c3194589ee26 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       qknight
-      domenkozar
     ];
     platforms = [
       "i686-linux"
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ccb30dbb5b..681e7ddfe8f0 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -135,7 +135,6 @@ buildGoModule rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [
       thoughtpolice
-      domenkozar
     ];
   };
 }
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 86f3bc9d8663..9e43d2e7e04c 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -7,7 +7,7 @@ datadog-agent.overrideAttrs (attrs: {
     // {
       description = "Live process collector for the DataDog Agent v7";
       mainProgram = "process-agent";
-      maintainers = with maintainers; [ domenkozar ];
+      maintainers = with maintainers; [ ];
     };
   subPackages = [ "cmd/process-agent" ];
   postInstall = null;
diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index e3daa878c5c5..b538720a20e5 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -235,7 +235,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2Plus;
     changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS";
     maintainers = with maintainers; [
-      domenkozar
       obadz
     ];
     teams = [ teams.freedesktop ];

From f92bc6c218df3fef1fe743ac5996375b91366646 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 10 Jun 2025 18:47:48 +0100
Subject: [PATCH 74/76] maintainers/team-list: add nixos-rebuild team

---
 maintainers/team-list.nix                        | 7 +++++++
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix     | 3 ++-
 pkgs/os-specific/linux/nixos-rebuild/default.nix | 6 ++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 28f2f1007e40..b106d814c841 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -922,6 +922,13 @@ with lib.maintainers;
     shortName = "NGI";
   };
 
+  nixos-rebuild = {
+    members = [ thiagokokada ];
+    scope = "Maintain nixos-rebuild(-ng).";
+    shortName = "nixos-rebuild";
+    enableFeatureFreezePing = true;
+  };
+
   node = {
     members = [ winter ];
     scope = "Maintain Node.js runtimes and build tooling.";
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 7e1841ceb615..8590cc90549a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -132,7 +132,8 @@ python3Packages.buildPythonApplication rec {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-rebuild-ng";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.thiagokokada ];
+    maintainers = [ ];
+    teams = [ lib.teams.nixos-rebuild ];
     mainProgram = executable;
   };
 }
diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix
index 8e8f7f44b103..13d0a6991133 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/default.nix
+++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix
@@ -81,10 +81,8 @@ substitute {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      Profpatsch
-      thiagokokada
-    ];
+    maintainers = [ lib.maintainers.Profpatsch ];
+    teams = [ lib.teams.nixos-rebuild ];
     mainProgram = "nixos-rebuild";
   };
 }

From c73df248ae10a095f6de8288d805508ce57997cc Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 11 Jun 2025 03:57:42 +0900
Subject: [PATCH 75/76] shogihome: correct startupWMClass

---
 pkgs/by-name/sh/shogihome/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 31fbead6651d..02459a2d722e 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -117,7 +117,11 @@ buildNpmPackage (finalAttrs: {
       genericName = "Shogi Frontend";
       comment = finalAttrs.meta.description;
       categories = [ "Game" ];
-      startupWMClass = "ShogiHome";
+
+      # The project was renamed "shogihome" from "electron-shogi."
+      # Some references to "electron-shogi" remain for compatibility.
+      # ref: https://github.com/sunfish-shogi/shogihome/commit/e5bbc4d43d231df23ac31c655adb64e11890993e
+      startupWMClass = "electron-shogi";
     })
   ];
 

From a975ab07527f350b2f22b05a79924baf9148054a Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Mon, 2 Jun 2025 12:00:00 +0000
Subject: [PATCH 76/76] nixos/doc: explain how to use the ff sync module with
 ff android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

source https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html#howto-run-sync15

Quotation:

```
Firefox for Android (“Daylight”, versions 79 and later) does support using a non-Mozilla-hosted Sync server. Before logging in, go to App Menu > Settings > About Firefox and click the logo 5 times. You should see a “debug menu enabled” notification. Go back to the main menu and you will see two options for a custom account server and a custom Sync server. Set the Sync server to the URL given above and then log in.

To configure Android Firefox 44 up to 78 to talk to your new Sync server, just set the “identity.sync.tokenserver.uri” exactly as above before signing in to Mozilla accounts and Sync on your Android device.

Important: after creating the Android account, changes to “identity.sync.tokenserver.uri” will be ignored. (If you need to change the URI, delete the Android account using the Settings > Sync > Disconnect… menu item, update the pref, and sign in again.) Non-default TokenServer URLs are displayed in the Settings > Sync panel in Firefox for Android, so you should be able to verify your URL there.
```

the /token/ prefix is experimentally wrong.
---
 nixos/doc/manual/redirects.json               |  9 ++++++
 .../services/networking/firefox-syncserver.md | 28 ++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 44ab6c6b860c..4a5c4237021f 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -50,6 +50,15 @@
   "module-services-crab-hole-upstream-options": [
     "index.html#module-services-crab-hole-upstream-options"
   ],
+  "module-services-firefox-syncserver-clients": [
+    "index.html#module-services-firefox-syncserver-clients"
+  ],
+  "module-services-firefox-syncserver-clients-android": [
+    "index.html#module-services-firefox-syncserver-clients-android"
+  ],
+  "module-services-firefox-syncserver-clients-desktop": [
+    "index.html#module-services-firefox-syncserver-clients-desktop"
+  ],
   "module-services-opencloud": [
     "index.html#module-services-opencloud"
   ],
diff --git a/nixos/modules/services/networking/firefox-syncserver.md b/nixos/modules/services/networking/firefox-syncserver.md
index f6b515e67f15..991e97f799d6 100644
--- a/nixos/modules/services/networking/firefox-syncserver.md
+++ b/nixos/modules/services/networking/firefox-syncserver.md
@@ -24,10 +24,8 @@ The absolute minimal configuration for the sync server looks like this:
 }
 ```
 
-This will start a sync server that is only accessible locally. Once the services is
-running you can navigate to `about:config` in your Firefox profile and set
-`identity.sync.tokenserver.uri` to `http://localhost:5000/1.0/sync/1.5`. Your browser
-will now use your local sync server for data storage.
+This will start a sync server that is only accessible locally on the following url: `http://localhost:5000/1.0/sync/1.5`.
+See [the dedicated section](#module-services-firefox-syncserver-clients) to configure your browser to use this sync server.
 
 ::: {.warning}
 This configuration should never be used in production. It is not encrypted and
@@ -55,3 +53,25 @@ be made via TLS.
 
 For actual deployment it is also recommended to store the `secrets` file in a
 secure location.
+
+## Configuring clients to use this server {#module-services-firefox-syncserver-clients}
+
+### Firefox desktop {#module-services-firefox-syncserver-clients-desktop}
+To configure a desktop version of Firefox to use your server, navigate to
+`about:config` in your Firefox profile and set
+`identity.sync.tokenserver.uri` to `https://myhostname:5000/1.0/sync/1.5`.
+
+### Firefox Android {#module-services-firefox-syncserver-clients-android}
+To configure an Android version of Firefox to use your server:
+* First ensure that you are disconnected from you Mozilla account.
+* Go to App Menu > Settings > About Firefox and click the logo 5 times. You
+  should see a “debug menu enabled” notification.
+* Back to the main menu, a new menu "sync debug" should have appeared.
+* In this menu, set "custom sync server" to `https://myhostname:5000/1.0/sync/1.5`.
+
+::: {.warning}
+Changes to this configuration value are ignored if you are currently connected to your account.
+:::
+
+* Restart the application.
+* Log in to your account.