From 201e8fa440565e2180ec4b01c5d20e59cd1b4fb9 Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 27 Jun 2025 22:38:57 -0300
Subject: [PATCH 01/65] libfreehand: init at 0.1.2

---
 pkgs/by-name/li/libfreehand/package.nix | 58 +++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/li/libfreehand/package.nix

diff --git a/pkgs/by-name/li/libfreehand/package.nix b/pkgs/by-name/li/libfreehand/package.nix
new file mode 100644
index 000000000000..3a7ae6f8565e
--- /dev/null
+++ b/pkgs/by-name/li/libfreehand/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchpatch,
+  perl,
+  pkg-config,
+  boost,
+  cppunit,
+  doxygen,
+  gperf,
+  icu,
+  lcms2,
+  librevenge,
+  zlib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libfreehand";
+  version = "0.1.2";
+
+  src = fetchzip {
+    url = "https://dev-www.libreoffice.org/src/libfreehand/libfreehand-${finalAttrs.version}.tar.xz";
+    hash = "sha256-0icEGnTtYveP24FbYjRB7tFW/TquSOszbqZspHAhQ7I=";
+  };
+
+  nativeBuildInputs = [
+    perl
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    cppunit
+    doxygen
+    gperf
+    icu
+    lcms2
+    librevenge
+    zlib
+  ];
+
+  configureFlags = [ "--disable-werror" ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libfreehand/-/raw/main/libfreehand-0.1.2-icu-fix.patch?ref_type=heads";
+      hash = "sha256-SRkcF+FRkFdueLSTOMYWo6+CCl05f0OBP6G5VrXRyCw=";
+    })
+  ];
+
+  meta = {
+    description = "Adobe Freehand import library";
+    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ arthsmn ];
+    platforms = lib.platforms.all;
+  };
+})

From 854270d45fd1e84a75da3a6dbab2dedef6fcb769 Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 27 Jun 2025 22:49:42 -0300
Subject: [PATCH 02/65] libpagemaker: init at 0.0.4

---
 pkgs/by-name/li/libpagemaker/package.nix | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/li/libpagemaker/package.nix

diff --git a/pkgs/by-name/li/libpagemaker/package.nix b/pkgs/by-name/li/libpagemaker/package.nix
new file mode 100644
index 000000000000..4edb59e9d992
--- /dev/null
+++ b/pkgs/by-name/li/libpagemaker/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchpatch,
+  pkg-config,
+  boost,
+  doxygen,
+  librevenge,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libpagemaker";
+  version = "0.0.4";
+
+  src = fetchzip {
+    url = "https://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-${finalAttrs.version}.tar.xz";
+    hash = "sha256-fAtCNbP0fI2LxTOPPh5zbdF50wWhsrfSoNFPVU9tBas=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    boost
+    doxygen
+    librevenge
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libpagemaker/-/raw/main/libpagemaker-0.0.4-const-ref-exception.patch?ref_type=heads";
+      hash = "sha256-yZbiLAZHgzygGetiuoKiQS010pRfZTi2CbAAxQdCZbs=";
+    })
+  ];
+
+  meta = {
+    description = "Adobe PageMaker import library";
+    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ arthsmn ];
+    platforms = lib.platforms.all;
+  };
+})

From cfde5ac44ee5b387f8480a5ca44a3bfd598fff4f Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 27 Jun 2025 22:59:02 -0300
Subject: [PATCH 03/65] libmspub: init at 0.1.4

---
 pkgs/by-name/li/libmspub/package.nix | 49 ++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/li/libmspub/package.nix

diff --git a/pkgs/by-name/li/libmspub/package.nix b/pkgs/by-name/li/libmspub/package.nix
new file mode 100644
index 000000000000..803be7ab7e32
--- /dev/null
+++ b/pkgs/by-name/li/libmspub/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchpatch,
+  pkg-config,
+  boost,
+  doxygen,
+  icu,
+  librevenge,
+  zlib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmspub";
+  version = "0.1.4";
+
+  src = fetchzip {
+    url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    boost
+    doxygen
+    icu
+    librevenge
+    zlib
+  ];
+
+  configureFlags = [ "--with-docs" ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/main/buildfix.diff?ref_type=heads";
+      hash = "sha256-evxEoQ0a6YHoymR+SEJwqfr7rkWp3JnsWOD1tfYfZOw=";
+    })
+  ];
+
+  meta = {
+    description = "Microsoft Publisher import library";
+    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libmspub";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ arthsmn ];
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+  };
+})

From 5ad7e1948b171ee638a57eaaceb29601b203d60e Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 27 Jun 2025 23:05:43 -0300
Subject: [PATCH 04/65] libqxp: init at 0.0.2

---
 pkgs/by-name/li/libqxp/package.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/li/libqxp/package.nix

diff --git a/pkgs/by-name/li/libqxp/package.nix b/pkgs/by-name/li/libqxp/package.nix
new file mode 100644
index 000000000000..46a70cf55007
--- /dev/null
+++ b/pkgs/by-name/li/libqxp/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  pkg-config,
+  boost,
+  cppunit,
+  doxygen,
+  icu,
+  librevenge,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libqxp";
+  version = "0.0.2";
+
+  src = fetchzip {
+    url = "https://dev-www.libreoffice.org/src/libqxp/libqxp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5AcZDdmowFbsl9xJ/CPXAUL5zSNu90HgX3V0V8Pt/Rw=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    boost
+    cppunit
+    doxygen
+    icu
+    librevenge
+  ];
+
+  meta = {
+    description = "QuarkXPress import library";
+    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libqxp";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ arthsmn ];
+    platforms = lib.platforms.all;
+  };
+})

From 88dd9182a347a9f7b9a45214f4280197b0f85797 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sun, 29 Jun 2025 16:54:48 +0330
Subject: [PATCH 05/65] nix-fast-build: added bashInteractive as runtime
 dependency

---
 pkgs/by-name/ni/nix-fast-build/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix
index 0996d4a98b41..90ea52a3f504 100644
--- a/pkgs/by-name/ni/nix-fast-build/package.nix
+++ b/pkgs/by-name/ni/nix-fast-build/package.nix
@@ -6,6 +6,7 @@
   nix-eval-jobs,
   nix-output-monitor,
   nix-update-script,
+  bashInteractive,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -28,6 +29,7 @@ python3Packages.buildPythonApplication rec {
         [
           nix-eval-jobs
           nix-eval-jobs.nix
+          bashInteractive
         ]
         ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform nix-output-monitor.compiler) nix-output-monitor
       )

From 05a9ddb0a50bf5dc67e5d97befa40eb1ec6dc912 Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Sat, 5 Jul 2025 06:38:43 +0000
Subject: [PATCH 06/65] nixos/sing-box: apply migrations in tests

---
 nixos/tests/sing-box.nix | 47 +++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix
index 6d105253f29c..8e48031d1224 100644
--- a/nixos/tests/sing-box.nix
+++ b/nixos/tests/sing-box.nix
@@ -57,8 +57,6 @@ let
       "${hosts."${server_host}"}/32"
     ];
     strict_route = false;
-    sniff = true;
-    sniff_override_destination = false;
   };
 
   tproxyPort = 1081;
@@ -219,6 +217,9 @@ in
                 tag = "outbound:direct";
               }
             ];
+            route = {
+              default_interface = "eth1";
+            };
           };
         };
       };
@@ -267,6 +268,7 @@ in
               vmessOutbound
             ];
             route = {
+              default_interface = "eth1";
               final = "outbound:block";
               rules = [
                 {
@@ -315,25 +317,28 @@ in
                 type = "block";
                 tag = "outbound:block";
               }
+            ];
+            endpoints = [
               {
-                type = "direct";
-                tag = "outbound:direct";
-              }
-              {
-                detour = "outbound:direct";
                 type = "wireguard";
                 tag = "outbound:wireguard";
-                interface_name = "wg0";
-                local_address = [ "10.23.42.2/32" ];
+                name = "wg0";
+                address = [ "10.23.42.2/32" ];
                 mtu = 1280;
                 private_key = wg-keys.peer1.privateKey;
-                peer_public_key = wg-keys.peer0.publicKey;
-                server = server_host;
-                server_port = 2408;
-                system_interface = true;
+                peers = [
+                  {
+                    address = server_host;
+                    port = 2408;
+                    public_key = wg-keys.peer0.publicKey;
+                    allowed_ips = [ "0.0.0.0/0" ];
+                  }
+                ];
+                system = true;
               }
             ];
             route = {
+              default_interface = "eth1";
               final = "outbound:block";
             };
           };
@@ -377,8 +382,6 @@ in
                 listen = "0.0.0.0";
                 listen_port = tproxyPort;
                 udp_fragment = true;
-                sniff = true;
-                sniff_override_destination = false;
               }
             ];
             outbounds = [
@@ -393,6 +396,7 @@ in
               vmessOutbound
             ];
             route = {
+              default_interface = "eth1";
               final = "outbound:block";
               rules = [
                 {
@@ -434,7 +438,7 @@ in
               independent_cache = true;
               fakeip = {
                 enabled = true;
-                "inet4_range" = "198.18.0.0/16";
+                inet4_range = "198.18.0.0/16";
               };
               servers = [
                 {
@@ -458,7 +462,6 @@ in
                     "AAAA"
                   ];
                   server = "dns:fakeip";
-
                 }
               ];
             };
@@ -474,17 +477,17 @@ in
                 type = "direct";
                 tag = "outbound:direct";
               }
