From 5bb820b071dc4b42c402c371f156675756dcbeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Mon, 7 Apr 2025 13:51:12 +0700
Subject: [PATCH 01/61] inter-alia: init at 0-unstable-2024-01-12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are tags in the repo but it doesn’t seem to follow a conventional
scheme & is 2 years older than latest on-going commits
---
 pkgs/by-name/in/inter-alia/package.nix | 54 ++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/in/inter-alia/package.nix

diff --git a/pkgs/by-name/in/inter-alia/package.nix b/pkgs/by-name/in/inter-alia/package.nix
new file mode 100644
index 000000000000..820c1775ecea
--- /dev/null
+++ b/pkgs/by-name/in/inter-alia/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "inter-alia";
+  version = "0-unstable-2024-01-12";
+
+  src = fetchFromGitHub {
+    owner = "Shavian-info";
+    repo = "interalia";
+    rev = "5d182c4eb5511fec3879646c8b44c79ba338d53e";
+    hash = "sha256-q93cCrbKc72CH/2ybJPDY5wkUZvFyCKoyQe6WhL+kAU=";
+  };
+
+  outputs = [
+    "out"
+    "web"
+    "variable"
+    "variableweb"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -m444 -t $out/share/fonts/opentype instance_otf/*.otf
+    install -D -m444 -t $out/share/fonts/truetype instance_ttf/*.ttf
+    install -D -m444 -t $web/share/fonts/webfont instance_woff2/*.woff2
+    install -D -m444 -t $variable/share/fonts/opentype variable_otf/*.otf
+    install -D -m444 -t $variable/share/fonts/truetype variable_ttf/*.ttf
+    install -D -m444 -t $variableweb/share/fonts/webfont variable_woff2/*.woff2
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://shavian.info/shavian_fonts/";
+    description = "Expansion of Inter typeface to support the Shavian alphabet, old-style figures, & refinements to IPA glyphs";
+    longDescription = ''
+          Inter Alia is an expanded version of Rasmus Andersson's beautiful open source sans serif typeface, Inter. Inter was specially designed for user interfaces with focus on high legibility of small-to-medium sized text on computer screens.
+
+      Inter Alia builds on the features of Inter to add:
+
+          support for the Shavian alphabet with a newly designed set of glyphs, including the letters missing from Unicode (through character variants accessed by inserting 'Variation Selector 1' (U+FE00) after 𐑒, 𐑜, 𐑢, 𐑤, 𐑻, and 𐑺)
+          support for old-style figures or numerals, also known as text figures, with both proportional and tabular spacing
+          refinements to International Phonetic Alphabet glyphs and other less common glyphs.
+    '';
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ toastal ];
+  };
+}

From f90c1421718b174538d282b86e40cf94ed250499 Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Tue, 15 Apr 2025 06:24:30 +0000
Subject: [PATCH 02/61] encrypted-dns-server: init at 0.9.16

---
 .../en/encrypted-dns-server/package.nix       | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/en/encrypted-dns-server/package.nix

diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix
new file mode 100644
index 000000000000..dd8aa1a4c326
--- /dev/null
+++ b/pkgs/by-name/en/encrypted-dns-server/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libsodium,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "encrypted-dns-server";
+  version = "0.9.16";
+
+  src = fetchFromGitHub {
+    owner = "DNSCrypt";
+    repo = "encrypted-dns-server";
+    tag = version;
+    hash = "sha256-llBMOqmxEcysoBsRg5s1uqCyR6+ilTgBI7BaeSDVoEw=";
+  };
+
+  cargoHash = "sha256-33XcfiktgDG34aamw8X3y0QkybVENUJxLhx47WZUpFc=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libsodium ];
+
+  env = {
+    SODIUM_USE_PKG_CONFIG = true;
+  };
+
+  passthru.updateScript = nix-update-script { };
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/encrypted-dns";
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}";
+    description = "An easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server";
+    homepage = "https://github.com/DNSCrypt/encrypted-dns-server";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paepcke ];
+    mainProgram = "encrypted-dns";
+  };
+}

From 06727476d178e2ca79d8ce6f7c6f71be65840015 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 22 Apr 2025 19:56:51 +0200
Subject: [PATCH 03/61] edopro: Fix passthru.updateScript

- Error output was not getting printed to stderr, so running it via update.nix wouldn't display the error
- Fetched latest irrlicht was getting overridden by fixed irrlicht rev, meaning that irrlicht would never get an update
---
 pkgs/by-name/ed/edopro/update.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py
index c7594b758d21..5e0efed21ddc 100755
--- a/pkgs/by-name/ed/edopro/update.py
+++ b/pkgs/by-name/ed/edopro/update.py
@@ -2,6 +2,7 @@
 #! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit
 import json
 import subprocess
+import sys
 
 from githubkit import GitHub, UnauthAuthStrategy
 from githubkit.versions.latest.models import (
@@ -15,15 +16,11 @@ DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix"
 with GitHub(UnauthAuthStrategy()) as github:
     edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0]
 
-    # This dep is not versioned in anyway and is why we check below to see if this is a new version.
+    # This dep is not versioned in any way and is why we check below to see if this is a new version.
     irrlicht: Commit = github.rest.repos.list_commits(
         "edo9300", "irrlicht1-8-4"
     ).parsed_data[0]
 
-    irrlicht: Commit = github.rest.repos.get_commit(
-        "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22"
-    ).parsed_data
-
 
 edopro_working_version: str = ""
 try:
@@ -32,11 +29,11 @@ try:
             if "edopro-version" in line:
                 edopro_working_version = line.split('"')[1]
 except FileNotFoundError:
-    print("Error: Dep file not found.")
+    print("Error: Dep file not found.", file=sys.stderr)
     exit(2)
 
 if edopro_working_version == "":
-    print("Working version is unbound")
+    print("Working version is unbound", file=sys.stderr)
     exit(5)
 
 if edopro_working_version == edopro.name:
@@ -98,7 +95,7 @@ with open(DEPS_PATH, "w") as file:
   edopro-version = "{edopro.name}";
   edopro-rev = "{edopro.commit.sha}";
   edopro-hash = "{edopro_hash}";
-  irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}";
+  irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.strftime("%Y-%m-%d")}";
   irrlicht-rev = "{irrlicht.sha}";
   irrlicht-hash = "{irrlicht_hash}";
 }}

From 318c38a04ab476db94904aeb1f8c70afe2410f24 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 24 Apr 2025 19:59:40 +0200
Subject: [PATCH 04/61] edopro: Build & set up ocgcore from src as default core

Unlike last time, we still build edopro to look in downloaded script repos for updated ocgcores.
We just patch it so it can find & load the ocgcore from its release tag first, in case the
scripts download doesn't have a core.
---
 pkgs/by-name/ed/edopro/deps.nix               |  2 +-
 .../ed/edopro/ocgcore-lua-symbols.patch       | 29 +++++++
 pkgs/by-name/ed/edopro/package.nix            | 77 +++++++++++++++++--
 pkgs/by-name/ed/edopro/update.py              |  2 +-
 4 files changed, 102 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch

diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix
index e45c21c0f662..0a6ac49aca3c 100644
--- a/pkgs/by-name/ed/edopro/deps.nix
+++ b/pkgs/by-name/ed/edopro/deps.nix
@@ -4,7 +4,7 @@
   assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k=";
   edopro-version = "40.1.4";
   edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b";
-  edopro-hash = "sha256-mj0xEJsFcnY//za0uJosAPOPbU/jlduNX0YSNmvduLE=";
+  edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo=";
   irrlicht-version = "1.9.0-unstable-2023-02-18";
   irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22";
   irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA=";
diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
new file mode 100644
index 000000000000..253051ebf0f7
--- /dev/null
+++ b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
@@ -0,0 +1,29 @@
+From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Mon, 21 Oct 2024 17:42:24 +0200
+Subject: [PATCH] Mark Lua symbols as C symbols
+
+Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols.
+---
+ interpreter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/interpreter.h b/interpreter.h
+index 6c405a1..c471ecb 100644
+--- a/interpreter.h
++++ b/interpreter.h
+@@ -9,9 +9,11 @@
+ #define INTERPRETER_H_
+ 
+ // Due to longjmp behaviour, we must build Lua as C++ to avoid UB
++extern "C" {
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>
++}
+ 
+ #include "common.h"
+ #include <unordered_map>
+-- 
+2.44.1
+
diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index ba6cc7c6ae76..b43b9d2d7bf7 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -27,6 +27,7 @@
   libX11,
   libxkbcommon,
   libXxf86vm,
+  lua5_3,
   mono,
   nlohmann_json,
   openal,
@@ -57,6 +58,14 @@ let
   ];
 
   deps = import ./deps.nix;
+
+  edopro-src = fetchFromGitHub {
+    owner = "edo9300";
+    repo = "edopro";
+    rev = deps.edopro-rev;
+    fetchSubmodules = true;
+    hash = deps.edopro-hash;
+  };
 in
 let
   assets = fetchzip {
@@ -107,16 +116,67 @@ let
     };
   };
 
+  ocgcore = stdenv.mkDerivation {
+    pname = "ocgcore-edopro";
+    version = deps.edopro-version;
+
+    src = edopro-src;
+    sourceRoot = "${edopro-src.name}/ocgcore";
+
+    patches = [
+      # Fix linking against our Lua (different name mangling, C in Lua vs C++ in ocgcore)
+      ./ocgcore-lua-symbols.patch
+    ];
+
+    nativeBuildInputs = [
+      premake5
+    ];
+
+    # Drop when edopro version >= 41
+    buildInputs = [ lua5_3 ];
+    preBuild = ''
+      premake5 gmake2 \
+        --lua-path="${lua5_3}"
+    '';
+
+    enableParallelBuilding = true;
+
+    buildFlags = [
+      "verbose=true"
+      "config=release"
+      "ocgcoreshared"
+    ];
+
+    makeFlags = [
+      "-C"
+      "build"
+    ];
+
+    # To make sure linking errors are discovered at build time, not when edopro runs into them during loading
+    env.NIX_LDFLAGS = "--unresolved-symbols=report-all";
+
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm644 -t $out/lib bin/release/libocgcore*${stdenv.hostPlatform.extensions.sharedLibrary}
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "YGOPro script engine";
+      homepage = "https://github.com/edo9300/ygopro-core";
+      license = lib.licenses.agpl3Plus;
+      inherit maintainers;
+      platforms = lib.platforms.unix;
+    };
+  };
+
   edopro = stdenv.mkDerivation {
     pname = "edopro";
     version = deps.edopro-version;
 
-    src = fetchFromGitHub {
-      owner = "edo9300";
-      repo = "edopro";
-      rev = deps.edopro-rev;
-      hash = deps.edopro-hash;
-    };
+    src = edopro-src;
 
     nativeBuildInputs = [
       makeWrapper
@@ -150,10 +210,15 @@ let
     ];
 
     # nixpkgs' gcc stack currently appears to not support LTO
+    # Override where bundled ocgcore get looked up in, so we can supply ours
+    # (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)
     postPatch = ''
       substituteInPlace premake5.lua \
         --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"'
 
+      substituteInPlace gframe/game.cpp \
+        --replace-fail 'ocgcore = LoadOCGcore(Utils::GetWorkingDirectory())' 'ocgcore = LoadOCGcore("${lib.getLib ocgcore}/lib/")'
+
       touch ocgcore/premake5.lua
     '';
 
diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py
index 5e0efed21ddc..f582fe6a9d89 100755
--- a/pkgs/by-name/ed/edopro/update.py
+++ b/pkgs/by-name/ed/edopro/update.py
@@ -53,7 +53,7 @@ def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str:
     return out_json["hash"]
 
 
-edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha)
+edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True)
 irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha)
 
 asset_legacy_hash: str = (

From 08c916906d4f4556d46c7fd569c7c1298c6056e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 22:47:08 +0000
Subject: [PATCH 05/61] apkid: 2.1.5 -> 3.0.0

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

diff --git a/pkgs/by-name/ap/apkid/package.nix b/pkgs/by-name/ap/apkid/package.nix
index eb496bf43ad3..bd28e4d08de1 100644
--- a/pkgs/by-name/ap/apkid/package.nix
+++ b/pkgs/by-name/ap/apkid/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "apkid";
-  version = "2.1.5";
+  version = "3.0.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "rednaga";
     repo = "APKiD";
     tag = "v${version}";
-    hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4=";
+    hash = "sha256-/8p2qR1je65k1irXFcCre2e16rhGjcu0+u6RChMYTWQ=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 15d9300a4b1c7085ca83df43788e45112701daa7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 05:02:21 +0200
Subject: [PATCH 06/61] stepmania: fix build with system zlib

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

diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix
index f978d8c62bba..96c590de81bb 100644
--- a/pkgs/by-name/st/stepmania/package.nix
+++ b/pkgs/by-name/st/stepmania/package.nix
@@ -17,6 +17,7 @@
   libvorbis,
   udev,
   xorg,
+  zlib,
 }:
 
 stdenv.mkDerivation {
@@ -61,11 +62,13 @@ stdenv.mkDerivation {
     libvorbis
     udev
     xorg.libXtst
+    zlib
   ];
 
   cmakeFlags = [
     "-DWITH_SYSTEM_FFMPEG=1"
     "-DWITH_SYSTEM_PNG=on"
+    "-DWITH_SYSTEM_ZLIB=on"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];

From f93ca760ca989be50e4f9fb89a7f489dc326820d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 24 Apr 2025 17:34:08 +0200
Subject: [PATCH 07/61] edopro: Use writeShellApplication for launcher script,
 keep assets in subdirs

- Use WriteShellApplication for the launcher script, since that provides some good default shell options
  and runs shellcheck on the code
  - Fix any issues reported by shellcheck
- Keep assets in subdirs with corresponding edopro version
  Since some of the assets tell the game which game scripts to download, where to look for them, and which servers to
  look at for online play, and managing this across versions could be messy
- Check for multiple subdirs and issue warning about migrating data
  Let's not try to solve this ourselves, the user will know best if, and what, they care about when switching between versions
---
 pkgs/by-name/ed/edopro/package.nix | 68 ++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index b43b9d2d7bf7..7060714e6177 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -6,12 +6,14 @@
   fetchzip,
   makeWrapper,
   premake5,
-  writeShellScriptBin,
+  writeShellApplication,
   runCommandLocal,
   symlinkJoin,
+  writeText,
   imagemagick,
   bzip2,
   curl,
+  envsubst,
   flac,
   # Use fmt 10+ after release 40.1.4+
   fmt_9,
@@ -35,6 +37,7 @@
   sqlite,
   wayland,
   egl-wayland,
+  zenity,
   covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg",
   fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png",
   # While ygoprodeck has higher quality images, "spamming" of their api results in a ban.
@@ -309,21 +312,62 @@ let
         "textures"
         "WindBot"
       ];
+      wrapperZenityMessageTemplate = writeText "edopro-wrapper-multiple-versions-message.txt.in" ''
+        Nixpkgs' EDOPro wrapper has found more than 1 directory in: ''${EDOPRO_BASE_DIR}
+
+        We expected the only directory to be: ''${EDOPRO_DIR}
+
+        There may have been an update, requiring you to migrate any files you care about from an older version.
+
+        Examples include:
+
+        - decks/*
+        - config/system.conf - which has your client's settings
+        - any custom things you may have installed into: fonts, skins, script, sound, ...
+        - anything you wish to preserve from: replay, screenshots
+
+        Once you have copied over everything important to ''${EDOPRO_DIR}, delete the old version's path.
+      '';
     in
-    writeShellScriptBin "edopro" ''
-      set -eu
-      EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro"
+    writeShellApplication {
+      name = "edopro";
+      runtimeInputs = [
+        envsubst
+        zenity
+      ];
+      text = ''
+        export EDOPRO_VERSION="${deps.edopro-version}"
+        export EDOPRO_BASE_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro"
+        export EDOPRO_DIR="''${EDOPRO_BASE_DIR}/''${EDOPRO_VERSION}"
 
-      if [ ! -d $EDOPRO_DIR ]; then
-          mkdir -p $EDOPRO_DIR
-          cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR
-          chmod -R go-rwx $EDOPRO_DIR
+        # If versioned directory doesn't exist yet, make it & copy over assets
+        if [ ! -d "$EDOPRO_DIR" ]; then
+            mkdir -p "$EDOPRO_DIR"
+            cp -r --no-preserve=all ${assets}/{${assetsToCopy}} "$EDOPRO_DIR"
+            chmod -R go-rwx "$EDOPRO_DIR"
 
-          rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in
-      fi
+            rm "$EDOPRO_DIR"/config/io.github.edo9300.EDOPro.desktop.in
+        fi
 
-      exec ${lib.getExe edopro} -C $EDOPRO_DIR $@
-    '';
+        # Different versions provide different assets. Some are necessary for the game to run properly (configs for
+        # where to get incremental updates from, online servers, card scripting, certificates for communication etc),
+        # and some are optional nice-haves (example decks). It's also possible to override assets with custom skins.
+        #
+        # Don't try to manage all of this across versions, just inform the user that they may need to migrate their
+        # files if it looks like there are multiple versions.
+
+        edoproTopDirs="$(find "$EDOPRO_BASE_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l)"
+        if [ "$edoproTopDirs" -ne 1 ]; then
+          zenity \
+            --info \
+            --title='[NIX] Multiple asset copies found' \
+            --text="$(envsubst < ${wrapperZenityMessageTemplate})" \
+            --ok-label='Continue to EDOPro'
+        fi
+
+        exec ${lib.getExe edopro} -C "$EDOPRO_DIR" "$@"
+      '';
+    };
 
   edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } ''
     mkdir -p $out/share/applications

From 160d74ddfba4ff8f77023f5f10f400174c707b99 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 28 Apr 2025 23:37:46 +0200
Subject: [PATCH 08/61] edopro: 40.1.4 -> 41.0.2

- Rename ocgcore library to match expected platform-specific name
---
 pkgs/by-name/ed/edopro/deps.nix    |  14 ++--
 pkgs/by-name/ed/edopro/package.nix | 119 +++++++++++++++--------------
 2 files changed, 69 insertions(+), 64 deletions(-)

diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix
index 0a6ac49aca3c..14535d8f4634 100644
--- a/pkgs/by-name/ed/edopro/deps.nix
+++ b/pkgs/by-name/ed/edopro/deps.nix
@@ -1,11 +1,11 @@
 # This is automatically generated by the update script.
 # DO NOT MANUALLY EDIT.
 {
-  assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k=";
-  edopro-version = "40.1.4";
-  edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b";
-  edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo=";
-  irrlicht-version = "1.9.0-unstable-2023-02-18";
-  irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22";
-  irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA=";
+  assets-hash = "sha256-cta4k6yxrdaFFfum0eshEzLODExBfA+oVPqcOpXG9uk=";
+  edopro-version = "41.0.2";
+  edopro-rev = "e5c0578aa504d0831dcbe29dbacd018f7b885b2c";
+  edopro-hash = "sha256-ZkQXWt73S3Nn+RnkG+e91BId7keI5OpM3NSeDMJWlZY=";
+  irrlicht-version = "1.9.0-unstable-2025-03-30";
+  irrlicht-rev = "47264fc2bc3223d110c589c9ffe4339d696a3dd0";
+  irrlicht-hash = "sha256-AwUCHQOivNgSnYe8kG6JxDIz7H5PC6RoozGiOGUejTI=";
 }
diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index 7060714e6177..a19f90aed995 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   fetchzip,
   makeWrapper,
   premake5,
@@ -15,8 +14,7 @@
   curl,
   envsubst,
   flac,
-  # Use fmt 10+ after release 40.1.4+
-  fmt_9,
+  fmt,
   freetype,
   irrlicht,
   libevent,
@@ -29,7 +27,6 @@
   libX11,
   libxkbcommon,
   libXxf86vm,
-  lua5_3,
   mono,
   nlohmann_json,
   openal,
@@ -119,61 +116,77 @@ let
     };
   };
 
-  ocgcore = stdenv.mkDerivation {
-    pname = "ocgcore-edopro";
-    version = deps.edopro-version;
+  ocgcore =
+    let
+      # Refer to CORENAME EPRO_TEXT in <edopro>/gframe/dllinterface.cpp for this
+      ocgcoreName = lib.strings.concatStrings [
+        (lib.optionalString (!stdenv.hostPlatform.isWindows) "lib")
+        "ocgcore"
+        (
+          if stdenv.hostPlatform.isiOS then
+            "-ios"
+          else if stdenv.hostPlatform.isAndroid then
+            (
+              if stdenv.hostPlatform.isx86_64 then
+                "x64"
+              else if stdenv.hostPlatform.isx86_32 then
+                "x86"
+              else if stdenv.hostPlatform.isAarch64 then
+                "v8"
+              else if stdenv.hostPlatform.isAarch32 then
+                "v7"
+              else
+                throw "Don't know what platform suffix edopro expects for ocgcore on: ${stdenv.hostPlatform.system}"
+            )
+          else
+            lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ".aarch64"
+        )
+        stdenv.hostPlatform.extensions.sharedLibrary
+      ];
+    in
+    stdenv.mkDerivation {
+      pname = "ocgcore-edopro";
+      version = deps.edopro-version;
 
-    src = edopro-src;
-    sourceRoot = "${edopro-src.name}/ocgcore";
+      src = edopro-src;
+      sourceRoot = "${edopro-src.name}/ocgcore";
 
-    patches = [
-      # Fix linking against our Lua (different name mangling, C in Lua vs C++ in ocgcore)
-      ./ocgcore-lua-symbols.patch
-    ];
+      nativeBuildInputs = [
+        premake5
+      ];
 
-    nativeBuildInputs = [
-      premake5
-    ];
+      enableParallelBuilding = true;
 
-    # Drop when edopro version >= 41
-    buildInputs = [ lua5_3 ];
-    preBuild = ''
-      premake5 gmake2 \
-        --lua-path="${lua5_3}"
-    '';
+      buildFlags = [
+        "verbose=true"
+        "config=release"
+        "ocgcoreshared"
+      ];
 
-    enableParallelBuilding = true;
+      makeFlags = [
+        "-C"
+        "build"
+      ];
 
-    buildFlags = [
-      "verbose=true"
-      "config=release"
-      "ocgcoreshared"
-    ];
+      # To make sure linking errors are discovered at build time, not when edopro runs into them during loading
+      env.NIX_LDFLAGS = "--unresolved-symbols=report-all";
 
-    makeFlags = [
-      "-C"
-      "build"
-    ];
+      installPhase = ''
+        runHook preInstall
 
-    # To make sure linking errors are discovered at build time, not when edopro runs into them during loading
-    env.NIX_LDFLAGS = "--unresolved-symbols=report-all";
+        install -Dm644 bin/release/*ocgcore*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/${ocgcoreName}
 
-    installPhase = ''
-      runHook preInstall
+        runHook postInstall
+      '';
 
-      install -Dm644 -t $out/lib bin/release/libocgcore*${stdenv.hostPlatform.extensions.sharedLibrary}
-
-      runHook postInstall
-    '';
-
-    meta = {
-      description = "YGOPro script engine";
-      homepage = "https://github.com/edo9300/ygopro-core";
-      license = lib.licenses.agpl3Plus;
-      inherit maintainers;
-      platforms = lib.platforms.unix;
+      meta = {
+        description = "YGOPro script engine";
+        homepage = "https://github.com/edo9300/ygopro-core";
+        license = lib.licenses.agpl3Plus;
+        inherit maintainers;
+        platforms = lib.platforms.unix;
+      };
     };
-  };
 
   edopro = stdenv.mkDerivation {
     pname = "edopro";
@@ -190,7 +203,7 @@ let
       bzip2
       curl
       flac
-      fmt_9
+      fmt
       freetype
       irrlicht-edopro
       libevent
@@ -204,14 +217,6 @@ let
       sqlite
     ];
 
-    patches = [
-      (fetchpatch {
-        name = "libgit2-version.patch";
-        url = "https://github.com/edo9300/edopro/commit/f8ddbfff51231827a8dd1dcfcb2dda85f50a56d9.patch";
-        hash = "sha256-w9VTmWfw6vEyVvsOH+AK9lAbUOV+MagzGQ3Wa5DCS/U=";
-      })
-    ];
-
     # nixpkgs' gcc stack currently appears to not support LTO
     # Override where bundled ocgcore get looked up in, so we can supply ours
     # (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)

From 1e9c870b20dea2501852895fee93739f2caedcce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 00:52:59 +0000
Subject: [PATCH 09/61] victoriametrics: 1.115.0 -> 1.116.0

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

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 5f87b1a94c2d..183260448d55 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.115.0";
+  version = "1.116.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pCr2H6kaZURLX4IustRZuSIlIdRWU2Spzh1SWoYYj8M=";
+    hash = "sha256-iXMn1C5dUzsZSNwv4PqS4iMsTlxjhj9U9YLJHy8WGHs=";
   };
 
   vendorHash = null;

From 0776b2ddf1f978c273148db82c6581cf36e0aadd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 29 Apr 2025 10:07:05 +0200
Subject: [PATCH 10/61] apkid: refactor

---
 pkgs/by-name/ap/apkid/package.nix | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ap/apkid/package.nix b/pkgs/by-name/ap/apkid/package.nix
index bd28e4d08de1..2ee7d82560bc 100644
--- a/pkgs/by-name/ap/apkid/package.nix
+++ b/pkgs/by-name/ap/apkid/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "apkid";
   version = "3.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rednaga";
@@ -16,34 +16,31 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-/8p2qR1je65k1irXFcCre2e16rhGjcu0+u6RChMYTWQ=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    yara-python
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
-
-  preBuild = ''
-    # Prepare the YARA rules
-    ${python3.interpreter} prep-release.py
-  '';
-
   postPatch = ''
     # We have dex support enabled in yara-python
     substituteInPlace setup.py \
       --replace "yara-python-dex>=1.0.1" "yara-python"
   '';
 
-  pythonImportsCheck = [
-    "apkid"
-  ];
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [ yara-python ];
+
+  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
+
+  preBuild = ''
+    # Prepare the YARA rules
+    ${python3.interpreter} prep-release.py
+  '';
+
+  pythonImportsCheck = [ "apkid" ];
 
   meta = with lib; {
     description = "Android Application Identifier";
-    mainProgram = "apkid";
     homepage = "https://github.com/rednaga/APKiD";
-    license = with licenses; [ gpl3Only ];
+    changelog = "https://github.com/rednaga/APKiD/releases/tag/${src.tag}";
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "apkid";
   };
 }

From 103ce783fc3cd5331f3b3f990b5887019650a7f7 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 29 Apr 2025 22:30:07 +0800
Subject: [PATCH 11/61] gucci: 1.6.10 -> 1.9.0

Diff: https://github.com/noqcks/gucci/compare/refs/tags/v1.6.10...refs/tags/v1.9.0
---
 pkgs/by-name/gu/gucci/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gu/gucci/package.nix b/pkgs/by-name/gu/gucci/package.nix
index 4660c1a97ba5..87f8d7cbfd4c 100644
--- a/pkgs/by-name/gu/gucci/package.nix
+++ b/pkgs/by-name/gu/gucci/package.nix
@@ -6,23 +6,23 @@
   gucci,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gucci";
-  version = "1.6.10";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "noqcks";
     repo = "gucci";
-    tag = version;
-    sha256 = "sha256-bwPQQtaPHby96C5ZHZhBTok+m8GPPS40U1CUPVYqCa4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CL4Vn3DP40tBBejN28iQSIV+2GtHwl7IS8zVJ5wcqwY=";
   };
 
-  vendorHash = "sha256-/4OnbtxxhXQnmSV6UbjgzXdL7szhL9rKiG5BR8FsyqI=";
+  vendorHash = "sha256-+0pq2lbwfvWdAiz7nONrmlRRxS886B+wieoMeuxLUtM=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.AppVersion=${version}"
+    "-X main.AppVersion=${finalAttrs.version}"
   ];
 
   passthru.tests.version = testers.testVersion {
@@ -38,11 +38,11 @@ buildGoModule rec {
     "-skip=^TestIntegration"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple CLI templating tool written in golang";
     mainProgram = "gucci";
     homepage = "https://github.com/noqcks/gucci";
-    license = licenses.mit;
-    maintainers = with maintainers; [ braydenjw ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ braydenjw ];
   };
-}
+})

From 59c2aedc1eccb85ed1dbdd5c850fb883e42e56aa Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 29 Apr 2025 23:02:38 +0800
Subject: [PATCH 12/61] guvcview: 2.1.0 -> 2.2.1

---
 pkgs/os-specific/linux/guvcview/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 0bf66462f9d6..3920ff0938cf 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -3,6 +3,7 @@
   lib,
   stdenv,
   fetchurl,
+  cmake,
   intltool,
   pkg-config,
   portaudio,
@@ -27,18 +28,19 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.1.0";
   pname = "guvcview";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-PZPkyfq40aepveGm278E1s+dNHwTS1EotFhqHZC2PPs=";
+    hash = "sha256-0q3HznYpYehTw+FrURutYVBEktEvPi634w2kovet5a8=";
   };
 
   nativeBuildInputs =
     [
       intltool
       pkg-config
+      cmake
     ]
     ++ lib.optionals useGtk [ wrapGAppsHook3 ]
     ++ lib.optionals useQt [ wrapQtAppsHook ];

From c234cae7faf6b8871bb03cbbcad2ebad4e7843e7 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 30 Apr 2025 05:49:52 +0800
Subject: [PATCH 13/61] hatari: 2.3.1 -> 2.5.0

Diff: https://framagit.org/hatari/hatari/-/compare/refs/tags/v2.3.1...2.5.0
---
 pkgs/by-name/ha/hatari/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ha/hatari/package.nix b/pkgs/by-name/ha/hatari/package.nix
index 5b654b3ab0d4..235851e2ba95 100644
--- a/pkgs/by-name/ha/hatari/package.nix
+++ b/pkgs/by-name/ha/hatari/package.nix
@@ -1,28 +1,32 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  zlib,
-  SDL,
+  fetchFromGitLab,
   cmake,
+  zlib,
+  SDL2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hatari";
-  version = "2.3.1";
+  version = "2.5.0";
 
-  src = fetchurl {
-    url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-RKL2LKmV442eCHSAaVbwucPMhOqJ4BaaY4SbY807ZL0=";
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "hatari";
+    repo = "hatari";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RC+KA6rNG4Hk3dvTtejiHl9+pPHImALF0Ho5QuTtjz4=";
   };
 
   # For pthread_cancel
   cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ];
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     zlib
-    SDL
+    SDL2
   ];
 
   meta = {
@@ -32,4 +36,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})

From 361fc34bf1047f5f9dfc2d75446c91c2d46119a2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 30 Apr 2025 05:58:36 +0800
Subject: [PATCH 14/61] hebcal: 4.24 -> 5.9.0

Diff: https://github.com/hebcal/hebcal/compare/v4.24...v5.9.0
---
 pkgs/by-name/he/hebcal/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix
index c21900545a89..e7177f8da736 100644
--- a/pkgs/by-name/he/hebcal/package.nix
+++ b/pkgs/by-name/he/hebcal/package.nix
@@ -1,32 +1,35 @@
 {
   lib,
-  stdenv,
+  buildGoModule,
   fetchFromGitHub,
-  autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
-  version = "4.24";
+buildGoModule (finalAttrs: {
   pname = "hebcal";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
-    rev = "v${version}";
-    sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JtabO3/IM7Mh6zzO6Jwth1axnwOxIn/a3GQO9x3EHLw=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  vendorHash = "sha256-PhJdUU+QivGuLwHuThL7c645mbAgl160sbZ8y7Dd02M=";
+
+  preBuild = ''
+    make dcity.go
+  '';
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://hebcal.github.io";
     description = "Perpetual Jewish Calendar";
     longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays.";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.hhm ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.hhm ];
+    platforms = lib.platforms.all;
     mainProgram = "hebcal";
   };
-}
+})

From 61d7505967d090cfd8f89726763355f95d5fcb2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Apr 2025 01:14:40 +0200
Subject: [PATCH 15/61] python313Packages.pygitguardian: 1.20.0 -> 1.21.0

Diff: https://github.com/GitGuardian/py-gitguardian/compare/refs/tags/v1.20.0...refs/tags/v1.21.0

Changelog: https://github.com/GitGuardian/py-gitguardian/blob/v1.21.0/CHANGELOG.md
---
 pkgs/development/python-modules/pygitguardian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index 2406368d3ed9..2e46ac552fcf 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.20.0";
+  version = "1.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     tag = "v${version}";
-    hash = "sha256-vTzQbk6a/CTeCSjDB05AquuUft2oeFwEyZEM6jrnRD0=";
+    hash = "sha256-pFbryvVwAQbhjNDZ0v+edvtWpkHZ1AVTz0tEsfYBXz8=";
   };
 
   pythonRelaxDeps = [

From d0732fabc171a912998606e2c900a58165078525 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 30 Apr 2025 07:18:20 +0800
Subject: [PATCH 16/61] honcho: 1.1.0 -> 2.0.0

Diff: https://github.com/nickstenning/honcho/compare/v1.1.0...v2.0.0
---
 pkgs/by-name/ho/honcho/package.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ho/honcho/package.nix b/pkgs/by-name/ho/honcho/package.nix
index d60201187883..4e6ec490dd5b 100644
--- a/pkgs/by-name/ho/honcho/package.nix
+++ b/pkgs/by-name/ho/honcho/package.nix
@@ -4,22 +4,22 @@
   python3Packages,
 }:
 
-let
-  pname = "honcho";
-in
-
 python3Packages.buildPythonApplication rec {
-  name = "${pname}-${version}";
-  version = "1.1.0";
+  pname = "honcho";
+  version = "2.0.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nickstenning";
     repo = "honcho";
-    rev = "v${version}";
-    sha256 = "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj";
+    tag = "v${version}";
+    hash = "sha256-hXPoqxK9jzCn7KrQ6zH0E/3YVC60OSoiUx6654+bhhw=";
   };
 
-  propagatedBuildInputs = [ python3Packages.setuptools ];
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeCheckInputs = with python3Packages; [
     jinja2
@@ -33,16 +33,18 @@ python3Packages.buildPythonApplication rec {
 
   checkPhase = ''
     runHook preCheck
+
     PATH=$out/bin:$PATH coverage run -m pytest
+
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Python clone of Foreman, a tool for managing Procfile-based applications";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/nickstenning/honcho";
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ benley ];
+    platforms = lib.platforms.unix;
     mainProgram = "honcho";
   };
 }

From c601bb0f7cbdf976565db98c146852b0bf9643b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 30 Apr 2025 02:26:04 -0700
Subject: [PATCH 17/61] python313Packages.aiontfy: init at 0.5.1

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

diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix
new file mode 100644
index 000000000000..f369add3574b
--- /dev/null
+++ b/pkgs/development/python-modules/aiontfy/default.nix
@@ -0,0 +1,53 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-regex-commit,
+  hatchling,
+  lib,
+  mashumaro,
+  orjson,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "aiontfy";
+  version = "0.5.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tr4nt0r";
+    repo = "aiontfy";
+    tag = "v${version}";
+    hash = "sha256-WQb6sNjpQVgh+9vH7EyrmJHCWL0Mcmw4hHPHa8KsLYc=";
+  };
+
+  build-system = [
+    hatch-regex-commit
+    hatchling
+  ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+    orjson
+  ];
+
+  pythonImportsCheck = [ "aiontfy" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/tr4nt0r/aiontfy/releases/tag/${src.tag}";
+    description = "Async ntfy client library";
+    homepage = "https://github.com/tr4nt0r/aiontfy";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1613dfd9e0b5..96a80105b25d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -381,6 +381,8 @@ self: super: with self; {
 
   aionotion = callPackage ../development/python-modules/aionotion { };
 
+  aiontfy = callPackage ../development/python-modules/aiontfy { };
+
   aionut = callPackage ../development/python-modules/aionut { };
 
   aiooncue = callPackage ../development/python-modules/aiooncue { };

From fa7cae09a373f0f9ebc0c1465a0f88b3567c4a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 30 Apr 2025 02:47:15 -0700
Subject: [PATCH 18/61] python313Packages.google-genai: 1.11.0 -> 1.12.1

Diff: https://github.com/googleapis/python-genai/compare/refs/tags/v1.11.0...refs/tags/v1.12.1

Changelog: https://github.com/googleapis/python-genai/blob/v1.12.1/CHANGELOG.md
---
 pkgs/development/python-modules/google-genai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index 141d95ac970d..4ecfc191ce48 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.11.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-0z+I8nFYh4IhTfj8VgayGZwma9woPY0E+K/0fq4v2EM=";
+    hash = "sha256-+m5VwGErIAlXlbATTUMYU5oGSvqFSyRE6UqIByIv87U=";
   };
 
   build-system = [

From c96a0856037c75c8fe2183074232adfff3ac6865 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 30 Apr 2025 15:23:27 +0100
Subject: [PATCH 19/61] nexusmods-app: 0.9.2 -> 0.10.2

- Bump version
  - https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.10.2
- Drop git LFS mode from fetcher as upstream no longer uses LFS
- Update release notes
---
 doc/release-notes/rl-2505.section.md      |   2 +-
 pkgs/by-name/ne/nexusmods-app/deps.json   | 228 +++++++++++-----------
 pkgs/by-name/ne/nexusmods-app/package.nix |   5 +-
 3 files changed, 112 insertions(+), 123 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 1f674ee460b6..4a65e0bb52c7 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -390,7 +390,7 @@
 
 ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
 
-- `nexusmods-app` has been upgraded from version 0.6.3 to 0.9.2.
+- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
 
   - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
 
diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index 0728dca5649b..e3e8bc58dc00 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -19,11 +19,6 @@
     "version": "11.0.0",
     "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
   },
-  {
-    "pname": "Avalonia",
-    "version": "11.1.3",
-    "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="
-  },
   {
     "pname": "Avalonia",
     "version": "11.2.0",
@@ -31,8 +26,13 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.4",
-    "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
+    "version": "11.2.3",
+    "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.2.6",
+    "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -41,8 +41,8 @@
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.1.0",
-    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+    "version": "11.2.0",
+    "hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -56,13 +56,13 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.4",
-    "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo="
+    "version": "11.2.6",
+    "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.4",
-    "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo="
+    "version": "11.2.6",
+    "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI="
   },
   {
     "pname": "Avalonia.Controls.TreeDataGrid",
@@ -71,23 +71,23 @@
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.4",
-    "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo="
+    "version": "11.2.6",
+    "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.4",
-    "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4="
+    "version": "11.2.6",
+    "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.4",
-    "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk="
+    "version": "11.2.6",
+    "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ="
   },
   {
     "pname": "Avalonia.Headless",
-    "version": "11.2.4",
-    "hash": "sha256-3XvLm+pu+s3gXJVyn8dl8teQX4ikNn+dvKXb18Owsn8="
+    "version": "11.2.6",
+    "hash": "sha256-sV68KaIcXu/IK7dQ8S6GdPtRNm6PaOTv5v+z4IUYp1E="
   },
   {
     "pname": "Avalonia.Labs.Panels",
@@ -96,13 +96,13 @@
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.4",
-    "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM="
+    "version": "11.2.6",
+    "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.4",
-    "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw="
+    "version": "11.2.6",
+    "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -111,8 +111,8 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.4",
-    "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
+    "version": "11.2.6",
+    "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ="
   },
   {
     "pname": "Avalonia.Skia",
@@ -126,8 +126,8 @@
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.4",
-    "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI="
+    "version": "11.2.6",
+    "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c="
   },
   {
     "pname": "Avalonia.Svg.Skia",
@@ -136,28 +136,28 @@
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.4",
-    "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738="
+    "version": "11.2.6",
+    "hash": "sha256-L664hbpCtbu8aDX7YLnqKybF/eQFfes8eQp4A+as8PY="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.4",
-    "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak="
+    "version": "11.2.6",
+    "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.4",
-    "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY="
+    "version": "11.2.6",
+    "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.4",
-    "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk="
+    "version": "11.2.6",
+    "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw="
   },
   {
     "pname": "AvaloniaEdit.TextMate",
-    "version": "11.1.0",
-    "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="
+    "version": "11.2.0",
+    "hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI="
   },
   {
     "pname": "Bannerlord.LauncherManager",
@@ -361,58 +361,58 @@
   },
   {
     "pname": "GameFinder",
-    "version": "4.5.0",
-    "hash": "sha256-n9LaGrFy4kHTeXfk5HQbnZli1rzIaw0kWx4bXjUuFm8="
+    "version": "4.6.1",
+    "hash": "sha256-wx5MEcWHg+O7qmXZeoJiLCfEawh5rwtYdxYkSJh+/sk="
   },
   {
     "pname": "GameFinder.Common",
-    "version": "4.5.0",
-    "hash": "sha256-2HHwusG2DqMSfgH3eD07afvLTmRsUSOcPc6yIuHcMks="
+    "version": "4.6.1",
+    "hash": "sha256-bkgdsruhxbpu9zdyAebPSEPk08WzfzxUbxLGbIHjFT0="
   },
   {
     "pname": "GameFinder.Launcher.Heroic",
-    "version": "4.5.0",
-    "hash": "sha256-N9wQl4kTPcQC0ulqPm5OugCVeBUEstVLyG87/dwu1Fg="
+    "version": "4.6.1",
+    "hash": "sha256-Zx4fxMvdwoNKQFXe6vz2bp3IFqoK0QHzsB8BveqnNqY="
   },
   {
     "pname": "GameFinder.RegistryUtils",
-    "version": "4.5.0",
-    "hash": "sha256-n6ZmjyUlAp75mVIYi0R4ncQX7hqLAvsgapMf58Mr3Jo="
+    "version": "4.6.1",
+    "hash": "sha256-AKC6Lrwyb+oFLdUpAAERkdIblRlvNOb94C4hvJflaac="
   },
   {
     "pname": "GameFinder.StoreHandlers.EADesktop",
-    "version": "4.5.0",
-    "hash": "sha256-JUt5STjbESpaFmvDeGM0yQqgQziD4Or5FxBPwW4XMJE="
+    "version": "4.6.1",
+    "hash": "sha256-6NG35ERzXLt8nGC2mt5/qF3LUSSceHRqlnWtjRfRGTY="
   },
   {
     "pname": "GameFinder.StoreHandlers.EGS",
-    "version": "4.5.0",
-    "hash": "sha256-O8rFUroxJHQoX0UFK4xmV637Qz+bm5Xk/SCIbhRDZQA="
+    "version": "4.6.1",
+    "hash": "sha256-h+zv/YY8tLSz4XaLLZZVD7n04poAbqrJ422IHfT2rK0="
   },
   {
     "pname": "GameFinder.StoreHandlers.GOG",
-    "version": "4.5.0",
-    "hash": "sha256-EyX15gumoPf4hyZ4Q8YFfyQfD1dj6J2RmilcGnkf7NE="
+    "version": "4.6.1",
+    "hash": "sha256-SZNRdt77Bgg3I7w6/R0OSeDI6qt90pP1GIrEg2x/a4I="
   },
   {
     "pname": "GameFinder.StoreHandlers.Origin",
-    "version": "4.5.0",
-    "hash": "sha256-N2TS31L6hzJKn4LsW7g31v2LRsCjKyjVdOH6Kum7vWE="
+    "version": "4.6.1",
+    "hash": "sha256-xp7KDYEsdxjTzRRpkqPkeuf5Umi/5+o9+k0Xn9m6Yus="
   },
   {
     "pname": "GameFinder.StoreHandlers.Steam",
-    "version": "4.5.0",
-    "hash": "sha256-IjdnksYT1EApOxYix6eInBAE2khwOyTbK11hjNqXZT8="
+    "version": "4.6.1",
+    "hash": "sha256-xPW1IGePWF+clMOSjDky4AgEqCMMa42+ZmrH+WkZUcg="
   },
   {
     "pname": "GameFinder.StoreHandlers.Xbox",
-    "version": "4.5.0",
-    "hash": "sha256-CmiTBT2T3pC3GzqxUr6T2hQNDp9gmxrRPDkFOzNC3Yo="
+    "version": "4.6.1",
+    "hash": "sha256-jcWgZKQt4NYvEOAgA6tDlnm7oHCV6hwTNKztMpXnC1E="
   },
   {
     "pname": "GameFinder.Wine",
-    "version": "4.5.0",
-    "hash": "sha256-QARwwZNoHOEnSnHZXeqoGj9R0uK+hMXte9Hc38vZlAI="
+    "version": "4.6.1",
+    "hash": "sha256-DZTxn55GNcWsowre57csnhIS6SW4loC+6XroJ9ZGEC8="
   },
   {
     "pname": "Gee.External.Capstone",
@@ -816,8 +816,8 @@
   },
   {
     "pname": "LinuxDesktopUtils.XDGDesktopPortal",
-    "version": "1.0.0",
-    "hash": "sha256-DTxWI/DI01Flb4yfSxukaEw6roSzD9iy4Twy1I8/5Mg="
+    "version": "1.0.2",
+    "hash": "sha256-qE9u3mL/HTN1ABU4zegEpOSq6IblpmIVB9hlYrUzULE="
   },
   {
     "pname": "LiveChartsCore",
@@ -1621,38 +1621,38 @@
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.9.114",
-    "hash": "sha256-VE1SEKwsS+XAi12l+0jYOQDG1zYSI1t9wKDjXMMyyng="
+    "version": "0.9.122",
+    "hash": "sha256-uaADmIInfTD6jxbfG2XpBzZplVBjuuki7glK5iIS6BM="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.9.114",
-    "hash": "sha256-6nNJkQp5FhO29oKnwSvP3Qw6/Zab3RwB3F7WkS6mDBY="
+    "version": "0.9.122",
+    "hash": "sha256-UVGEPXfDx9vaOBPofVmlqJLg0LZS14AETFZWWc8KB14="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.9.114",
-    "hash": "sha256-vMGecXrBoDgWFk1VyMqsENEVpWuGVaPULjJ4azZThRE="
-  },
-  {
-    "pname": "NexusMods.Paths",
-    "version": "0.10.0",
-    "hash": "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M="
+    "version": "0.9.122",
+    "hash": "sha256-6YlvYr3mSd/D96iDm6zqP6O9x3mo/DezS3RRRBIn2wk="
   },
   {
     "pname": "NexusMods.Paths",
     "version": "0.15.0",
     "hash": "sha256-No2kbrDVmJ5ySLm7jH+gNAfNLVnsv4AtLT1phcuOFLc="
   },
+  {
+    "pname": "NexusMods.Paths",
+    "version": "0.18.0",
+    "hash": "sha256-HNFDFStIXxkoHU8bt9enmb6YxU2NZnqbiapztQpzCcE="
+  },
   {
     "pname": "NexusMods.Paths.Extensions.Nx",
-    "version": "0.15.0",
-    "hash": "sha256-8QT+Iu32u4m5wqMG2bAqramnUQPLDmUB8/c+ew4fRqM="
+    "version": "0.18.0",
+    "hash": "sha256-UcDLHyepHB1c3RnObNk7Y+2+GDAg+ZmJkGwJ+fLfo1w="
   },
   {
     "pname": "NexusMods.Paths.TestingHelpers",
-    "version": "0.15.0",
-    "hash": "sha256-xUZIAND1Ob0SRuoTTuJqw7N2j/4ncIlck3lgfeWxd5M="
+    "version": "0.18.0",
+    "hash": "sha256-J8vNJ5njlKz9Nl6JzrTo232p8PAgm9t3RPh+y7nnD68="
   },
   {
     "pname": "NLog",
@@ -1726,13 +1726,13 @@
   },
   {
     "pname": "ObservableCollections",
-    "version": "3.3.2",
-    "hash": "sha256-pM/2bPf2QvgOhkqA/cSpd/0jAqhOXrtLn01WWZiuoGc="
+    "version": "3.3.3",
+    "hash": "sha256-HH/xNIVQpvlWONL8RChuaeW2l6zC47Xx/JNSE5/JRR4="
   },
   {
     "pname": "ObservableCollections.R3",
-    "version": "3.3.2",
-    "hash": "sha256-q/Ch2JW4H/CvE0oFxmqQDKbgQVo1HfHmtuhMrnFQSEU="
+    "version": "3.3.3",
+    "hash": "sha256-9Zh9wjEHPi0qvix7elMGbrQkbe47cmtFLw2e/Wz5rK8="
   },
   {
     "pname": "OneOf",
@@ -1816,13 +1816,13 @@
   },
   {
     "pname": "Projektanker.Icons.Avalonia",
-    "version": "9.4.1",
-    "hash": "sha256-RK62Wls48/j7QZTLlzHOLCXV0jK/0WBra5367zyit7s="
+    "version": "9.6.1",
+    "hash": "sha256-vO6CqlO3EjzGYElIjy6r2d5b8g33P1m4EoqYuew9anM="
   },
   {
     "pname": "Projektanker.Icons.Avalonia.MaterialDesign",
-    "version": "9.4.1",
-    "hash": "sha256-YfGVVfl/Yon9WgJCZscXZMbZoCNg+OvGFvdPSxe+Q1I="
+    "version": "9.6.1",
+    "hash": "sha256-5e/MUcfACOKbX6Wgc+L/3nuDDbS8ccTXwZ0G5obo7Kw="
   },
   {
     "pname": "protobuf-net",
@@ -1854,10 +1854,15 @@
     "version": "1.2.9",
     "hash": "sha256-Wb3ELPbVhxEMqkrQq5vIjGC36VAzIuMdiYqSAEnVXpY="
   },
+  {
+    "pname": "R3",
+    "version": "1.3.0",
+    "hash": "sha256-IHKC8TzTPV9FSlUahbZ1EAtEOaATHUB3Ta7snJW1PKw="
+  },
   {
     "pname": "R3Extensions.Avalonia",
-    "version": "1.2.9",
-    "hash": "sha256-ZNah6u4+a13E93rYGtZIyYPIb3mkopIjjCzYUgmjCxQ="
+    "version": "1.3.0",
+    "hash": "sha256-zqLbdbKQrDz0YweAs50h5kc5O/4cYR/t/IQHYDwBDLg="
   },
   {
     "pname": "ReactiveUI",
@@ -1879,11 +1884,6 @@
     "version": "19.5.41",
     "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="
   },
-  {
-    "pname": "Reloaded.Memory",
-    "version": "9.4.1",
-    "hash": "sha256-bXaTAUx+/SiiMLmxuPumV9z5w1HcHpzEoNuR+xNhafs="
-  },
   {
     "pname": "Reloaded.Memory",
     "version": "9.4.2",
@@ -3014,11 +3014,6 @@
     "version": "8.0.0",
     "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
   },
-  {
-    "pname": "System.Text.Json",
-    "version": "8.0.4",
-    "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="
-  },
   {
     "pname": "System.Text.Json",
     "version": "8.0.5",
@@ -3111,34 +3106,24 @@
   },
   {
     "pname": "TextMateSharp",
-    "version": "1.0.59",
-    "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="
-  },
-  {
-    "pname": "TextMateSharp",
-    "version": "1.0.64",
-    "hash": "sha256-49Fdf6ndcb4BKMlWYjkjpJ3pLp17Z10FcGJpfdXvvzc="
+    "version": "1.0.65",
+    "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w="
   },
   {
     "pname": "TextMateSharp.Grammars",
-    "version": "1.0.59",
-    "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="
-  },
-  {
-    "pname": "TextMateSharp.Grammars",
-    "version": "1.0.64",
-    "hash": "sha256-ykBZOyvaX1/iFmZjue754qJG4jfPx38ZdHevEZvh7w8="
-  },
-  {
-    "pname": "Tmds.DBus.Protocol",
-    "version": "0.18.0",
-    "hash": "sha256-u5bRK7XbxU/NdMu8PZqxb3fmRdPTbimQ/YIe5/scPOo="
+    "version": "1.0.65",
+    "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE="
   },
   {
     "pname": "Tmds.DBus.Protocol",
     "version": "0.20.0",
     "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
   },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
   {
     "pname": "TransparentValueObjects",
     "version": "1.0.2",
@@ -3156,8 +3141,8 @@
   },
   {
     "pname": "ValveKeyValue",
-    "version": "0.10.0.360",
-    "hash": "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY="
+    "version": "0.13.1.398",
+    "hash": "sha256-dBoEU9Eb0VhzDWHLJY74xamz2Yt283tve+81I8mIxJc="
   },
   {
     "pname": "Verify",
@@ -3304,6 +3289,11 @@
     "version": "16.3.0",
     "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
   },
+  {
+    "pname": "ZLinq",
+    "version": "0.9.6",
+    "hash": "sha256-MxKNBih6j/t+S+Adw7OgkVN5llUylP+gstF9LSsDShY="
+  },
   {
     "pname": "ZstdSharp.Port",
     "version": "0.8.2",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 6e492636a9c8..0aff0df04e7c 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -24,14 +24,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.9.2";
+  version = "0.10.2";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Xb/i25l0jLn87OeouD0+CRv11d8aOn7Sr69z3TkS6I4=";
+    hash = "sha256-L75nmxjymPfuu6CM5QRE1jInElNrD2OuAXMR8+c2tGQ=";
     fetchSubmodules = true;
-    fetchLFS = true;
   };
 
   enableParallelBuilding = false;

From caab3abf7220332a6ed230db2ee6b477e99dd829 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@floxdev.com>
Date: Wed, 30 Apr 2025 09:39:45 -0700
Subject: [PATCH 20/61] maintainers: add nicklewis

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e18c09209be6..be35edb257ea 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17291,6 +17291,12 @@
     githubId = 450276;
     name = "Nick Hu";
   };
+  nicklewis = {
+    email = "nick@nlew.net";
+    github = "nicklewis";
+    githubId = 115494;
+    name = "Nick Lewis";
+  };
   nicknovitski = {
     email = "nixpkgs@nicknovitski.com";
     github = "nicknovitski";

From 5840412fdf2848e2a345ef4de9d79bbf4270dfa8 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@floxdev.com>
Date: Mon, 17 Mar 2025 14:25:35 -0700
Subject: [PATCH 21/61] python3Packages.openfga-sdk: init at 0.9.1

---
 .../python-modules/openfga-sdk/default.nix    | 61 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/python-modules/openfga-sdk/default.nix

diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix
new file mode 100644
index 000000000000..390f30cf1812
--- /dev/null
+++ b/pkgs/development/python-modules/openfga-sdk/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonAtLeast,
+  pytestCheckHook,
+  aiohttp,
+  build,
+  mock,
+  opentelemetry-api,
+  pytest-asyncio,
+  pytest-cov-stub,
+  python-dateutil,
+  setuptools,
+  urllib3,
+}:
+
+buildPythonPackage rec {
+  pname = "openfga-sdk";
+  version = "0.9.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openfga";
+    repo = "python-sdk";
+    tag = "v${version}";
+    hash = "sha256-+4Np406HAB6uHZhDUUSn9aDbuC4/G172+TZ560rYjlk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    build
+    opentelemetry-api
+    python-dateutil
+    urllib3
+  ];
+
+  pythonImportsCheck = [ "openfga_sdk" ];
+
+  nativeCheckInputs = [
+    mock
+    pytest-cov-stub
+    pytestCheckHook
+  ] ++ lib.optionals (pythonAtLeast "3.13") [ pytest-asyncio ];
+
+  disabledTests = lib.optionals (pythonAtLeast "3.13") [
+    # These fail due to a race condition in the test mocks
+    "test_client_batch_check_multiple_request"
+    "test_client_batch_check_multiple_request_fail"
+  ];
+
+  meta = {
+    changelog = "https://github.com/openfga/python-sdk/blob/v${version}/CHANGELOG.md";
+    description = "Fine-Grained Authorization solution for Python";
+    homepage = "https://github.com/openfga/python-sdk";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nicklewis ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1613dfd9e0b5..9134b5f34459 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10320,6 +10320,8 @@ self: super: with self; {
 
   openevsewifi = callPackage ../development/python-modules/openevsewifi { };
 
+  openfga-sdk = callPackage ../development/python-modules/openfga-sdk { };
+
   openhomedevice = callPackage ../development/python-modules/openhomedevice { };
 
   openidc-client = callPackage ../development/python-modules/openidc-client { };

From a05b5cbcd6189afe87ed47eb29a0b95fd5162a2e Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Wed, 30 Apr 2025 12:12:15 -0500
Subject: [PATCH 22/61] helmfile: 0.171.0 -> 1.0.0

---
 doc/release-notes/rl-2505.section.md                      | 5 +++++
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 1f674ee460b6..2a9b4a97d802 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -297,6 +297,11 @@
   For those unable to upgrade yet, there is a [v0 compatibility mode](https://www.openpolicyagent.org/docs/v1.0.1/v0-compatibility/)
   available too.
 
+- `helmfile` was updated to v1.0.0, which introduces several breaking changes.
+  See the release notes of
+  [v1.0.0](https://github.com/helmfile/helmfile/releases/v1.0.0) for more
+  information.
+
 - `vscode-utils.buildVscodeExtension` now requires pname as an argument
 
 - `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index e7e7bdc155a2..ff91255ee8d7 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.171.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${version}";
-    hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc=";
+    hash = "sha256-JvjReRKFTwKku7DXjS8zq/KFdbPU9B9EccYUmTMLV6E=";
   };
 
-  vendorHash = "sha256-sGqnM40Y1nr9dXcSSC1lkwh1ToRLpCMiWJhyMcxxH9U=";
+  vendorHash = "sha256-SWvRnoqxNJMRdAomvkIxGOdyeqVWblM9LaQ4wF2g6ms=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

From ee89a9830b0c353600cb334e954981d315229711 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 01:31:21 +0800
Subject: [PATCH 23/61] flclash: 0.8.82 -> 0.8.83

---
 pkgs/by-name/fl/flclash/package.nix       | 6 +++---
 pkgs/by-name/fl/flclash/pubspec.lock.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index dc0b1d6052d0..e2775f492f80 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -12,14 +12,14 @@
 
 let
   pname = "flclash";
-  version = "0.8.82";
+  version = "0.8.83";
 
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-vZa/JHnoCHuCGWh9ImdK67uBmqosiDm0LZ+/lszPSlY=";
+      hash = "sha256-vkek2pHeXiIQ8pv5t8mRJDvqojhYW5cTUeKWN/mhGu8=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -41,7 +41,7 @@ let
 
     modRoot = "core";
 
-    vendorHash = "sha256-oVgYvRrG7Izr9zlc/76ZKRQgxobzeNzXr9SaIgW1sMY=";
+    vendorHash = "sha256-YrJtvkDpSQnx5AE+3zjCim8lrTjARzJvz6nCkKVOCew=";
 
     env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
index eaf7b7adc530..6011f367d9f0 100644
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -347,7 +347,7 @@
       "version": "0.3.4+2"
     },
     "crypto": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "crypto",
         "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
@@ -1051,7 +1051,7 @@
       "version": "0.12.17"
     },
     "material_color_utilities": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "material_color_utilities",
         "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",

From c2e26b33ae9d5c191cd1f00871465ab8e227f798 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 02:17:58 +0800
Subject: [PATCH 24/61] kn: 1.15.0 -> 1.18.0

Diff: https://github.com/knative/client/compare/knative-v1.15.0...knative-v1.18.0

Changelog: https://github.com/knative/client/releases/tag/v1.18.0
---
 pkgs/by-name/kn/kn/package.nix | 38 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix
index eee5c96d2cd7..5461596d9ab2 100644
--- a/pkgs/by-name/kn/kn/package.nix
+++ b/pkgs/by-name/kn/kn/package.nix
@@ -2,31 +2,30 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  getent,
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kn";
-  version = "1.15.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "knative";
     repo = "client";
-    rev = "knative-v${version}";
-    sha256 = "sha256-bXICU1UBNPVIumzRPSOWa1I5hUYWEvo6orBpUvbPEvg=";
+    tag = "knative-v${finalAttrs.version}";
+    hash = "sha256-Hi5MIzOTL8B1gL+UNv/G18VkBXflSObzCaZZALjWjw0=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-bgZi5SdedpqqAdkl+iP1gqXonEMSrHjXKV2QRijvrtE=";
+
+  env.GOWORK = "off";
 
   subPackages = [ "cmd/kn" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
-  ldflags = [
-    "-X knative.dev/client/pkg/kn/commands/version.Version=v${version}"
-    "-X knative.dev/client/pkg/kn/commands/version.VersionEventing=v${version}"
-    "-X knative.dev/client/pkg/kn/commands/version.VersionServing=v${version}"
-  ];
+  ldflags = [ "-X knative.dev/client/pkg/commands/version.Version=v${finalAttrs.version}" ];
 
   postInstall = ''
     installShellCompletion --cmd kn \
@@ -35,16 +34,21 @@ buildGoModule rec {
   '';
 
   doInstallCheck = true;
+
   installCheckPhase = ''
-    $out/bin/kn version | grep ${version} > /dev/null
+    runHook preInstallCheck
+
+    PATH=$PATH:${getent}/bin $out/bin/kn version | grep ${finalAttrs.version} > /dev/null
+
+    runHook postInstallCheck
   '';
 
-  meta = with lib; {
-    description = "Knative client kn is your door to the Knative world. It allows you to create Knative resources interactively from the command line or from within scripts";
+  meta = {
+    description = "Create Knative resources interactively from the command line or from within scripts";
     mainProgram = "kn";
     homepage = "https://github.com/knative/client";
-    changelog = "https://github.com/knative/client/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bryanasdev000 ];
+    changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bryanasdev000 ];
   };
-}
+})

From 074878c73a62dd4ab487af0f4fcd4c19e49d3dec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 18:58:39 +0000
Subject: [PATCH 25/61] talosctl: 1.9.5 -> 1.10.0

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

diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix
index eb13a45cb1a3..0a72490daa3d 100644
--- a/pkgs/by-name/ta/talosctl/package.nix
+++ b/pkgs/by-name/ta/talosctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.9.5";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${version}";
-    hash = "sha256-2YKZfW62yOA8uV3bn6at/9YV3OHjiMuqA1SUupyAAx4=";
+    hash = "sha256-T/iFzMl3+tZu3EFNyof+QIywJA7ZTLm1asvy/q97Dus=";
   };
 
-  vendorHash = "sha256-f2hOAF746nMAZe1KEopdpFHfRMEZQdy4VoVUi49CBJo=";
+  vendorHash = "sha256-aFxeKyBcMdw5WOTRvXRofO2jA7rrQNaJGrZw3mcqvXE=";
 
   ldflags = [
     "-s"

From b5bbb7246dd0e919b226f90847377417bdd0fee5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 30 Apr 2025 22:19:30 +0300
Subject: [PATCH 26/61] mesa: 25.0.4 -> 25.0.5

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.0.4...mesa-25.0.5

Changelog: https://docs.mesa3d.org/relnotes/25.0.5.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 91624d6d4bfc..adfbe426cc00 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.0.4";
+  version = "25.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU=";
+    hash = "sha256-zYZgvuRnqhPbVmxmdmq4rLng20gMiAvJYD0o4jN5McI=";
   };
 
   meta = {

From d8fd1a3a5ab0731c87f183b154eb664849619cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20Ol=C3=A1h?= <attila@dorn.haus>
Date: Wed, 30 Apr 2025 21:34:13 +0200
Subject: [PATCH 27/61] python3Packages.timezonefinder: 6.5.7 -> 6.5.9

- Patch poetry-core to allow building with version 2.
- Limit to Python 3.10+ to make sure we don't hit the related bug:
  https://github.com/jannikmi/timezonefinder/issues/267
---
 .../python-modules/timezonefinder/default.nix         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix
index e91cb13e361f..1a6d03167365 100644
--- a/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/pkgs/development/python-modules/timezonefinder/default.nix
@@ -14,16 +14,16 @@
 
 buildPythonPackage rec {
   pname = "timezonefinder";
-  version = "6.5.7";
+  version = "6.5.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "jannikmi";
     repo = "timezonefinder";
     tag = version;
-    hash = "sha256-Jo3sOFbmy+NKPL0+21rZQUXIC9WpVT1D3X2sxTC89jY=";
+    hash = "sha256-LkGDR8nSGfRiBxSXugauGhe3+8RsLRPWU3oE+1c5iCk=";
   };
 
   build-system = [
@@ -46,6 +46,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "timezonefinder" ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-warn '"poetry-core>=1.0.0,<2.0.0"' '"poetry-core>=1.0.0"'
+  '';
+
   preCheck = ''
     # Some tests need the CLI on the PATH
     export PATH=$out/bin:$PATH

From 3a7285d183a095c3d0953835df8cbbc178f5b91e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 22:36:05 +0000
Subject: [PATCH 28/61] python312Packages.celery: 5.5.0 -> 5.5.2

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 80af56b68c1c..d0f322bcfb0b 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "celery";
-  version = "5.5.0";
+  version = "5.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ENSfmSbRYjcxAQmw5uHi96ITO4TmhLs2U012Y+ZpGbs=";
+    hash = "sha256-TWkw81T50pKVQl16NyYSRcdKMoB8Rddkvtwoav0Ock4=";
   };
 
   build-system = [ setuptools ];

From d1f42ac6d1c7a6854b7f04f278a24b93b48836a5 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 30 Apr 2025 12:13:20 -0700
Subject: [PATCH 29/61] codex: 0.1.2504161510 -> 0.1.2504251709; use `pnpm`

---
 pkgs/by-name/co/codex/package.nix | 53 ++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 2f35a543ccd3..8f907e478f52 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -1,24 +1,61 @@
 {
   lib,
-  buildNpmPackage,
+  stdenv,
   fetchFromGitHub,
+  nodejs_22, # Node ≥22 is required by codex-cli
+  pnpm_10,
+  makeBinaryWrapper,
   versionCheckHook,
 }:
 
-buildNpmPackage rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "codex";
-  version = "0.1.2504161510"; # from codex-cli/package.json
+  version = "0.1.2504251709"; # from codex-cli/package.json
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
-    rev = "b0ccca555685b1534a0028cb7bfdcad8fe2e477a";
-    hash = "sha256-WTnP6HZfrMjUoUZL635cngpfvvjrA2Zvm74T2627GwA=";
+    rev = "103093f79324482020490cb658cc1a696aece3bc";
+    hash = "sha256-GmMQi67HRanGKhiTKX8wgnpUbA1UwkPVe3siU4qC02Y=";
   };
 
-  sourceRoot = "${src.name}/codex-cli";
+  pnpmWorkspaces = [ "@openai/codex" ];
 
-  npmDepsHash = "sha256-riVXC7T9zgUBUazH5Wq7+MjU1FepLkp9kHLSq+ZVqbs=";
+  nativeBuildInputs = [
+    nodejs_22
+    pnpm_10.configHook
+    makeBinaryWrapper
+  ];
+
+  pnpmDeps = pnpm_10.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmWorkspaces
+      ;
+    hash = "sha256-pPwHjtqqaG+Zqmq6x5o+WCT1H9XuXAqFNKMzevp7wTc=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+    pnpm --filter @openai/codex run build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    dest=$out/lib/node_modules/@openai/codex
+    mkdir -p "$dest"
+    cp -r codex-cli/dist codex-cli/bin codex-cli/package.json "$dest"
+    cp LICENSE README.md "$dest"
+
+    mkdir -p $out/bin
+    makeBinaryWrapper ${nodejs_22}/bin/node $out/bin/codex --add-flags "$dest/bin/codex.js"
+
+    runHook postInstall
+  '';
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
@@ -30,4 +67,4 @@ buildNpmPackage rec {
     maintainers = [ lib.maintainers.malo ];
     mainProgram = "codex";
   };
-}
+})

From 0818337430c2d71dd5025fe044d34ad1bb6e73ba Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 30 Apr 2025 14:59:00 -0700
Subject: [PATCH 30/61] codex: add shell completions

---
 pkgs/by-name/co/codex/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 8f907e478f52..1add11343ffa 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -5,6 +5,7 @@
   nodejs_22, # Node ≥22 is required by codex-cli
   pnpm_10,
   makeBinaryWrapper,
+  installShellFiles,
   versionCheckHook,
 }:
 
@@ -25,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     nodejs_22
     pnpm_10.configHook
     makeBinaryWrapper
+    installShellFiles
   ];
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -54,6 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
     makeBinaryWrapper ${nodejs_22}/bin/node $out/bin/codex --add-flags "$dest/bin/codex.js"
 
+    # Install shell completions
+    ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      $out/bin/codex completion bash > codex.bash
+      $out/bin/codex completion zsh > codex.zsh
+      $out/bin/codex completion fish > codex.fish
+      installShellCompletion codex.{bash,zsh,fish}
+    ''}
+
     runHook postInstall
   '';
 

From 66041c65feaa4be8ff9bfb075eb8ba2fd6500699 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:09:41 +0200
Subject: [PATCH 31/61] python312Packages.mypy-boto3-cleanrooms: 1.38.0 ->
 1.38.6

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 759495956344..0bda69193116 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -210,8 +210,8 @@ rec {
       "sha256-tzYioIJx6aJQxiCUMOCQl71uzKW9f9kEw2xZlFrgfpI=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.38.0"
-      "sha256-SfcrN5BVxW5t1zEUDUww6qOKqFrnu6DclVFwy8hWGVE=";
+    buildMypyBoto3Package "cleanrooms" "1.38.6"
+      "sha256-1OGeYcLRpFeLfnxKEjSUPfPI6keLDJbZVvhNXq12OaA=";
 
   mypy-boto3-cloud9 =
     buildMypyBoto3Package "cloud9" "1.38.0"

From 634a0ab3ea764d7b2a81b2710b5a59774536e2ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:10:12 +0200
Subject: [PATCH 32/61] python312Packages.mypy-boto3-ec2: 1.38.0 -> 1.38.6

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0bda69193116..de54ded4063a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.38.0"
-      "sha256-75De58jFMumZ5f04hEx1dLC8mdk+XdQWnO/eP4dfzKk=";
+    buildMypyBoto3Package "ec2" "1.38.6"
+      "sha256-jkfIR/cdjFrsW05jU8Vmc4HZIO0AmD9TVhZH17B/q6c=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.38.0"

From ea3e29b3b7f21d4d339d36a63befbd131cecdac1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:10:15 +0200
Subject: [PATCH 33/61] python312Packages.mypy-boto3-ecr: 1.38.0 -> 1.38.6

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index de54ded4063a..3fc35213c49d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -454,8 +454,8 @@ rec {
       "sha256-1zg5Vw+V+bpp5FxTw0CSfxSN7JNVBwY4I8uDFhEJL3w=";
 
   mypy-boto3-ecr =
-    buildMypyBoto3Package "ecr" "1.38.0"
-      "sha256-JPXmkpdWjQSVG8Z7gH385dRy/3HUraLxDLdmO/mqZU4=";
+    buildMypyBoto3Package "ecr" "1.38.6"
+      "sha256-CTIvlIYRlak6FnjhbyyShNGtYbRk45/ESXEKIoR7q/I=";
 
   mypy-boto3-ecr-public =
     buildMypyBoto3Package "ecr-public" "1.38.0"

From f7831983214acc41a1501c05024146e4ee092afa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:10:16 +0200
Subject: [PATCH 34/61] python312Packages.mypy-boto3-ecr-public: 1.38.0 ->
 1.38.6

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3fc35213c49d..74e4db2afb7c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -458,8 +458,8 @@ rec {
       "sha256-CTIvlIYRlak6FnjhbyyShNGtYbRk45/ESXEKIoR7q/I=";
 
   mypy-boto3-ecr-public =
-    buildMypyBoto3Package "ecr-public" "1.38.0"
-      "sha256-qJ22ZyzB+8OVRjRklxWYKJlA9WZg542CccUWmdx4p+s=";
+    buildMypyBoto3Package "ecr-public" "1.38.6"
+      "sha256-aSZu8mxsTho4pvWWbNwlJf0IROjqjTlIUEE5DJkAje4=";
 
   mypy-boto3-ecs =
     buildMypyBoto3Package "ecs" "1.38.3"

From 2e0dc49b657b80e697e8de4015c951c82fc431db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:10:43 +0200
Subject: [PATCH 35/61] python312Packages.mypy-boto3-logs: 1.38.0 -> 1.38.6

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 74e4db2afb7c..14894d9bbd56 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -810,8 +810,8 @@ rec {
       "sha256-uypKW3Cqj98SLeWmSwCXVKhKpXWXEvwdUexqqFgXeEc=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.38.0"
-      "sha256-5jb6bzG4T2w9jNW4XYf9m6t2ZjGZnEoMg8LPAAPv5ac=";
+    buildMypyBoto3Package "logs" "1.38.6"
+      "sha256-Fpe+7mXJQHikCVyn/hcRvFPu/U+wvDL0JmDN0/Vvxwc=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.38.0"

From 0814a10d4b271825b427ca35c642ec2c9d59ab0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:12:10 +0200
Subject: [PATCH 36/61] python313Packages.botocore-stubs: 1.38.5 -> 1.38.6

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 7c2117c5b1f7..1b836ecab166 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.38.5";
+  version = "1.38.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-Vg4ZPjnysVOw1kvEIKfgL4oYjz8cZnt5qUu/KrVq3cc=";
+    hash = "sha256-Vu2Hs+CHDSGpaKg0YSm1eOH2tw7pAtALu2sWLCkSIvQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

From cf714da7f2b389fa6fea766cb595c0db9f48feda Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:12:18 +0200
Subject: [PATCH 37/61] python313Packages.boto3-stubs: 1.38.5 -> 1.38.6

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index caca2a1c423b..756e4446ab34 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.5";
+  version = "1.38.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-sCxjR/j03GmpmQuKSd40ejHR3p2z+H28w+XpTpNRVSA=";
+    hash = "sha256-NFnRID2lyjQAoWBrXaxTsQwxh3rBG7+VqCuFeE/zJ3E=";
   };
 
   build-system = [ setuptools ];

From 734fba45b5b22b8ac2dd0080d47fd20225c4accb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:14:08 +0200
Subject: [PATCH 38/61] ggshield: 1.38.1 -> 1.39.0

Diff: https://github.com/GitGuardian/ggshield/compare/refs/tags/v1.38.1...refs/tags/v1.39.0

Changelog: https://github.com/GitGuardian/ggshield/blob/1.39.0/CHANGELOG.md
---
 pkgs/tools/security/ggshield/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix
index c579d45c0414..6461a07688dc 100644
--- a/pkgs/tools/security/ggshield/default.nix
+++ b/pkgs/tools/security/ggshield/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ggshield";
-  version = "1.38.1";
+  version = "1.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GitGuardian";
     repo = "ggshield";
     tag = "v${version}";
-    hash = "sha256-VioahNz9mlai+pavSTvuyE8dm1gyrjFgBLlSPE1IKRw=";
+    hash = "sha256-9VQLWeZPYz3ZqNUzw1vLC5no2NjRru4GcUpjW4QhuBY=";
   };
 
   pythonRelaxDeps = true;

From e6f5b4d66b7ae908f5f1f93f3d3c3796d14a9316 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:19:00 +0200
Subject: [PATCH 39/61] python313Packages.bc-detect-secrets: 1.5.41 -> 1.5.42

Diff: https://github.com/bridgecrewio/detect-secrets/compare/refs/tags/1.5.41...refs/tags/1.5.42
---
 pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
index d887687e6d2d..d5b47d86b6d9 100644
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "bc-detect-secrets";
-  version = "1.5.41";
+  version = "1.5.42";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "bridgecrewio";
     repo = "detect-secrets";
     tag = version;
-    hash = "sha256-YFBG/0jT7o2HFUDWzpr1N+aRcg9iVFyyYqDL0TuBOAw=";
+    hash = "sha256-ADK9zopoO7rOslJx3imxiKbziVK6oInfYHytgTVbq/w=";
   };
 
   build-system = [ setuptools ];

From 291f1c3f7bfc52a513625535271b0204b104907f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:22:09 +0200
Subject: [PATCH 40/61] python313Packages.playwrightcapture: 1.29.0 -> 1.29.1

Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.29.0...refs/tags/v1.29.1

Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.29.1
---
 pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 85a4726aceca..a89e5305117c 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.29.0";
+  version = "1.29.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     tag = "v${version}";
-    hash = "sha256-p2EprahxHqq4jL7bdnq1+BK3IPea5tZLu/X4N+kZLSY=";
+    hash = "sha256-n2lVP+oThZ2hRVOadudaaNFU2KI14rrkG7ipJ0vrj20=";
   };
 
   pythonRelaxDeps = [

From 5d5eab1eae039d86cd9a29af97d1614a1da51ccf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:22:27 +0200
Subject: [PATCH 41/61] python313Packages.publicsuffixlist: 1.0.2.20250428 ->
 1.0.2.20250430

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250430-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index a16d91384ec0..eac763965218 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250428";
+  version = "1.0.2.20250430";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ayh85fs1eiNNJzJNgFV3bWYc3Mw+iEdvNB9+ci3BY68=";
+    hash = "sha256-de7yJviyIb/R0Z93yh5LeQKpefjGsJi1YWZ/AtXwtnc=";
   };
 
   build-system = [ setuptools ];

From 70005268b6b33e47f00317c711f8480fbd39f83e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:23:59 +0200
Subject: [PATCH 42/61] python313Packages.mcpadapt: 0.1.3 -> 0.1.4

Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.1.3...refs/tags/v0.1.4

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

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index 29704b659d44..cdf638c671eb 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-9TMVg70kj25bSNvgVxeFNsY6YnBg+9KswOfcv4Y2SqA=";
+    hash = "sha256-1GgQ2JVCSNCnsxPS82e+6ICG7ChTGFYiejCPtI827Yk=";
   };
 
   build-system = [ hatchling ];

From cd68894ba281d33a1f55c3c968ca709449878402 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:24:48 +0200
Subject: [PATCH 43/61] python313Packages.odp-amsterdam: 6.0.2 -> 6.1.1

Diff: https://github.com/klaasnicolaas/python-odp-amsterdam/compare/refs/tags/v6.0.2...refs/tags/v6.1.1

Changelog: https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v6.1.1
---
 pkgs/development/python-modules/odp-amsterdam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix
index 83bd4ae8ee53..8ff31f307b9e 100644
--- a/pkgs/development/python-modules/odp-amsterdam/default.nix
+++ b/pkgs/development/python-modules/odp-amsterdam/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "odp-amsterdam";
-  version = "6.0.2";
+  version = "6.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-odp-amsterdam";
     tag = "v${version}";
-    hash = "sha256-veBccNxqhqBYKUC5pdjZ1IOWUYUqiNK5pJq1L+8UCxA=";
+    hash = "sha256-ZSo0CNN4NjHQDq3Nx6aqfPEssfty7wNefFX6QG5+pQ4=";
   };
 
   postPatch = ''

From 2c7a68c95cd785b7a31daab031d2c9624db3c043 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 1 May 2025 01:33:03 +0200
Subject: [PATCH 44/61] re-Isearch: fix aarch64-linux build

---
 pkgs/by-name/re/re-isearch/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 5f9f661d82a3..ca799c160456 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttr: {
   postPatch = ''
     # Fix gcc-13 build due to missing <cstdint> include.
     sed -e '1i #include <cstdint>' -i src/mmap.cxx
+
+    # g++: error: unrecognized command-line option '-msse2'
+    # gcc: error: unrecognized command-line option '-m64'
+    substituteInPlace build/Makefile.ubuntu \
+      --replace-fail "-msse2" "" \
+      --replace-fail "-m64" ""
   '';
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];
@@ -69,7 +75,7 @@ stdenv.mkDerivation (finalAttr: {
     description = "Novel multimodal search and retrieval engine";
     homepage = "https://nlnet.nl/project/Re-iSearch/";
     license = lib.licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.astro ];
     teams = [ lib.teams.ngi ];
   };

From 91222af948787507d406e3ec10135f1c3c571689 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 00:43:09 +0000
Subject: [PATCH 45/61] watchlog: 1.244.0 -> 1.246.0

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

diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index 4942c18cfd96..b892e4ae7194 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchlog";
-  version = "1.244.0";
+  version = "1.246.0";
 
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
     rev = "v${version}";
-    hash = "sha256-RQggLV4ROV9j5FxiJ2pRh/jlTFhgKUiBO/Gh/jLJ3tg=";
+    hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hdNEEbpsasAc8thQ6fKP4DQ+6jQiA2CO781Zz8CEiHU=";
+  cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ=";
 
   meta = {
     description = "Easier monitoring of live logs";

From 477c19b38b0f8bbecf196837a0d7476fed656444 Mon Sep 17 00:00:00 2001
From: mitchmindtree <mail@mitchellnordine.com>
Date: Sat, 27 Jan 2024 16:11:05 +1100
Subject: [PATCH 46/61] reth: init at 1.3.12

This commit adds `reth`, an Ethereum execution client by Paradigm
written in Rust.

This package is adapted from the [nix-community/ethereum.nix package][1]
with a version update, darwin support, and some slight modifications to
better suit the nixpkgs conventions.

Closes #249233

[1]: https://github.com/nix-community/ethereum.nix/blob/main/pkgs/by-name/re/reth/default.nix
---
 pkgs/by-name/re/reth/package.nix | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/re/reth/package.nix

diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix
new file mode 100644
index 000000000000..d2c039e2b338
--- /dev/null
+++ b/pkgs/by-name/re/reth/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "reth";
+  version = "1.3.12";
+
+  src = fetchFromGitHub {
+    owner = "paradigmxyz";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-59XUrMaXMiqSELQX8i7eK4Eo8YfGjPVZHT6q+rxoSPs=";
+  };
+
+  cargoHash = "sha256-FHQ+iPcjxwcY7uoZMXlm/lRoVA5E5wRg7qFgJe+VSEc=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+  ];
+
+  # Some tests fail due to I/O that is unfriendly with nix sandbox.
+  checkFlags = [
+    "--skip=builder::tests::block_number_node_config_test"
+    "--skip=builder::tests::launch_multiple_nodes"
+    "--skip=builder::tests::rpc_handles_none_without_http"
+    "--skip=cli::tests::override_trusted_setup_file"
+    "--skip=cli::tests::parse_env_filter_directives"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modular Ethereum execution client in Rust by Paradigm";
+    homepage = "https://github.com/paradigmxyz/reth";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    mainProgram = "reth";
+    maintainers = with lib.maintainers; [ mitchmindtree ];
+    platforms = lib.platforms.unix;
+  };
+}

From e252ac83044c8b8055184d9cf9550b055a5554ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 05:06:31 +0000
Subject: [PATCH 47/61] pdfcpu: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 13b9f144b950..f05af5f56ea7 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-IODE6/TIXZZC5Z8guFK24iiHTwj84fcf9RiAyFkX2F8=";
+    hash = "sha256-vfU0mFfOW9K3rgVNdfN2RBiKJLbijoVMtuywsoclEgE=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the

From 800908cd551ebe956ef5d64a5bf86548acd9245c Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 1 May 2025 12:14:55 +0530
Subject: [PATCH 48/61] nixosTests.scx: init (#401972)

For now, test only the useful schedulers, there's no need to test all of them.

Co-authored-by: Gliczy <129636582+Gliczy@users.noreply.github.com>
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 nixos/tests/all-tests.nix               |  1 +
 nixos/tests/scx/default.nix             | 42 +++++++++++++++++++++++++
 pkgs/os-specific/linux/scx/scx_full.nix |  3 ++
 3 files changed, 46 insertions(+)
 create mode 100644 nixos/tests/scx/default.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 610a57f674bd..a00ce39bdf4f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1192,6 +1192,7 @@ in
   schleuder = handleTest ./schleuder.nix { };
   scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { };
   scrutiny = runTest ./scrutiny.nix;
+  scx = runTest ./scx/default.nix;
   sddm = handleTest ./sddm.nix { };
   sdl3 = handleTest ./sdl3.nix { };
   seafile = handleTest ./seafile.nix { };
diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix
new file mode 100644
index 000000000000..67627d0ed3e3
--- /dev/null
+++ b/nixos/tests/scx/default.nix
@@ -0,0 +1,42 @@
+{ pkgs, ... }:
+
+{
+  name = "scx_full";
+  meta = {
+    inherit (pkgs.scx.full.meta) maintainers;
+  };
+
+  nodes.machine = {
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+    services.scx.enable = true;
+
+    specialisation = {
+      bpfland.configuration.services.scx.scheduler = "scx_bpfland";
+      central.configuration.services.scx.scheduler = "scx_central";
+      lavd.configuration.services.scx.scheduler = "scx_lavd";
+      rlfifo.configuration.services.scx.scheduler = "scx_rlfifo";
+      rustland.configuration.services.scx.scheduler = "scx_rustland";
+      rusty.configuration.services.scx.scheduler = "scx_rusty";
+    };
+  };
+
+  testScript = ''
+    specialisation = [
+      "bpfland",
+      "central",
+      "lavd",
+      "rlfifo",
+      "rustland",
+      "rusty"
+    ]
+
+    def activate_specialisation(name: str):
+      machine.succeed(f"/run/booted-system/specialisation/{name}/bin/switch-to-configuration test >&2")
+
+    for sched in specialisation:
+      with subtest(f"{sched}"):
+        activate_specialisation(sched)
+        machine.succeed("systemctl restart scx.service")
+        machine.succeed(f"ps -U root -u root u | grep scx_{sched}")
+  '';
+}
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index c56208058a2f..ea1d9ad7b23e 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -3,6 +3,7 @@
   stdenv,
   scx-common,
   scx,
+  nixosTests,
 }:
 scx.cscheds.overrideAttrs (oldAttrs: {
   pname = "scx_full";
@@ -12,6 +13,8 @@ scx.cscheds.overrideAttrs (oldAttrs: {
       cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
     '';
 
+  passthru.tests.basic = nixosTests.scx;
+
   passthru.updateScript.command = ./update.sh;
 
   meta = oldAttrs.meta // {

From fa25c34482e1b8b175acae1e733b34fe0bc1c707 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 07:01:54 +0000
Subject: [PATCH 49/61] python312Packages.tlds: 2025042400 -> 2025043000

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

diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index 15fd3eeb3708..25702a4a5df9 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2025042400";
+  version = "2025043000";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     tag = version;
-    hash = "sha256-SxiV0EVOECxNjq+v8dCKtm+zcAvNdG6HwsQzUpmVaos=";
+    hash = "sha256-yyDnQMQmZAlHvrWgxSi47E26fJ74FI4COwv1NOLvOL0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 81efc023b256c0884812bbb571974bd57ec5cf89 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 30 Apr 2025 22:16:11 +0200
Subject: [PATCH 50/61] plantuml: add passthru.updateScript

---
 pkgs/by-name/pl/plantuml/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index 0f0078255607..fe3e501e523e 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   fetchurl,
   graphviz,
+  gitUpdater,
   jre,
   makeBinaryWrapper,
   testers,
@@ -38,9 +39,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     $out/bin/plantuml -testdot
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-    command = "plantuml --version";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "plantuml --version";
+    };
+    updateScript = gitUpdater {
+      url = "https://github.com/plantuml/plantuml.git";
+      allowedVersions = "^1\\.[0-9\\.]+$";
+      rev-prefix = "v";
+    };
   };
 
   meta = {

From f6631d5993663e349572a099b41bab5d723895a3 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 30 Apr 2025 22:16:20 +0200
Subject: [PATCH 51/61] plantuml: 1.2025.0 -> 1.2025.2

https://github.com/plantuml/plantuml/releases/tag/v1.2025.2
https://github.com/plantuml/plantuml/releases/tag/v1.2025.1
---
 pkgs/by-name/pl/plantuml/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index fe3e501e523e..faddd49464e8 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plantuml";
-  version = "1.2025.0";
+  version = "1.2025.2";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-tHlhO7+q/iG5jbivTzQtvaOiDXoIEC/thA2nJnS6Kak=";
+    hash = "sha256-mDP72BLe7+WqjCsxIrhF//jVQVpmU0jwgFeH2sW1mH0=";
   };
 
   nativeBuildInputs = [

From c0aabc9700dcd500c93dd06999df72b11491e8e2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 01:13:12 +0200
Subject: [PATCH 52/61] python313Packages.tencentcloud-sdk-python: 3.0.1367 ->
 3.0.1368

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1367...refs/tags/3.0.1368

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1368/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 47b370605a2b..6e17540d48ee 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1367";
+  version = "3.0.1368";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-DY//LYVzL1gCqp++yk6R1O9HBa8Df8x3q980bDTvGWA=";
+    hash = "sha256-Wf0RLUAY6Ex8PVq7TI3cUL7PcY2jvfy/0lDJ5JCwXms=";
   };
 
   build-system = [ setuptools ];

From 443c97e0b6a33ce323c80b207a62084d095f46cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 May 2025 09:32:46 +0200
Subject: [PATCH 53/61] python313Packages.tencentcloud-sdk-python: 3.0.1368 ->
 3.0.1369

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1368...refs/tags/3.0.1369

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1369/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 6e17540d48ee..d11d9e1edb37 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1368";
+  version = "3.0.1369";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-Wf0RLUAY6Ex8PVq7TI3cUL7PcY2jvfy/0lDJ5JCwXms=";
+    hash = "sha256-2KJ8Xcg5JB7/CWrFohvDcEplYY5QjJsr/b8xCKZpUQY=";
   };
 
   build-system = [ setuptools ];

From 2607954fdcd8c7148bff27200896d9669513a4d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 07:57:32 +0000
Subject: [PATCH 54/61] simdutf: 6.5.0 -> 7.0.0

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index fdc4f4257cde..9f3b7e7d9414 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "6.5.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bZ4r62GMz2Dkd3fKTJhelitaA8jUBaDjG6jOysEg8Nk=";
+    hash = "sha256-sXxw3PCctcy4kxJHvUfXc07gArRqF5lz9DEJvzyzY48=";
   };
 
   # Fix build on darwin

From 11d168eb99880f16d61f1875832db9211ef739ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 08:56:13 +0000
Subject: [PATCH 55/61] python312Packages.unstructured-client: 0.33.0 -> 0.34.0

---
 .../python-modules/unstructured-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
index 4329ae297996..8a0b5496cb20 100644
--- a/pkgs/development/python-modules/unstructured-client/default.nix
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "unstructured-client";
-  version = "0.33.0";
+  version = "0.34.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${version}";
-    hash = "sha256-leQlBLR4BfirUpjhxSiXIgTm7Di6lh5ic0oELzON+Uw=";
+    hash = "sha256-HzdIth6pK13zi3nDusgY9paeiWEKzSpJhwGVMjDpd/g=";
   };
 
   preBuild = ''

From 14cde665cceede07635fcfcf0bbb8d5ab18241e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 09:20:04 +0000
Subject: [PATCH 56/61] parseable: 1.7.3 -> 2.2.0

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

diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix
index 0cb6e5fccf5c..ab2f9187c8d0 100644
--- a/pkgs/by-name/pa/parseable/package.nix
+++ b/pkgs/by-name/pa/parseable/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "parseable";
-  version = "1.7.3";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "parseablehq";
     repo = "parseable";
     tag = "v${version}";
-    hash = "sha256-arRaib5jzU2mtSJI70UphVqPN+hOGoag++jopgx/zCw=";
+    hash = "sha256-oMDFi5cBcghxzwmmR/Gg50PcYCb6HaxDqWA8vVyw30Y=";
   };
 
   LOCAL_ASSETS_PATH = fetchzip {
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-j+v3lf3x3eW1PAjYdPHfma6PnUsb4m6ZBRj+5jdPxCs=";
+  cargoHash = "sha256-kVLUSu+9jW3M0YosmpZWDIKCj7GilZZibMMtufHPdfM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1e6abb4359dea30b00031bdee347ed08f37b464b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 1 May 2025 02:25:49 -0700
Subject: [PATCH 57/61] python313Packages.wallbox: 0.8.0 -> 0.9.0

Diff: https://github.com/cliviu74/wallbox/compare/refs/tags/0.8.0...refs/tags/0.9.0

Changelog: https://github.com/cliviu74/wallbox/releases/tag/0.9.0
---
 .../python-modules/wallbox/default.nix        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix
index 0600450af7d3..efe5f948b83a 100644
--- a/pkgs/development/python-modules/wallbox/default.nix
+++ b/pkgs/development/python-modules/wallbox/default.nix
@@ -2,22 +2,21 @@
   lib,
   aenum,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "wallbox";
-  version = "0.8.0";
+  version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-S1JP7/D3U853fQU3a2pyL+dt/hVLDP3TB82tcGlcXVQ=";
+  src = fetchFromGitHub {
+    owner = "cliviu74";
+    repo = "wallbox";
+    tag = version;
+    hash = "sha256-1/hm0x71YTW3cA11Nw/e4xUol5T9lElgm1bKi1wRi3o=";
   };
 
   build-system = [
@@ -34,11 +33,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "wallbox" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for interacting with Wallbox EV charger API";
     homepage = "https://github.com/cliviu74/wallbox";
-    changelog = "https://github.com/cliviu74/wallbox/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/cliviu74/wallbox/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From e4cad25ca9540e28847ef182bc4dad9d97c8c9ac Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 22 Apr 2025 16:07:38 -0400
Subject: [PATCH 58/61] python312Packages.celery: drop unused dependecy tzdata

---
 pkgs/development/python-modules/celery/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index d0f322bcfb0b..fcfd5d1ddc60 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -30,7 +30,6 @@
   pythonOlder,
   pyyaml,
   setuptools,
-  tzdata,
   vine,
 }:
 
@@ -56,7 +55,6 @@ buildPythonPackage rec {
     click-repl
     kombu
     python-dateutil
-    tzdata
     vine
   ];
 

From 4a2e28d5b6007f8beb1695d40763453f86cc71a5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 1 May 2025 11:44:27 +0200
Subject: [PATCH 59/61] geocode-glib_2.updateScript: Fix eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes `maintainers/scripts/update.nix` returning an error when looking for update scripts:

    error: Cannot find attribute ‘geocode-glib’.

Follow up to 8a11a371d9b9cf63d70edbd85fd2344a95da5def.
---
 pkgs/by-name/ge/geocode-glib_2/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ge/geocode-glib_2/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix
index 297cabbe3010..31fc68259b27 100644
--- a/pkgs/by-name/ge/geocode-glib_2/package.nix
+++ b/pkgs/by-name/ge/geocode-glib_2/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gnome.updateScript {
+      attrPath = "geocode-glib_2";
       packageName = "geocode-glib";
     };
     tests = {

From fdec61cee283e4142bd385aa14ff7aa4a7934f7a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 1 May 2025 12:10:45 +0100
Subject: [PATCH 60/61] uhexen2: fix the build against SDL_compat

Without the change build fails due to missing libraries as
https://hydra.nixos.org/build/294936344:

    ../h2shared/glheader.h:40:10: fatal error: GL/gl.h: No such file or directory
       40 | #include <GL/gl.h>
          |          ^~~~~~~~~
---
 pkgs/by-name/uh/uhexen2/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/uh/uhexen2/package.nix b/pkgs/by-name/uh/uhexen2/package.nix
index 1c56aaacf586..d8bdb19ea2d8 100644
--- a/pkgs/by-name/uh/uhexen2/package.nix
+++ b/pkgs/by-name/uh/uhexen2/package.nix
@@ -3,6 +3,8 @@
   fetchgit,
   SDL,
   stdenv,
+  alsa-lib,
+  libGL,
   libogg,
   libvorbis,
   libmad,
@@ -21,6 +23,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL
+    alsa-lib
+    libGL
     libogg
     libvorbis
     libmad

From ee7f754f898c3af22e0bdd5a953ec08cc6cb6c28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 21:24:28 +1000
Subject: [PATCH 61/61] python312Packages.neoteroi-mkdocs: 1.1.1 -> 1.1.2
 (#403280)

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

diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
index 08e2bb45fab1..ad9f8ef42bd9 100644
--- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "neoteroi-mkdocs";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "mkdocs-plugins";
     tag = "v${version}";
-    hash = "sha256-EbhkhcH8sGxiwimg9dfmSSOJR7DYw7nfS3m1HUSH0vg=";
+    hash = "sha256-+bH4pkY+BE31t3b750ZAbbesKLFjgx6KF9b2tXFTmhI=";
   };
 
   buildInputs = [ hatchling ];