From d9e684a371df7caaf6437f22e1cf0c6da4092eaa Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sat, 31 May 2025 21:13:35 +0200
Subject: [PATCH 01/28] podofo_0_9: rename attr and alias, adopt, top-level,
 remove 'with lib', switch source from sourceforge to github, remove unused
 dep expat

---
 pkgs/by-name/ca/calibre/package.nix           |  2 +-
 .../po/podofo_0_9/package.nix}                | 21 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)
 rename pkgs/{development/libraries/podofo/default.nix => by-name/po/podofo_0_9/package.nix} (77%)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 52c1d0061ed8..0f2b25262a63 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
     export FC_INC_DIR=${fontconfig.dev}/include/fontconfig
     export FC_LIB_DIR=${fontconfig.lib}/lib
     export PODOFO_INC_DIR=${podofo.dev}/include/podofo
-    export PODOFO_LIB_DIR=${podofo.lib}/lib
+    export PODOFO_LIB_DIR=${podofo}/lib
     export XDG_DATA_HOME=$out/share
     export XDG_UTILS_INSTALL_MODE="user"
     export PIPER_TTS_DIR=${piper-tts}/bin
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/by-name/po/podofo_0_9/package.nix
similarity index 77%
rename from pkgs/development/libraries/podofo/default.nix
rename to pkgs/by-name/po/podofo_0_9/package.nix
index c49c31be8822..1d7bf196678c 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/by-name/po/podofo_0_9/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   cmake,
   zlib,
   freetype,
@@ -13,16 +13,17 @@
   lua5,
   pkg-config,
   libidn,
-  expat,
 }:
 
 stdenv.mkDerivation rec {
   version = "0.9.8";
   pname = "podofo";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
-    sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ=";
+  src = fetchFromGitHub {
+    owner = "podofo";
+    repo = "podofo";
+    rev = version;
+    hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s=";
   };
 
   outputs = [
@@ -45,7 +46,6 @@ stdenv.mkDerivation rec {
     openssl
     libpng
     libidn
-    expat
     lua5
   ];
 
@@ -64,13 +64,16 @@ stdenv.mkDerivation rec {
         -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://podofo.sourceforge.net";
     description = "Library to work with the PDF file format";
-    platforms = platforms.all;
-    license = with licenses; [
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [
       gpl2Plus
       lgpl2Plus
     ];
+    maintainers = with lib.maintainers; [
+      kuflierl
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf24872632db..bf64a3e6cbb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9291,9 +9291,8 @@ with pkgs;
 
   place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
 
-  podofo = callPackage ../development/libraries/podofo { };
-
   podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { };
+  podofo = podofo_0_9;
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 

From 6fff083f648a83fa39b59f7e9e4f92fd7bbba36c Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sat, 31 May 2025 23:33:04 +0200
Subject: [PATCH 02/28] podofo_0_10: rename and alias attr from podofo010,
 adopt, top-level, 0.10.4 -> 0.10.5, remove unused deps expat and lua, remove
 unnecesarry build output lib

---
 .../po/podofo_0_10/package.nix}                     | 13 +++++--------
 pkgs/top-level/aliases.nix                          |  1 +
 pkgs/top-level/all-packages.nix                     |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{development/libraries/podofo/0.10.x.nix => by-name/po/podofo_0_10/package.nix} (85%)

diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/by-name/po/podofo_0_10/package.nix
similarity index 85%
rename from pkgs/development/libraries/podofo/0.10.x.nix
rename to pkgs/by-name/po/podofo_0_10/package.nix
index a1d202232544..6f82a5c9c7b2 100644
--- a/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/pkgs/by-name/po/podofo_0_10/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  expat,
   fontconfig,
   freetype,
   libidn,
@@ -11,7 +10,6 @@
   libpng,
   libtiff,
   libxml2,
-  lua5,
   openssl,
   pkg-config,
   zlib,
@@ -19,19 +17,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "podofo";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "podofo";
     repo = "podofo";
     rev = finalAttrs.version;
-    hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk=";
+    hash = "sha256-lYykDGhxFWLwuZhfBIgbw3B0SEhrAP7vLNNXsPKRFZw=";
   };
 
   outputs = [
     "out"
     "dev"
-    "lib"
   ];
 
   nativeBuildInputs = [
@@ -40,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    expat
     fontconfig
     freetype
     libidn
@@ -48,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libxml2
-    lua5
     openssl
     zlib
   ];
@@ -66,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
       gpl2Plus
       lgpl2Plus
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      kuflierl
+    ];
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2ec215065942..440261a6beb0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1526,6 +1526,7 @@ mapAliases {
   plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
   pltScheme = racket; # just to be sure
   poac = cabinpkg; # Added 2025-01-22
+  podofo010 = podofo_0_10; # Added 2025-06-01
   polkit-kde-agent = throw ''
     The top-level polkit-kde-agent alias has been removed.
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf64a3e6cbb1..884d6189fe0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9291,7 +9291,6 @@ with pkgs;
 
   place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
 
-  podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { };
   podofo = podofo_0_9;
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
@@ -12007,7 +12006,7 @@ with pkgs;
   calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
 
   calibre = callPackage ../by-name/ca/calibre/package.nix {
-    podofo = podofo010;
+    podofo = podofo_0_10;
   };
 
   # calico-felix and calico-node have not been packaged due to libbpf, linking issues

From 81ac1d425dc6584d8512b5a1580a4c1d3c6ff9c5 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sat, 31 May 2025 21:47:33 +0200
Subject: [PATCH 03/28] podofo_1_0: init at 1.0.0

---
 pkgs/by-name/po/podofo_1_0/package.nix | 66 ++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pkgs/by-name/po/podofo_1_0/package.nix

diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo_1_0/package.nix
new file mode 100644
index 000000000000..773b7de814cf
--- /dev/null
+++ b/pkgs/by-name/po/podofo_1_0/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  fontconfig,
+  freetype,
+  libjpeg,
+  libpng,
+  libtiff,
+  libxml2,
+  openssl,
+  pkg-config,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "podofo";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "podofo";
+    repo = "podofo";
+    rev = finalAttrs.version;
+    hash = "sha256-DtbTaPNXjVRl1KU0NH/Sd2j9y3OZlUQGOYYJL3bTQQg=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+    libjpeg
+    libpng
+    libtiff
+    libxml2
+    openssl
+    zlib
+  ];
+
+  cmakeFlags = [
+    "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
+    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+  ];
+
+  meta = {
+    homepage = "https://github.com/podofo/podofo";
+    description = "Library to work with the PDF file format";
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl2Plus
+    ];
+    maintainers = with lib.maintainers; [
+      kuflierl
+    ];
+  };
+})