-              {
-                type = "dns";
-                tag = "outbound:dns";
-              }
             ];
             route = {
+              default_interface = "eth1";
               final = "outbound:direct";
               rules = [
+                {
+                  action = "sniff";
+                }
                 {
                   protocol = "dns";
-                  outbound = "outbound:dns";
+                  action = "hijack-dns";
                 }
               ];
             };

From 9c4d06fd12d46b8895c33a703ce5ed26a2fe81f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 16:57:59 +0000
Subject: [PATCH 07/65] python3Packages.edk2-pytool-library: 0.23.3 -> 0.23.4

---
 .../python-modules/edk2-pytool-library/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index 796daf64dc20..de76fbc3825a 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.23.3";
+  version = "0.23.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     tag = "v${version}";
-    hash = "sha256-fWt9epsc77YCQiB5BeuCHUZ2Or8ddgMDSZPHC4f3yZ8=";
+    hash = "sha256-7wjNOwrTXhieUI7Etn6AdiNedoPKSIADtC7dc4Bdlxc=";
   };
 
   build-system = [

From 3587eb72e474b0f4e4827537c2d82c14c8728333 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 9 Jun 2025 21:35:57 +0200
Subject: [PATCH 08/65] freedv: 1.9.9.2 -> 2.0

---
 pkgs/by-name/fr/freedv/no-framework.patch |  28 ++++++
 pkgs/by-name/fr/freedv/package.nix        | 109 ++++++++++++++++------
 2 files changed, 109 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/by-name/fr/freedv/no-framework.patch

diff --git a/pkgs/by-name/fr/freedv/no-framework.patch b/pkgs/by-name/fr/freedv/no-framework.patch
new file mode 100644
index 000000000000..01bb31e00bf5
--- /dev/null
+++ b/pkgs/by-name/fr/freedv/no-framework.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 38b3b262..3be9bfee 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -146,21 +146,16 @@ if(APPLE)
+         TARGET FreeDV
+         POST_BUILD
+         COMMAND rm -rf dist_tmp FreeDV.dmg || true
+-        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR}
++        COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src
+         COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
+         COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks
+         COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks
+-        COMMAND cp ARGS -a ${Python3_ROOT_DIR}/../../../Python.framework FreeDV.app/Contents/Frameworks
+-        COMMAND install_name_tool ARGS -add_rpath @loader_path/../Frameworks/Python.framework FreeDV.app/Contents/libs/librade*.dylib
+         COMMAND cp ARGS ../rade_src/radae_*e.py FreeDV.app/Contents/Resources
+         COMMAND cp ARGS -a ../rade_src/radae FreeDV.app/Contents/Resources
+         COMMAND cp ARGS -a ../rade_src/model19_check3 FreeDV.app/Contents/Resources
+         
+-        # Precompile Python code to improve startup time
+-        COMMAND cd FreeDV.app/Contents/Resources && ../Frameworks/Python.framework/Versions/Current/bin/python3 -c "import radae_txe\; import radae_rxe\;" && cd ../../..
+-        
+         # Codesign binary so that it can execute
+-        COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/bin -name 'Python' -o -name 'python3.12*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/lib/python3.12/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/Python
++        COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'`
+     )
+ 
+     if (MACOS_CODESIGN_KEYCHAIN_PROFILE)
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index ff04378f9f7e..bdff43aaef2f 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -1,9 +1,11 @@
 {
-  config,
   lib,
   stdenv,
   fetchFromGitHub,
   cmake,
+  pkg-config,
+  python3,
+  libopus,
   macdylibbundler,
   makeWrapper,
   darwin,
@@ -17,64 +19,115 @@
   hamlib_4,
   wxGTK32,
   sioclient,
-  pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  dbus,
+  apple-sdk_15,
   nix-update-script,
 }:
 
+let
+  radaeSrc = fetchFromGitHub {
+    owner = "drowe67";
+    repo = "radae";
+    rev = "2354cd2a4b3af60c7feb1c0d6b3d6dd7417c2ac9";
+    hash = "sha256-yEr/OCXV83qXi89QHXMrUtQ2UwNOsijQMN35Or2JP+Y=";
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freedv";
-  version = "1.9.9.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "freedv-gui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g=";
+    hash = "sha256-3vwFB+3LloumEAGlSJZc2+/I8uI6KLP/KuDGeDOj87k=";
   };
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "-Wl,-ld_classic" ""
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler"
-    sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt
-  '';
+  patches = [
+    ./no-framework.patch
+  ];
+
+  postPatch =
+    ''
+      cp -R ${radaeSrc} radae
+      chmod -R u+w radae
+      substituteInPlace radae/cmake/BuildOpus.cmake \
+        --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \
+        --replace-fail "./autogen.sh && " ""
+      substituteInPlace cmake/BuildRADE.cmake \
+        --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \
+        --replace-fail "GIT_TAG main" ""
+      patchShebangs test/test_*.sh
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "-Wl,-ld_classic" ""
+      substituteInPlace src/CMakeLists.txt \
+        --replace-fail "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler"
+      sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt
+    '';
 
   nativeBuildInputs =
     [
       cmake
+      pkg-config
+      python3
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       macdylibbundler
       makeWrapper
       darwin.autoSignDarwinBinariesHook
+      darwin.sigtool
     ];
 
-  buildInputs = [
-    codec2
-    libsamplerate
-    libsndfile
-    lpcnet
-    speexdsp
-    hamlib_4
-    wxGTK32
-    sioclient
-  ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]);
+  buildInputs =
+    [
+      codec2
+      libsamplerate
+      libsndfile
+      lpcnet
+      speexdsp
+      hamlib_4
+      wxGTK32
+      sioclient
+      python3.pkgs.numpy
+    ]
+    ++ (
+      if stdenv.hostPlatform.isLinux then
+        [
+          libpulseaudio
+          dbus
+        ]
+      else if stdenv.hostPlatform.isDarwin then
+        [
+          apple-sdk_15
+        ]
+      else
+        [
+          portaudio
+        ]
+    );
 
   cmakeFlags = [
     (lib.cmakeBool "USE_INTERNAL_CODEC2" false)
     (lib.cmakeBool "USE_STATIC_DEPS" false)
     (lib.cmakeBool "UNITTEST" true)
-    (lib.cmakeBool "USE_PULSEAUDIO" pulseSupport)
+    (lib.cmakeBool "USE_NATIVE_AUDIO" (with stdenv.hostPlatform; isLinux || isDarwin))
   ];
 
-  doCheck = true;
+  env.NIX_CFLAGS_COMPILE = "-I${codec2.src}/src";
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv $out/bin/FreeDV.app $out/Applications
-    makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv
-  '';
+  doCheck = false;
+
+  postInstall =
+    ''
+      install -Dm755 rade_build/src/librade.* -t $out/lib
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      mv $out/bin/FreeDV.app $out/Applications
+      makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv
+    '';
 
   passthru.updateScript = nix-update-script {
     extraArgs = [

From e615182da27b07e7f4685aeb7d01e55134f55d5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 10:29:56 +0000
Subject: [PATCH 09/65] ncspot: 1.2.2 -> 1.3.0

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

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 84ddcf446fa3..78e6958f4acf 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -33,16 +33,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ncspot";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho=";
+    hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk=";
   };
 
-  cargoHash = "sha256-c16qw2khbMXTA8IbYQnMKqivO63DwyAWKfV2P1aD7dU=";
+  cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
 

From 6101f4e5228a2ab3d0f7d1622b3b38882ce04441 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 8 Jul 2025 18:30:31 +0200
Subject: [PATCH 10/65] linuxPackages.nvidiaPackages.vulkan_beta: 570.123.18 ->
 570.123.19

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 0d5db1423241..065258d24bef 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -101,11 +101,11 @@ rec {
   # Vulkan developer beta driver
   # See here for more information: https://developer.nvidia.com/vulkan-driver
   vulkan_beta = generic rec {
-    version = "570.123.18";
+    version = "570.123.19";
     persistencedVersion = "550.142";
     settingsVersion = "550.142";
-    sha256_64bit = "sha256-GoBNatVpits13a3xsJSUr9BFG+5xrUDROfHmvss2cSY=";
-    openSha256 = "sha256-AYl8En0ZAZXWlJ8J8LKbPvAEKX+y65L1aq4Hm+dJScs=";
+    sha256_64bit = "sha256-K1ElpoTBjlLUG7slBrAhKqnEjUFwupiF7TS/8ogCf7c=";
+    openSha256 = "sha256-uGH2lnnADf5AGl5ShcbCOULsCIWtJlbxgHiz7I2efVE=";
     settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY=";
     persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA=";
     url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

From a4dde87093e42a4bde9cd7fedd89eabf82e871e3 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 8 Jul 2025 18:30:57 +0200
Subject: [PATCH 11/65] linuxPackages.nvidiaPackages.vulkan_beta: bump
 utilities to r570

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 065258d24bef..52f6546e0f23 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -102,12 +102,12 @@ rec {
   # See here for more information: https://developer.nvidia.com/vulkan-driver
   vulkan_beta = generic rec {
     version = "570.123.19";
-    persistencedVersion = "550.142";
-    settingsVersion = "550.142";
+    persistencedVersion = "570.169";
+    settingsVersion = "570.169";
     sha256_64bit = "sha256-K1ElpoTBjlLUG7slBrAhKqnEjUFwupiF7TS/8ogCf7c=";
     openSha256 = "sha256-uGH2lnnADf5AGl5ShcbCOULsCIWtJlbxgHiz7I2efVE=";
-    settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY=";
-    persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA=";
+    settingsSha256 = "sha256-0E3UnpMukGMWcX8td6dqmpakaVbj4OhhKXgmqz77XZc=";
+    persistencedSha256 = "sha256-dttFu+TmbFI+mt1MbbmJcUnc1KIJ20eHZDR7YzfWmgE=";
     url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
 
     broken = kernel.kernelAtLeast "6.15";

From cd9ac20af512fea5f3bfca5acc9ddf1b081474d7 Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 27 Jun 2025 21:07:37 -0300
Subject: [PATCH 12/65] scribus: 1.6.4 -> 1.7.0

---
 pkgs/applications/office/scribus/default.nix | 63 ++++++++++++++++----
 pkgs/top-level/all-packages.nix              |  3 +-
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index d5fc795c3645..6e5fbf8b34ad 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -4,14 +4,27 @@
   cmake,
   cups,
   fetchurl,
+  fetchpatch,
   fontconfig,
   freetype,
+  graphicsmagick,
   harfbuzzFull,
   hunspell,
   lcms2,
+  libcdr,
+  libfreehand,
   libjpeg,
+  libjxl,
+  libmspub,
+  libpagemaker,
+  libqxp,
+  librevenge,
+  libsysprof-capture,
   libtiff,
+  libvisio,
+  libwpg,
   libxml2,
+  libzmf,
   pixman,
   pkg-config,
   podofo_0_10,
@@ -20,7 +33,7 @@
   python3,
   lib,
   stdenv,
-  qt5,
+  qt6,
 }:
 
 let
@@ -32,17 +45,17 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "scribus";
 
-  version = "1.6.4";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UzvnrwOs+qc27F96P8JWKr0gD+9coqfN7gK19E1hgp4=";
+    hash = "sha256-+lnWIh/3z/qTcjV5l+hlcBYuHhiRNza3F2/RD0jCQ/Y=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -51,37 +64,63 @@ stdenv.mkDerivation (finalAttrs: {
     cups
     fontconfig
     freetype
+    graphicsmagick
     harfbuzzFull
     hunspell
     lcms2
+    libcdr
+    libfreehand
     libjpeg
+    libjxl
+    libpagemaker
+    libqxp
+    librevenge
+    libsysprof-capture
     libtiff
+    libvisio
+    libwpg
     libxml2
+    libzmf
     pixman
     podofo_0_10
     poppler
     poppler_data
     pythonEnv
-    qt5.qtbase
-    qt5.qtimageformats
-    qt5.qttools
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtimageformats
+    qt6.qtsvg
+    qt6.qttools
+  ] ++ lib.optionals libmspub.meta.available [ libmspub ];
+
+  cmakeFlags = [ (lib.cmakeBool "WANT_GRAPHICSMAGICK" true) ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_qt_6.9.0.patch?h=scribus-unstable";
+      hash = "sha256-hzd9XpoVVqbwvZ40QPGBqqWkIFXug/tSojf/Ikc4nn4=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable";
+      hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg=";
+    })
   ];
 
-  meta = with lib; {
-    maintainers = with maintainers; [
-      arthsmn
-    ];
+  meta = {
+    maintainers = with lib.maintainers; [ arthsmn ];
     description = "Desktop Publishing (DTP) and Layout program";
     mainProgram = "scribus";
     homepage = "https://www.scribus.net";
     # There are a lot of licenses...
     # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       gpl2Plus
       mit
       publicDomain
     ];
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 845e7e2c543c..2be835c35d14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13726,8 +13726,7 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
-  scribus = scribus_1_5;
+  scribus = callPackage ../applications/office/scribus/default.nix { };
 
   seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
 

From 0bbb2099b875eb21cc7bfb0c56de407be0854dab Mon Sep 17 00:00:00 2001
From: ferres <justferres@yandex.ru>
Date: Fri, 11 Jul 2025 00:49:50 +0300
Subject: [PATCH 13/65] python3Packages.xformers: support aarch64-darwin

---
 .../python-modules/xformers/default.nix       | 44 ++++++++++---------
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index db01a4abeb48..46e77b3c3acd 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -26,7 +26,8 @@
   einops,
   transformers,
   timm,
-#, flash-attn
+  #, flash-attn
+  openmp,
 }:
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
@@ -66,23 +67,28 @@ buildPythonPackage {
 
   stdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 
-  buildInputs = lib.optionals cudaSupport (
-    with cudaPackages;
-    [
-      # flash-attn build
-      cuda_cudart # cuda_runtime_api.h
-      libcusparse # cusparse.h
-      cuda_cccl # nv/target
-      libcublas # cublas_v2.h
-      libcusolver # cusolverDn.h
-      libcurand # curand_kernel.h
-    ]
-  );
+  buildInputs =
+    lib.optional stdenv.hostPlatform.isDarwin openmp
+    ++ lib.optionals cudaSupport (
+      with cudaPackages;
+      [
+        # flash-attn build
+        cuda_cudart # cuda_runtime_api.h
+        libcusparse # cusparse.h
+        cuda_cccl # nv/target
+        libcublas # cublas_v2.h
+        libcusolver # cusolverDn.h
+        libcurand # curand_kernel.h
+      ]
+    );
 
-  nativeBuildInputs = [
-    ninja
-    which
-  ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]);
+  nativeBuildInputs =
+    [
+      ninja
+      which
+    ]
+    ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ])
+    ++ lib.optional stdenv.hostPlatform.isDarwin openmp.dev;
 
   dependencies = [
     numpy
@@ -123,9 +129,5 @@ buildPythonPackage {
     changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ happysalada ];
-    badPlatforms = [
-      # fatal error: 'omp.h' file not found
-      lib.systems.inspect.patterns.isDarwin
-    ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5696d02af7e5..1232ed8ebeb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19574,7 +19574,9 @@ self: super: with self; {
 
   xen = toPythonModule (pkgs.xen.override { python3Packages = self; });
 
-  xformers = callPackage ../development/python-modules/xformers { };
+  xformers = callPackage ../development/python-modules/xformers {
+    inherit (pkgs.llvmPackages) openmp;
+  };
 
   xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; };
 

From 7fc48d12766062cb12286e3d93c11057835eb946 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 05:53:24 +0000
Subject: [PATCH 14/65] drawterm: 0-unstable-2025-06-13 ->
 0-unstable-2025-06-29

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

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index 835dfea8faac..9501e867b5b0 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2025-06-13";
+  version = "0-unstable-2025-06-29";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "4e32a9fa6e58c1474f747a99083303c4a2f14ea7";
-    hash = "sha256-j0s6xB8c8vQoOzL34Gu84elec0ig4z75NzlUx6PsW4E=";
+    rev = "903bcd8dba9cb9dfc70707a28089c469e5302539";
+    hash = "sha256-gZAPNRzAuvpIAV7ArPGsqVv6SYBJkqA+Okf6FmStvsU=";
   };
 
   enableParallelBuilding = true;

From 45e9f457f9943c5e9ff28a22d4cc4c8da10370d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 07:38:14 +0000
Subject: [PATCH 15/65] ada: 3.2.4 -> 3.2.5

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

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index 9bee2fc45d33..f8fc46ad7551 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.4";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-tC7Hpf9xCysraTtVC+mYE/DVNrG02lwLAlDiTeaWpY4=";
+    hash = "sha256-gXeQYNuhrlCEvvDQtQ07+nE/9gGzzEYPnEKMxWryLRI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 0108b8124f5f50de7639e3426c2a8d344caecaab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 12:44:43 +0000
Subject: [PATCH 16/65] uhk-agent: 7.0.1 -> 8.0.0

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

diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix
index 5a095b4411d8..8feaea98ae70 100644
--- a/pkgs/by-name/uh/uhk-agent/package.nix
+++ b/pkgs/by-name/uh/uhk-agent/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "uhk-agent";
-  version = "7.0.1";
+  version = "8.0.0";
 
   src = fetchurl {
     url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
     name = "${pname}-${version}.AppImage";
-    sha256 = "sha256-8zf6vhgZj8cY9XoI/6FZH1/xh7/I3vboVumLsTq3q8Q=";
+    sha256 = "sha256-1XgmGAjLoxJ9ZyeaDSk8UC9fVVwkY83i+DRBRIQz7/M=";
   };
 
   appimageContents = appimageTools.extract {

From d1795ed69010032b1654c451b2cf31a4ac7b70a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 12:47:58 +0000
Subject: [PATCH 17/65] openpgp-card-tools: 0.11.9 -> 0.11.10

---
 pkgs/by-name/op/openpgp-card-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
index cb6c21ceb2f3..3cc6e76e7aea 100644
--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -13,18 +13,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-card-tools";
-  version = "0.11.9";
+  version = "0.11.10";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "openpgp-card";
     repo = "openpgp-card-tools";
     rev = "v${version}";
-    hash = "sha256-kT/egkOBOomUX+fwT3OeRSZOnGeuFRLKKAXtW8nN4rw=";
+    hash = "sha256-1sm/zaKhUPMGdYg8sX/IXAI4vIRRZezSD89rljG4S/Y=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mZZ8veY3iqsgScfFAGYo496qxTew24R5NxYf3WjnHco=";
+  cargoHash = "sha256-S+TOSUh/sr647aUBjo+aaZgVrrOubwa+XVFcwNBOxmI=";
 
   nativeBuildInputs = [
     installShellFiles

From f3ffa332d6dea9c05547a5aed97e35a176ccca1a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 11 Jul 2025 18:45:48 +0100
Subject: [PATCH 18/65] diffoscope: 300 -> 301

Changes: https://diffoscope.org/news/diffoscope-301-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 382a3fc8f7b1..59519f997d3d 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,12 +106,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "300";
+  version = "301";
   format = "setuptools";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-ByfAS1ygWex8FLGeaV1HouSb6ElDZjAhXV5xjpsltFE=";
+    hash = "sha256-piTdP812LgcxvvgvUOKUrkxVXCbclyQW8dp84beT7H4=";
   };
 
   outputs = [

From 87a19275ee1744fecea5c12dd1d6257f36effb3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 01:07:05 +0000
Subject: [PATCH 19/65] wdt: 1.27.1612021-unstable-2025-06-12 ->
 1.27.1612021-unstable-2025-07-09

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

diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index e2a26733c427..95e12fd6b062 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "wdt";
-  version = "1.27.1612021-unstable-2025-06-12";
+  version = "1.27.1612021-unstable-2025-07-09";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "5fdb967ef2618e483341bc5021c6fa5f5506a549";
-    sha256 = "sha256-3RT7sM8KosrW0r/yrxa8fKz2dSjjf2684VL3ULqfkC4=";
+    rev = "e4d03e392e90b8ff4d2a67da31d65405afd32db5";
+    sha256 = "sha256-epjZFTczJLmI5MgKLMVXhEhv9MYJCYWYOAkZcvqeBs0=";
   };
 
   nativeBuildInputs = [ cmake ];

From dbad3228bcfb20479a9ef2a46f7f6884a164f79a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 16:28:06 +0000
Subject: [PATCH 20/65] home-manager: 0-unstable-2025-07-02 ->
 0-unstable-2025-07-11

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

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index a0de686dfb10..039d6c1489d6 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-07-02";
+  version = "0-unstable-2025-07-11";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "89af52d9a893af013f5f4c1d2d56912106827153";
-    hash = "sha256-ENTd/sd4Vz/VJYn14SVqW1OH2m7WIAvsm9A9SrmDZRY=";
+    rev = "392ddb642abec771d63688c49fa7bcbb9d2a5717";
+    hash = "sha256-A4nftqiNz2bNihz0bKY94Hq/6ydR6UQOcGioeL7iymY=";
   };
 
   nativeBuildInputs = [

From 149672f249f282dd69f532c2ea7bad2d5a474894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 18:40:35 +0000
Subject: [PATCH 21/65] wpprobe: 0.7.2 -> 0.7.3

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

diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix
index 866956db428b..8c5fa5cafa9b 100644
--- a/pkgs/by-name/wp/wpprobe/package.nix
+++ b/pkgs/by-name/wp/wpprobe/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wpprobe";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "Chocapikk";
     repo = "wpprobe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6aL1hK9oZYcBVQbfualIOsYrbMWTA1uV+fEKbOFaSHU=";
+    hash = "sha256-duTd+4nY8G8+RPlNBrcEZ4hBd4lf/gEyykIdbWcWPbs=";
   };
 
   vendorHash = "sha256-KV6Ss0fN3xwm5Id7MAHMUjq9TsQbaInLjd5xcLKGX6U=";

From 20e61d4a72cc487fba436f00d6f271f854c79143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 02:08:32 +0000
Subject: [PATCH 22/65] sqlfluff: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix
index b6a4852f61ed..40b6a82d5329 100644
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "3.4.1";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
     tag = version;
-    hash = "sha256-gtpYQvhDOxNO97YXaSHqSgUklmPJIe2ynjexTZPBUmA=";
+    hash = "sha256-Cf4nrINpe5Kr2JYwcTYx1oO+E6ydlBs0W7F4Mh7ITAs=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "SQL linter and auto-formatter";
     homepage = "https://www.sqlfluff.com/";
-    changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/sqlfluff/sqlfluff/blob/${src.tag}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sqlfluff";

From db0528c17e6a250a79c98b550f2a1ef89d112643 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 03:48:03 +0000
Subject: [PATCH 23/65] python3Packages.pyais: 2.11.1 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index ce8be1fffd07..d109d1cc08c9 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.11.1";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "M0r13n";
     repo = "pyais";
     tag = "v${version}";
-    hash = "sha256-/etiTXKNcf5sMHxdl2dq1gH3OwKTwrz7zyH3CXmx/vQ=";
+    hash = "sha256-83JZ8OWbk6vwcbB6JFwHNNuvbq1n/4YHi1FhG+FIts8=";
   };
 
   build-system = [ setuptools ];