From e89036ce6d6c71f404b76772651650acb391563d Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sun, 1 Jun 2025 00:43:17 +0200
Subject: [PATCH 04/28] podofo: change default podofo version from 0.9 to 1.0

- update release notes 25.11
- set podofo version for the following packages:
  - krename: 0.9
  - scribus: 0.9 -> 0.10
  - calibre: 0.10
  - cie-middleware-linux: 0.9 -> 0.10
  - gImageReader: 0.9 -> 0.10
  - horizon-eda: 0.9 -> 0.10
- Implicit podofo version changes:
  - pdfmixtool: 0.9 -> 1.0
---
 doc/release-notes/rl-2511.section.md             | 3 +++
 pkgs/applications/misc/krename/default.nix       | 4 ++--
 pkgs/applications/office/scribus/default.nix     | 4 ++--
 pkgs/by-name/ca/calibre/package.nix              | 8 ++++----
 pkgs/by-name/ci/cie-middleware-linux/package.nix | 4 ++--
 pkgs/by-name/gi/gImageReader/package.nix         | 4 ++--
 pkgs/by-name/ho/horizon-eda/base.nix             | 4 ++--
 pkgs/top-level/all-packages.nix                  | 6 +-----
 8 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c50ae7739abd..eca516c7085f 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -18,6 +18,9 @@
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 
+- `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatable due to major api changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
+  Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 58e81790e683..fd385e7eddfe 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -11,7 +11,7 @@
   kjsembed,
   taglib,
   exiv2,
-  podofo,
+  podofo_0_9,
   kcrash,
 }:
 
@@ -39,7 +39,7 @@ mkDerivation rec {
   buildInputs = [
     taglib
     exiv2
-    podofo
+    podofo_0_9
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 42f157f81562..d5fc795c3645 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -14,7 +14,7 @@
   libxml2,
   pixman,
   pkg-config,
-  podofo,
+  podofo_0_10,
   poppler,
   poppler_data,
   python3,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     libxml2
     pixman
-    podofo
+    podofo_0_10
     poppler
     poppler_data
     pythonEnv
diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 0f2b25262a63..ad0c9a0e6e59 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -21,7 +21,7 @@
   optipng,
   piper-tts,
   pkg-config,
-  podofo,
+  podofo_0_10,
   poppler-utils,
   python3Packages,
   qt6,
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     libuchardet
     libusb1
     piper-tts
-    podofo
+    podofo_0_10
     poppler-utils
     qt6.qtbase
     qt6.qtwayland
@@ -156,8 +156,8 @@ stdenv.mkDerivation (finalAttrs: {
     export MAGICK_LIB=${imagemagick.out}/lib
     export FC_INC_DIR=${fontconfig.dev}/include/fontconfig
     export FC_LIB_DIR=${fontconfig.lib}/lib
-    export PODOFO_INC_DIR=${podofo.dev}/include/podofo
-    export PODOFO_LIB_DIR=${podofo}/lib
+    export PODOFO_INC_DIR=${podofo_0_10.dev}/include/podofo
+    export PODOFO_LIB_DIR=${podofo_0_10}/lib
     export XDG_DATA_HOME=$out/share
     export XDG_UTILS_INSTALL_MODE="user"
     export PIPER_TTS_DIR=${piper-tts}/bin
diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index 0495b82c0693..77c9528e4451 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -15,7 +15,7 @@
   libxml2,
   openssl,
   pcsclite,
-  podofo,
+  podofo_0_10,
   ghostscript,
 }:
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
   buildInputs = [
     cryptopp
     fontconfig
-    podofo
+    podofo_0_10
     openssl
     pcsclite
     curl
diff --git a/pkgs/by-name/gi/gImageReader/package.nix b/pkgs/by-name/gi/gImageReader/package.nix
index 36bdd412d35a..b3fec01f2d3d 100644
--- a/pkgs/by-name/gi/gImageReader/package.nix
+++ b/pkgs/by-name/gi/gImageReader/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   libuuid,
   sane-backends,
-  podofo,
+  podofo_0_10,
   libjpeg,
   djvulibre,
   libxmlxx3,
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       libzip
       libuuid
       sane-backends
-      podofo
+      podofo_0_10
       libjpeg
       djvulibre
       tesseract
diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 31c980998aa4..d76be96824d7 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -15,7 +15,7 @@
   ninja,
   opencascade-occt_7_6,
   pkg-config,
-  podofo,
+  podofo_0_10,
   sqlite,
 }:
 let
@@ -51,7 +51,7 @@ rec {
     librsvg
     libuuid
     opencascade-occt
-    podofo
+    podofo_0_10
     sqlite
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 884d6189fe0c..673d6f431ea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9291,7 +9291,7 @@ with pkgs;
 
   place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
 
-  podofo = podofo_0_9;
+  podofo = podofo_1_0;
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 
@@ -12005,10 +12005,6 @@ with pkgs;
 
   calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
 
-  calibre = callPackage ../by-name/ca/calibre/package.nix {
-    podofo = podofo_0_10;
-  };
-
   # calico-felix and calico-node have not been packaged due to libbpf, linking issues
   inherit (callPackage ../applications/networking/cluster/calico { })
     calico-apiserver

From ece2e8dae6e94f60fe7936eda02b1280e961e36f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jun 2025 18:57:38 +0000
Subject: [PATCH 05/28] ipxe: 1.21.1-unstable-2025-06-02 ->
 1.21.1-unstable-2025-06-17

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

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index f1b2db0e39cf..547f953eb665 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-06-02";
+  version = "1.21.1-unstable-2025-06-17";
 
   nativeBuildInputs = [
     mtools
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "5b3ebf8b24ae40a6f9f9f78491702d508f843e56";
-    hash = "sha256-uGR82lR6gpp6IKBVDsKYLtovnbTiWg3RgbVQt6mug+I=";
+    rev = "60e167c00b138fdb162e7b2192e9cbb196ed3cbd";
+    hash = "sha256-RaYu3gvqAxA+vEJdLOLMbCRtrt+PyrRd/Wqyj2hXYZU=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 020fe13bf92e3cd147522f7b7f45e259cd65b6ef Mon Sep 17 00:00:00 2001
From: Andrew Gigena <mail@andrewgigena.dev>
Date: Thu, 19 Jun 2025 23:50:14 -0300
Subject: [PATCH 06/28] maintainers: add andrewgigena

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7724dd513143..b41201df8433 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1606,6 +1606,12 @@
     githubId = 7644264;
     name = "Andrew Gazelka";
   };
+  andrewgigena = {
+    email = "work@andrewgigena.dev";
+    github = "andrewgigena";
+    githubId = 37125554;
+    name = "Andrew Gigena";
+  };
   AndrewKvalheim = {
     email = "andrew@kvalhe.im";
     github = "AndrewKvalheim";

From da029dddebf7f03a1b6de34d60451c16e0fa86ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 21:58:53 +0000
Subject: [PATCH 07/28] python3Packages.coiled: 1.101.1 -> 1.103.1

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

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index 1cb9cd7e94df..f6f18b9ccd93 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.101.1";
+  version = "1.103.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7+uRvyK+PbQ8jHFQhi0+jkwSvUzAMOVAeCZMIUaujeM=";
+    hash = "sha256-EtshOvxaGbciOf0bc0EaNVkOEKI6Z2PbR6ZtgPCuzkc=";
   };
 
   build-system = [

From 2a133e59f3993d8fbe8d884b1197398c18bec56f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 05:23:59 +0000
Subject: [PATCH 08/28] files-cli: 2.15.25 -> 2.15.32

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index a3dce0ff35d9..9d5ce40c9805 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.25";
+  version = "2.15.32";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-pdUvxWdFeL2whTgP+iqJ5spxHW5xMjSpIMf+0VbqPwI=";
+    hash = "sha256-etUcjmRZJvwEUHX87sPBoYsh9oVFm4fxdrJR6VJBvrE=";
   };
 
-  vendorHash = "sha256-bDoomu7zyoTb6yAXwYlLTbw94gTIM0ELbey/AXgov48=";
+  vendorHash = "sha256-8mEl9/ljAKkTHgcEgf+SjeVjFv/fxVlYnhOxKzEIxgM=";
 
   ldflags = [
     "-s"

From 3accd8f7ecd71b81647fdf5eb7fe580997c0ecaf Mon Sep 17 00:00:00 2001
From: Mostafa Khaled <m.khaled.dev@gmail.com>
Date: Fri, 20 Jun 2025 20:56:28 +0300
Subject: [PATCH 09/28] python3Packages.djoser: init at 2.3.1

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

diff --git a/pkgs/development/python-modules/djoser/default.nix b/pkgs/development/python-modules/djoser/default.nix
new file mode 100644
index 000000000000..f0f9669cc046
--- /dev/null
+++ b/pkgs/development/python-modules/djoser/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  django,
+  djangorestframework-simplejwt,
+  social-auth-app-django,
+}:
+
+buildPythonPackage rec {
+  pname = "djoser";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "sunscrapers";
+    repo = "djoser";
+    tag = version;
+    hash = "sha256-xPhf7FiJSq5bHfAU5RKbobgnsRh/6cLcXP6vfrLdzJA=";
+  };
+
+  buildInputs = [
+    django
+    djangorestframework-simplejwt
+    social-auth-app-django
+  ];
+
+  pyproject = true;
+
+  build-system = [
+    poetry-core
+  ];
+
+  # djet isn't packaged yet
+  # nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "djoser" ];
+
+  meta = {
+    changelog = "https://github.com/sunscrapers/djoser/releases/tag/${version}";
+    description = "REST implementation of Django authentication system";
+    homepage = "https://github.com/sunscrapers/djoser";
+    maintainers = with lib.maintainers; [ MostafaKhaled ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95f3fe42791a..ed6efd838906 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4078,6 +4078,8 @@ self: super: with self; {
 
   djmail = callPackage ../development/python-modules/djmail { };
 
+  djoser = callPackage ../development/python-modules/djoser { };
+
   dkimpy = callPackage ../development/python-modules/dkimpy { };
 
   dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; };

From cd09c97fc5514a20a9ea61902ec6397c437066b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 09:45:41 +0000
Subject: [PATCH 10/28] python3Packages.litellm: 1.72.2 -> 1.72.6

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

diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index d86353c3eb04..03cf701b4d55 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -46,7 +46,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.72.2";
+  version = "1.72.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     owner = "BerriAI";
     repo = "litellm";
     tag = "v${version}-stable";
-    hash = "sha256-CGmdk5SjtmeqXLVWiBqvofQ4+C2gW4TJXFkQdaQqMEA=";
+    hash = "sha256-Qs/jmNJx/fztLqce47yd1pzIZyPsz0XhXUyoC1vkp6g=";
   };
 
   build-system = [ poetry-core ];

From c3cf30611407a71c472eae7276eecc647e8d749d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 12:16:53 +0000
Subject: [PATCH 11/28] graphite-cli: 1.6.4 -> 1.6.5

---
 pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++--
 pkgs/by-name/gr/graphite-cli/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index b967b6262200..375f1b011380 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.6.4",
+      "version": "1.6.5",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index f91780ad5067..ca661d8f1743 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -8,14 +8,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-NxqqYghE9QNbO8VdBH4MsUomeRUvYNRijQMqrlE7/II=";
+    hash = "sha256-Z1lJUKe1fET4Xj2bmxCbH2abH/hX6BEtWFD+HC2w2iw=";
   };
 
-  npmDepsHash = "sha256-LDSn5lIEHRyYyicP6b7/CTs5VivzcspeCUQzR+BqrS0=";
+  npmDepsHash = "sha256-lN7mg2gNFXuQ39hbjG7kVvDhPF6mWg3E6dszywbKHZo=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From 5ff574a33461440b310656daf2dd834fe8f56e74 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 21 Jun 2025 06:28:41 -0600
Subject: [PATCH 12/28] wrangler: 4.17.0 -> 4.20.5

https://github.com/cloudflare/workers-sdk/releases/tag/wrangler@4.20.5
Diff: https://github.com/cloudflare/workers-sdk/compare/wrangler@4.17.0...wrangler@4.20.5
---
 pkgs/by-name/wr/wrangler/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index eed4d7d88552..7bbc825262be 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
-  version = "4.17.0";
+  version = "4.20.5";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-sdk";
     rev = "wrangler@${finalAttrs.version}";
-    hash = "sha256-PXVfNYy1gzK1OqYOeGRxTRRrxNEQkEhAjE5J9yKcQ/w=";
+    hash = "sha256-jf4HZVLNqwl8IcS/Po2PKPCd1iMvBuFybhz0z3b0stM=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       postPatch
       ;
-    hash = "sha256-OCxUhvPIPKSGTTeXaLmkErOBpYQ8mKmieUYj6qxuTK4=";
+    hash = "sha256-r3QswmqP6CNufnsFM0KeKojm/HjHogrfYO/TdL3SrmA=";
   };
   # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
   postPatch = ''

From e7cd636ac1fc907b639d48bcfbc3bba5cde50920 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 21 Jun 2025 20:55:44 +0800
Subject: [PATCH 13/28] baidupcs-go: fix building on darwin

---
 pkgs/by-name/ba/baidupcs-go/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index 02cf013e0635..6c2e7b191c7c 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
 
   postInstall = ''
     rm -f $out/bin/AndroidNDKBuild
-    ln -s $out/bin/BaiduPCS-Go $out/bin/baidupcs-go
+    ln -s $out/bin/BaiduPCS-Go $out/bin/baidupcs-go || true
   '';
 
   postVersionCheck = ''

From ee4263b6ad5a04ff67265e8d9644aff552272192 Mon Sep 17 00:00:00 2001
From: Ophestra <contrib@gensokyo.uk>
Date: Sat, 21 Jun 2025 21:54:30 +0900
Subject: [PATCH 14/28] via: fix license metadata

The via electron wrapper claims to be gpl, however source code is not
available and never became available despite frequent requests over a
substantial time period.

This change fixes its metadata in nixpkgs to avoid misleading users.
---
 pkgs/by-name/vi/via/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vi/via/package.nix b/pkgs/by-name/vi/via/package.nix
index 32497ea01073..04e624a6395b 100644
--- a/pkgs/by-name/vi/via/package.nix
+++ b/pkgs/by-name/vi/via/package.nix
@@ -36,7 +36,8 @@ appimageTools.wrapType2 {
   meta = with lib; {
     description = "Yet another keyboard configurator";
     homepage = "https://caniusevia.com/";
-    license = licenses.gpl3;
+    # Upstream claims to be GPL-3 but doesn't release source code
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ emilytrau ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "via";

From f2a2cfee8a0baae45ba9fb94ea6b29644ff4d770 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 20 Jun 2025 15:26:55 +0000
Subject: [PATCH 15/28] treewide: refactor meta section

---
 pkgs/by-name/_0/_0verkill/package.nix                | 8 ++++----
 pkgs/by-name/_0/_0xproto/package.nix                 | 8 ++++----
 pkgs/by-name/_1/_1password-cli/package.nix           | 8 ++++----
 pkgs/by-name/_9/_915resolution/package.nix           | 4 ++--
 pkgs/by-name/_9/_9base/package.nix                   | 8 ++++----
 pkgs/by-name/aa/aaaaxy/package.nix                   | 8 ++++----
 pkgs/by-name/aa/aarch64-esr-decoder/package.nix      | 6 +++---
 pkgs/by-name/ab/abpoa/package.nix                    | 8 ++++----
 pkgs/by-name/ac/acpi/package.nix                     | 6 +++---
 pkgs/by-name/ac/acpic/package.nix                    | 6 +++---
 pkgs/by-name/ac/acpid/package.nix                    | 6 +++---
 pkgs/by-name/ac/acpilight/package.nix                | 8 ++++----
 pkgs/by-name/ac/acsccid/package.nix                  | 8 ++++----
 pkgs/by-name/ac/action-validator/package.nix         | 6 +++---
 pkgs/by-name/ac/activate-linux/package.nix           | 8 ++++----
 pkgs/by-name/ad/adbfs-rootless/package.nix           | 8 ++++----
 pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix | 8 ++++----
 pkgs/by-name/ad/adrgen/package.nix                   | 6 +++---
 pkgs/by-name/ae/aefs/package.nix                     | 8 ++++----
 pkgs/by-name/ae/aeolus/package.nix                   | 8 ++++----
 pkgs/by-name/ae/aerospike/package.nix                | 6 +++---
 pkgs/by-name/ae/aespipe/package.nix                  | 8 ++++----
 pkgs/by-name/af/afetch/package.nix                   | 8 ++++----
 pkgs/by-name/af/afew/package.nix                     | 6 +++---
 pkgs/by-name/af/afsctool/package.nix                 | 8 ++++----
 pkgs/by-name/af/aften/package.nix                    | 8 ++++----
 26 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/pkgs/by-name/_0/_0verkill/package.nix b/pkgs/by-name/_0/_0verkill/package.nix
index 1992dd8cc9ae..c23bad6ef5d8 100644
--- a/pkgs/by-name/_0/_0verkill/package.nix
+++ b/pkgs/by-name/_0/_0verkill/package.nix
@@ -37,11 +37,11 @@ gccStdenv.mkDerivation {
   env.NIX_CFLAGS_COMPILE = "-fcommon";
   hardeningDisable = [ "all" ]; # Someday the upstream will update the code...
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/hackndev/0verkill";
     description = "ASCII-ART bloody 2D action deathmatch-like game";
-    license = with licenses; gpl2Only;
-    maintainers = with maintainers; [ ];
-    platforms = with platforms; unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/_0/_0xproto/package.nix b/pkgs/by-name/_0/_0xproto/package.nix
index 91857593b493..93bb9f31b3ef 100644
--- a/pkgs/by-name/_0/_0xproto/package.nix
+++ b/pkgs/by-name/_0/_0xproto/package.nix
@@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free and Open-source font for programming";
     homepage = "https://github.com/0xType/0xProto";
-    license = licenses.ofl;
-    maintainers = [ maintainers.edswordsmith ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ edswordsmith ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index c3bfcf383d1f..c5f84562267a 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -86,16 +86,16 @@ stdenv.mkDerivation {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "1Password command-line tool";
     homepage = "https://developer.1password.com/docs/cli/";
     downloadPage = "https://app-updates.agilebits.com/product_history/CLI2";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       joelburget
       khaneliman
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
     inherit mainProgram platforms;
   };
 }
diff --git a/pkgs/by-name/_9/_915resolution/package.nix b/pkgs/by-name/_9/_915resolution/package.nix
index 1b2ef09a5789..681855bb2862 100644
--- a/pkgs/by-name/_9/_915resolution/package.nix
+++ b/pkgs/by-name/_9/_915resolution/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patchPhase = "rm *.o";
   installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/";
 
-  meta = with lib; {
+  meta = {
     homepage = "http://915resolution.mango-lang.org/";
     description = "Tool to modify Intel 800/900 video BIOS";
     mainProgram = "915resolution";
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
       "i686-linux"
       "x86_64-linux"
     ];
-    license = licenses.publicDomain;
+    license = lib.licenses.publicDomain;
   };
 }
diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix
index 02aa841117af..cc2410ed3cdb 100644
--- a/pkgs/by-name/_9/_9base/package.nix
+++ b/pkgs/by-name/_9/_9base/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     "troff"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tools.suckless.org/9base/";
     description = "9base is a port of various original Plan 9 tools for Unix, based on plan9port";
     longDescription = ''
@@ -74,12 +74,12 @@ stdenv.mkDerivation {
       The overall SLOC is about 66kSLOC, so this userland + all libs is much smaller than, e.g. bash.
       9base can be used to run werc instead of the full blown plan9port.
     '';
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # and
       lpl-102
     ];
-    maintainers = with maintainers; [ jk ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ jk ];
+    platforms = lib.platforms.unix;
     # needs additional work to support aarch64-darwin
     # due to usage of _DARWIN_NO_64_BIT_INODE
     broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index a1a3d289eea3..784eec6b892b 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -128,12 +128,12 @@ buildGoModule rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Nonlinear 2D puzzle platformer taking place in impossible spaces";
     mainProgram = "aaaaxy";
     homepage = "https://divverent.github.io/aaaaxy/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ Luflosi ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Luflosi ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
index d54b303919c7..b2544b49bc44 100644
--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-LiNnTNpluQkomQhIOsAnUbbBftTgqgNdpT8heCrBayg=";
 
-  meta = with lib; {
+  meta = {
     description = "Utility for decoding aarch64 ESR register values";
     homepage = "https://github.com/google/aarch64-esr-decoder";
     changelog = "https://github.com/google/aarch64-esr-decoder/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jmbaur ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jmbaur ];
     mainProgram = "aarch64-esr-decoder";
   };
 }
diff --git a/pkgs/by-name/ab/abpoa/package.nix b/pkgs/by-name/ab/abpoa/package.nix
index a7f23fc035e9..9b143cbfb04e 100644
--- a/pkgs/by-name/ab/abpoa/package.nix
+++ b/pkgs/by-name/ab/abpoa/package.nix
@@ -90,13 +90,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "SIMD-based C library for fast partial order alignment using adaptive band";
     homepage = "https://github.com/yangao07/abPOA";
     changelog = "https://github.com/yangao07/abPOA/releases/tag/v${finalAttrs.version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "abpoa";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ac/acpi/package.nix b/pkgs/by-name/ac/acpi/package.nix
index 54ea37c8ca2e..4f4583a3d14b 100644
--- a/pkgs/by-name/ac/acpi/package.nix
+++ b/pkgs/by-name/ac/acpi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Show battery status and other ACPI information";
     mainProgram = "acpi";
     longDescription = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://sourceforge.net/projects/acpiclient/";
     license = lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ac/acpic/package.nix b/pkgs/by-name/ac/acpic/package.nix
index 246d6aa67904..516662ffa20d 100644
--- a/pkgs/by-name/ac/acpic/package.nix
+++ b/pkgs/by-name/ac/acpic/package.nix
@@ -27,11 +27,11 @@ python3Packages.buildPythonApplication rec {
   # no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Daemon extending acpid event handling capabilities";
     mainProgram = "acpic";
     homepage = "https://github.com/psliwka/acpic";
-    license = licenses.wtfpl;
-    maintainers = with maintainers; [ aacebedo ];
+    license = lib.licenses.wtfpl;
+    maintainers = with lib.maintainers; [ aacebedo ];
   };
 }
diff --git a/pkgs/by-name/ac/acpid/package.nix b/pkgs/by-name/ac/acpid/package.nix
index 0d626b0fad71..97a5416ab271 100644
--- a/pkgs/by-name/ac/acpid/package.nix
+++ b/pkgs/by-name/ac/acpid/package.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sourceforge.net/projects/acpid2/";
     description = "Daemon for delivering ACPI events to userspace programs";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ac/acpilight/package.nix b/pkgs/by-name/ac/acpilight/package.nix
index 5988f6ba58fc..533fc86901a7 100644
--- a/pkgs/by-name/ac/acpilight/package.nix
+++ b/pkgs/by-name/ac/acpilight/package.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
   ];
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.com/wavexx/acpilight";
     description = "ACPI backlight control";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ smakarov ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ smakarov ];
+    platforms = lib.platforms.linux;
     mainProgram = "xbacklight";
   };
 }
diff --git a/pkgs/by-name/ac/acsccid/package.nix b/pkgs/by-name/ac/acsccid/package.nix
index 37a49bfbabc3..c24a94b3e7e3 100644
--- a/pkgs/by-name/ac/acsccid/package.nix
+++ b/pkgs/by-name/ac/acsccid/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     autoconf
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
     longDescription = ''
       acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
         services.pcscd.plugins = [ pkgs.acsccid ];
     '';
     homepage = src.meta.homepage;
-    license = licenses.lgpl2Plus;
-    maintainers = [ ];
-    platforms = with platforms; unix;
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index df8b6c2fec76..063bf29c3c18 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -25,11 +25,11 @@ rustPlatform.buildRustPackage {
     branch = "main";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to validate GitHub Action and Workflow YAML files";
     homepage = "https://github.com/mpalmer/action-validator";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "action-validator";
-    maintainers = with maintainers; [ thiagokokada ];
+    maintainers = with lib.maintainers; [ thiagokokada ];
   };
 }
diff --git a/pkgs/by-name/ac/activate-linux/package.nix b/pkgs/by-name/ac/activate-linux/package.nix
index 8bc7f83f5d60..75d67265f816 100644
--- a/pkgs/by-name/ac/activate-linux/package.nix
+++ b/pkgs/by-name/ac/activate-linux/package.nix
@@ -61,15 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "\"Activate Windows\" watermark ported to Linux";
     homepage = "https://github.com/MrGlockenspiel/activate-linux";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       alexnortung
       donovanglover
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "activate-linux";
   };
 })
diff --git a/pkgs/by-name/ad/adbfs-rootless/package.nix b/pkgs/by-name/ad/adbfs-rootless/package.nix
index 0d4c6344437d..cf6cf458fc0b 100644
--- a/pkgs/by-name/ad/adbfs-rootless/package.nix
+++ b/pkgs/by-name/ad/adbfs-rootless/package.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Mount Android phones on Linux with adb, no root required";
     mainProgram = "adbfs";
     inherit (src.meta) homepage;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix b/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
index 5aa7e78ac11a..f362ff50f7fa 100644
--- a/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
+++ b/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \;
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Plymouth boot themes from adi1090x";
     longDescription = ''
       A variety of plymouth boot screens by adi1090x.  Using the default value
@@ -60,8 +60,8 @@ stdenv.mkDerivation {
       ./shas.nix for available themes.
     '';
     homepage = "https://github.com/adi1090x/plymouth-themes";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ slwst ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ slwst ];
   };
 }
diff --git a/pkgs/by-name/ad/adrgen/package.nix b/pkgs/by-name/ad/adrgen/package.nix
index e018fd97c083..a54fd666e4cc 100644
--- a/pkgs/by-name/ad/adrgen/package.nix
+++ b/pkgs/by-name/ad/adrgen/package.nix
@@ -35,11 +35,11 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/asiermarques/adrgen";
     description = "Command-line tool for generating and managing Architecture Decision Records";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "adrgen";
   };
 }
diff --git a/pkgs/by-name/ae/aefs/package.nix b/pkgs/by-name/ae/aefs/package.nix
index 024601c772fd..52e11397f9c9 100644
--- a/pkgs/by-name/ae/aefs/package.nix
+++ b/pkgs/by-name/ae/aefs/package.nix
@@ -35,12 +35,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ fuse ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/edolstra/aefs";
     description = "Cryptographic filesystem implemented in userspace using FUSE";
-    maintainers = [ ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ae/aeolus/package.nix b/pkgs/by-name/ae/aeolus/package.nix
index 00dc30271805..958fed5b073e 100644
--- a/pkgs/by-name/ae/aeolus/package.nix
+++ b/pkgs/by-name/ae/aeolus/package.nix
@@ -58,12 +58,12 @@ stdenv.mkDerivation rec {
       echo -n "${cfg}" > $out/etc/aeolus.conf
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Synthetized (not sampled) pipe organ emulator";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       nico202
       orivej
     ];
diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix
index 6f79ead45736..cb322361bedc 100644
--- a/pkgs/by-name/ae/aerospike/package.nix
+++ b/pkgs/by-name/ae/aerospike/package.nix
@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
     cp target/Linux-x86_64/bin/asd $out/bin/asd
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Flash-optimized, in-memory, NoSQL database";
     mainProgram = "asd";
     homepage = "https://aerospike.com/";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ kalbasit ];
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
 }
diff --git a/pkgs/by-name/ae/aespipe/package.nix b/pkgs/by-name/ae/aespipe/package.nix
index 7964bb697cce..e077b6d592a8 100644
--- a/pkgs/by-name/ae/aespipe/package.nix
+++ b/pkgs/by-name/ae/aespipe/package.nix
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
      --prefix PATH : $out/bin:${lib.makeBinPath [ sharutils ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "AES encrypting or decrypting pipe";
     homepage = "https://loop-aes.sourceforge.net/aespipe.README";
-    license = licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/af/afetch/package.nix b/pkgs/by-name/af/afetch/package.nix
index a959d0786420..5eebb959873a 100644
--- a/pkgs/by-name/af/afetch/package.nix
+++ b/pkgs/by-name/af/afetch/package.nix
@@ -19,15 +19,15 @@ stdenv.mkDerivation rec {
     "PREFIX=${placeholder "out"}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fetch program written in C";
     homepage = "https://github.com/13-CF/afetch";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       dan4ik605743
       jk
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "afetch";
   };
 }
diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix
index 912f7ec3d301..a3fc331f1bff 100644
--- a/pkgs/by-name/af/afew/package.nix
+++ b/pkgs/by-name/af/afew/package.nix
@@ -60,11 +60,11 @@ python3Packages.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/afewmail/afew";
     description = "Initial tagging script for notmuch mail";
     mainProgram = "afew";
-    license = licenses.isc;
-    maintainers = with maintainers; [ flokli ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ flokli ];
   };
 }
diff --git a/pkgs/by-name/af/afsctool/package.nix b/pkgs/by-name/af/afsctool/package.nix
index a932a79b63fd..d145161df443 100644
--- a/pkgs/by-name/af/afsctool/package.nix
+++ b/pkgs/by-name/af/afsctool/package.nix
@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
     sparsehash
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Utility that allows end-users to leverage HFS+/APFS compression";
-    license = licenses.unfree;
-    maintainers = [ maintainers.viraptor ];
-    platforms = platforms.darwin;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.darwin;
     homepage = "https://github.com/RJVB/afsctool";
   };
 }
diff --git a/pkgs/by-name/af/aften/package.nix b/pkgs/by-name/af/aften/package.nix
index 36e149541976..b0960550c857 100644
--- a/pkgs/by-name/af/aften/package.nix
+++ b/pkgs/by-name/af/aften/package.nix
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSHARED=ON" ];
 
-  meta = with lib; {
+  meta = {
     description = "Audio encoder which generates compressed audio streams based on ATSC A/52 specification";
     homepage = "https://aften.sourceforge.net/";
-    license = licenses.lgpl21Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ emilytrau ];
+    license = lib.licenses.lgpl21Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ emilytrau ];
   };
 }

From 78e1b5423b80a91f33ae3647ff9779e3f5f4b2a0 Mon Sep 17 00:00:00 2001
From: Alexander Lampalzer <sascha@localhost.systems>
Date: Wed, 18 Jun 2025 22:56:16 +0200
Subject: [PATCH 16/28] foxglove-cli: init at 1.0.23

---
 pkgs/by-name/fo/foxglove-cli/package.nix | 85 ++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 pkgs/by-name/fo/foxglove-cli/package.nix

diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix
new file mode 100644
index 000000000000..a177bd518359
--- /dev/null
+++ b/pkgs/by-name/fo/foxglove-cli/package.nix
@@ -0,0 +1,85 @@
+{
+  stdenv,
+  lib,
+  buildGoModule,
+  buildPackages,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "foxglove-cli";
+  version = "1.0.23";
+
+  src = fetchFromGitHub {
+    owner = "foxglove";
+    repo = "foxglove-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jJD8sRTiJ4UGouc3KFgdgpjL7AQuU4wdxIaLqd/bih4=";
+  };
+
+  vendorHash = "sha256-8WHfXLcpYI2TlXOgjwcuJW61ftTHQEDP0Wc5XZ8ZsCQ=";
+
+  env.CGO_ENABLED = 0;
+  tags = [ "netgo" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  modRoot = "foxglove";
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestDoExport"
+        "TestExport"
+        "TestExportCommand"
+        "TestImport"
+        "TestImportCommand"
+        "TestLogin"
+        "TestLoginCommand"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd foxglove \
+        --bash <(${emulator} $out/bin/foxglove completion bash) \
+        --fish <(${emulator} $out/bin/foxglove completion fish) \
+        --zsh <(${emulator} $out/bin/foxglove completion zsh)
+    ''
+  );
+
+  passthru.updateScript = nix-update-script { };
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
+  meta = {
+    changelog = "https://github.com/foxglove/foxglove-cli/releases/tag/v${finalAttrs.version}";
+    description = "Interact with the Foxglove platform";
+    downloadPage = "https://github.com/foxglove/foxglove-cli";
+    homepage = "https://docs.foxglove.dev/docs/cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sascha8a ];
+    mainProgram = "foxglove";
+  };
+})

From aace24d3f69fcd8278ab4135b5c94f0f461e904c Mon Sep 17 00:00:00 2001
From: quartz <weirdrock@riseup.net>
Date: Fri, 20 Jun 2025 23:45:25 -0400
Subject: [PATCH 17/28] todds: init at 0.4.1

---
 pkgs/by-name/to/todds/TBB-version.patch | 13 ++++++
 pkgs/by-name/to/todds/package.nix       | 54 +++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/to/todds/TBB-version.patch
 create mode 100644 pkgs/by-name/to/todds/package.nix

diff --git a/pkgs/by-name/to/todds/TBB-version.patch b/pkgs/by-name/to/todds/TBB-version.patch
new file mode 100644
index 000000000000..6b16778aa801
--- /dev/null
+++ b/pkgs/by-name/to/todds/TBB-version.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d41a1e2..7990cdf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,7 @@ if (TODDS_REGULAR_EXPRESSIONS)
+ endif ()
+ find_package(OpenCV 4.0 REQUIRED)
+ find_package(Threads REQUIRED)
+-find_package(TBB 2021.5.0 REQUIRED)
++find_package(TBB REQUIRED)
+ 
+ if (TODDS_TRACY)
+ 	find_package(Tracy REQUIRED)
diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix
new file mode 100644
index 000000000000..f6d0a9baca64
--- /dev/null
+++ b/pkgs/by-name/to/todds/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  ninja,
+  pkg-config,
+  ispc,
+  boost,
+  fmt,
+  hyperscan,
+  opencv,
+  tbb_2021,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "todds";
+  version = "0.4.1";
+
+  patches = [ ./TBB-version.patch ];
+
+  src = fetchFromGitHub {
+    owner = "todds-encoder";
+    repo = "todds";
+    tag = finalAttrs.version;
+    hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    ispc
+  ];
+
+  buildInputs = [
+    boost
+    fmt
+    hyperscan
+    opencv
+    tbb_2021
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "CPU-based DDS encoder optimized for fast batch conversions with high encoding quality";
+    homepage = "https://github.com/todds-encoder/todds";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ weirdrock ];
+    mainProgram = "todds";
+    platforms = lib.platforms.linux;
+  };
+})

From 7f0fecce45c4e51fc3db2d7414cdf5f8339d4a93 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Sat, 21 Jun 2025 18:18:01 +0100
Subject: [PATCH 18/28] regionset: include README in package

The README file contains most of the documentation for how to use this
package, and is explicitly referenced in the manual.  Add it to the
compiled package so users can access it more easily, and make sure the
path to the file is correct, too.
---
 pkgs/by-name/re/regionset/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/re/regionset/package.nix b/pkgs/by-name/re/regionset/package.nix
index 547a307ea1fb..cd21a3f23873 100644
--- a/pkgs/by-name/re/regionset/package.nix
+++ b/pkgs/by-name/re/regionset/package.nix
@@ -16,9 +16,15 @@ stdenv.mkDerivation {
     sha256 = "1fgps85dmjvj41a5bkira43vs2aiivzhqwzdvvpw5dpvdrjqcp0d";
   };
 
+  prePatch = ''
+    substituteInPlace regionset.8 \
+        --replace-fail /usr/share/doc/ "$out"/share/doc/
+  '';
+
   installPhase = ''
     install -Dm755 {.,$out/bin}/regionset
     install -Dm644 {.,$out/share/man/man8}/regionset.8
+    install -Dm644 {.,$out/share/doc/regionset}/README
   '';
 
   meta = with lib; {

From 39504265f2434cdeaa16c01903512b20f464f9f5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 21 Jun 2025 22:46:15 +0200
Subject: [PATCH 19/28] ytdl-sub: enable tests

Co-authored-by: nialov <nikolasovaskainen@gmail.com>
---
 pkgs/by-name/yt/ytdl-sub/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 960a5a8cea7f..ac6837807669 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -42,9 +42,28 @@ python3Packages.buildPythonApplication rec {
     "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"
   ];
 
-  nativeCheckInputs = [ versionCheckHook ];
+  nativeCheckInputs = [
+    versionCheckHook
+    python3Packages.pytestCheckHook
+  ];
   versionCheckProgramArg = "--version";
 
+  env = {
+    YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg "ffmpeg"}";
+    YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg "ffprobe"}";
+  };
+
+  disabledTests = [
+    "test_presets_run"
+    "test_logger_can_be_cleaned_during_execution"
+  ];
+
+  pytestFlagsArray = [
+    # According to documentation, e2e tests can be flaky:
+    # "This checksum can be inaccurate for end-to-end tests"
+    "--ignore=tests/e2e"
+  ];
+
   passthru.updateScript = ./update.sh;
 
   meta = {

From 9ab5e86a73577b2b1e0722ac1f58990aec5517dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 00:35:58 +0000
Subject: [PATCH 20/28] erofs-utils: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 12c7369ddd67..d5b1e9d43cc0 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "erofs-utils";
-  version = "1.8.6";
+  version = "1.8.7";
   outputs = [
     "out"
     "man"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
-    hash = "sha256-WyIdw/1tFRQlswU07eRvt6kNwjOoZZy6A3J5awoGZUc=";
+    hash = "sha256-2ElBqDNpqRKPLVezAUqshuY8oasDAAqfW7IccD8Q0nI=";
   };
 
   nativeBuildInputs = [

From bb4801f5202de93bb6b0211524964f56dd6040af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 01:01:54 +0000
Subject: [PATCH 21/28] zashboard: 1.94.0 -> 1.94.2

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

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index a3a17c7221e2..d4d031d62319 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.94.0";
+  version = "1.94.2";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jhnK7G1OLAntVRpozVCn/Gky3qy6rAu8Eevs0nLTvSI=";
+    hash = "sha256-bG4fa6lsOsHYly6ORDx9WzUjgW5liY8hgUblYicbXXY=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-hZ6Lvj4YimhIKFu/fJHCd+EOCny+RSFMOdhBcUUNqNw=";
+    hash = "sha256-aiSZS6FEs7kqGXxC9Tx6Rngv3qrPMi5gOuh5Z3/oZyc=";
   };
 
   buildPhase = ''

From fd1a4b258b4ce4ffc64a23a770bd5997db28480d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 02:33:35 +0000
Subject: [PATCH 22/28] manga-tui: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index 4c2da99f92a4..836934dc461c 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -10,7 +10,7 @@
   nix-update-script,
 }:
 let
-  version = "0.8.0";
+  version = "0.8.1";
 in
 rustPlatform.buildRustPackage {
   pname = "manga-tui";
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
     owner = "josueBarretogit";
     repo = "manga-tui";
     rev = "v${version}";
-    hash = "sha256-81P5LwL9njxA0qx4FvqgrHdqVgUXkZTTzAXLdRTftS4=";
+    hash = "sha256-CAmXTAUlwdc4iGzXonoYPd1okqgA4hWgR9bnsPsuDus=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dne0sJ0K/UVXGaj/vUM9O++ZS0hu69bdLnV8VAr3tbM=";
+  cargoHash = "sha256-viiL1LcBbWuKA+jgkAPc9gpI7wQu4UXfO5DSPm26ido=";
 
   nativeBuildInputs = [ pkg-config ];
 

From acdb7d4da2c206ee9afebfd4b6ce84fc9f02581c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 03:39:18 +0000
Subject: [PATCH 23/28] phel: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 83cd031815b2..9d14d111067c 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5FwYBt1v1zhOnv4Q4zvWUxnVnOeV6rpdSW9i8ptVpW4=";
+    hash = "sha256-YwmDTj1uc71rpp5Iq/7cDq0gLLy8Bh96bu0RaYqi5J0=";
   };
 
-  vendorHash = "sha256-mLSxlPzS/uSNEu7BnQR9yaj3OCSqMe5DHqkLI8dG6SQ=";
+  vendorHash = "sha256-zZK4v9IncoOurf2yUeFqwmAkqsMBlLfuZTUm9cWQBCA=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 3045fea7110e80f5cda7b2beb2405cd740d04ea8 Mon Sep 17 00:00:00 2001
From: Andrew Gigena <mail@andrewgigena.dev>
Date: Sun, 22 Jun 2025 01:20:47 -0300
Subject: [PATCH 24/28] opencl-caps-viewer: init at 1.20

---
 .../by-name/op/opencl-caps-viewer/package.nix | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/op/opencl-caps-viewer/package.nix

diff --git a/pkgs/by-name/op/opencl-caps-viewer/package.nix b/pkgs/by-name/op/opencl-caps-viewer/package.nix
new file mode 100644
index 000000000000..bff2baab4143
--- /dev/null
+++ b/pkgs/by-name/op/opencl-caps-viewer/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ocl-icd,
+  opencl-headers,
+  libsForQt5,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opencl-caps-viewer";
+  version = "1.20";
+
+  src = fetchFromGitHub {
+    owner = "SaschaWillems";
+    repo = "OpenCLCapsViewer";
+    tag = finalAttrs.version;
+    hash = "sha256-P7G8FvVXzDAfN3d4pGXC+c9x4bY08/cJNYQ6lvjyVCQ=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    ocl-icd
+    opencl-headers
+    libsForQt5.qtx11extras
+    libsForQt5.qtbase
+  ];
+
+  postPatch = ''
+    # Fix installation paths
+    substituteInPlace OpenCLCapsViewer.pro \
+      --replace-fail "target.path = /usr/bin" "target.path = /bin/" \
+      --replace-fail "desktop.path = /usr/share/applications" "desktop.path = /share/applications" \
+      --replace-fail "icon.path = /usr/share/icons/hicolor/256x256/apps/" "icon.path = /share/icons/hicolor/256x256/apps/" \
+      --replace-fail 'else: unix:!android: target.path = /opt/$${TARGET}/bin' ""
+  '';
+
+  qmakeFlags = [
+    "OpenCLCapsViewer.pro"
+    "CONFIG+=x11"
+  ];
+
+  installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ];
+
+  postInstall = ''
+    cp Resources/icon.png $out/share/icons/hicolor/256x256/apps/openclCapsViewer.png
+  '';
+
+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${ocl-icd}/lib"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    mainProgram = "OpenCLCapsViewer";
+    description = "OpenCL hardware capability viewer";
+    longDescription = ''
+      Client application to display hardware implementation details for devices supporting the OpenCL API by Khronos.
+      The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc.
+    '';
+    homepage = "https://opencl.gpuinfo.org/";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ andrewgigena ];
+    changelog = "https://github.com/SaschaWillems/OpenCLCapsViewer/releases/tag/${finalAttrs.version}";
+  };
+})

From 4e3389a1ae6a67ff0c8772b5d6087b02549145e7 Mon Sep 17 00:00:00 2001
From: darkyzhou <darkyoooooo@gmail.com>
Date: Sun, 22 Jun 2025 12:08:42 +0800
Subject: [PATCH 25/28] maintainers: add darkyzhou

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b3658e72834e..c775e913e3af 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5702,6 +5702,12 @@
     github = "DarkOnion0";
     githubId = 68606322;
   };
+  darkyzhou = {
+    name = "darkyzhou";
+    email = "me@zqy.io";
+    github = "darkyzhou";
+    githubId = 7220778;
+  };
   daru-san = {
     name = "Daru";
     email = "zadarumaka@proton.me";

From 402f0fc40e1a46907a6f772b4a2cdfd02dbb259f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 03:06:18 +0000
Subject: [PATCH 26/28] plymouth-vortex-ubuntu-theme: 0-unstable-2024-11-20 ->
 0-unstable-2025-06-20

---
 pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix b/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix
index e1faaa81ea42..1a5128f21597 100644
--- a/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix
+++ b/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "plymouth-vortex-ubuntu-theme";
-  version = "0-unstable-2024-11-20";
+  version = "0-unstable-2025-06-20";
 
   src = fetchFromGitHub {
     owner = "emanuele-scarsella";
     repo = "vortex-ubuntu-plymouth-theme";
-    rev = "5b3c88102fd8f322626c01514deedd7ba8e7ebdd";
-    hash = "sha256-AuYLjyOfpmwE4pFhKDQdR1uC+6Rr5FWUC5h9yWesXRE=";
+    rev = "3072445ee35f10a0268baa9aaa326c0abd54af3e";
+    hash = "sha256-RBV5g1ccDw7O6MnrLb2yCga/ASjVo7GOE5CIoJcku4w=";
   };
 
   dontBuild = true;

From d3cd2e74d7ba8b2a0f65dfa95f69ab271b70d7fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 04:30:44 +0000
Subject: [PATCH 27/28] hyprprop: 0.1-unstable-2025-05-18 ->
 0.1-unstable-2025-06-19

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

diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index 8e4daab9e84b..63a8d07dbf78 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hyprprop";
-  version = "0.1-unstable-2025-05-18";
+  version = "0.1-unstable-2025-06-19";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "910dad4c5755c1735d30da10c96d9086aa2a608d";
-    hash = "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=";
+    rev = "189f32f56285aae9646bf1292976392beba5a2e2";
+    hash = "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hyprprop";

From a003dc975416ade78a03694fab3bf524c96177d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 21:45:03 +0000
Subject: [PATCH 28/28] uwsm: 0.21.8 -> 0.22.0

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

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index b0ae1721c435..891f6adce484 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.21.8";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b5n0SuJ0WEm7Mx77BVgjabw5QQeXR7lGUHLxIyqmM9I=";
+    hash = "sha256-8MdgtfmgWVUl5YPP/91KrGNNHl60P2ID2TUMZ4V3BiI=";
   };
 
   nativeBuildInputs = [