From 5aee4d158dd8374b41eb2945fc5acfc980222bc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 07:50:34 +0000
Subject: [PATCH 24/65] python3Packages.py-ocsf-models: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix
index 76f2a00cd600..326906f3ab5e 100644
--- a/pkgs/development/python-modules/py-ocsf-models/default.nix
+++ b/pkgs/development/python-modules/py-ocsf-models/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "py-ocsf-models";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "prowler-cloud";
     repo = "py-ocsf-models";
     tag = version;
-    hash = "sha256-aHde/dYgY4x5b/iwIddqvfQ3/pRhEp0zDsrK3+jMV44=";
+    hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M=";
   };
 
   pythonRelaxDeps = true;

From 41ee9de1bcd82d2184ebaf65ca131b095c489b93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 08:56:33 +0000
Subject: [PATCH 25/65] python3Packages.python-arango: 8.2.0 -> 8.2.1

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

diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix
index 7e4d50915daa..14a8a7cfbdc0 100644
--- a/pkgs/development/python-modules/python-arango/default.nix
+++ b/pkgs/development/python-modules/python-arango/default.nix
@@ -33,7 +33,7 @@ in
 
 buildPythonPackage rec {
   pname = "python-arango";
-  version = "8.2.0";
+  version = "8.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "arangodb";
     repo = "python-arango";
     tag = version;
-    hash = "sha256-DPyCHa9tAnxKYeieiHe10UV7EPnF7octbDm23dSlIb0=";
+    hash = "sha256-ZLjCcH6cSG+LcoeSifBm6HGjnRFJwYNTXbcw9b/BeQY=";
   };
 
   nativeBuildInputs = [

From 8ac27652629beeaa8d0765f7bb4237fb9da13b3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 08:59:43 +0000
Subject: [PATCH 26/65] python3Packages.openfga-sdk: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix
index 5cd8bbe94fd2..37368c4deb21 100644
--- a/pkgs/development/python-modules/openfga-sdk/default.nix
+++ b/pkgs/development/python-modules/openfga-sdk/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "openfga-sdk";
-  version = "0.9.4";
+  version = "0.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-ukx3XzNl2vIhPtHPJ46mUYbuxXkMKmlUNXV/3UF4DKo=";
+    hash = "sha256-e/Pgyj7A1HtcDPeRy0QK+Nok2ruWBiU9A1Yh7RZvtVI=";
   };
 
   build-system = [ setuptools ];

From b245c42ec19935893394c5f88f4dd7cbbf645359 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 09:00:28 +0000
Subject: [PATCH 27/65] terraform-providers.bigip: 1.23.0 -> 1.23.1

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9a6810e2c8c0..b6820a68053d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -171,11 +171,11 @@
     "vendorHash": null
   },
   "bigip": {
-    "hash": "sha256-JGsleJiOo2wnIObvbQpvpmfc/CUaznVDIiNFX+eetW8=",
+    "hash": "sha256-lhN9YPufx6JITEhwLfqUMudXKTJqFdRCPkS+lTZpmH8=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.23.0",
+    "rev": "v1.23.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From e742182e2b9719e70a158666722b9a96b4210c15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 09:04:22 +0000
Subject: [PATCH 28/65] python3Packages.qpageview: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix
index c383e89b0de0..12ab639fd775 100644
--- a/pkgs/development/python-modules/qpageview/default.nix
+++ b/pkgs/development/python-modules/qpageview/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "qpageview";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "frescobaldi";
     repo = "qpageview";
     tag = "v${version}";
-    hash = "sha256-UADC+DH3eG1pqlC9BRsqGQQjJcpfwWWVq4O7aFGLxLA=";
+    hash = "sha256-5D+fumQVCfl9ZEHIQmbdXkAuAkiKy6P5+StMWSE+a0A=";
   };
 
   build-system = [ hatchling ];

From fbb5da0cfd1806e29740a936fecbb3105b3b623b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 11:45:30 +0000
Subject: [PATCH 29/65] doctl: 1.132.0 -> 1.133.0

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

diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index c1066373414b..895763c82698 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.132.0";
+  version = "1.133.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${version}";
-    hash = "sha256-A4CtJpqHkC88kH6CsEt2Pc+SgHeznjnzRYwclvm7De0=";
+    hash = "sha256-U3n407HnivvogybgTuB/Rb932bt0WTbk6M1Wf7jRoTo=";
   };
 
   meta = {

From 893dd8b125e4d546f272b676e3ef5757336db1b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 12:45:53 +0000
Subject: [PATCH 30/65] python3Packages.pylamarzocco: 2.0.10 -> 2.0.11

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 3871ba0145ef..e895eb3180ac 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "2.0.10";
+  version = "2.0.11";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     tag = "v${version}";
-    hash = "sha256-8nmbnucTJa1RAmsOsqQLusjTnnrDZtHaADycnn3NyUU=";
+    hash = "sha256-g0qhNBhcU7Dogcw9WiEk+APk2McU7woXBqgeUS9D8iQ=";
   };
 
   build-system = [ setuptools ];

From 2e332ce335a3e5d3d1da07db349f73078cb45036 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 13:04:09 +0000
Subject: [PATCH 31/65] python3Packages.rclone-python: 0.1.21 -> 0.1.23

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

diff --git a/pkgs/development/python-modules/rclone-python/default.nix b/pkgs/development/python-modules/rclone-python/default.nix
index 6d0a508c3fc2..1b6be818b936 100644
--- a/pkgs/development/python-modules/rclone-python/default.nix
+++ b/pkgs/development/python-modules/rclone-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "rclone-python";
-  version = "0.1.21";
+  version = "0.1.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Johannes11833";
     repo = "rclone_python";
     tag = "v${version}";
-    hash = "sha256-lYrPSDBWGVQmT2/MgzbtZ6hHNZXINCmmFP+ZHFZQDw8=";
+    hash = "sha256-vvsiXS3uI0TcL+X8+75BQmycrF+EGIgQE1dmGef35rI=";
   };
 
   build-system = [ setuptools ];

From 63560aefe77eb5e3710095812ed79f0b436c8b1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 13:30:00 +0000
Subject: [PATCH 32/65] lxgw-neoxihei: 1.218 -> 1.218.1

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

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 102698250980..022eb700ecb5 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.218";
+  version = "1.218.1";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-TGl4J4r7ueAahrTgsJH0DlucuT2OrW3NzR1jQGwQA7E=";
+    hash = "sha256-ZWotvGj2LpQbi3t6mVBL8kE19JC4X6VqkIXSQSuyjR0=";
   };
 
   dontUnpack = true;

From 6df3e4d75c9f4b534a6d95f908dfbb8cd8b77808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 13:40:40 +0000
Subject: [PATCH 33/65] python3Packages.pyexploitdb: 0.2.88 -> 0.2.89

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

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 92222c73676e..d26992820e9c 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.88";
+  version = "0.2.89";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-KHFzK9MIT3tHwFmdGx/i9OSzQTKIhGXgWEI+qtH1Dkk=";
+    hash = "sha256-DCQmJ4YNQKMIK0IJwAYwIYp+ulGcRdjwDIsNI6W6RsU=";
   };
 
   build-system = [ setuptools ];

From e2d56866a15a7fb94376c7ba202ae198f8f97b19 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 13 Jul 2025 12:33:03 +0000
Subject: [PATCH 34/65] olivetin: 2025.6.22 -> 2025.7.13

Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.7.13
Diff: https://github.com/OliveTin/OliveTin/compare/2025.6.22...2025.7.13
---
 pkgs/by-name/ol/olivetin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 21eb3657b331..775586a951ff 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -81,18 +81,18 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.6.22";
+    version = "2025.7.13";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-fNE8x0d0lnKVxy4fk3h5QrcWnMKBcxhrxpDbZYTXimc=";
+      hash = "sha256-/KylnGxamyhrvLNHAIcBUcDWU+Agizg7tlMOv6qnpCI=";
     };
 
     modRoot = "service";
 
-    vendorHash = "sha256-8rPJoB75de2Y56iyIwdI9HPk7OlCgfMPy28TW1i7+sU=";
+    vendorHash = "sha256-mI17WV+U4wbcZhSymX4NnxwvHqQNehubrvH9CxXe4/o=";
 
     ldflags = [
       "-s"

From cdbb4ae1e14dc273f19df88d93942d58180139ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 14:36:21 +0000
Subject: [PATCH 35/65] terraform-providers.sakuracloud: 2.28.0 -> 2.28.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9a6810e2c8c0..1722039f8d6b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1147,13 +1147,13 @@
     "vendorHash": null
   },
   "sakuracloud": {
-    "hash": "sha256-vIP7hlPvx7o8/uXpg6TOEeoDL9FGaTBdXzziOyLrdGY=",
+    "hash": "sha256-IbR3m0s5LCC9tIOC67yn2yI6lssnIlc/pB6XIf0UOuk=",
     "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
     "owner": "sacloud",
     "repo": "terraform-provider-sakuracloud",
-    "rev": "v2.28.0",
+    "rev": "v2.28.1",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-hJmMNxlhyzcnguLFJih/K1CSZHIOspTgCJ8nyVjT7mg="
+    "vendorHash": "sha256-HKmIl/GjGJZmhWLrK3lMjYo1F5nmo+U9ZpvBo5hDH/0="
   },
   "scaleway": {
     "hash": "sha256-3MLtSOcMCIl3pFJH/xKK/fPQcRrW2Nx4b2jCZiUE2aw=",

From ee3b8ba10b918e8b75e46ba01dc0045dd14f109b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 15:44:31 +0000
Subject: [PATCH 36/65] xscreensaver: 6.11 -> 6.12

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

diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix
index e02f96562936..62ec22428439 100644
--- a/pkgs/by-name/xs/xscreensaver/package.nix
+++ b/pkgs/by-name/xs/xscreensaver/package.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xscreensaver";
-  version = "6.11";
+  version = "6.12";
 
   src = fetchurl {
     url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lIi3ouZVkSh7lEMB8x+WjXcX/5vGswmJ46vtZiyH4eg=";
+    hash = "sha256-T/Z5ghfju7w8cza+7afoPq+/AzAawpsiNtpmoPExdkM=";
   };
 
   outputs = [

From 57c49795e4ee8fd16072173cbe7321ca7448df8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 17:13:06 +0000
Subject: [PATCH 37/65] melange: 0.29.0 -> 0.29.1

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

diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 2ddf086f8b9d..74e135d7f36f 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-nyrR9RxoZzQQ4OqV4FtW9534PQAyGnBCEqCJReMkCIQ=";
+    hash = "sha256-GQvsq9PJA4dbi69ZAMcyPwbsSSbsNm4ZyBj+W6c0VV4=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

From ad8079c7e0a54f2e5e81f1c9e427efd105f73ba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 17:19:02 +0000
Subject: [PATCH 38/65] halo: 2.21.2 -> 2.21.3

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

diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index d2a694d0285c..ef8fabdf6e59 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "halo";
-  version = "2.21.2";
+  version = "2.21.3";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
-    hash = "sha256-XYzk989eaOXU81EWUbwhLl6Fy30dbLhn4/x2wJ4I4ac=";
+    hash = "sha256-l5tD9QIQfuRXG6hxP2ensb3SeX/A7F/xx694rQKUUrI=";
   };
 
   nativeBuildInputs = [

From 5ee1a5f186f70774db60e70df9fd24bd397ef149 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 17:31:06 +0000
Subject: [PATCH 39/65] python3Packages.pylitterbot: 2024.2.1 -> 2024.2.2

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

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 7f9d01ae3964..26f7b8934954 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.1";
+  version = "2024.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-33LiWgI9E7/I6fyrdv+YXcw+gxUOsPZ0mYvEIF8/fOI=";
+    hash = "sha256-FKBgvP3qXT3nKHn5R9pp4nYNX+mO4vfDi5fzQ5+y1Nc=";
   };
 
   pythonRelaxDeps = [ "deepdiff" ];

From 72423ca649ca589026ce3959bf35918324f8f5a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 19:25:35 +0000
Subject: [PATCH 40/65] misconfig-mapper: 1.14.4 -> 1.14.5

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

diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index 9ff75fefa6a9..515893a91bd3 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.14.4";
+  version = "1.14.5";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${version}";
-    hash = "sha256-HLGBQugGg66wH3NFPDvFRRGdDscd+Vz6LHG8CYHqgYw=";
+    hash = "sha256-faIjS3B019eYefOIklJMuUVcCzkM3bHu/HJ1kaERtUA=";
   };
 
-  vendorHash = "sha256-GY3eRMj7YtuP/Bibf2e4fAOwGNe9TTadmOBpOxK4S6c=";
+  vendorHash = "sha256-mh66gH4ln/D2OWaD+VISTysszjpPGg2dHF29BD1i6z8=";
 
   ldflags = [
     "-s"

From 0fabecf2aac6e35cb2cc05e121a6d923371456bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 19:48:00 +0000
Subject: [PATCH 41/65] autotiling-rs: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index b095f7d06174..f4e979b04bd5 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "autotiling-rs";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "ammgws";
     repo = "autotiling-rs";
     rev = "v${version}";
-    sha256 = "sha256-rihNlKaESxIEQ61FP6PzIg82yuwQ/R4GX5BA0Ss+I5w=";
+    sha256 = "sha256-S/6LRQTHdPGZkmbTAb0ufNoXE1nD+rIQ2ASJ8jjFS3E=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mXuI+kA8J2Bhli6HiX9h72i61cRbByKJQtUHHjCUza8=";
+  cargoHash = "sha256-riQ1nOs4fBj9y/jK0nS7Y85vMejLrKrEJzNnsQKkoeg=";
 
   meta = with lib; {
     description = "Autotiling for sway (and possibly i3)";

From 620620ebe2023c1dff48e3183197d526581198c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 19:53:48 +0000
Subject: [PATCH 42/65] gifski: 1.33.0 -> 1.34.0

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

diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index eb0ee73c73a9..ca5991392321 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "1.33.0";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI=";
+    hash = "sha256-8EAC8YH3AIbvYdTL7HtqTL7WqztzCwvDwIVkhiqvtrQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2A7SDu9f7Tf74SAD72gCQ00Ccp3r2MaPo0qjVe3nR5s=";
+  cargoHash = "sha256-ZppSO3TyZBbNhG+YW71+C9kMu7ok2+kbnnCRbAKsbfs=";
 
   nativeBuildInputs = [
     pkg-config

From 27c31f43b9b38f6a8cdf6127fa387d136a5b663c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Jul 2025 22:06:28 +0200
Subject: [PATCH 43/65] evcc: 0.204.5 -> 0.205.0

https://github.com/evcc-io/evcc/releases/tag/0.205.0
---
 pkgs/by-name/ev/evcc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 3b648c3d1614..b9e4c5d58803 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.204.5";
+  version = "0.205.0";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-kGn7O2OCvStez2eaT+h7EDBi96Q7dshK8X7DUD2SBOo=";
+    hash = "sha256-T97f5K4TDaAdqm2zU8+cEyq1YIzwy35tX8mb3pPkhIo=";
   };
 
-  vendorHash = "sha256-n67OSKpMhvgqftoVAqtABfcNgdRSbWjmJv7HSmv3Ev8=";
+  vendorHash = "sha256-gbTh9/Ny4JVCbpzz+opN92m6LQhPEBj/XuLLZ4M6tIc=";
 
   commonMeta = with lib; {
     license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo124Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-HDokBgvRxmKkuQyGIqkX0Hy4Up+K25yYSRYAstE8mBY=";
+    hash = "sha256-OmiINzMCXbvceCDZ9zYTQKfWQ3iUgovMznmVoQkQ5DE=";
   };
 
   nativeBuildInputs = [

From a26a3a4dad9a64d38302faf5a735b79eab0daac1 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 13 Jul 2025 21:54:51 +0000
Subject: [PATCH 44/65] synapse-admin-etkecc: 0.11.1-etke44 -> 0.11.1-etke45

Changelog: https://github.com/etkecc/synapse-admin/releases/tag/v0.11.1-etke45
Diff: https://github.com/etkecc/synapse-admin/compare/v0.11.1-etke44...v0.11.1-etke45
---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index f9b32eb054cb..4bb6743d2470 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke44";
+  version = "0.11.1-etke45";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8IL81rMohPNss0ZTKgyxvx4FNcgFtDoJGZ6uyM/nJgg=";
+    hash = "sha256-LlwNVlgZl5O9paEGem68FbzAPOfXlLTxZ865vR7qPR8=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-6TVVYitLtpNjyMOUXaMYlhOskSZCb/eWW91S69RTeFo=";
+    hash = "sha256-7eSQQdcJkBIbG/0cj0uh02Day+4ph6LMQGIaMPqjpdk=";
   };
 
   nativeBuildInputs = [

From 4b97e20925efdbfa40f01c9e1b916ef408c4d6a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 09:52:44 +0000
Subject: [PATCH 45/65] python3Packages.pyatv: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 8bb069700b9a..767b8c5eb067 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "pyatv";
-  version = "0.16.0";
+  version = "0.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "postlund";
     repo = "pyatv";
     tag = "v${version}";
-    hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA=";
+    hash = "sha256-b5u9u5CD/1W422rCxHvoyBqT5CuBAh68/EUBzNDcXoE=";
   };
 
   postPatch = ''
@@ -109,7 +109,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client library for the Apple TV";
     homepage = "https://github.com/postlund/pyatv";
-    changelog = "https://github.com/postlund/pyatv/blob/v${version}/CHANGES.md";
+    changelog = "https://github.com/postlund/pyatv/blob/${src.tag}/CHANGES.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 0dd874f69a016f1cb2a86279f477f0fc7652679b Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 14 Jul 2025 16:22:04 +0200
Subject: [PATCH 46/65] protonplus: 0.5.8 -> 0.5.9

Changelog: https://github.com/Vysp3r/ProtonPlus/releases/tag/v0.5.9
---
 pkgs/by-name/pr/protonplus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index fc56159e4148..9d3f654a16fc 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-99RD1M6i/titM0dzyNPZGdWyNAUo7ZBj2QEw/qDl5nM=";
+    hash = "sha256-Ss+9p6mQQNYcY+5gAD1CtM+TpNRC/kVqV8fmfowydBk=";
   };
 
   nativeBuildInputs = [

From 0ac4a7d07e1f5d19631beecae598032bae472104 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 14 Jul 2025 16:23:32 +0200
Subject: [PATCH 47/65] protonplus: fix meta.mainProgram

---
 pkgs/by-name/pr/protonplus/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index 9d3f654a16fc..c3c68cc2a845 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    mainProgram = "com.vysp3r.ProtonPlus";
+    mainProgram = "protonplus";
     description = "Simple Wine and Proton-based compatibility tools manager";
     homepage = "https://github.com/Vysp3r/ProtonPlus";
     changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}";

From b784f21dca31d51739ee71ff7beab555ca22cdf5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 14 Jul 2025 15:19:08 +0200
Subject: [PATCH 48/65] python3Packages.pyvers: init a 0.1.0

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

diff --git a/pkgs/development/python-modules/pyvers/default.nix b/pkgs/development/python-modules/pyvers/default.nix
new file mode 100644
index 000000000000..972abed60503
--- /dev/null
+++ b/pkgs/development/python-modules/pyvers/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  packaging,
+
+  # tests
+  jax,
+  numpy,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyvers";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "vmoens";
+    repo = "pyvers";
+    tag = "v${version}";
+    hash = "sha256-BUUfb0vI1r/VV5aF9gmqnXGOIWQfBJ98MrcF/IH5CEs=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    packaging
+  ];
+
+  pythonImportsCheck = [ "pyvers" ];
+
+  nativeCheckInputs = [
+    jax
+    numpy
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python library for dynamic dispatch based on module versions and backends";
+    homepage = "https://github.com/vmoens/pyvers";
+    changelog = "https://github.com/vmoens/pyvers/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f90a3258ce3..40daf5da6b9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14948,6 +14948,8 @@ self: super: with self; {
 
   pyverilog = callPackage ../development/python-modules/pyverilog { };
 
+  pyvers = callPackage ../development/python-modules/pyvers { };
+
   pyversasense = callPackage ../development/python-modules/pyversasense { };
 
   pyvesync = callPackage ../development/python-modules/pyvesync { };

From 26f0921b431908fd6894d90fabda1655627f8f72 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 14 Jul 2025 15:06:33 +0200
Subject: [PATCH 49/65] python3Packages.tensordict: 0.9.0 -> 0.9.1

Diff: https://github.com/pytorch/tensordict/compare/refs/tags/v0.9.0...refs/tags/v0.9.1

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

diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix
index 59395912ba36..66cc02861228 100644
--- a/pkgs/development/python-modules/tensordict/default.nix
+++ b/pkgs/development/python-modules/tensordict/default.nix
@@ -19,6 +19,7 @@
   numpy,
   orjson,
   packaging,
+  pyvers,
   torch,
 
   # tests
@@ -28,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "tensordict";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "tensordict";
     tag = "v${version}";
-    hash = "sha256-actBFzWb2JBPsLhRZiD6zRpk7eyX2OHUPMU9JpJ90Wc=";
+    hash = "sha256-OdS9dw/BtSLZuY857O2njlFOMQj5IJ6v9c2aRP+H1Hc=";
   };
 
   build-system = [
@@ -56,6 +57,7 @@ buildPythonPackage rec {
     numpy
     orjson
     packaging
+    pyvers
     torch
   ];
 

From 0bab7a5151e7d3f8d60ea164fa849d48629c9ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?=
 <65301509+KiruyaMomochi@users.noreply.github.com>
Date: Sun, 13 Jul 2025 22:24:30 +0800
Subject: [PATCH 50/65] openobserve: 0.14.0 -> 0.14.7

---
 pkgs/by-name/op/openobserve/build.rs.patch | 12 ++++++------
 pkgs/by-name/op/openobserve/package.nix    |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/op/openobserve/build.rs.patch b/pkgs/by-name/op/openobserve/build.rs.patch
index 1cfb91c7c12b..70e89ec2c873 100644
--- a/pkgs/by-name/op/openobserve/build.rs.patch
+++ b/pkgs/by-name/op/openobserve/build.rs.patch
@@ -1,11 +1,11 @@
 diff --git a/build.rs b/build.rs
 index 0f66ace..be74fad 100644
---- a/build.rs
-+++ b/build.rs
-@@ -99,24 +99,5 @@ fn main() -> Result<()> {
-         &["proto"],
-     )?;
- 
+--- a/src/config/build.rs
++++ b/src/config/build.rs
+@@ -20,24 +20,5 @@ use chrono::{DateTime, SecondsFormat, Utc};
+ fn main() -> Result<()> {
+     println!("cargo:rerun-if-changed=build.rs");
+
 -    // build information
 -    let output = Command::new("git")
 -        .args(["describe", "--tags", "--abbrev=0"])
diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix
index 6684c7d4f1e9..8472b1700e23 100644
--- a/pkgs/by-name/op/openobserve/package.nix
+++ b/pkgs/by-name/op/openobserve/package.nix
@@ -15,12 +15,12 @@
 }:
 
 let
-  version = "0.14.0";
+  version = "0.14.7";
   src = fetchFromGitHub {
     owner = "openobserve";
     repo = "openobserve";
     tag = "v${version}";
-    hash = "sha256-rTp+DkADqYkJg1zJog1yURE082V5kCqgid/oUd81SN8=";
+    hash = "sha256-+YcVTn/jcEbaqTycMCYn6B0z2HsvgrCY1gHnkRajwSs=";
   };
   web = buildNpmPackage {
     inherit src version;
@@ -28,7 +28,7 @@ let
 
     sourceRoot = "${src.name}/web";
 
-    npmDepsHash = "sha256-awfQR1wZBX3ggmD0uJE9Fur4voPydeygrviRijKnBTE=";
+    npmDepsHash = "sha256-1MUmAWkeYUEL6WZGq1Jg5W2uKa2xj0oZbGlIbvZWT1E=";
 
     preBuild = ''
       # Patch vite config to not open the browser to visualize plugin composition
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-FWMUPghx9CxuzP7jFZYSIwZsylApWzQsfx8DuwS4GTo=";
+  cargoHash = "sha256-vfc6B+Uc8RXQD8vGC1yV9w5YAefkYJMpCH2frqjrSWk=";
 
   nativeBuildInputs = [
     pkg-config
@@ -96,6 +96,7 @@ rustPlatform.buildRustPackage {
   checkFlags = [
     "--skip=handler::http::router::tests::test_get_proxy_routes"
     "--skip=tests::e2e_test"
+    "--skip=service::organization::tests::test_organization"
   ];
 
   passthru.updateScript = gitUpdater {

From 51b4ad9e00ee5536c55110abca0f62ee2b7085e4 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 29 Jun 2025 21:03:58 -0700
Subject: [PATCH 51/65] linuxPackages.broadcom_sta: add nullcube as maintainer

---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1fee859946b2..3c318630d005 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -96,7 +96,10 @@ stdenv.mkDerivation {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
     license = lib.licenses.unfreeRedistributable;
-    maintainers = [ lib.maintainers.j0hax ];
+    maintainers = with lib.maintainers; [
+      j0hax
+      nullcube
+    ];
     platforms = lib.platforms.linux;
   };
 }

From 6530ed815c8d0a1ceb0efa6e4643157e328cf88d Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Mon, 14 Jul 2025 07:16:10 -0700
Subject: [PATCH 52/65] linuxPackages.broadcom_sta: fix homepage url, fix
 platforms

Update homepage URL to point to broadcom_sta resources
Correctly set meta.platforms to match available versions
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 3c318630d005..cc0f53b2cf62 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -94,12 +94,15 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Kernel module driver for some Broadcom's wireless cards";
-    homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
+    homepage = "https://www.broadcom.com/support/download-search?pg=Legacy%20Products&pf=Legacy%20Wireless&pn&pa&po&dk&pl";
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [
       j0hax
       nullcube
     ];
-    platforms = lib.platforms.linux;
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
   };
 }

From 5d6c7f9e122138b05b05fe398257ed939fe6445c Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 29 Jun 2025 19:33:51 -0700
Subject: [PATCH 53/65] linuxPackages.broadcom_sta: 6.30.223.271(-56) ->
 6.30.223.271-57

Add patches from rpmfusion to fix build on kernel 6.15.
Add the release number from the rpmfusion repo to the package version in
order to better differentiate the various versions of the package.

Full changelog:
https://github.com/rpmfusion/wl-kmod/compare/9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2..b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index cc0f53b2cf62..1ec66a9d92e0 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -3,12 +3,15 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  fetchpatch2,
   kernel,
 }:
 
 let
   version = "6.30.223.271";
+  # Patchset release number from rpmfusion, to more easily differentiate
+  # versions and updates. See `wl-kmod.spec` file:
+  # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19
+  release = "57";
   hashes = {
     i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0=";
     x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4=";
@@ -21,8 +24,8 @@ let
   rpmFusionPatches = fetchFromGitHub {
     owner = "rpmfusion";
     repo = "wl-kmod";
-    rev = "9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2";
-    hash = "sha256-pOOkkOjc77KGqc9fWuRyRsymd90OpLEnbOvxBbeIdKQ=";
+    rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957";
+    hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4=";
   };
   patchset = [
     "wl-kmod-001_wext_workaround.patch"
@@ -55,10 +58,14 @@ let
     "wl-kmod-028_kernel_6.12_adaptation.patch"
     "wl-kmod-029_kernel_6.13_adaptation.patch"
     "wl-kmod-030_kernel_6.14_adaptation.patch"
+    "wl-kmod-031_replace_EXTRA_CFLAGS_EXTRA_LDFLAGS_with_ccflags-y_ldflags-y.patch"
+    "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch"
+    "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch"
+    "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch"
   ];
 in
 stdenv.mkDerivation {
-  name = "broadcom-sta-${version}-${kernel.version}";
+  name = "broadcom-sta-${version}-${release}-${kernel.version}";
 
   src = fetchurl {
     url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";

From 4d6edc8a15ce8fb242b0a5b3a785af336c63da09 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sun, 13 Jul 2025 18:27:17 -0700
Subject: [PATCH 54/65] linuxPackages.broadcom_sta: added CVE's and
 unmaintained warning to meta.knownVulnerabilities

Important warning: this module has reached the end of support from Broadcom.
It is therefore exposed to Common Vulnerabilities and Exposures (CVE).
More information on the concerned CVE could be obtained here:
https://www.cve.org/CVERecord/SearchResults?query=broadcom+wl+WiFi+driver

Message from:
https://github.com/rpmfusion/wl-kmod/blob/b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957/wl-kmod.spec#L86-L89
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1ec66a9d92e0..b2ca5dca7cf9 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -111,5 +111,15 @@ stdenv.mkDerivation {
       "i686-linux"
       "x86_64-linux"
     ];
+    knownVulnerabilities = [
+      "CVE-2019-9501: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets"
+      "CVE-2019-9502: heap buffer overflow, potentially allowing remote code execution by sending specially-crafted WiFi packets"
+      (
+        "The Broadcom STA wireless driver is not maintained "
+        + "and is incompatible with Linux kernel security mitigations. "
+        + "It is heavily recommended to replace the hardware and remove the driver. "
+        + "Proceed at your own risk!"
+      )
+    ];
   };
 }

From 99c14f90ed11900b89dd8d91a227ed93df715757 Mon Sep 17 00:00:00 2001
From: maryjane <ndukauba.oluchi@gmail.com>
Date: Mon, 5 May 2025 14:28:29 +0100
Subject: [PATCH 55/65] python312Packages.urwid-satext: init at
 0.8.0-unstable-2023-04-08

Co-authored-by: maryjane <ndukauba.oluchi@gmail.com>
Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/urwid-satext/default.nix   | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/urwid-satext/default.nix

diff --git a/pkgs/development/python-modules/urwid-satext/default.nix b/pkgs/development/python-modules/urwid-satext/default.nix
new file mode 100644
index 000000000000..5c4d35f1dda2
--- /dev/null
+++ b/pkgs/development/python-modules/urwid-satext/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchhg,
+  setuptools,
+  urwid,
+}:
+
+buildPythonPackage rec {
+  pname = "urwid-satext";
+  version = "0.8.0-unstable-2023-04-08";
+  pyproject = true;
+
+  src = fetchhg {
+    url = "https://repos.goffi.org/urwid-satext";
+    rev = "6689aa54b20cb38731c68d4d39d86d01d25c21fa";
+    hash = "sha256-llCONyYV2kVVmT4EsugnW9j5X5PIeYEnnk4i5rQnE0w=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    urwid
+  ];
+
+  pythonImportsCheck = [
+    "urwid_satext"
+  ];
+
+  # no pytest tests exist
+  doCheck = false;
+
+  meta = {
+    description = "SàT extension widgets for Urwid";
+    homepage = "https://libervia.org";
+    changelog = "https://repos.goffi.org/urwid-satext/file/${src.rev}/CHANGELOG";
+    license = lib.licenses.lgpl3Plus;
+    teams = with lib.teams; [ ngi ];
+    maintainers = [ lib.maintainers.oluchitheanalyst ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da5ba1c36992..1df0f1177d58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19063,6 +19063,8 @@ self: super: with self; {
 
   urwid-readline = callPackage ../development/python-modules/urwid-readline { };
 
+  urwid-satext = callPackage ../development/python-modules/urwid-satext { };
+
   urwidgets = callPackage ../development/python-modules/urwidgets { };
 
   urwidtrees = callPackage ../development/python-modules/urwidtrees { };

From 0f8033a74bea8b5d84175b380e9b83045d0f7044 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 18:44:52 +0000
Subject: [PATCH 56/65] trickest-cli: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 03204b1428f2..31a077a5a99e 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "trickest-cli";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "trickest";
     repo = "trickest-cli";
     tag = "v${version}";
-    hash = "sha256-OuCiW/5g4swtSpqM2rhLyB1syiRkyTbJsghEvyosz/A=";
+    hash = "sha256-rYdv0OkABV2ih5u28AoxAg3qabbl2VQnuQ01PCXPY6M=";
   };
 
   vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";

From 5476f457e69e71dd998b611c50fdfdaa60d61025 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 19:01:32 +0000
Subject: [PATCH 57/65] gitkraken: 11.2.0 -> 11.2.1

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 6465e144acf9..48688fa884e5 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,24 +56,24 @@
 
 let
   pname = "gitkraken";
-  version = "11.2.0";
+  version = "11.2.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
-      hash = "sha256-yCAxNYwjnmK0lSkH9x8Q4KoQgAWwWmCS8O81tcsqWhs=";
+      hash = "sha256-nxYWcw8A/lIVyjiUJOmcjmTblbxiLSxMUjo7KnlAMzs=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-q3sy2VxgccA/9UaX08NcNusibXYNPFzZcaNlVi2eN9E=";
+      hash = "sha256-7I3yAEarGGhFs/PvcqvoDx8MbJ/zEuNN/s0o357M1vc=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-6SxuOgfWMpaYYES+9QBwYJ4t+Go43Af0cwzs/tPVOts=";
+      hash = "sha256-pDPdi+cRMqhxu/84u6ojxteIi1VHfN3qy/NTruHVt8U=";
     };
   };
 

From 2eedfc337dc80ca3a296a2c076c9ccab34f64d9f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 14 Jul 2025 14:25:53 -0500
Subject: [PATCH 58/65] djhtml: Migrate to by-name

---
 .../default.nix => by-name/dj/djhtml/package.nix}   | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{development/tools/djhtml/default.nix => by-name/dj/djhtml/package.nix} (70%)

diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/by-name/dj/djhtml/package.nix
similarity index 70%
rename from pkgs/development/tools/djhtml/default.nix
rename to pkgs/by-name/dj/djhtml/package.nix
index dc94350fdb2b..2f4f4be65d3d 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/by-name/dj/djhtml/package.nix
@@ -1,10 +1,9 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  setuptools,
 }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "djhtml";
   version = "3.0.8";
   pyproject = true;
@@ -16,16 +15,16 @@ buildPythonApplication rec {
     hash = "sha256-1bopV6mjwjXdoIN9i3An4NvSpeGcVlQ24nLLjP/UfQU=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   pythonImportsCheck = [ "djhtml" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/rtts/djhtml";
     description = "Django/Jinja template indenter";
     changelog = "https://github.com/rtts/djhtml/releases/tag/${src.tag}";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "djhtml";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d9af12de2a7..72f0db0da184 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -395,8 +395,6 @@ with pkgs;
     }
   );
 
-  djhtml = python3Packages.callPackage ../development/tools/djhtml { };
-
   dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core;
 
   dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };

From 6d505828443848f318367f8d7d49954d41712b4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 19:41:07 +0000
Subject: [PATCH 59/65] kubo: 0.35.0 -> 0.36.0

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

diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix
index 78b542d6d841..72e95894d686 100644
--- a/pkgs/by-name/ku/kubo/package.nix
+++ b/pkgs/by-name/ku/kubo/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.35.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
   passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version
@@ -16,7 +16,7 @@ buildGoModule rec {
   # Kubo makes changes to its source tarball that don't match the git source.
   src = fetchurl {
     url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-    hash = "sha256-OubXaa2JWbEaakDV6pExm5PkiZ5XPd9uG+S4KwWb0xQ=";
+    hash = "sha256-KrNP3JMkyTo6hghLLGWerH1Oz3HsnTI5jCfqRbp6AR8=";
   };
 
   # tarball contains multiple files/directories

From 3ecec2474efbd31d3dfdb2b6db94eab4b30e6ecd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 20:14:01 +0000
Subject: [PATCH 60/65] surrealdb: 2.3.5 -> 2.3.7

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

diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix
index 2b075e2abc4f..58c9f8952f4c 100644
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@@ -11,17 +11,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "surrealdb";
-  version = "2.3.5";
+  version = "2.3.7";
 
   src = fetchFromGitHub {
     owner = "surrealdb";
     repo = "surrealdb";
     tag = "v${version}";
-    hash = "sha256-7Rv57D966TQFHbZKmtnt1XWuNOwD+r175iUVJiVho/0=";
+    hash = "sha256-gZICuvgMOdwa39i+5ETUDuFfBtSiZuuFOYW5pHPkoms=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JENp5g1as1RS9fdV5qepEAhE9/SJ8lbMiwyk3YDeu5k=";
+  cargoHash = "sha256-KndVaz7o0kMtMvQf4NK0pNMaC518keWddmGkYtemeWg=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 0455292066a49d3670dd7709ee82deb5531aa3c4 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 12:45:06 +0200
Subject: [PATCH 61/65] haskellPackages.monad-bayes: disable tests on not
 x86_64-linux

The test suite checks floating point numbers against expected results
which can easily fail due to precision issues. We should only attempt to
run the test suite on platforms upstream also checks.

On Hydra, the test suite also fails on x86_64-darwin which I'm putting
down to the underlying machines actually being aarch64-darwin host. I
may be wrong on that, though.
---
 .../haskell-modules/configuration-common.nix         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f2bb0174a32..9cf00c318a16 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3214,6 +3214,18 @@ with haskellLib;
   brillo-juicy = warnAfterVersion "0.2.4" (doJailbreak super.brillo-juicy);
   brillo = warnAfterVersion "1.13.3" (doJailbreak super.brillo);
 
+  # Floating point precision issues. Test suite is only checked on x86_64.
+  # https://github.com/tweag/monad-bayes/issues/368
+  monad-bayes = dontCheckIf (
+    let
+      inherit (pkgs.stdenv) hostPlatform;
+    in
+    !hostPlatform.isx86_64
+    # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin
+    # also fails on Hydra
+    || hostPlatform.isDarwin
+  ) super.monad-bayes;
+
   # 2025-04-13: jailbreak to allow th-abstraction >= 0.7
   crucible = warnAfterVersion "0.7.2" (
     doJailbreak (

From 5a03cf5aad2f805eb7ad96a68eb30c1ff297441b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 16:40:37 +0000
Subject: [PATCH 62/65] python3Packages.robotframework-databaselibrary: 2.1.3
 -> 2.1.4

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

diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
index 15e766dd0a83..109fc786e775 100644
--- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "robotframework-databaselibrary";
-  version = "2.1.3";
+  version = "2.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MarketSquare";
     repo = "Robotframework-Database-Library";
     tag = "v.${version}";
-    hash = "sha256-XsRXQU31Q2iGUMJgDvIIcSsT8guALZO5tnIjwGLR8+Q=";
+    hash = "sha256-ZZOhGZTJGWYCHyvJXDYGn9BMuPioCVIu0KONGkXsRmk=";
   };
 
   nativeBuildInputs = [

From 2a415e39d86f800582ddb1cd299ee2173b7af568 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 21:06:47 +0000
Subject: [PATCH 63/65] basedpyright: 1.29.5 -> 1.30.1

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

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index 7257b7a1f881..2cd18243b106 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -16,13 +16,13 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.29.5";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-fD7A37G1kr7sWfwI8GXOm1cOlpnTSE9tN/WzotM8BeQ=";
+    hash = "sha256-YPjeiRg7vIpb9k32og6byWMk+EfhDS9MwfJveAndbQQ=";
   };
 
   npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";

From c16dc54a851d6b2d214262953b795407cd324462 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 21:30:02 +0000
Subject: [PATCH 64/65] python3Packages.llm-grok: 1.0.1 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/llm-grok/default.nix b/pkgs/development/python-modules/llm-grok/default.nix
index a2c5ac03adc3..1e834b795deb 100644
--- a/pkgs/development/python-modules/llm-grok/default.nix
+++ b/pkgs/development/python-modules/llm-grok/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "llm-grok";
-  version = "1.0.1";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Hiepler";
     repo = "llm-grok";
     tag = "v${version}";
-    hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw=";
+    hash = "sha256-Zwvf33XSoULJxJMBHftysY3RzGEQ+L46UJ0V8b/+UXQ=";
   };
 
   build-system = [ setuptools ];

From c02c28168d13a2cb0cd7138702dca76f4d715006 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 15 Jul 2025 02:07:28 +0400
Subject: [PATCH 65/65] surrealdb: modernize

---
 pkgs/by-name/su/surrealdb/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix
index 58c9f8952f4c..e95b4e5e03b5 100644
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@@ -6,17 +6,16 @@
   openssl,
   rocksdb,
   testers,
-  surrealdb,
   protobuf,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surrealdb";
   version = "2.3.7";
 
   src = fetchFromGitHub {
     owner = "surrealdb";
     repo = "surrealdb";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-gZICuvgMOdwa39i+5ETUDuFfBtSiZuuFOYW5pHPkoms=";
   };
 
@@ -55,19 +54,19 @@ rustPlatform.buildRustPackage rec {
   __darwinAllowLocalNetworking = true;
 
   passthru.tests.version = testers.testVersion {
-    package = surrealdb;
+    package = finalAttrs.finalPackage;
     command = "surreal version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Scalable, distributed, collaborative, document-graph database, for the realtime web";
     homepage = "https://surrealdb.com/";
     mainProgram = "surreal";
-    license = licenses.bsl11;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [
       sikmir
       happysalada
       siriobalmelli
     ];
   };
-}
+})