From 45563684e3db88a42b4f97020fb96cdb2f4283d1 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Fri, 13 Dec 2024 11:03:46 +0100
Subject: [PATCH 001/117] catbox: init at 0.2.2

---
 pkgs/by-name/ca/catbox/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ca/catbox/package.nix

diff --git a/pkgs/by-name/ca/catbox/package.nix b/pkgs/by-name/ca/catbox/package.nix
new file mode 100644
index 000000000000..e4bc2f051931
--- /dev/null
+++ b/pkgs/by-name/ca/catbox/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "catbox";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "konimarti";
+    repo = "catbox";
+    tag = "v${version}";
+    hash = "sha256-mLjrHDc8Sn/cHYc8VbrC0YMVVCKyhiYHVzE5kvMergc=";
+  };
+
+  vendorHash = "sha256-mbxZUCxkPhgIzUUgiQ1P1z6Zgs0UaVnm+erW60AIIH8=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Pipe mbox messages into shell commands";
+    homepage = "https://github.com/konimarti/catbox";
+    license = lib.licenses.mit;
+    mainProgram = "catbox";
+    maintainers = with lib.maintainers; [ antonmosich ];
+  };
+}

From 0a0da6ded53a8ee683c6344247a3f32b8ec65aca Mon Sep 17 00:00:00 2001
From: Henrik Lievonen <henrik.lievonen@hotmail.com>
Date: Thu, 27 Mar 2025 14:30:56 +0200
Subject: [PATCH 002/117] yle-dl: 20240706 -> 20250316

The project has migrated to using pyproject.
---
 pkgs/by-name/yl/yle-dl/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix
index 0094b450cff9..25579121bce6 100644
--- a/pkgs/by-name/yl/yle-dl/package.nix
+++ b/pkgs/by-name/yl/yle-dl/package.nix
@@ -12,15 +12,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "yle-dl";
-  version = "20240706";
+  version = "20250316";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
-    rev = version;
-    hash = "sha256-X5fkcJgTVGASoVvvshGWUFNzB1V4KMSKgwoxzP62mxc=";
+    rev = "releases/${version}";
+    hash = "sha256-8cJVaoZRKAR/mkRebpgMfwOWIdDySS8q6Dc2kanr4SE=";
   };
 
+  pyproject = true;
+
   propagatedBuildInputs = with python3Packages; [
     attrs
     configargparse
@@ -29,6 +31,9 @@ python3Packages.buildPythonApplication rec {
     lxml
     requests
   ];
+  buildInputs = with python3Packages; [
+    flit-core
+  ];
   pythonPath = [
     rtmpdump
     php

From 72155225aa62c6ac9bc67a1253079f140045511f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 23 Feb 2025 11:44:44 +0100
Subject: [PATCH 003/117] nixos/lib/testing: avoid generating darwin VM tests

We're getting 2x5 darwin VM jobs that aren't schedulable
on our current Hydra.nixos.org, which makes them hang around
and delay advancing of all `nixpkgs-*` channels.
To me that's quite an annoying effect, as it can be like an extra day
of additional delay without any benefit that I can really perceive.
(unless someone like me keeps manually cancelling the jobs all the time)
---
 nixos/lib/testing/default.nix | 16 +++++++++-------
 nixos/lib/testing/meta.nix    |  4 +++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/lib/testing/default.nix b/nixos/lib/testing/default.nix
index 7fdd454c22b8..7d511619e32d 100644
--- a/nixos/lib/testing/default.nix
+++ b/nixos/lib/testing/default.nix
@@ -9,13 +9,15 @@ let
     };
   runTest =
     module:
-    (evalTest (
-      { config, ... }:
-      {
-        imports = [ module ];
-        result = config.test;
-      }
-    )).config.result;
+    # Infra issue: virtualization on darwin doesn't seem to work yet.
+    lib.addMetaAttrs { hydraPlatforms = lib.platforms.linux; }
+      (evalTest (
+        { config, ... }:
+        {
+          imports = [ module ];
+          result = config.test;
+        }
+      )).config.result;
 
   testModules = [
     ./call-test.nix
diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix
index 0a4c89ed4b06..6c6cfc49f141 100644
--- a/nixos/lib/testing/meta.nix
+++ b/nixos/lib/testing/meta.nix
@@ -36,7 +36,9 @@ in
           };
           platforms = lib.mkOption {
             type = types.listOf types.raw;
-            default = lib.platforms.linux ++ lib.platforms.darwin;
+            # darwin could be added, but it would add VM tests that don't work on Hydra.nixos.org (so far)
+            # see https://github.com/NixOS/nixpkgs/pull/303597#issuecomment-2128782362
+            default = lib.platforms.linux;
             description = ''
               Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
             '';

From c0d7db4865c4629b0f35eef3845350b82ca34267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 29 Mar 2025 13:00:48 +0100
Subject: [PATCH 004/117] littlenavmap: init 3.0.16

---
 pkgs/by-name/li/littlenavmap/atools.nix   |  46 ++++++++
 pkgs/by-name/li/littlenavmap/deploy.patch | 108 ++++++++++++++++++
 pkgs/by-name/li/littlenavmap/package.nix  | 131 ++++++++++++++++++++++
 3 files changed, 285 insertions(+)
 create mode 100644 pkgs/by-name/li/littlenavmap/atools.nix
 create mode 100644 pkgs/by-name/li/littlenavmap/deploy.patch
 create mode 100644 pkgs/by-name/li/littlenavmap/package.nix

diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix
new file mode 100644
index 000000000000..c24c675f3c3c
--- /dev/null
+++ b/pkgs/by-name/li/littlenavmap/atools.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libsForQt5,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "atools";
+  version = "4.0.16";
+
+  src = fetchFromGitHub {
+    owner = "albar965";
+    repo = "atools";
+    tag = "v${version}";
+    hash = "sha256-wPDE2CUHrf/WoksInYZ9UBEBMISqIkBYcMVu0NaxbmE=";
+  };
+
+  nativeBuildInputs = [
+    libsForQt5.qmake
+  ];
+
+  buildInputs = [
+    libsForQt5.qtsvg
+  ];
+
+  env.ATOOLS_NO_CRASHHANDLER = "true";
+
+  installTargets = "deploy";
+
+  postInstall = ''
+    rmdir $out
+    mv D/atools $out
+  '';
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "A static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more";
+    homepage = "https://github.com/albar965/atools";
+    changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ck3d ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/li/littlenavmap/deploy.patch b/pkgs/by-name/li/littlenavmap/deploy.patch
new file mode 100644
index 000000000000..d35674f7c2e1
--- /dev/null
+++ b/pkgs/by-name/li/littlenavmap/deploy.patch
@@ -0,0 +1,108 @@
+diff --git a/littlenavmap.pro b/littlenavmap.pro
+index 7c8ed0c6..31590e2c 100644
+--- a/littlenavmap.pro
++++ b/littlenavmap.pro
+@@ -777,18 +777,6 @@ OTHER_FILES += \
+ # Linux - Copy help and Marble plugins and data
+ unix:!macx {
+   copydata.commands = mkdir -p $$OUT_PWD/plugins &&
+-  copydata.commands += cp -avfu \
+-    $$MARBLE_LIB_PATH/marble/plugins/libCachePlugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libAtmospherePlugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libCompassFloatItem.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libGraticulePlugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libKmlPlugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libLatLonPlugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libPn2Plugin.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libMapScaleFloatItem.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libNavigationFloatItem.so \
+-    $$MARBLE_LIB_PATH/marble/plugins/libOverviewMap.so \
+-    $$OUT_PWD/plugins &&
+   copydata.commands += mkdir -p $$OUT_PWD/translations &&
+   copydata.commands += cp -avfu $$PWD/*.qm $$OUT_PWD/translations &&
+   copydata.commands += cp -avfu $$ATOOLS_INC_PATH/../*.qm $$OUT_PWD/translations &&
+@@ -796,8 +784,7 @@ unix:!macx {
+   copydata.commands += cp -avfu $$PWD/web $$OUT_PWD &&
+   copydata.commands += cp -avfu $$PWD/customize $$OUT_PWD &&
+   copydata.commands += cp -avfu $$PWD/marble/data $$OUT_PWD &&
+-  copydata.commands += cp -vf $$PWD/desktop/littlenavmap*.sh $$OUT_PWD &&
+-  copydata.commands += chmod -v a+x $$OUT_PWD/littlenavmap*.sh
++  copydata.commands += true
+ }
+ 
+ # Mac OS X - Copy help and Marble plugins and data
+@@ -820,73 +807,20 @@ unix:!macx {
+ 
+   deploy.commands += rm -Rfv $$DEPLOY_DIR &&
+   deploy.commands += mkdir -pv $$DEPLOY_DIR/translations &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/iconengines &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platformthemes &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/printsupport &&
+-  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/sqldrivers &&
+   deploy.commands += echo $$VERSION_NUMBER > $$DEPLOY_DIR/version.txt &&
+-  deploy.commands += echo $$GIT_REVISION_FULL > $$DEPLOY_DIR/revision.txt &&
+-  deploy.commands += cp -Rvf $$MARBLE_LIB_PATH/*.so* $$DEPLOY_DIR_LIB &&
+-  deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libmarblewidget-qt5.so* &&
+-  deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libastro.so* &&
+-  deploy.commands += cp -Rvf $$OUT_PWD/plugins $$DEPLOY_DIR &&
+   deploy.commands += cp -Rvf $$OUT_PWD/data $$DEPLOY_DIR &&
+   deploy.commands += cp -Rvf $$OUT_PWD/help $$DEPLOY_DIR &&
+   deploy.commands += cp -Rvf $$OUT_PWD/web $$DEPLOY_DIR &&
+   deploy.commands += cp -Rvf $$OUT_PWD/customize $$DEPLOY_DIR &&
+   deploy.commands += cp -Rvf $$OUT_PWD/littlenavmap $$DEPLOY_DIR &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??.qm  $$DEPLOY_DIR/translations &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??_??.qm  $$DEPLOY_DIR/translations &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qtbase*.qm  $$DEPLOY_DIR/translations &&
+   deploy.commands += cp -Rvf $$OUT_PWD/translations $$DEPLOY_DIR &&
+   exists($$DATABASE_BASE) : deploy.commands += cp -Rvf $$DATABASE_BASE $$DEPLOY_DIR &&
+   exists($$HELP_BASE) : deploy.commands += cp -Rvf $$HELP_BASE/* $$DEPLOY_DIR/help &&
+-  deploy.commands += cp -vf $$PWD/desktop/\"Little Navmap Portable Linux.sh\" $$DEPLOY_DIR/\"Little Navmap Portable.sh\" &&
+-  deploy.commands += cp -vf $$PWD/desktop/linux-qt.conf $$DEPLOY_DIR/qt.conf &&
+   deploy.commands += cp -vf $$PWD/CHANGELOG.txt $$DEPLOY_DIR &&
+   deploy.commands += cp -vf $$PWD/README.txt $$DEPLOY_DIR &&
+   deploy.commands += cp -vf $$PWD/LICENSE.txt $$DEPLOY_DIR &&
+   deploy.commands += cp -vf $$PWD/resources/icons/littlenavmap.svg $$DEPLOY_DIR &&
+-  deploy.commands += cp -vf \"$$PWD/desktop/Little Navmap.desktop\" $$DEPLOY_DIR &&
+-  exists(/usr/lib/x86_64-linux-gnu/libssl.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libssl.so.1.1 $$DEPLOY_DIR_LIB &&
+-  exists(/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/iconengines/libqsvgicon.so*  $$DEPLOY_DIR_LIB/iconengines &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so*  $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqjpeg.so*  $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqsvg.so*  $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwbmp.so*  $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwebp.so*  $$DEPLOY_DIR_LIB/imageformats &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqeglfs.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimalegl.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so*  $$DEPLOY_DIR_LIB/platforms &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platformthemes/libqgtk*.so*  $$DEPLOY_DIR_LIB/platformthemes &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/printsupport/libcupsprintersupport.so*  $$DEPLOY_DIR_LIB/printsupport &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/sqldrivers/libqsqlite.so*  $$DEPLOY_DIR_LIB/sqldrivers &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicudata.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicui18n.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicuuc.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Concurrent.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Core.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5DBus.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Gui.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Network.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5PrintSupport.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Qml.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Quick.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Sql.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Svg.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Widgets.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5X11Extras.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5XcbQpa.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5QmlModels.so*  $$DEPLOY_DIR_LIB &&
+-  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Xml.so* $$DEPLOY_DIR_LIB &&
+-  deploy.commands += rm -fv $$DEPLOY_DIR_LIB/lib*.so.*.debug $$DEPLOY_DIR_LIB/*/lib*.so.*.debug
++  deploy.commands += true
+ }
+ 
+ # Mac specific deploy target
diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
new file mode 100644
index 000000000000..3648037ef2eb
--- /dev/null
+++ b/pkgs/by-name/li/littlenavmap/package.nix
@@ -0,0 +1,131 @@
+{
+  lib,
+  stdenv,
+  callPackage,
+  fetchFromGitHub,
+  libsForQt5,
+  makeDesktopItem,
+}:
+let
+  atools = callPackage ./atools.nix { };
+  marble = libsForQt5.marble.overrideAttrs (self: {
+    version = "0.25.5";
+
+    src = fetchFromGitHub {
+      owner = "albar965";
+      repo = "marble";
+      rev = "722acf7f8d79023f6c6a761063645a1470bb3935";
+      hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8=";
+    };
+
+    # https://github.com/albar965/littlenavmap/wiki/Compiling#compile-marble
+    cmakeFlags =
+      let
+        disable = n: lib.cmakeBool n false;
+        enable = n: lib.cmakeBool n true;
+      in
+      map enable [
+        "STATIC_BUILD"
+        "MARBLE_EMPTY_MAPTHEME"
+        "QTONLY"
+      ]
+      ++ map disable [
+        "BUILD_MARBLE_EXAMPLES"
+        "BUILD_INHIBIT_SCREENSAVER_PLUGIN"
+        "BUILD_MARBLE_APPS"
+        "BUILD_MARBLE_EXAMPLES"
+        "BUILD_MARBLE_TESTS"
+        "BUILD_MARBLE_TOOLS"
+        "BUILD_TESTING"
+        "BUILD_WITH_DBUS"
+        "MOBILE"
+        "WITH_DESIGNER_PLUGIN"
+        "WITH_Phonon"
+        "WITH_Qt5Location"
+        "WITH_Qt5Positioning"
+        "WITH_Qt5SerialPort"
+        "WITH_ZLIB"
+        "WITH_libgps"
+        "WITH_libshp"
+        "WITH_libwlocate"
+      ];
+  });
+
+  pname = "littlenavmap";
+
+  desktopItem = makeDesktopItem {
+    name = "Little Navmap";
+    desktopName = "Little Navmap";
+    icon = pname;
+    terminal = false;
+    exec = pname;
+    categories = [
+      "Qt"
+      "Utility"
+      "Geography"
+      "Maps"
+    ];
+  };
+in
+stdenv.mkDerivation (finalAttrs: rec {
+  inherit pname;
+  version = "3.0.16";
+
+  src = fetchFromGitHub {
+    owner = "albar965";
+    repo = "littlenavmap";
+    rev = "v${version}";
+    hash = "sha256-QUgQV8WOAVowjGFpNbzl32gksQ2OnWtLfrJmBK2lJ6M=";
+  };
+
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  # https://github.com/albar965/littlenavmap/wiki/Compiling#default-paths-and-environment-variables-2
+  env = {
+    ATOOLS_INC_PATH = "${atools}/include";
+    ATOOLS_LIB_PATH = "${atools}/lib";
+    MARBLE_INC_PATH = "${marble.dev}/include";
+    MARBLE_LIB_PATH = "${marble}/lib";
+    inherit (atools) ATOOLS_NO_CRASHHANDLER;
+  };
+
+  patches = [ ./deploy.patch ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    # we have to build out of source tree
+    cd build
+    qmake "''${flagsArray[@]}" ..
+
+    runHook postConfigure
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin $out/lib $out/share/icons/scaleable/apps
+    mv "../../deploy/Little Navmap" $out/lib/littlenavmap
+    ln -s $out/lib/littlenavmap/littlenavmap $out/bin
+    cp -ra ${desktopItem}/* $out
+    mv $out/lib/littlenavmap/littlenavmap.svg $out/share/icons/scaleable/apps
+  '';
+
+  enableParallelBuilding = true;
+  enableParallelInstalling = true;
+
+  installTargets = "deploy";
+
+  passthru.local-packages = { inherit atools marble; };
+
+  meta = {
+    description = "A free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
+    homepage = "https://github.com/albar965/littlenavmap";
+    changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ck3d ];
+    mainProgram = "littlenavmap";
+    platforms = lib.platforms.linux;
+  };
+})

From dea1a898a3dfe48c13675dd48b37eb39eb95e7c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 06:58:02 +0000
Subject: [PATCH 005/117] python312Packages.pytest-ansible: 25.1.0 -> 25.4.0

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

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index ce0501d4eaa8..fc4f414c7125 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "25.1.0";
+  version = "25.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "pytest-ansible";
     tag = "v${version}";
-    hash = "sha256-8Lwr8n2zMztE13ExQk+QYsS7lcLxj7hqpRWMACthXZs=";
+    hash = "sha256-AX/yqxWHlLvS0K3Axhukzimi7IZYY6+IwkB9+tiqHTM=";
   };
 
   postPatch = ''
@@ -89,7 +89,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Plugin for pytest to simplify calling ansible modules from tests or fixtures";
     homepage = "https://github.com/jlaska/pytest-ansible";
-    changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}";
+    changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ tjni ];
   };

From 79cd7af5b6bd5db520ba1608b6424b220f6cc69f Mon Sep 17 00:00:00 2001
From: Josh Heinrichs <josh.heinrichs@shopify.com>
Date: Thu, 3 Apr 2025 17:54:02 -0600
Subject: [PATCH 006/117] maintainers: add joshheinrichs-shopify

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5f3b6bfb689f..fda48ad5f050 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11725,6 +11725,12 @@
     github = "joshainglis";
     githubId = 1281131;
   };
+  joshheinrichs-shopify = {
+    name = "Josh Heinrichs";
+    email = "josh.heinrichs@shopify.com";
+    github = "joshheinrichs-shopify";
+    githubId = 100245234;
+  };
   joshniemela = {
     name = "Joshua Niemelä";
     email = "josh@jniemela.dk";

From 73f05ba59cb99d65b28e0c0324c6e8d1213c41aa Mon Sep 17 00:00:00 2001
From: Josh Heinrichs <josh.heinrichs@shopify.com>
Date: Thu, 3 Apr 2025 17:54:55 -0600
Subject: [PATCH 007/117] graphite-cli: add joshheinrichs-shopify to
 maintainers

---
 pkgs/by-name/gr/graphite-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 9b1a442694bf..fa98208a571f 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -44,6 +44,6 @@ buildNpmPackage rec {
     homepage = "https://graphite.dev/docs/graphite-cli";
     license = lib.licenses.unfree; # no license specified
     mainProgram = "gt";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ joshheinrichs-shopify ];
   };
 }

From c5bcdbe7a8510a71b67d07ce4a4d616c6e5491f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 00:34:45 +0000
Subject: [PATCH 008/117] aws-signing-helper: 1.4.0 -> 1.5.0

---
 pkgs/by-name/aw/aws-signing-helper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/aws-signing-helper/package.nix b/pkgs/by-name/aw/aws-signing-helper/package.nix
index 3b9ee9e1b363..dc4ca020dbb0 100644
--- a/pkgs/by-name/aw/aws-signing-helper/package.nix
+++ b/pkgs/by-name/aw/aws-signing-helper/package.nix
@@ -6,15 +6,15 @@
 }:
 buildGoModule rec {
   pname = "aws-signing-helper";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "rolesanywhere-credential-helper";
     rev = "v${version}";
-    hash = "sha256-CIUhO+5gMIknB3NwYwaBbtZEkW2x/U2Bi9Qbqn9bLuc=";
+    hash = "sha256-aWSOSGv7JpRii/xYzLF1K58Lcvwywzw9AN9dNUZni/I=";
   };
-  vendorHash = "sha256-QKKgBIocJoGbfs78PxNBLBi4KTDPtSuhzvsb6OBhNWQ=";
+  vendorHash = "sha256-8YkLeGtf8Il7V5rVk+YJgH03lx+Ivq6kcqZNXcUnyrc=";
 
   checkPhase = ''
     runHook preCheck

From f2f4a0658b2add384309d7fae12421e08a0e7115 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 18:14:46 +0000
Subject: [PATCH 009/117] localstack: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index e8f95f38e034..bdc074f7345a 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     tag = "v${version}";
-    hash = "sha256-cmBorHlYL7xmq4SIdyGu11/byCJK+OzrJsqVZHJDDTE=";
+    hash = "sha256-owkRyMT/ntKPUHp4Are91/4LThVzzaoeZZ0gpKLD6mM=";
   };
 
   build-system = with python3.pkgs; [

From a7bbd53332c556fd47a7a9f9f78264c2e4d2ad2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 03:45:05 +0000
Subject: [PATCH 010/117] pwsafe: 1.20.0 -> 1.21.0fp

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

diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index 0ef4f94a3df1..cafec2153e6d 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "pwsafe";
-  version = "1.20.0"; # do NOT update to 3.x Windows releases
+  version = "1.21.0fp"; # do NOT update to 3.x Windows releases
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4=";
+    hash = "sha256-pPKUFX6NNGtGGjHL3g0Y6xzj+bHU2KDNMhYCnpP9wgM=";
   };
 
   strictDeps = true;

From 21a3af88ff5c436987611c659eae3974c64e8599 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 09:48:46 +0000
Subject: [PATCH 011/117] irpf: 2025-1.1 -> 2025-1.2

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

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index 70be4394034e..ec23c1b4a292 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2025-1.1";
+  version = "2025-1.2";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-C5Ebit11TGhh3jI0ZKVEPFpuqnHbrDC1JoMt0v21S90=";
+      hash = "sha256-RlkDioXLcD3wHm9DDLw42QCRT4z0rEwlM0sGMORxk/A=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''

From 72d17044e0d5b8661c961ef428ad32e318f1c160 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 20:19:55 +0000
Subject: [PATCH 012/117] yafc-ce: 2.11.0 -> 2.11.1

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

diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 0d8ebe02570f..0e527992cf76 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
     rev = finalAttrs.version;
-    hash = "sha256-jWJOJ00VXBaHogm3xUsV9Shvv9islRA+Z4fkln5VuWM=";
+    hash = "sha256-n6twiCIQ1nMSidfmdl2py5wHvx4kk6skK0f8chXTCjQ=";
   };
 
   projectFile = [ "Yafc/Yafc.csproj" ];

From 104411004f1dda0886cfbe92afda6d968dff4792 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Apr 2025 00:32:05 +0000
Subject: [PATCH 013/117] async-profiler: 3.0 -> 4.0

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

diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index e82ebcd62f22..ccefb7e77c79 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "async-profiler";
-  version = "3.0";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
     rev = "v${version}";
-    hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
+    hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7325a48e283f2afe0929ff54b75b853e406fb95c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Apr 2025 19:10:24 +0000
Subject: [PATCH 014/117] renode-dts2repl: 0-unstable-2025-03-17 ->
 0-unstable-2025-04-08

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index 448c21e62e27..3353240c5af3 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-03-17";
+  version = "0-unstable-2025-04-08";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "1039408cd06b7630bef0ef2d04d64d14e9a00641";
-    hash = "sha256-Ho7H4gb48PfkuF0q4My9E4MHIny1cfqWeLwZpVb0L1E=";
+    rev = "8395f0e36546df3f6ca73961f60c89220c022d1a";
+    hash = "sha256-PJ+OCWUw6MpDU5+BdG0h/15BmGQOsLPl+Lq/WPyPc00=";
   };
 
   nativeBuildInputs = [

From 4589825627d30dfdfb396e95551d100a2f3555a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Apr 2025 00:38:42 +0000
Subject: [PATCH 015/117] uwsgi: 2.0.28 -> 2.0.29

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

diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 2d8b2ab1a07b..6c1aeda8e297 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -80,13 +80,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsgi";
-  version = "2.0.28";
+  version = "2.0.29";
 
   src = fetchFromGitHub {
     owner = "unbit";
     repo = "uwsgi";
     tag = finalAttrs.version;
-    hash = "sha256-/7Z9lq7JiGBrTpmtbIEqpMg7nw9SVm8ypmzd1/p6xgU=";
+    hash = "sha256-WlbvvAu+A0anPItnG8RnWrXm450/xbOloPzUd2L9TuU=";
   };
 
   patches = [

From 9dbc03c7079dc7c08fde055a631358f27ff2bf6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Apr 2025 07:52:25 +0000
Subject: [PATCH 016/117] prometheus-redis-exporter: 1.69.0 -> 1.70.0

---
 pkgs/servers/monitoring/prometheus/redis-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 8fa0995e38cc..3896480db6a8 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.69.0";
+  version = "1.70.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-KIbrJJ2QNghj/dehcDXJqWJU2pD6mt8Gw9RPLK3RTk0=";
+    sha256 = "sha256-zIb3Wix+HJokOdMzs7L206eRd8z0DIWaXw+TbT9tnDg=";
   };
 
-  vendorHash = "sha256-8N/gY6YvhrGGwziLUPC12vhoxZ8QnCxgv9jxFnG6/XQ=";
+  vendorHash = "sha256-pWndOpRKC+DKQjcycV8Oy14qgEYcxFDW9jTGpaq9zYg=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"

From 6db89ca2ecb9f38de4a2fb7cb63898b853357e12 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 1 Apr 2025 07:14:01 +0200
Subject: [PATCH 017/117] python3Packages.jsonrpclib-pelix: 0.4.3.3 -> 0.4.3.4

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jsonrpclib-pelix/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 314e3433dadf..622d76b9d95b 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -6,12 +6,13 @@
 
 buildPythonPackage rec {
   pname = "jsonrpclib-pelix";
-  version = "0.4.3.3";
+  version = "0.4.3.4";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-xJT+cQCxE5sTEUacKLwy0cuS5P8fRRH7cdaAcgXcN3M=";
+    pname = "jsonrpclib_pelix";
+    inherit version;
+    hash = "sha256-6C1vTakHp9ER75P9I2HIwgt50ki+T+mWeOCGJqqPy+8=";
   };
 
   doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.

From b3a989d5ae7a0ec70b751ff7ff2e4c98627a8d9f Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 11 Apr 2025 15:11:15 +0200
Subject: [PATCH 018/117] python3Packages.jsonrpclib-pelix: fix build with
 hatchling

Since the update in a1f43b177e86a2f5adfb313c4fcd36431b662046 ,
the build fails with

> setuptools.errors.InvalidConfigError: License classifiers have been superseded by license expressions (see https://peps.python.org/pep-0639/).

This is likely caused by the addition of `pyproject.toml` in
https://github.com/tcalmant/jsonrpclib/commit/987cbfff76500054e77d30b50cd38b781646f5c8

The new `pyproject.toml` mandates hatchling as build system.
Since non-pyproject.toml-build are deprecated,
we use the opportunity to migration the
build to pyproject.toml and hatchling.
---
 pkgs/development/python-modules/jsonrpclib-pelix/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 622d76b9d95b..6e9078f47fe8 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  hatchling,
   fetchPypi,
   lib,
 }:
@@ -7,7 +8,8 @@
 buildPythonPackage rec {
   pname = "jsonrpclib-pelix";
   version = "0.4.3.4";
-  format = "setuptools";
+  pyproject = true;
+  build-system = [ hatchling ];
 
   src = fetchPypi {
     pname = "jsonrpclib_pelix";

From 34f60d3bdcb7a8c10789a3e4098ed6fa74a42322 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 11 Apr 2025 15:16:42 +0200
Subject: [PATCH 019/117] python3Packages.jsonrpclib-pelix: drop unused `with
 lib;`

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

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 6e9078f47fe8..ea241918cdbc 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
 
-  meta = with lib; {
+  meta = {
     description = "JSON RPC client library - Pelix compatible fork";
     homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/";
     license = lib.licenses.asl20;

From 5813ed12b28c30add86363c653e877450a0d7fbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Apr 2025 14:21:40 +0000
Subject: [PATCH 020/117] bazel-remote: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix
index bfe3fe7b9744..4be45daec22c 100644
--- a/pkgs/by-name/ba/bazel-remote/package.nix
+++ b/pkgs/by-name/ba/bazel-remote/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "bazel-remote";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "buchgr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vNj1w08g7364DcN2reIdamMxKNApKquf/CvFZx3Gu7A=";
+    hash = "sha256-PjhLybiZoq7Uies2bWdlLKAbKcG3+AQZ55Qp706u7hc=";
   };
 
-  vendorHash = "sha256-UakVmKimlWRcubUIvVgBO+ffltrPwYHhfXwFNbl3J3I=";
+  vendorHash = "sha256-okXGqPN/Do7Ht3zW8jVWo+8YquUEqNhirr9pPqMelmk=";
 
   subPackages = [ "." ];
 

From 9a20a7f5646c91cf974942d7b35e266992cdd3e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 02:58:56 +0000
Subject: [PATCH 021/117] zef: 0.22.8 -> 1.0.0

---
 pkgs/development/interpreters/rakudo/zef.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index 8c60bfa16b02..c7e1c11d3ae5 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zef";
-  version = "0.22.8";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "ugexe";
     repo = "zef";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FyxNguwaVcCbE0JZzXFa0wSFEPMF15WkUC9QJnR0Md8=";
+    hash = "sha256-TUsEevaxB8DYMNhAsF8qFf1owv5ML8xSyGS9C0IkfbI=";
   };
 
   nativeBuildInputs = [

From 0b15a4d23519ebdc0eaf6256e69b78788450ccd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 07:52:04 +0000
Subject: [PATCH 022/117] juju: 3.6.4 -> 3.6.5

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

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 0398dc0346f8..99b82625407b 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.4";
+  version = "3.6.5";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-kXSqOifUkx6ReXBrB19Zx6TbiloaG+G90cIo/+ysIHk=";
+    hash = "sha256-Ruwmj+MrqulB+XwbE3qvqFJ/yt0ttwFuM9lqXV9YI7k=";
   };
 
-  vendorHash = "sha256-xqF5+QvZbC04e2f8/pftfbhXrJjCZKfAcyw74kwgdn4=";
+  vendorHash = "sha256-/BejA4Wn+SbKQHDqA7hanVaTKzaInLNOMSlesy714VI=";
 
   subPackages = [
     "cmd/juju"

From e9b95509b20f328e25e6b5123248cd22b9a6d245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 13 Apr 2025 23:18:38 +0200
Subject: [PATCH 023/117] stub-ld: disable 32-bit stub ld on 64-bit systems

This pulls in another instance of nixpkgs including glibc.
This is both not great from a evaluation perspective and a dependency
closure.

So let's remove this part from nixpkgs again and re-enable it, when we
have slimmed down the build according to `environment.ldso32 = mkIf
pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32);`
---
 nixos/modules/config/stub-ld.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix
index 836cd129e22f..277ed7594566 100644
--- a/nixos/modules/config/stub-ld.nix
+++ b/nixos/modules/config/stub-ld.nix
@@ -42,10 +42,7 @@ let
         $CC -Os main.c -o $out
       '';
 
-  pkgs32 = pkgs.pkgsi686Linux;
-
   stub-ld = stub-ld-for pkgs message;
-  stub-ld32 = stub-ld-for pkgs32 message;
 in
 {
   options = {
@@ -65,7 +62,6 @@ in
 
   config = mkIf cfg.enable {
     environment.ldso = mkDefault stub-ld;
-    environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32);
   };
 
   meta.maintainers = with lib.maintainers; [ tejing ];

From 692e104e0432853e0eeb753618078caed232cb2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 08:49:07 +0000
Subject: [PATCH 024/117] velero: 1.15.2 -> 1.16.0

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

diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index f4ddd73c10a7..d84af64e7fbf 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "velero";
-  version = "1.15.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
     rev = "v${version}";
-    hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE=";
+    hash = "sha256-+gEu323/Y6BZiN22yX1oj9WmejoVSOLjBCKL0YTXI6A=";
   };
 
   ldflags = [
@@ -26,7 +26,7 @@ buildGoModule rec {
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
   ];
 
-  vendorHash = "sha256-Q3h39o78V5Lqzols3RmSDL9d5WevMnTt4bv4qBscnGs=";
+  vendorHash = "sha256-+gmHQoAIfvKT3g4q7YsOVwKS/LMkmwpq9OTtCuqEd/Y=";
 
   excludedPackages = [
     "issue-template-gen"

From a4e52dc60c0431446b7e686bd1fa8fc58bbfbe6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Apr 2025 19:50:55 +0000
Subject: [PATCH 025/117] glbinding: 3.4.0 -> 3.5.0

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

diff --git a/pkgs/by-name/gl/glbinding/package.nix b/pkgs/by-name/gl/glbinding/package.nix
index 91d92fa27d7c..b965149ae64d 100644
--- a/pkgs/by-name/gl/glbinding/package.nix
+++ b/pkgs/by-name/gl/glbinding/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glbinding";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "cginternals";
     repo = "glbinding";
     rev = "v${version}";
-    sha256 = "sha256-EHvudihHL/MEVo0lbSqxrgc6TJnPH8Ia6bCJK0yNCbg=";
+    sha256 = "sha256-oLtOsiXfl/18rY/89vl9JDDWpPmEELOFKAHuClveU0c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4c2adf8232b0a4ba10f6b759ea20f08fac20bdfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 03:22:16 +0000
Subject: [PATCH 026/117] skypilot: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index 7a7322bca65a..1a081673ed48 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "skypilot";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "skypilot-org";
     repo = "skypilot";
     tag = "v${version}";
-    hash = "sha256-WM2glbjRFwAxyrIV5ID0bRaGb8UCQXiIgm0Praf7mU4=";
+    hash = "sha256-jLjYsBkb5Tba3q/mdqCWK04FLg0pEdHyZH3vuMIP6tg=";
   };
 
   pyproject = true;

From 05198c46053ed1fb6374e665f7607b051c9ccd96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 04:09:36 +0000
Subject: [PATCH 027/117] steampipePackages.steampipe-plugin-azure: 1.2.0 ->
 1.3.0

---
 .../steampipe-packages/steampipe-plugin-azure/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index 8d2cd62e5fb3..88b8e2886ee3 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-azure";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-azure";
     tag = "v${version}";
-    hash = "sha256-vpd42VbAdQspVmMXZp7XpDY+JXnsfi9LJB8DVDmmUak=";
+    hash = "sha256-flIgdQ10qrkjgf5Z0i47G/h5VIQicZ50itQ77CYuue0=";
   };
 
-  vendorHash = "sha256-9Qgm+1NaSJrmvAfLPON7rCanjKfoY0d5x9Ntm9saXZI=";
+  vendorHash = "sha256-CYz76ttMgwS9VfCO/2MQ59bBsOpzOzT39q4ma19x644=";
 
   ldflags = [
     "-s"

From 0f1c5f1a1271d71140da536e6b7bcb3b7438def0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 08:32:31 +0000
Subject: [PATCH 028/117] sslh: 2.1.3 -> 2.2.1

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

diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix
index 83a377e1be2a..eb937f3ef823 100644
--- a/pkgs/by-name/ss/sslh/package.nix
+++ b/pkgs/by-name/ss/sslh/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sslh";
-  version = "2.1.3";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "yrutschle";
     repo = "sslh";
     rev = "v${version}";
-    hash = "sha256-46lnQ+u+TfHrI2Yz5jd/Tl82K8mmqFY2Cqu6ktLiveA=";
+    hash = "sha256-AAGS7/mhlPRbZ6VazVA0wnKf3SrEB/AgF8HgeICwvx4=";
   };
 
   postPatch = "patchShebangs *.sh";

From 0e1ead2490ac774dd5c415ddca9362ed43bcde89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 19:09:40 +0000
Subject: [PATCH 029/117] steampipe: 1.0.3 -> 1.1.0

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

diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 3c47b99cfd98..0fb1f426a6c6 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "1.0.3";
+  version = "1.1.0";
 
   env.CGO_ENABLED = 0;
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "turbot";
     repo = "steampipe";
     tag = "v${version}";
-    hash = "sha256-GpFTMbwfTou+mKB8hn4ucXbcvSFl7SEzlz7H98ojGO4=";
+    hash = "sha256-7RRSsjQUgDLNpSvCIgdojsUv3o8W0OjobLzGwqfG6Zo=";
   };
 
-  vendorHash = "sha256-/8MDRlPR53MTMtW/VF6XsJ2NdV4NLDF8aukx7Rm/D7A=";
+  vendorHash = "sha256-pYXS7RwulpmDlCdNf3DXg97lsMshHYAzhZ+PTRvKBhE=";
   proxyVendor = true;
 
   postPatch = ''

From beed3b9970dc8cd71dbdb2d927e38ab51009a1ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 20:10:57 +0000
Subject: [PATCH 030/117] tabby: 0.26.0 -> 0.27.1

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

diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index 17fb9f1c28ff..09202a2d8974 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -32,7 +32,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.26.0";
+  version = "0.27.1";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -121,12 +121,12 @@ rustPlatform.buildRustPackage {
     owner = "TabbyML";
     repo = "tabby";
     tag = "v${version}";
-    hash = "sha256-OIt0UtknzPikGowfYWMufBXl0Ktt6zsZKqRMx63UqR4=";
+    hash = "sha256-mpLy+bSKoJr3fo9bEE1dyES1ZeIHQLSvzpt23E55b4o=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-wkd2EVCyWkUEo/gqNuX+P5wDeNmx0Jrd7UhhvIZwAFU=";
+  cargoHash = "sha256-einG593Brv59j1F5sebUATFnfER/PmXwQJpF3VLPKjg=";
 
   # Don't need to build llama-cpp-server (included in default build)
   # We also don't add CUDA features here since we're using the overridden llama-cpp package

From 66773040f761e6a018d7f4f7ed3ab0a48fe60c28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 22:50:22 +0000
Subject: [PATCH 031/117] graalvmPackages.truffleruby: 24.2.0 -> 24.2.1

---
 .../community-edition/truffleruby/hashes.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix
index dbb4c31bce7b..5f5084d7018a 100644
--- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix
@@ -1,22 +1,22 @@
 # Generated by update.sh script
 {
-  "version" = "24.2.0";
+  "version" = "24.2.1";
   "hashes" = {
     "aarch64-linux" = {
-      sha256 = "0nxhll26wl3193jk360hyr0hck929rvsnbmk1gx5zf8r4076zs2c";
-      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.0/truffleruby-community-24.2.0-linux-aarch64.tar.gz";
+      sha256 = "1g6c7wk4d9n4xgx549w9zmwd3aniayghwivx65l4fd1x9l78fhz9";
+      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.1/truffleruby-community-24.2.1-linux-aarch64.tar.gz";
     };
     "x86_64-linux" = {
-      sha256 = "0vn8ccxqzri0a2c4rz6r9gpam5j8l6g72jd8iwak5jjjmxdn0wlg";
-      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.0/truffleruby-community-24.2.0-linux-amd64.tar.gz";
+      sha256 = "06jc89r4w5isjxbndyy8g2p9q1jbb3879xdgj76379hrpzkdd6hd";
+      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.1/truffleruby-community-24.2.1-linux-amd64.tar.gz";
     };
     "x86_64-darwin" = {
-      sha256 = "1v1mgh28gqncjc12v31525ca53h3c2jz3ss0mk5l4w0zw0lrl1l1";
-      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.0/truffleruby-community-24.2.0-macos-amd64.tar.gz";
+      sha256 = "1a9kb7d1kv3j2svc41zwb43jx3jp96n2smqnijc3wkblgcg3gc51";
+      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.1/truffleruby-community-24.2.1-macos-amd64.tar.gz";
     };
     "aarch64-darwin" = {
-      sha256 = "0312r3pihpm5zbkiabzy9iv4rijy9ckh6mx72igcwlzbwgqb0916";
-      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.0/truffleruby-community-24.2.0-macos-aarch64.tar.gz";
+      sha256 = "0gbmk5h2api8y48sl3a731j3bjp1zzq9raar8ps81wld2yigxx0r";
+      url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.1/truffleruby-community-24.2.1-macos-aarch64.tar.gz";
     };
   };
 }

From 0f5ddd2dc092568434db7c3621f837336143d1a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 22:52:20 +0000
Subject: [PATCH 032/117] graalvmPackages.graalpy: 24.2.0 -> 24.2.1

---
 .../community-edition/graalpy/hashes.nix       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix
index 151f564cecad..7927c38565ae 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix
@@ -1,22 +1,22 @@
 # Generated by update.sh script
 {
-  "version" = "24.2.0";
+  "version" = "24.2.1";
   "hashes" = {
     "aarch64-linux" = {
-      sha256 = "0idzgirhx30h65bflsccbgjn4dszy78zb2ahwzhlfy6zxgm94mvd";
-      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-community-24.2.0-linux-aarch64.tar.gz";
+      sha256 = "1zqf6pjs2majxdhxa276wyfhszw1jbm3qykwk40jq6hs07kfyvk7";
+      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-community-24.2.1-linux-aarch64.tar.gz";
     };
     "x86_64-linux" = {
-      sha256 = "0ql20z31mv85xidmwg1h7aiyngh7gr886ffd3442fvhqmy8rvgm3";
-      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-community-24.2.0-linux-amd64.tar.gz";
+      sha256 = "184hp8k1d2pp1k8jqi9f60fg5k9jv4sx955n1ggjb12gc0rg7hcn";
+      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-community-24.2.1-linux-amd64.tar.gz";
     };
     "x86_64-darwin" = {
-      sha256 = "0vwv49araj5lrcab3i64y424b6gv3fqrxh1rgmcv7ga1jc3bw5ja";
-      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-community-24.2.0-macos-amd64.tar.gz";
+      sha256 = "1jhs797cdscay36nh2yrrd7kc2sx4xx2ibwjp6xdwys5jg6502hd";
+      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-community-24.2.1-macos-amd64.tar.gz";
     };
     "aarch64-darwin" = {
-      sha256 = "10dp9665qbzalzlw5a8zflq2q5z9dxydhl90d9v9ka30q9dv3n5y";
-      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-community-24.2.0-macos-aarch64.tar.gz";
+      sha256 = "02a9jr9sh1zn786ci4wc94rdblrsq9js64rh37ffcf2908gzqcgc";
+      url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-community-24.2.1-macos-aarch64.tar.gz";
     };
   };
 }

From 1e15746ef2e372a6e791bec26e746d14f00543d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 22:52:23 +0000
Subject: [PATCH 033/117] graalvmPackages.graalnodejs: 24.2.0 -> 24.2.1

---
 .../community-edition/graalnodejs/hashes.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix
index 47a494ed380e..460c23680792 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix
@@ -1,22 +1,22 @@
 # Generated by update.sh script
 {
-  "version" = "24.2.0";
+  "version" = "24.2.1";
   "hashes" = {
     "aarch64-linux" = {
-      sha256 = "1f74v71g3abxxwdzqk50pg9yyfpd41gq8kdr8cji97307ipi41jy";
-      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.0/graalnodejs-community-24.2.0-linux-aarch64.tar.gz";
+      sha256 = "0hz90igswilf6scdlpgj1a1fq6d3jkwzk7g7aflrq9z4ij2qkpn0";
+      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.1/graalnodejs-community-24.2.1-linux-aarch64.tar.gz";
     };
     "x86_64-linux" = {
-      sha256 = "15kjr2i2ymdmi7rrssgwka9nhfcak5nrh4yj3rxgw42rik4f8d83";
-      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.0/graalnodejs-community-24.2.0-linux-amd64.tar.gz";
+      sha256 = "01gvnfgcmylwsw6cbybhg1nl5xwshmcnsxmpn4wyq4h801qmmsxx";
+      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.1/graalnodejs-community-24.2.1-linux-amd64.tar.gz";
     };
     "x86_64-darwin" = {
-      sha256 = "06zhyyz4bx7z30mky1slqm3rg8p7nixbls9w6h0q2xm50ck2mx38";
-      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.0/graalnodejs-community-24.2.0-macos-amd64.tar.gz";
+      sha256 = "0mix0phzm0kg2q0w37ip8qkri8hg9mqd0f1215apl42b4nps71sl";
+      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.1/graalnodejs-community-24.2.1-macos-amd64.tar.gz";
     };
     "aarch64-darwin" = {
-      sha256 = "0lzqff3n1pk6ymv7c828l37g6xl6bgw2af3gb7amnqxyy9qzpz8d";
-      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.0/graalnodejs-community-24.2.0-macos-aarch64.tar.gz";
+      sha256 = "1ix6zb1d3sp55hf3fb5l7v65272gich5abbh6ggkxcskhk41xilq";
+      url = "https://github.com/oracle/graaljs/releases/download/graal-24.2.1/graalnodejs-community-24.2.1-macos-aarch64.tar.gz";
     };
   };
 }

From 615bd295ad0038eb346f87a09c8f7557968ee436 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 00:28:02 +0000
Subject: [PATCH 034/117] tomcat10: 10.1.39 -> 10.1.40

---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 11b852f86af7..1054b67d6046 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.39";
-    hash = "sha256-AM7ck/AzfNjJi9nCFppuYifVaNx7oLsaRHUrM7VPzuU=";
+    version = "10.1.40";
+    hash = "sha256-JfHmB/F+4vqZ4ynuwjtjk6ueE5CSnGzcsx90lXa5TY4=";
   };
 
   tomcat11 = common {

From ba3653bdd93144f70a8f461adf19bbff720ff1ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 05:32:00 +0000
Subject: [PATCH 035/117] steampipePackages.steampipe-plugin-aws: 1.10.0 ->
 1.11.0

---
 .../steampipe-packages/steampipe-plugin-aws/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index 7dfb4c295013..b236007fa08e 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-aws";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-aws";
     tag = "v${version}";
-    hash = "sha256-lCzkL3yL6bE0MeXqNt4f5zL2MoN+m93NSwJHY874Usg=";
+    hash = "sha256-Qt88EDDToYOKcgffgW+WyVjwBibfV+jYNWMjHrYxhIk=";
   };
 
-  vendorHash = "sha256-58jUSDoEHfYGXrMftf9k8RhceiDKdY4HRpmbahXnfHY=";
+  vendorHash = "sha256-TRVMj4iD5eDE1LxyDSqCKjEnQB/98MdP6rTevHTtsHQ=";
 
   ldflags = [
     "-s"

From 3b5657f2cbd2c0cdc5c1fda471dd4a46638e8276 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 09:02:07 +0000
Subject: [PATCH 036/117] vscode-extensions.ms-dotnettools.csharp: 2.72.27 ->
 2.72.34

---
 .../extensions/ms-dotnettools.csharp/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 201bfa8ab23f..c014337b6796 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -14,19 +14,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-YmlXnmLp0ZtFvHXOsI0sLySLprU+ntduywvvlZ2Riw0=";
+        hash = "sha256-pMcUrsIVpb0lYhonEKB/5pZG+08OhL/Py7wmkmlXWgo=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-QBon9zOXykngvJHydJQPdgjvLxy65DbWS+IUAzo638o=";
+        hash = "sha256-dJilgYVLkx5JVHk3e3mZjW7qpWrviuB4OhtzV1DkmrI=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-fOfCm+XiD5NVexMlBeBfSxtTr9mTnn2HKFsJjuGBCJ0=";
+        hash = "sha256-DyueVd+G67P48Oo0+HTC3Sg0/en/bRBV+F8mKuz66RY=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-e1cxz8A2IlO6fnN41PKXqPxthTuAOmAWy6/kRck6hsM=";
+        hash = "sha256-yk6bSeaEivx8kc3fqpSJBTMxUDsJGVwMoRxPPwaHgtc=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -36,7 +36,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.72.27";
+    version = "2.72.34";
     inherit (extInfo) hash arch;
   };
 

From 3e94c0ab2b4762c668b59724a3bd384961381bc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 12:48:13 +0000
Subject: [PATCH 037/117] spaceship-prompt: 4.17.0 -> 4.18.0

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

diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index e6c64c1c4484..1236d29e9a58 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "4.17.0";
+  version = "4.18.0";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
     rev = "v${version}";
-    sha256 = "sha256-a7z/z++dmwMqIrutOc74ljz/Tu/wuEuQaN2XRBMtOvw=";
+    sha256 = "sha256-ymIOv4GRwDpD3bbs81muzecsrUcKSYaPcR7mcaSYbl8=";
   };
 
   strictDeps = true;

From ca22270c0be71e761772feebf3a372940246e095 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 03:52:46 +0000
Subject: [PATCH 038/117] aws-iam-authenticator: 0.6.31 -> 0.7.1

---
 pkgs/by-name/aw/aws-iam-authenticator/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
index d1bc599ae78c..4e7805019a17 100644
--- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix
+++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "aws-iam-authenticator";
-  version = "0.6.31";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-v0CWwDLgjMU9kjPx5yUUauWNnzP0gP5zm4xCzBMPZpE=";
+    hash = "sha256-IjV07F0PyXhOMz3/FoJLhcX8SSgTvV6dInvFp0GDjS8=";
   };
 
-  vendorHash = "sha256-dR98s5g2KFGJIFbgYHmW2813GEhLFZZvV5nja84a0Ik=";
+  vendorHash = "sha256-dMoX3qfmLKrmof80KTfRiH2VLv0UOOrSofSz73HYpO0=";
 
   ldflags =
     let

From 5737bd989d6dc024a4a9b33e0bb71f7880c1e8ac Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 18 Apr 2025 10:26:23 +0200
Subject: [PATCH 039/117] waybar: make the systemd target that pulls in waybar
 configurable

This is useful for instance when you only want one WM to pull in waybar,
and not all of them.
---
 nixos/modules/programs/wayland/waybar.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/wayland/waybar.nix b/nixos/modules/programs/wayland/waybar.nix
index 074537ea9ed3..6e7199dbf425 100644
--- a/nixos/modules/programs/wayland/waybar.nix
+++ b/nixos/modules/programs/wayland/waybar.nix
@@ -16,13 +16,20 @@ in
       // lib.mkOption {
         apply = pkg: pkg.override { systemdSupport = true; };
       };
+    systemd.target = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        The systemd target that will automatically start the Waybar service.
+      '';
+      default = "graphical-session.target";
+    };
   };
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
     systemd = {
       packages = [ cfg.package ];
-      user.services.waybar.wantedBy = [ "graphical-session.target" ];
+      user.services.waybar.wantedBy = [ cfg.systemd.target ];
     };
   };
 

From d67c72fd8d9c2f78b95fc7d3d47dfdb3a6980866 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 11:09:04 +0000
Subject: [PATCH 040/117] heimdall-proxy: 0.15.10 -> 0.16.0

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

diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index cb833fca79fe..6289325dcc78 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.15.10";
+  version = "0.16.0";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-WB8ZfuL8zNJ4UK6hbFapCjbRg/xMXxMeoajXZliLVD0=";
+    hash = "sha256-50LLclXdSIJ03zQ3qqF+2LlPAeIyZFaa2U2tJGFLpuk=";
   };
 
-  vendorHash = "sha256-WFtqZTCaL3oZArWhVjeTH085O2BkY7y1feUJuRllY7E=";
+  vendorHash = "sha256-MFlRjTlaD6pppk5Dx0+EAtRSlVH/EOp3NKQgHbtQdRA=";
 
   tags = [ "sqlite" ];
 

From a94f7e01b87a1f893b02dac714b5a7a769ddeb7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 11:42:14 +0000
Subject: [PATCH 041/117] octavePackages.video: 2.1.1 -> 2.1.3

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

diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index 903d68589d2f..8c7f139e587a 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -9,13 +9,13 @@
 
 buildOctavePackage rec {
   pname = "video";
-  version = "2.1.1";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "Andy1978";
     repo = "octave-video";
-    rev = version;
-    hash = "sha256-JFySAu/3lCnfuFMNGYPzX2MqhsRi1+IyJQBcKB9vCo0=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-fn9LNfuS9dSStBfzBjRRkvP50JJ5K+Em02J9+cHqt6w=";
   };
 
   nativeBuildInputs = [

From c7f322bcd5a0ff8f42af6b872af92a96125136cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 12:12:36 +0000
Subject: [PATCH 042/117] wallabag: 2.6.10 -> 2.6.12

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

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

From bee99efa09a1c891a58b43ac7d2b8bad04913bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 15:48:31 +0000
Subject: [PATCH 043/117] heroku: 10.4.0 -> 10.6.1

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

diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix
index ef561b831c12..2e68ba2caefc 100644
--- a/pkgs/by-name/he/heroku/package.nix
+++ b/pkgs/by-name/he/heroku/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation {
   pname = "heroku";
-  version = "10.4.0";
+  version = "10.6.1";
 
   src = fetchzip {
-    url = "https://cli-assets.heroku.com/versions/10.4.0/467b8ab/heroku-v10.4.0-467b8ab-linux-x64.tar.xz";
-    hash = "sha256-SSZby3CjNOaukrc8Bv/8OwWY6JkU6XpXvfEt/kh4Rig=";
+    url = "https://cli-assets.heroku.com/versions/10.6.1/6a01789/heroku-v10.6.1-6a01789-linux-x64.tar.xz";
+    hash = "sha256-dJ18GYfYVzWNssVyBu+L/iuHyRok5whQfs7CC2AYnf4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c70c96de6c07d0e17495206105e084aeac0b0701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 17:09:44 +0000
Subject: [PATCH 044/117] jackett: 0.22.1705 -> 0.22.1791

---
 pkgs/servers/jackett/default.nix |  4 ++--
 pkgs/servers/jackett/deps.json   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index a698422da543..f2f0e6286d67 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.22.1705";
+  version = "0.22.1791";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-AnyCT52wZR+2rhUXg3BOaWo7ESZUQNMLtaiVld2c2vYw7atq78N+uDFUIYfsvxemDAStB5tjw1mdwdLevzCkTA==";
+    hash = "sha512-nT1B9CSF9yDbeVfmaS+XI9ixcHWZiZZ0z5cN/CR1lZXJZ3EfMI0XsoBGyXRc1V7UlNOjTPbvUL8HytjFa2smeg==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/jackett/deps.json b/pkgs/servers/jackett/deps.json
index 286e4692e6d0..2336c8d9cf98 100644
--- a/pkgs/servers/jackett/deps.json
+++ b/pkgs/servers/jackett/deps.json
@@ -31,8 +31,8 @@
   },
   {
     "pname": "coverlet.msbuild",
-    "version": "6.0.2",
-    "hash": "sha256-Ptj/f41dJ1T+DYvJ8bUo7Bnjp5R+xFOKGVhg3GA+f/A="
+    "version": "6.0.4",
+    "hash": "sha256-HAMarJnbFQY0Y6KvjNC7rOHrR3bRLCdPGvOa1I7Do8Q="
   },
   {
     "pname": "DotNet4.SocksProxy",
@@ -81,13 +81,13 @@
   },
   {
     "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "8.0.14",
-    "hash": "sha256-YebSEuvvA1zzBkwknK4w3hF6ToDD3ewMT8Iw2mUWEAE="
+    "version": "8.0.15",
+    "hash": "sha256-mR3bIl4cvPcFzPWnweVU9pQdysTjmU7dzn2knmki9Y0="
   },
   {
     "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "8.0.14",
-    "hash": "sha256-/tI0qt8DWt9qZBNpV3H4NHvR4uR48s5MR+B+wNnhMCo="
+    "version": "8.0.15",
+    "hash": "sha256-7o0BM/bBVA399eGa1bmZ19+9OKNJHE8EafQ+M2Pks80="
   },
   {
     "pname": "Microsoft.AspNetCore.WebUtilities",
@@ -476,7 +476,7 @@
   },
   {
     "pname": "YamlDotNet",
-    "version": "13.0.1",
-    "hash": "sha256-vrPm3nActRBC+psOSDGu2sjy/FL1Sak/okZPwurOUB8="
+    "version": "16.3.0",
+    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
   }
 ]

From d66fd9360c36767fb2cb26958506b99f7dcdd737 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 19 Apr 2025 03:13:23 +0800
Subject: [PATCH 045/117] bark-server: 2.1.9 -> 2.2.0

---
 pkgs/by-name/ba/bark-server/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index 167a709fac5a..8022dc1851fb 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "bark-server";
-  version = "2.1.9";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
     tag = "v${version}";
-    hash = "sha256-bZWX47krx9V0qXg6Yl8yQbX1zd5DtsWkIBLi0bDxrpA=";
+    hash = "sha256-c3kMGD4JuLAP/Ms2dJBAl85urvranGGIicTmx4gIhNM=";
     # 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;
@@ -35,10 +35,13 @@ buildGoModule rec {
   ];
 
   preBuild = ''
-    ldflags+=" -X \"main.buildDate=$(cat SOURCE_DATE_EPOCH)\""
-    ldflags+=" -X main.commitID==$(cat COMMIT)"
+    ldflags+=" -X \"main.buildDate=$(<SOURCE_DATE_EPOCH)\""
+    ldflags+=" -X main.commitID==$(<COMMIT)"
   '';
 
+  # All tests require network
+  doCheck = false;
+
   doInstallCheck = true;
 
   versionCheckProgramArg = "-v";

From c81db5475dd71278e99d9cf4a587b1e6d1c64ff3 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 19 Apr 2025 03:14:50 +0800
Subject: [PATCH 046/117] bark-server: migrate to finalAttrs

---
 pkgs/by-name/ba/bark-server/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index 8022dc1851fb..f0ce135c70eb 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -5,14 +5,14 @@
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "bark-server";
   version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-c3kMGD4JuLAP/Ms2dJBAl85urvranGGIicTmx4gIhNM=";
     # 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.
@@ -31,7 +31,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   preBuild = ''
@@ -53,9 +53,9 @@ buildGoModule rec {
   meta = {
     description = "Backend of Bark, an iOS App which allows you to push customed notifications to your iPhone";
     homepage = "https://github.com/Finb/bark-server";
-    changelog = "https://github.com/Finb/bark-server/releases/tag/v${version}";
+    changelog = "https://github.com/Finb/bark-server/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ moraxyc ];
     mainProgram = "bark-server";
   };
-}
+})

From 4fb1894f574a4c8aec17bc0e6a085fa42a21d5c3 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 19 Apr 2025 03:15:14 +0800
Subject: [PATCH 047/117] bark-server: add updateScript

---
 pkgs/by-name/ba/bark-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index f0ce135c70eb..d0d416423bdd 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
@@ -50,6 +51,8 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Backend of Bark, an iOS App which allows you to push customed notifications to your iPhone";
     homepage = "https://github.com/Finb/bark-server";

From a902810e85c7fc828e276be9b134739ba633e362 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 19:21:54 +0000
Subject: [PATCH 048/117] messer-slim: 4.3 -> 5.0

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

diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix
index 6c90806992ed..cc2558340e78 100644
--- a/pkgs/by-name/me/messer-slim/package.nix
+++ b/pkgs/by-name/me/messer-slim/package.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.3";
+  version = "5.0";
   pname = "messer-slim";
 
   src = fetchFromGitHub {
     owner = "MesserLab";
     repo = "SLiM";
     rev = "v${version}";
-    hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI=";
+    hash = "sha256-fouZI5Uc8pY7eXD9Tm1C66j3reu7kijTEGA402bOJwc=";
   };
 
   nativeBuildInputs = [

From 9bd8efc15be61ad09ad6745adbdad582c5f2b076 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 00:51:00 +0000
Subject: [PATCH 049/117] auto-multiple-choice: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
index b6cc032bb152..85820918503f 100644
--- a/pkgs/by-name/au/auto-multiple-choice/package.nix
+++ b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -25,11 +25,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "auto-multiple-choice";
-  version = "1.6.0";
+  version = "1.7.0";
   src = fetchurl {
     url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz";
-    # before 1.6.0, the URL pattern used "precomp" instead of "dist".    ^^^^
-    sha256 = "sha256-I9Xw1BN8ZSQhi5F1R3axHBKE6tnaCNk8k5tts6LoMjY=";
+    # before 1.7.0, the URL pattern used "precomp" instead of "dist".    ^^^^
+    sha256 = "sha256-37kWqgdvZopvNSU6LA/FmY2wfSJz3rRSlaQF2HSbdmA=";
   };
 
   # There's only the Makefile

From 71489307e31a3ded07e273763026c1ec7070f5c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 01:48:37 +0000
Subject: [PATCH 050/117] opam-publish: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index 994b7ecad4a1..b6ccbd11210b 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -19,13 +19,13 @@ in
 
 buildDunePackage rec {
   pname = "opam-publish";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
     rev = version;
-    hash = "sha256-HjMba80c4vOEm9p7r0cfFBf3y0XoFf986XjTDCPzn38=";
+    hash = "sha256-clTEm2DGxcNsv+Y1wwWwnM/lrRJDQBHsncwrdqVWA5U=";
   };
 
   buildInputs = [

From 57581f1ab952bdaadd263a263fa4f829d5ac4770 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 05:27:55 +0000
Subject: [PATCH 051/117] terraform-providers.rancher2: 6.1.4 -> 7.0.0

---
 .../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 bcde7929cdaa..3e468637e0cd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1075,13 +1075,13 @@
     "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
   },
   "rancher2": {
-    "hash": "sha256-LJgYGgJ7PLRq3WlT2rAnnM8svn4EGghLy3rY7lpmJxI=",
+    "hash": "sha256-H6ZdGvKSYRlDsCKIHlPHdEv1+6aa1rll/73IeJ+PDhc=",
     "homepage": "https://registry.terraform.io/providers/rancher/rancher2",
     "owner": "rancher",
     "repo": "terraform-provider-rancher2",
-    "rev": "v6.1.4",
+    "rev": "v7.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA="
+    "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "random": {
     "hash": "sha256-bbqTCLPjL1EowsEIx9SiwKAUt11LYxOOtj3syW/7gjQ=",

From 65d66ffbf09400d526f31f89be68f4ace4efef7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 06:15:19 +0000
Subject: [PATCH 052/117] persepolis: 5.0.2 -> 5.1.0

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

diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix
index e548658ea7da..2be96d8ecc32 100644
--- a/pkgs/by-name/pe/persepolis/package.nix
+++ b/pkgs/by-name/pe/persepolis/package.nix
@@ -14,14 +14,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "persepolis";
-  version = "5.0.2";
+  version = "5.1.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "persepolisdm";
     repo = "persepolis";
     tag = version;
-    hash = "sha256-n8hMf+odUkL6cXYeh+SFmR4raI4RrmqzjEm5n/MpxHQ=";
+    hash = "sha256-viRRPccw0C1GmZFXWAtg008HfDmnTwEjg2TqVlIiICY=";
   };
 
   postPatch = ''

From 902ada988a49a79333286df8b8db2f4e02386058 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 06:35:04 +0000
Subject: [PATCH 053/117] xrsh: 0-unstable-2025-03-28 -> 0-unstable-2025-04-18

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

diff --git a/pkgs/by-name/xr/xrsh/package.nix b/pkgs/by-name/xr/xrsh/package.nix
index 37c68a6812f6..c514e25ccfe8 100644
--- a/pkgs/by-name/xr/xrsh/package.nix
+++ b/pkgs/by-name/xr/xrsh/package.nix
@@ -10,15 +10,15 @@
 
 stdenv.mkDerivation {
   pname = "xrsh";
-  version = "0-unstable-2025-03-28";
+  version = "0-unstable-2025-04-18";
 
   src = fetchFromGitea {
     fetchSubmodules = true;
     domain = "codeberg.org";
     owner = "xrsh";
     repo = "xrsh";
-    rev = "6eb4feb04ddd4aa96319340921d12b9fdd1bbe59";
-    hash = "sha256-EPrp9tsBDo7A4Si0wV8cup3zOBeMG3em1ePSZwjXUcI=";
+    rev = "f9ca00efb864447ceac94d3e8134a7ed4c41a590";
+    hash = "sha256-2nGG6B+uW2QEdIjg8NXQjtbIQu+1hhOSKeHFQenc6eI=";
   };
 
   dontBuild = true;

From 0b76a14fd5d9db971c9f7208643fcbe4017f3f84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 19:02:55 +0000
Subject: [PATCH 054/117] mpremote: 1.24.1 -> 1.25.0

---
 pkgs/tools/misc/mpremote/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix
index 20a4954a718e..e71a89e492a9 100644
--- a/pkgs/tools/misc/mpremote/default.nix
+++ b/pkgs/tools/misc/mpremote/default.nix
@@ -10,13 +10,13 @@
 }:
 buildPythonApplication rec {
   pname = "mpremote";
-  version = "1.24.1";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "micropython";
     repo = "micropython";
     tag = "v${version}";
-    hash = "sha256-Dc40uLyLQBfs8Elku8g+sTz/OETsFNqLqp/xnbF/rn4=";
+    hash = "sha256-Hk/DHMb9U/mLLVRKe+K3u5snxzW5BW3+bYRPFEAmUBQ=";
   };
   sourceRoot = "${src.name}/tools/mpremote";
   format = "pyproject";

From 80d4ac80f6eaeb7ca76ea4d45f791214c098b5d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 21:24:15 +0000
Subject: [PATCH 055/117] iosevka-bin: 33.2.0 -> 33.2.1

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index ac3717869433..4cc8c09d8636 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.2.0";
+  version = "33.2.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 8532189f3aca..7a44954f92fc 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1fp26w8gwvs7rnfkjx36dkf6d87py9y3wd9x21l6v8kia8lfpmbd";
-  IosevkaAile = "1inglmx8xqhyn4zrh8hk11xsnz00rahvg539ca9fbvzn096lbhfz";
-  IosevkaCurly = "1srw7fpssmyksp9ylqif81vppwi0a0rdmwr7d24q7ij6h2kk094d";
-  IosevkaCurlySlab = "047m9lwmrw40mlgb6mislqahvjs7i5laqgya3xsrgsmm9ybkf2gn";
-  IosevkaEtoile = "1cdvsbbpzf0b0daqpyzcdffi0g31b8xfbzara933gs5xmf01ggv5";
-  IosevkaSlab = "1yvxx6kg92jv5j8fjb5z8xw3fqh0hp305i4f523wwhbxvf3jjpmb";
-  IosevkaSS01 = "0ml1ypz2wxsqxwcx8g4kvj4facqlav2lw9ymj94clkgxm07mp6nz";
-  IosevkaSS02 = "1gijwlzbj5wc1qfagnn8zcivzd9m6bw7p6z3cxkivnknsnirnnd2";
-  IosevkaSS03 = "1xbh6igibgv430lnr92xn31srglvajmbpbirfammhr7lp4fxwh64";
-  IosevkaSS04 = "1mm2j2k4l73y2r5x6snswn4cyikxs5dqy70cqj31f5286x8ggf67";
-  IosevkaSS05 = "1gm35zh3lmvni3vspnan5zkqxkc91324n3a5dqic1zdc4ispigv4";
-  IosevkaSS06 = "11j6hy19rpw7mv2km76qcngcxq6vx27qpl7k8nnv7lbs2932kngv";
-  IosevkaSS07 = "1wivn5h4ryn3d47953jy8ylbp4as6p4ml2x9p492lccrhbb3hbmi";
-  IosevkaSS08 = "1xdn8yf3w4641fxzk0s4171f8z0dg7xysh6ambi4mx5yfwr4rhxa";
-  IosevkaSS09 = "0akaaix1a74sjcnrkg1b4df01zvsbspww4814j1sdm149ckp559c";
-  IosevkaSS10 = "0ddz060z14pij8sjy5yf1ip5lzdvv9sl57cn17l8ls16hc3k2b9j";
-  IosevkaSS11 = "0l3yikky9gqmlvqxgk1smzcmyymdxj8ha8kpjmdcpdll8zzhdqf1";
-  IosevkaSS12 = "1qpqllyc1avp9ca6yimdxljr1qq4dgqm5zwprbnf200sayr84vg8";
-  IosevkaSS13 = "1qlad3glcsarmg9nxcx4yx611z8fr5993hwg82s3xpd2zqadkgrn";
-  IosevkaSS14 = "17gb43kdfi63djcww59pmmh9pi274gpxsf5k5p01gfp5792xs4c5";
-  IosevkaSS15 = "0viiikzhgxydmrn9nq090z3rydh4k1rr62ri2593157k3bdqc1xa";
-  IosevkaSS16 = "1pfnb8ih1gi10f61dmxjgqm2z6aik71bqmjc0ax5w16dg9shqdrj";
-  IosevkaSS17 = "068rf59f6zcni6635waabspg8spdj02lqksjxp1lxbl6rf6dsadl";
-  IosevkaSS18 = "1wkymkrzqgsmp9d07wggzvnvsni649kc68gnq98x2j5nrl8jcivp";
-  SGr-Iosevka = "1hxsz9f1pg5wcwzb51asabxqly87cvrmq0rsq9f7kg2w10m9ckzd";
-  SGr-IosevkaCurly = "1gn179s1niisc29i2dms45qmr1cglwix60mwq5pjs5fkzg23nqb4";
-  SGr-IosevkaCurlySlab = "18fd3gmzc2f759aq8gn8p03zvqpydvvp80ly42bpl3s3i8gbxg0q";
-  SGr-IosevkaFixed = "1dnms6sidyrjyi6379x3yv6g1a5njbn1qa3s2k4j0q5mfs41273p";
-  SGr-IosevkaFixedCurly = "0h3lhawlimvy2x0zl6i0imp3l57shdzapzg15y5961dbcdbsyf4f";
-  SGr-IosevkaFixedCurlySlab = "1zx9xpv8dkib1fgqw9m494skhwlji8vg0m1is4syk3c4h5q87d3j";
-  SGr-IosevkaFixedSlab = "03i7d5bqi4ycbvx74srsmvns0g8pmfnyc9ivk3jn91ahnp6fflxa";
-  SGr-IosevkaFixedSS01 = "1jg1qy8crjsr2vpdc7sc82z2nrsblm71gpl5nhzs0v9jkp55iiwk";
-  SGr-IosevkaFixedSS02 = "10lh9996knlsp8rjm4jp98rs5ykyrib9zqm0dpx23dmrxpsq86rn";
-  SGr-IosevkaFixedSS03 = "1kpkzrqmwabrwg29f4rm8i3d199jkq3yc7aq4wq1qj6bgvsw1qsq";
-  SGr-IosevkaFixedSS04 = "1myjn9i5ssjrqa3ljmf8yqq5675c36mxy4xq5cxn730zm436cl3w";
-  SGr-IosevkaFixedSS05 = "114naq0k3yf3qfcp87w6a4527sjs2259rc6gldzw7xxhfq13mdkp";
-  SGr-IosevkaFixedSS06 = "0qvqs24rcj70n3x7qsrbh6gxs5nld5qp5wxqmzhhsypr5z54rb27";
-  SGr-IosevkaFixedSS07 = "1kyz866kv6vfnqdaizn6d71qh5jhx321zh9sjiyifqlgmyjn6ahw";
-  SGr-IosevkaFixedSS08 = "1zyfkadgsjxgzkbw2c5qgh1gkhsmpxxsbqjfxiwqpfjhzb023rxs";
-  SGr-IosevkaFixedSS09 = "0nm562ywsmgqywbsylxh6ynr75ngkw9h9ffz85gs8acf6m8x5v64";
-  SGr-IosevkaFixedSS10 = "0vnq36s96h7srbkzcayclhiy55crnzmgj1ilj7in2mrb7sk7jzlq";
-  SGr-IosevkaFixedSS11 = "0p771fwl54pl9kv6qk3piwxpqcbx0p4vx8dq7pgbpnkbhj0mrb1r";
-  SGr-IosevkaFixedSS12 = "0nxgpsiyprpgzas304j3imk4gff0q1v2k93sgdwxj7cl1cnncl79";
-  SGr-IosevkaFixedSS13 = "14rmi3fgxvbc8db7i767wlki850nbg8sgyafqdpisn0l5n2qxma9";
-  SGr-IosevkaFixedSS14 = "1mssv68ky1pqfldbhy9sx4cy99l5as8v2gkav85m3wj8a26x63fp";
-  SGr-IosevkaFixedSS15 = "03c8ll9yiyh7pwnm73wggv160wbvvik0bp2s36122w5fyws48m8c";
-  SGr-IosevkaFixedSS16 = "0mh3b633yqagfpx31dx91p0y8c8l8ks0bnm1v8snbvp1irkjhkgs";
-  SGr-IosevkaFixedSS17 = "03isvkr0m6pvygiqr497p4drly4vqlbvpmy4rc81c6kj1klwsi7a";
-  SGr-IosevkaFixedSS18 = "0z9idiblf12yfi106mmzw7nmxija7jpnil6809r9ilgp4wdm68hv";
-  SGr-IosevkaSlab = "1bx49i4lbiqvjfj3j3pc9yfg3xn4s2m269vp5zdavhxdakjxlgq1";
-  SGr-IosevkaSS01 = "0ymx90ajjcdgk0d5432srmbm4a0f46l52r3ig6gpq2q144qdnnfd";
-  SGr-IosevkaSS02 = "0d4q81jp4pj99h0bkm9gqwyhhm82h46p2i6p7wcvqnpar8diqpbg";
-  SGr-IosevkaSS03 = "1g5xm3rmpi5r6sk29i5csjjbqlkpza4sdp00w19bvpbj6c5xkmvh";
-  SGr-IosevkaSS04 = "1lv4fh3x1ykgcby0k4hky0rjmxy2c4ndilns14zbj51gb7w99iw8";
-  SGr-IosevkaSS05 = "1npm7dz5p05b5gc683jf0ky2249hdjdv96vgv0vp2xb7v9lm5mmw";
-  SGr-IosevkaSS06 = "0ixg8fsjc56kyizr1z3db3p17rkjm3hblv8vlilansszj9j0nhbj";
-  SGr-IosevkaSS07 = "07brpyb3bra1mhlscn64x5ca4yicqn6saalv8rdpnx9y4rwnc11p";
-  SGr-IosevkaSS08 = "07cl4sg1rhvq28liys8qay6v7xxqs07xpy1lkh7zzkjfmviw0kcm";
-  SGr-IosevkaSS09 = "0j005bk7njxcbiy4d05mvgrb4h2jygjp5sa9d16a5rzkpksia9jn";
-  SGr-IosevkaSS10 = "01hyahgssqw92qr5nlq06b6hd0vj3jcd9f7w82b2cp70z50027y8";
-  SGr-IosevkaSS11 = "0r50w6kqq0s9gv9w28kdc3vvv2scnp15iww04izrgzayd3frl685";
-  SGr-IosevkaSS12 = "1h16fc6az407zjnkfpchgw534m7h00i7shb1bc9690hfibcdiwib";
-  SGr-IosevkaSS13 = "1d8p1mbp57zmwi6xdnmq74m3vildnlsikxj2src0ybzc7vk33cyk";
-  SGr-IosevkaSS14 = "0zv5d9i596c36rzvyjf640zg85nr91vm8xvxbx523rrk1by70hvl";
-  SGr-IosevkaSS15 = "11rn8j21a2811bvh2nn2fxn1sgy084598cqxypi3d9z3bazq34xv";
-  SGr-IosevkaSS16 = "1y40x7vsni6ir9z88xvl9f33j1wynwg43vjy9b6ip96jm1760h34";
-  SGr-IosevkaSS17 = "1cfasza68xmifhkllfax4f0fr76ymmapd39d3da98pw3cp4m984b";
-  SGr-IosevkaSS18 = "0lc3sc7wydxbrfxkngb323fkdsdkvf1d6s2c4k42i1y0jjk2g3zj";
-  SGr-IosevkaTerm = "0ll89axvrvnvzdgsvmy4aqkkgwl42r09a112lk3z909wp4qcg69h";
-  SGr-IosevkaTermCurly = "0frxm0hc1fxdcgy88jh9wgj2r9g93cdmz1b3j71mniqpyf5zg219";
-  SGr-IosevkaTermCurlySlab = "1r8ljbvxnfjd27kccfjz7f7y3lwyvaaa09hhnj5h1cm2n97l1kbd";
-  SGr-IosevkaTermSlab = "1z96xhrbpcmwml46kd5x7ai6pmiagyvg4p4nlz0qn5xcfs3pvwan";
-  SGr-IosevkaTermSS01 = "0b1rd5s2rv6a5bpwhbrs9sdnsp64vzljrd6c0ql5m1svg3flfrjd";
-  SGr-IosevkaTermSS02 = "0mgpgz7bgx29chwbmy6wsq8j57p3nd45frqahsqjlj40k8f8smqp";
-  SGr-IosevkaTermSS03 = "05pg4a2lcil21yv1m5896xa9gazh5jzgihlzlmax6gzc0m6qcjx1";
-  SGr-IosevkaTermSS04 = "18j178n5mpszx5agjgvbgp253mnn6k1sdkwvm2xqvl53gxmxc179";
-  SGr-IosevkaTermSS05 = "0cai601srxcng56fw465ykikhs2gb6d05yd3694561bxp43mhnxb";
-  SGr-IosevkaTermSS06 = "0v4m0x9r94mqjicqnx8w2ia41n8xxqnax747ghdsrympfra7fkar";
-  SGr-IosevkaTermSS07 = "1xyr0qj8xz9pz3v5xj80c80q32j6n066xq5mknvy8d71kka3ikqm";
-  SGr-IosevkaTermSS08 = "1wwghn8j0q2r2n94v8gg9jd426z272ww4j6ln40h3ib6hfal8k53";
-  SGr-IosevkaTermSS09 = "0b17mr4h7m9ms2j84jifjp1f9l5cxwqdfliaqwhpmmnjsj3p95zz";
-  SGr-IosevkaTermSS10 = "0lh471pr3dcj2iwragsbgnvvp4d6l87f7wihkgdr5hzv7bjqgjh9";
-  SGr-IosevkaTermSS11 = "1h8mcywy9vgwna68n0s8a373jq78c39xkny95az8jbcxsbbg3z9w";
-  SGr-IosevkaTermSS12 = "04399p8rv8rhklfhghsnwl7fy473klbng5msqnnm6cgi7fq4myam";
-  SGr-IosevkaTermSS13 = "0m748a43xavjr2qnz32g0jsgjrnbl6ajyknc648i42gipbq0mgfp";
-  SGr-IosevkaTermSS14 = "15l6i5pcya9mdv07sbb1gab637kp0rqg77bl9rwknhlg1y91blw3";
-  SGr-IosevkaTermSS15 = "18lg7h5cg3dd4miy9wmcq692fy98c9j45pn23wdh8awl7bmfjbk9";
-  SGr-IosevkaTermSS16 = "1185c8q068i0zs1qr7nzzcf4k50yil9jxnl9833sr5wxpn7x74mv";
-  SGr-IosevkaTermSS17 = "0j6mwgxla3dw3a6ddk61w8biv7kwkf0bgfda87yvpfim598anif2";
-  SGr-IosevkaTermSS18 = "070lag58blnd0vf3icqfsm7c3ydgpljyr2qh7ak7yz1fg61mzhmx";
+  Iosevka = "08z48033g3px5ybh5idcc8i9sgkaqphm2246ncrh4g7bwap4gm3p";
+  IosevkaAile = "10hc78wsqd7ijglsiml1mpcn3c8g0hf9j1hbz6k51rz8ql4iq12b";
+  IosevkaCurly = "13hdcvg51wlpxqjxzgf055gxfdqlw7ly2x9fajqiqwxfg6haq701";
+  IosevkaCurlySlab = "172g677kr092v1a86yv1nbnifdmvhk824fqwqyr9q8zv8yibq4pd";
+  IosevkaEtoile = "0ckz3qs9alf3r9xzq3l2pgdf86y8bckpyqbl8f37mwdqqk177y8l";
+  IosevkaSlab = "0sqwsgn8p1fympsm4ah27ghckxafddiqia8wibc54908jb84j6n2";
+  IosevkaSS01 = "1lsymss2scp7y8hdbwgzzqxi03wdmfikphfz0b2hjwbzqsv3198i";
+  IosevkaSS02 = "1fhiiwnmb7l2cw7rvmk65zn3x2g665p2hwl4mxmnbj94m0h1nyki";
+  IosevkaSS03 = "0vsrj557mzn21gdw1nrmrxl4r8q6rf3w7h1z104vxzp0zqn15hz6";
+  IosevkaSS04 = "114gzjjg00lagmq2lhdkjjgzsa2a9jc8v7mw0ayjc4gadjdvr3qv";
+  IosevkaSS05 = "1gw2wdxw4yz825aqi50p14bz7iz7i1d7nph1vz58ii52nnkygivq";
+  IosevkaSS06 = "0j5fz5vyg3b9c9aybrizncxdmh76yk2k6f430znqx6dd692i3irq";
+  IosevkaSS07 = "1qd28dp96xjqsz35b4fqxgiq2g797vpfv9zjvd1r1xcgsaliin5p";
+  IosevkaSS08 = "19n75kan3xggx3xvf0i978j058wzjd62bbyx36vyyjki104wkphk";
+  IosevkaSS09 = "0fidll4cqfwral0babkh3zb0kb9fi5nahax4cy395hbd2db4frzy";
+  IosevkaSS10 = "04nagrfnw0is75g0bh9pk046y6vh5b236d6mgfjxvv93zvqxdvyy";
+  IosevkaSS11 = "1ni71hx8pi9vyrg7imkym25g1pnx4fig525vkxp6mxzv63g50c43";
+  IosevkaSS12 = "1afhf8gvb7j0qlw87ps7rwaq2j39f199ghaif6qlh84wrahbmvr0";
+  IosevkaSS13 = "0byc54mpm28qcyzjryasyr6xm3nsqcc460caa9vmr0aajjmjqrva";
+  IosevkaSS14 = "0vlaa0zpb9myxnxrzwmr1sh99yypiiv94dabhyh5qwr8n8dz90qw";
+  IosevkaSS15 = "0q0jymy8brda65lliyfyfphw68s0zdh3c5vha1n0qgx26giq6cfx";
+  IosevkaSS16 = "0xdfagax1jaigxhk4n58r5wplpqgv9n4592g8rz09y9fnx16j42f";
+  IosevkaSS17 = "10yj4flqci2y7mbsjfm5zib7fa0jkxjsv4bjdh07bsgf0z1c5v4i";
+  IosevkaSS18 = "1j97gc101al6nqwrb2n896r1m29g9x9138fy9f7607mxd9l6m4y0";
+  SGr-Iosevka = "1rxmirx3xys75nmj76vdb6kh7m8awx8js9amm3cx9zwgn3rsibbm";
+  SGr-IosevkaCurly = "0sjqgnsbmmlb9g65z4zdfp57qbidmidzqvfal2szbydqp2kfpm8x";
+  SGr-IosevkaCurlySlab = "1yqy4fmfk8jbn98gqbg8q2iihlnzy590h4cyc3ap03npki9z737z";
+  SGr-IosevkaFixed = "1jw3w3nxbcbkqa2shskfjnh173zwj0n7qn1cl4dh5x4fpbpd8q1v";
+  SGr-IosevkaFixedCurly = "0pq0hyw1v687i1kwjzadwfbr9k6i07jyvg276h9mjsw6nc3x1lzm";
+  SGr-IosevkaFixedCurlySlab = "12bz84pm0cm37h99c67qw3ajqnfw894xx7jpzc6mygblcqv5ll6h";
+  SGr-IosevkaFixedSlab = "1cn9bndrcf1iv6jhry9wd850arb94dypm1zhv352vcq87vqawnyw";
+  SGr-IosevkaFixedSS01 = "1dgr2a94xhzcqsvcnpixdwvlm70nmxzpflr4m5c824g36n8xvvj3";
+  SGr-IosevkaFixedSS02 = "0vzfiq0wm6xf9alkarn2yyrdwjcxrr3z4ckskxl297pbpl3brr04";
+  SGr-IosevkaFixedSS03 = "1jbjmwx3l9h0978f319p4vkcm7bj9kmynywjvwgdfjwja5xl3mni";
+  SGr-IosevkaFixedSS04 = "0yiihs1l257bq9mxk6mmkldh5jipzc5nlh7v833pzw5b04i8lppl";
+  SGr-IosevkaFixedSS05 = "0n5v1yqgbydi51gf68d1w22vcp12annfialrj7w5azwszbgqps7k";
+  SGr-IosevkaFixedSS06 = "07lg26m4nbx02q1bfp7jg19pa2rvchpniay1wi3y064xw2xknzyb";
+  SGr-IosevkaFixedSS07 = "0pfbfifibcp5s7q8p4a17y6d5xp233ycba3n50qw3h0caml4qbnv";
+  SGr-IosevkaFixedSS08 = "18pc0fqx0zdqp2b3wxznx0c7qsa3b1fg9pfp90yc8984zfnfi0g7";
+  SGr-IosevkaFixedSS09 = "0mjyhjdif1a6mmh0swjczqmq4422ahpdpf5ivkpkd1dphcnpw5p5";
+  SGr-IosevkaFixedSS10 = "12m4c567cl869myhcbssy9xbigghvhylps3p76152hx0dvlaf7g5";
+  SGr-IosevkaFixedSS11 = "09q39nrzhcd1248nadv8cpqffkbzz2c4wcrq3pzfhxgsd3rl1asf";
+  SGr-IosevkaFixedSS12 = "1bj4j5zkyifsn0fgpb5ngixc2xii2rj9yglahy1hanxj5wd7i2ac";
+  SGr-IosevkaFixedSS13 = "1r0d62hka8jgkaasy4vagy0fvigfj7ffmjggqzsyrxma8lqhq73q";
+  SGr-IosevkaFixedSS14 = "1g1xyxs3lzzk1gj0qjv9gviklcs5psc19wrgklik6gd979rw1nzk";
+  SGr-IosevkaFixedSS15 = "0spga64nmnsbcrzvx7fqffbaxgps62qk90ap7ziqfbpvjmv1z7ig";
+  SGr-IosevkaFixedSS16 = "0yavrjd0b356kh32w4h022rrmk5cjs9zd7ibxfw8v4jzs0kyfcjy";
+  SGr-IosevkaFixedSS17 = "0aysk3lqvrrgng5sd0g40xsbkd74bqxksnm4mw4zngnp6mf59vvf";
+  SGr-IosevkaFixedSS18 = "0xd7d4j37xd2s2yhjc36fj6908s2zfl02cbn5yg2r8l02k4axi9v";
+  SGr-IosevkaSlab = "1y9xk9pyy16n239gn3l6355w5vmkb7chml3f7bhj4ad2ksiifvqx";
+  SGr-IosevkaSS01 = "1wz1vh7bqq1rwb7lgcb3864d7y5y1kf17hg83zg6061hdxfdsmhl";
+  SGr-IosevkaSS02 = "090idw6d1vqycs9gv6c3ajsgkk4wf66rag8gry9pcr54q9m5lym5";
+  SGr-IosevkaSS03 = "1p3q9gvx453506lrjcarvsqwqdbwgcdcrzq63p9gk2gm1n5kff85";
+  SGr-IosevkaSS04 = "1i22r2xkzj7271lhzaz2054nm5h6bdrz0jyagj93g2jdmqalfcpr";
+  SGr-IosevkaSS05 = "1qkxnj5wa2n9vk4v7ygyb4mrs52r1nh0847md42cj23ra5ym52xl";
+  SGr-IosevkaSS06 = "11mdlppqls83lrm2008bqzi1vmif6ficxby3p4ali61cv4w7svzx";
+  SGr-IosevkaSS07 = "1h7m4amjxhvhas3c7hxilfl8njn0i7d5rz6qczfwfd39v08iz5xy";
+  SGr-IosevkaSS08 = "1nq2c3a1s5lm1x4rx6xxpmxxkvvsg8rl2d98lriv80zhgs0lm4r8";
+  SGr-IosevkaSS09 = "1a90gi3gdfcid5kdrmyr0f7b5vg4akqmndxzrycrfbagbjdbi1v6";
+  SGr-IosevkaSS10 = "1ingh71nf7wkkgv4l6z4rbc43w4ca18x4ncr4f1jcyfliqqbf16k";
+  SGr-IosevkaSS11 = "0kgw3syf5ssym2hzz4xhg9dm078p6n1cj917bnvcymclam4b6c22";
+  SGr-IosevkaSS12 = "05vyx3fz0c9rrb4jfh194zw4bi8pafib6aa7cmiz1f6hz1vbacy5";
+  SGr-IosevkaSS13 = "0d6y1hjbnr30amcpakrwlmajcab1jlm3r5n7hhrc8d5jz35hqaa8";
+  SGr-IosevkaSS14 = "1l88ipygz2agjcqn44j1i5gnmqjrh793mwan67ilp1z5lgnzhw16";
+  SGr-IosevkaSS15 = "0j1svlf5c62bjhax31l9v2cn4qr5vx7hqpn8znv6035zdahilsqq";
+  SGr-IosevkaSS16 = "0q5dxd5zn75lfsxnvs219ii4nhc9gb6qaf42anzvqh7gq735kavh";
+  SGr-IosevkaSS17 = "0400s8yww3f98p797pppb4i3przdimbn432zah7dk5sgb0ywx95x";
+  SGr-IosevkaSS18 = "1ipbn79y1s095yqcji4wcysshnm1gkacb0xc5qh3lvsw8j2cr0v1";
+  SGr-IosevkaTerm = "1rqydb9y3nv8sb3vw874kr2f2lzphm1q7p1nlvv5sbwcd6fp53kf";
+  SGr-IosevkaTermCurly = "0gb5cxj0lhpi8mlsicfs3g9zzngfia0ggcmydv7c203bnza4d4ml";
+  SGr-IosevkaTermCurlySlab = "18anf1rzxgjc7df9jfr3pv0lxn6r7dn369lydqjlycpqjsfbfm30";
+  SGr-IosevkaTermSlab = "1fb1prmbdddh2jlsjnjw1gszxhccfp3bwjpzzs6b882bkryg8rmz";
+  SGr-IosevkaTermSS01 = "17y2bscaq7fjmy5cvwqycsmkzc5q0mp7lb99n2xrp9mrgf4yhqs0";
+  SGr-IosevkaTermSS02 = "126lpqnsx78i78nqi4l3n2va6588h8aw2ka7c2flj85vr29yisys";
+  SGr-IosevkaTermSS03 = "1wa8xl2m50kml1xj1yw29c3i6yzipqxcsryhi0k509cc9sxgnka7";
+  SGr-IosevkaTermSS04 = "0wfbi0hay0wrkrsa1v7hdy1l64mp5ipfpsl53jgf31panys7c683";
+  SGr-IosevkaTermSS05 = "0jk6cjlada8jxp68q05baw1f04waq5gmi01mipdrnvbw9kc30hyr";
+  SGr-IosevkaTermSS06 = "08jryrlih6kfnjj568i6imkrla1rgjmjr9wal16fng3gzfm8xq3p";
+  SGr-IosevkaTermSS07 = "0jiddj4qwrisq4v597dhvk15bkgiwx22ym64h2s5mkfqi7ddmfg3";
+  SGr-IosevkaTermSS08 = "0gjr3fd1cw78svlcdlq2dv8zzqrqijl57i51yll6g44vycfbfhh9";
+  SGr-IosevkaTermSS09 = "11x29agzb8s3a327zw6sb8sr1qkigc9psi4kinbmqzaxv86qgmx4";
+  SGr-IosevkaTermSS10 = "12x00b7fgci8jikayzhsf1p2qc0mrkff9n1rcq3xbwk03n0dykrn";
+  SGr-IosevkaTermSS11 = "0x836r4ham7ymlmpzxyk3bf3gb11rg40fdlin4liv4dj8mq2l8vb";
+  SGr-IosevkaTermSS12 = "1rk9lzxh1dgsnnk638p0fdxvvrnvbd5nxr3r2hx9qpfv72js19rk";
+  SGr-IosevkaTermSS13 = "0dbfmpx0asjichvgk4r2xi1w1mfsl5j496ih7cs5401vzwxm2xji";
+  SGr-IosevkaTermSS14 = "1433cfzzgxw1kb5alyjgfphq3ihwb8m45wpwnk7q9mlbap47wdff";
+  SGr-IosevkaTermSS15 = "15pi839rj3a72f85bbzxqysaykmd4lkfi9pxcvzr0yy0x2iy1cwz";
+  SGr-IosevkaTermSS16 = "1lfhgg5acmdxhkwwc2mp47sa835yhm0lj558gxcf59nd70hc3wak";
+  SGr-IosevkaTermSS17 = "14qp2i3f8r2bcgw8s8xnrykk34ik5p0d37pypf5rj8ph9fyfdjj1";
+  SGr-IosevkaTermSS18 = "0arw7wwgsr0a530jz7835m49ag4sp71zhs5xbc8sbhi9cqg94rdk";
 }

From e72dfa39891eb149cbfb69c3a8a3f2ac4fa428df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Apr 2025 02:29:08 +0000
Subject: [PATCH 056/117] yoink: 0.5.0 -> 1.0.1

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

diff --git a/pkgs/by-name/yo/yoink/package.nix b/pkgs/by-name/yo/yoink/package.nix
index 8a816e104506..558cca0f8b99 100644
--- a/pkgs/by-name/yo/yoink/package.nix
+++ b/pkgs/by-name/yo/yoink/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.5.0";
+  version = "1.0.1";
 in
 buildGoModule {
   pname = "yoink";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "MrMarble";
     repo = "yoink";
     rev = "v${version}";
-    hash = "sha256-9ftlAECywF4khH279h2qcSvKRDQX2I7GDQ7EYcEybL0=";
+    hash = "sha256-yI3koHVeZWkujpiO0qLj1i4m5l5BiZNZE5ix+IKFwyc=";
   };
 
-  vendorHash = "sha256-cnfh2D/k4JP9BNlI+6FVLBFyk5XMIYG/DotUdAZaY0Q=";
+  vendorHash = "sha256-P1bkugMaVKCvVx7y8g/elsEublHPA0SgeKzWiQCi4vs=";
 
   meta = {
     homepage = "https://github.com/MrMarble/yoink";

From d596c89e1558e8f3368947009d68c77c378e46b2 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 18 Mar 2025 20:20:02 +0100
Subject: [PATCH 057/117] clubhouse-cli: remove

I haven't actually maintained this in a long time it has been failing
to build for a while as well. Upstream has renamed to shortcut years
ago but nobody complained about this package.
Altogether that is pretty strong evidence that this package doesn't
have any users and it that it is best to remove it.
---
 pkgs/by-name/cl/clubhouse-cli/package.nix | 28 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/by-name/cl/clubhouse-cli/package.nix

diff --git a/pkgs/by-name/cl/clubhouse-cli/package.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix
deleted file mode 100644
index f77b9419988b..000000000000
--- a/pkgs/by-name/cl/clubhouse-cli/package.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-}:
-
-buildNpmPackage rec {
-  pname = "clubhouse-cli";
-  version = "2.7.0";
-
-  src = fetchFromGitHub {
-    owner = "andjosh";
-    repo = "clubhouse-cli";
-    rev = "v${version}";
-    hash = "sha256-OGUEPWKL3GBIQHEDljX1gXMRDEztIrJT5ivAIcyW91k=";
-  };
-
-  npmDepsHash = "sha256-QlCLEvmqLVkWwgTVlToYD6bptLp/MVfQ10Wdfr3PIr4=";
-
-  meta = {
-    description = "Command line tool for viewing, creating and updating clubhouse.io stories";
-    homepage = "https://github.com/andjosh/clubhouse-cli";
-    changelog = "https://github.com/andjosh/clubhouse-cli/blob/${src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    mainProgram = "club";
-    maintainers = with lib.maintainers; [ tobim ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 88249e9ca3d3..5a20dad38b58 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -445,6 +445,7 @@ mapAliases {
   clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
   clasp = clingo; # added 2022-12-22
   claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17
+  clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
   cockroachdb-bin = cockroachdb; # 2024-03-15
   codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
   inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17

From 9148419881e97f001a9e9d1b1639b32cb39f6ea4 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 04:09:22 +0800
Subject: [PATCH 058/117] dotbot: 1.20.4 -> 1.21.0

Diff: https://github.com/anishathalye/dotbot/compare/refs/tags/v1.20.4...refs/tags/v1.21.0

Changelog: https://github.com/anishathalye/dotbot/blob/v1.21.0/CHANGELOG.md
---
 pkgs/by-name/do/dotbot/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix
index 7bb4b99872d5..0cd926383768 100644
--- a/pkgs/by-name/do/dotbot/package.nix
+++ b/pkgs/by-name/do/dotbot/package.nix
@@ -6,23 +6,23 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dotbot";
-  version = "1.20.4";
+  version = "1.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anishathalye";
     repo = "dotbot";
     tag = "v${version}";
-    hash = "sha256-GnzN8z7LP9rVD0DnKkPxJ0BxiO1YDY7MyMWBt1CAh6g=";
+    hash = "sha256-f+ykGXcQ1hLptGElQ5ZTt8z0SXnlTbdcf922AVF78bU=";
   };
 
   preCheck = ''
     patchShebangs bin/dotbot
   '';
 
-  nativeBuildInputs = with python3Packages; [ setuptools ];
+  build-system = with python3Packages; [ hatchling ];
 
-  propagatedBuildInputs = with python3Packages; [ pyyaml ];
+  dependencies = with python3Packages; [ pyyaml ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 

From 8f8e30db647c64936b253616cd43108a15eeea6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 00:41:53 +0000
Subject: [PATCH 059/117] snd: 25.2 -> 25.3

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

diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index 69a315d03504..650e37809148 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snd";
-  version = "25.2";
+  version = "25.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
-    hash = "sha256-BPtovk1seGGz/hrIRP5SEjfBIi4trZoKMLJ1v8DE/Tk=";
+    hash = "sha256-YZcMojm68CiyEH8shmoIH9Tl27RSV20q7UId7L9rhYM=";
   };
 
   nativeBuildInputs = [

From 544c415d7b262bce14eb8787f4b59614f37c1e74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 10:46:47 +0000
Subject: [PATCH 060/117] gitlab-runner: 17.10.1 -> 17.11.0

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

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 30f90db82be6..49323dc35e79 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "17.10.1";
+  version = "17.11.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pLmDWZHxd9dNhmbcHJRBxPuY0IpcJoXz/fOJeP1lVlA=";
+    hash = "sha256-Jppy8IG0Oq95RDDkvN1FpXjJuSc3DkfhGgnfpaUSKa4=";
   };
 
-  vendorHash = "sha256-1NteDxcGjsC0kT/9u7BT065EN/rBhaNznegdPHZUKxo=";
+  vendorHash = "sha256-wxFVDkqiqs7jaZEPGyawWfs6h6UgAhCWSckM90G44lA=";
 
   # For patchShebangs
   nativeBuildInputs = [ bash ];

From 1176f0e0dd391c0e8239182dda3e469727a6081e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 19:58:38 +0000
Subject: [PATCH 061/117] chawan: 0-unstable-2025-03-27 ->
 0-unstable-2025-04-18

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

diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index cdb802b357af..acd3bfeed975 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "chawan";
-  version = "0-unstable-2025-03-27";
+  version = "0-unstable-2025-04-18";
 
   src = fetchFromSourcehut {
     owner = "~bptato";
     repo = "chawan";
-    rev = "b2d954b96f227597b62cfae1ac64785bd8f0fb37";
-    hash = "sha256-1kxqzzEMGDFNk25mQX8p7TuADuTMIz+hHZ7p+i7m494=";
+    rev = "656092f399d36c13a551b4a2474c8aded3388b1a";
+    hash = "sha256-GYCmRIswHFM+VehBlf8NSAt0ewrl7SVD0y9lLhFYkvo=";
   };
 
   patches = [ ./mancha-augment-path.diff ];

From bc924d240742d268eb943416ac23d951b399085b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 00:32:00 +0000
Subject: [PATCH 062/117] instawow: 4.8.0 -> 6.0.0

---
 pkgs/games/instawow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/instawow/default.nix b/pkgs/games/instawow/default.nix
index 7f3a0a85b1e9..a3f2d3c36f20 100644
--- a/pkgs/games/instawow/default.nix
+++ b/pkgs/games/instawow/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "instawow";
-  version = "4.8.0";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "layday";
     repo = pname;
     tag = "v${version}";
-    sha256 = "sha256-eOILlbLt7R7EvPgFYnN6Bvj0yOx3KaXTHugspa4/kBc=";
+    sha256 = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
   };
 
   extras = [ ]; # Disable GUI, most dependencies are not packaged.

From 6100bb9fee3bf78096e136b41cf87a7e32563b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 04:37:00 +0000
Subject: [PATCH 063/117] whistle: 2.9.96 -> 2.9.97

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

diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 7f86ab0cdecc..b01768606575 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "whistle";
-  version = "2.9.96";
+  version = "2.9.97";
 
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
     rev = "v${version}";
-    hash = "sha256-+v+wuH/30egnBDMv/IbSIXvuFHaXLle7jvWgIA9n4YM=";
+    hash = "sha256-V6LnwhWTgkEBph/DkENhiUwoetEV8Wj6iGNbRWGWITU=";
   };
 
-  npmDepsHash = "sha256-5mxQOdHFUn/7el67stVb4B2TYGA9uC2/FQa7C/MyiTo=";
+  npmDepsHash = "sha256-td6Nl0ntFzztvE/TIFnYrgy5ny1N9ZCHMMiJpBYnAzA=";
 
   dontNpmBuild = true;
 

From 777a4d3583b07d082b07733e1e784251bb2fffb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 08:02:17 +0000
Subject: [PATCH 064/117] stevenblack-blocklist: 3.15.29 -> 3.15.34

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 6e355c9fd398..19a845a19a8d 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.15.29";
+  version = "3.15.34";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-Ph0Wc7tl5FHZatSK9BNMZ8lNhGdJKx9X3+Px9MaYKyI=";
+    hash = "sha256-FSZzTEQrjY4InqHo1wPbnqqwKHpbfV1Y5JJsYR/c6VU=";
   };
 
   outputs = [

From 09be1d175383818795a7e480df50585286aef934 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 10:29:51 +0000
Subject: [PATCH 065/117] penpot-desktop: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix
index be49f4acccd1..f6db3d0146e4 100644
--- a/pkgs/by-name/pe/penpot-desktop/package.nix
+++ b/pkgs/by-name/pe/penpot-desktop/package.nix
@@ -19,13 +19,13 @@ let
 in
 buildNpmPackage rec {
   pname = "penpot-desktop";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "author-more";
     repo = "penpot-desktop";
     tag = "v${version}";
-    hash = "sha256-ga37rZ70Xfll3y58uKC4d57NJOxQzQZZps/j/baxkPk=";
+    hash = "sha256-ZN0SoPvzZlCGrWOfYw/ain+3+IWLwl6mKLhhArf4MIg=";
   };
 
   makeCacheWritable = true;
@@ -33,7 +33,7 @@ buildNpmPackage rec {
     "--engine-strict"
     "--legacy-peer-deps"
   ];
-  npmDepsHash = "sha256-E8b/L5g+Xt/N3ddOPgm7xkbb5jQtL5ceFtJW6DQN4nA=";
+  npmDepsHash = "sha256-wJpcgSp9V0GJm8I+3LgFwo2Nq/Hu5qW24peKBwNvzMo=";
   # Do not run the default build script as it leads to errors caused by the electron-builder configuration
   dontNpmBuild = true;
 

From 378340cd3f493965b6a2c494419c2a9716bf0ae3 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 24 Apr 2025 14:41:45 +0200
Subject: [PATCH 066/117] neovide: add libX11 to LD_LIBRARY_PATH

This fixes a bug where it wouldn't launch on X.org
---
 pkgs/by-name/ne/neovide/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 3d574e2db026..79d69da40353 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -89,6 +89,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
         [
           libglvnd
           libxkbcommon
+          xorg.libX11
           xorg.libXcursor
           xorg.libXext
           xorg.libXrandr

From 09ac9fdb57a168e0f98005de8d96aa6c5181c6de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 14:20:36 +0000
Subject: [PATCH 067/117] got: 0.110 -> 0.111

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

diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index c856a00b048f..101a4b569182 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.110";
+  version = "0.111";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-NjXkEgXn+FI2pudv94XT2JlxMc81PIzfb20lwDFmHSk=";
+    hash = "sha256-0Jb3bpGnAN0NIvuvlkHCuU+KbeFvCbD0k5yblqnYeM4=";
   };
 
   nativeBuildInputs = [

From 9439477fa4576b31740b4ac56345ce01dfbd7c8f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 24 Apr 2025 23:50:23 +0800
Subject: [PATCH 068/117] aravis: 0.8.33 -> 0.8.34

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

diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix
index 7f2f7ce4a2f3..5447efb9e304 100644
--- a/pkgs/by-name/ar/aravis/package.nix
+++ b/pkgs/by-name/ar/aravis/package.nix
@@ -30,13 +30,13 @@ assert enableViewer -> wrapGAppsHook3 != null;
 
 stdenv.mkDerivation rec {
   pname = "aravis";
-  version = "0.8.33";
+  version = "0.8.34";
 
   src = fetchFromGitHub {
     owner = "AravisProject";
     repo = "aravis";
-    rev = version;
-    sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY=";
+    tag = version;
+    hash = "sha256-6tCV2QyzlMNnkXlRz41JT05FeBcRckHXM50VGY5/BnM=";
   };
 
   outputs = [
@@ -82,6 +82,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # needed for fakegv tests
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Library for video acquisition using GenICam cameras";
     longDescription = ''

From 01c74c6922f3b8875e9d42c0a4f5f444da41c6b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 21:50:38 +0000
Subject: [PATCH 069/117] ente-web: 1.0.0 -> 1.0.4

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

diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 04dc3af39c6e..3c8515170b43 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-hK5CO4FTjh2MNT8pztV/GO7ifOGv1hw32flXrmcUAfk=";
+    hash = "sha256-M1kAZgqjbWNn6LqymtWRmAk/v0vWEGbyS50lVrsr85o=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-n/+HETnwtnpFlfDLA0znCzro5YhNsISweR820QXJFUQ=";
+    hash = "sha256-EYhYwy6+7bgWckU/7SfL1PREWw9JUgKxWadSVtoZwXs=";
   };
 
   nativeBuildInputs = [

From 73873af859ebb4fccce96202c1d82c0c2c9628cd Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 23 Apr 2025 11:25:25 +0200
Subject: [PATCH 070/117] markitdown: unstable-2024-12-18 -> 0.1.1

---
 .../python-modules/markitdown/default.nix     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index a52844307a57..244f9ce8e1ed 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -5,6 +5,7 @@
   hatchling,
   beautifulsoup4,
   ffmpeg-headless,
+  magika,
   mammoth,
   markdownify,
   numpy,
@@ -19,30 +20,38 @@
   requests,
   speechrecognition,
   youtube-transcript-api,
+  olefile,
+  xlrd,
+  lxml,
   pytestCheckHook,
   gitUpdater,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "markitdown";
-  version = "unstable-2024-12-18";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "markitdown";
-    rev = "3ce21a47abed0e4db162de1088d661887ae076ff";
-    hash = "sha256-5YafFL8OHNcGgB/qH6CmX0rTith1ZSRNIa+ktl4Ffvg=";
+    tag = "v${version}";
+    hash = "sha256-siXam2a+ryyLBbciQgjd9k6zC8r46LbzjPMoc1dG0wk=";
   };
 
+  sourceRoot = "${src.name}/packages/markitdown";
+
   build-system = [ hatchling ];
 
   dependencies = [
     beautifulsoup4
     ffmpeg-headless
+    lxml
+    magika
     mammoth
     markdownify
     numpy
+    olefile
     openai
     openpyxl
     pandas
@@ -53,6 +62,7 @@ buildPythonPackage {
     python-pptx
     requests
     speechrecognition
+    xlrd
     youtube-transcript-api
   ];
 
@@ -63,6 +73,9 @@ buildPythonPackage {
   disabledTests = [
     # Require network access
     "test_markitdown_remote"
+    "test_module_vectors"
+    "test_cli_vectors"
+    "test_module_misc"
   ];
 
   passthru.updateScripts = gitUpdater { };

From dbe361baff3b48a8dc598818fcd7b1ea314e7c67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 14:22:54 +0000
Subject: [PATCH 071/117] tt-rss: 0-unstable-2025-03-19 ->
 0-unstable-2025-04-17

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

diff --git a/pkgs/by-name/tt/tt-rss/package.nix b/pkgs/by-name/tt/tt-rss/package.nix
index 49c175446089..8440b319dad4 100644
--- a/pkgs/by-name/tt/tt-rss/package.nix
+++ b/pkgs/by-name/tt/tt-rss/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tt-rss";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-04-17";
 
   src = fetchgit {
     url = "https://git.tt-rss.org/fox/tt-rss.git";
-    rev = "5dcb8db933f1e49526137a55638d26f4d8d2d182";
-    hash = "sha256-8iHWrfyV2Gm4P91E/1Y8Z58Um4r5a1mwJ1Y7vNYpIM8=";
+    rev = "be82663ac9b59de8a135178a519efe9f7ebae213";
+    hash = "sha256-bZrmOOFB5HhiWsV6wWfqv3/wW4rf/05AX7qU+v1IBFE=";
   };
 
   installPhase = ''

From 3b12dc86c510046175ab9ee9814fd6e619b64e48 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sat, 26 Apr 2025 11:19:49 +0800
Subject: [PATCH 072/117] notion-app: 4.6.3 -> 4.9.1

---
 pkgs/by-name/no/notion-app/info.json   | 12 ++++++------
 pkgs/by-name/no/notion-app/package.nix |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json
index a88884f7b803..8bbde63624f3 100644
--- a/pkgs/by-name/no/notion-app/info.json
+++ b/pkgs/by-name/no/notion-app/info.json
@@ -1,12 +1,12 @@
 {
   "x86_64-darwin": {
-    "version": "4.6.3",
-    "url": "https://desktop-release.notion-static.com/Notion-4.6.3.zip",
-    "hash": "sha512-8MVCebWFInBLh8PEnm2hcCW95tncOvaIPx+MxC0xCr377fEpCAU9IlCjhUokKxw/u3sljU7Vfkxhwk/kXjh+PQ=="
+    "version": "4.9.1",
+    "url": "https://desktop-release.notion-static.com/Notion-4.9.1.zip",
+    "hash": "sha512-q32pytnWo9YIXqWFvEa7Pw2FI1S0EAR5O0O33At2l7OVCJLytdV0BavsZtMP+xhDw51TUUYnDsMzkXoTVAzaCQ=="
   },
   "aarch64-darwin": {
-    "version": "4.6.3",
-    "url": "https://desktop-release.notion-static.com/Notion-arm64-4.6.3.zip",
-    "hash": "sha512-aNMx/tZ26KXz0Wb3kajRER6Ni9raItflCCt+aQTKMz3v4SN+wkoad/aKbIugrNB30+4cxeVRJISOZMNWmQryOA=="
+    "version": "4.9.1",
+    "url": "https://desktop-release.notion-static.com/Notion-arm64-4.9.1.zip",
+    "hash": "sha512-DFgQOevvIDIq3zG0O3x3kwmDmtEtpifw0MIB7CPmuAhAix7LJwM2+FxeOXr1YlJF0MaAja5kllMWSyK993Qijw=="
   }
 }
diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix
index 544d6454528e..bd33b998b55c 100644
--- a/pkgs/by-name/no/notion-app/package.nix
+++ b/pkgs/by-name/no/notion-app/package.nix
@@ -5,9 +5,7 @@
   unzip,
 }:
 let
-  info =
-    (builtins.fromJSON (builtins.readFile ./info.json))."${stdenvNoCC.targetPlatform.system}"
-      or (throw "notion-app: unsupported system ${stdenvNoCC.targetPlatform.system}");
+  info = (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin";
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "notion-app";

From 188c9276dbd9e5545d9bf640138b66a02446957a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 14:31:11 +0000
Subject: [PATCH 073/117] aflplusplus: 4.31c -> 4.32c

---
 pkgs/tools/security/aflplusplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index 2a0797668d35..6d5db8f1061b 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -37,13 +37,13 @@ let
   libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; };
   aflplusplus = stdenvNoCC.mkDerivation rec {
     pname = "aflplusplus";
-    version = "4.31c";
+    version = "4.32c";
 
     src = fetchFromGitHub {
       owner = "AFLplusplus";
       repo = "AFLplusplus";
       tag = "v${version}";
-      hash = "sha256-O3NPtQaxcRRFE6H7O6JTsmQsO+iEl8eQxHGKtc+1g8w=";
+      hash = "sha256-Fhf7dHyHd8IGXq7t1y9TwN9VN8SckLRkgfGGMvmqIqk=";
     };
 
     enableParallelBuilding = true;

From f5d220cccd1aeec4502e0f7aea09093009f8b988 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 23 Apr 2025 23:30:20 +0300
Subject: [PATCH 074/117] doc/rl2505: mention addition of `goSum` to
 `buildGoModule`

---
 doc/release-notes/rl-2505.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 346319db23ab..eff151f88b18 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -149,6 +149,8 @@
 
 - `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
 
+- `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes.
+
 - top-level `playwright` now refers to the github Microsoft/playwright package
   instead of the python tester launcher. You can still refer to the python
   launcher via `python3Packages.toPythonApplication python3Packages.playwright`

From 3952f1a06eb6ef8c46b6e5ed84a918ec9cd7917c Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sat, 26 Apr 2025 18:23:13 +0300
Subject: [PATCH 075/117] openbao: Install bash shell completions

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

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index ab59f23068a4..a66e487207dd 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildGoModule,
   go_1_24,
+  installShellFiles,
   versionCheckHook,
   nix-update-script,
   nixosTests,
@@ -43,8 +44,15 @@ buildGoModule.override { go = go_1_24; } (finalAttrs: {
     cp -r --no-preserve=mode ${finalAttrs.passthru.ui} http/web_ui
   '';
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   postInstall = ''
     mv $out/bin/openbao $out/bin/bao
+
+    # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8
+    installShellCompletion --bash --name bao <(echo complete -C "$out/bin/bao" bao)
   '';
 
   nativeInstallCheckInputs = [

From ead2f2c399c417fbedc3296f5e91149dc6fd3878 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 16:56:19 +0000
Subject: [PATCH 076/117] fflogs: 8.16.56 -> 8.17.1

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

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 5f460dff6adf..86eb9ec38189 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.16.56";
+  version = "8.17.1";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-ahStMcNvtvOVK3K9W73gSuymmicuYRWZdpfeFQ5uNCI=";
+    hash = "sha256-ky9MsRo6/wxNNHrAC8BcWkBBgJTtSmssKiU4cADW3kk=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 5761f0acc7c6294d4d8d9e376cb2b4e2e7ea929b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 26 Apr 2025 18:12:32 +0300
Subject: [PATCH 077/117]  docs: update Go section after the addition of
 `goSum` attribute

---
 doc/languages-frameworks/go.section.md | 7 +++++++
 doc/redirects.json                     | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index c23dba3d0cc1..172bf2ca8f37 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -188,6 +188,13 @@ Whether the build result should be allowed to contain references to the Go tool
 
 Defaults to `false`
 
+### `goSum` {#var-go-goSum}
+
+Specifies the contents of the `go.sum` file and triggers rebuilds when it changes. This helps combat inconsistent dependency errors on `go.sum` changes.
+
+Defaults to `null`
+
+
 ## Overriding `goModules` {#buildGoModule-goModules-override}
 
 Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation.
diff --git a/doc/redirects.json b/doc/redirects.json
index 627b4137281d..4884e193a656 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -434,6 +434,9 @@
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],
+  "var-go-goSum": [
+    "index.html#var-go-goSum"
+  ],
   "variables-specifying-dependencies": [
     "index.html#variables-specifying-dependencies"
   ],

From 1990359005998c4023a76f5b81be6d207f4b2448 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 26 Apr 2025 21:57:24 +0200
Subject: [PATCH 078/117] annextimelog: unbreak by relaxing rich

---
 pkgs/by-name/an/annextimelog/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix
index da260dbce7ba..e791ce9f7d8b 100644
--- a/pkgs/by-name/an/annextimelog/package.nix
+++ b/pkgs/by-name/an/annextimelog/package.nix
@@ -28,6 +28,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs=";
   };
 
+  pythonRelaxDeps = [ "rich" ];
+
   nativeBuildInputs =
     with python3.pkgs;
     [

From 54c15419bea7100da112f04bb2fe426c5ba196a7 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Apr 2025 21:41:32 +0200
Subject: [PATCH 079/117] libxmp: modernize

---
 pkgs/by-name/li/libxmp/package.nix | 57 ++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix
index d8b8ba0f3b40..8bcd45813903 100644
--- a/pkgs/by-name/li/libxmp/package.nix
+++ b/pkgs/by-name/li/libxmp/package.nix
@@ -1,27 +1,62 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  docutils,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxmp";
   version = "4.6.2";
 
-  meta = with lib; {
+  src = fetchFromGitHub {
+    owner = "libxmp";
+    repo = "libxmp";
+    tag = "libxmp-${finalAttrs.version}";
+    hash = "sha256-AfHathuBmF9OhtTyt8WabZKzFtnAkX1YeiYFF079z80=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    docutils
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic)
+    (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck)
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "libxmp-(.*)"
+    ];
+  };
+
+  meta = {
     description = "Extended module player library";
     homepage = "https://xmp.sourceforge.net/";
+    changelog = "https://github.com/libxmp/libxmp/releases/tag/${finalAttrs.src.tag}";
     longDescription = ''
       Libxmp is a library that renders module files to PCM data. It supports
       over 90 mainstream and obscure module formats including Protracker (MOD),
       Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).
     '';
-    license = licenses.lgpl21Plus;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
   };
-
-  src = fetchurl {
-    url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz";
-    sha256 = "sha256-rKwXBb4sT7TS1w3AV1mFO6aqt0eoPeV2sIJ4TUb1pLk=";
-  };
-}
+})

From 8861f73b345efe4aefe0858910bf16c23e0a3369 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Apr 2025 22:24:53 +0200
Subject: [PATCH 080/117] libxmp: add marcin-serwin as a maintainer

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

diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix
index 8bcd45813903..c5d177117f59 100644
--- a/pkgs/by-name/li/libxmp/package.nix
+++ b/pkgs/by-name/li/libxmp/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
       over 90 mainstream and obscure module formats including Protracker (MOD),
       Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).
     '';
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
   };

From 841807dd4c62f920d131b13a59eeaab3a0469bb6 Mon Sep 17 00:00:00 2001
From: tri-ler <tylerh689@gmail.com>
Date: Sat, 26 Apr 2025 16:32:58 -0400
Subject: [PATCH 081/117] octoprint.python.pkgs.OctoPrint-OctoPod: 0.3.16 ->
 0.3.18

---
 pkgs/by-name/oc/octoprint/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index c5b076bd2428..a5fcb927f2a6 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -345,13 +345,13 @@ in
 
   octopod = buildPlugin rec {
     pname = "octopod";
-    version = "0.3.16";
+    version = "0.3.18";
 
     src = fetchFromGitHub {
       owner = "gdombiak";
       repo = "OctoPrint-OctoPod";
       rev = version;
-      sha256 = "sha256-9QKC1MsYO3XihOTAijJUv5i20iMSQHOHPfLiYPV5y8s=";
+      sha256 = "sha256-HLR5402hFlUX0MLg3HXE7bIHKNnOI0buGAViqDt8mLc=";
     };
 
     propagatedBuildInputs = with super; [ pillow ];

From 28ba8c5d4da10bec42bc5c9690965b2988352ace Mon Sep 17 00:00:00 2001
From: tri-ler <tylerh689@gmail.com>
Date: Sat, 26 Apr 2025 16:37:45 -0400
Subject: [PATCH 082/117] octoprint.python.pkgs.OctoPrint-PrintTimeGenius:
 2.3.3-> 2.4.0

---
 pkgs/by-name/oc/octoprint/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index a5fcb927f2a6..afb774bb64db 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -366,13 +366,13 @@ in
 
   printtimegenius = buildPlugin rec {
     pname = "printtimegenius";
-    version = "2.3.3";
+    version = "2.4.0";
 
     src = fetchFromGitHub {
       owner = "eyal0";
       repo = "OctoPrint-PrintTimeGenius";
       rev = version;
-      sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U=";
+      sha256 = "sha256-+EmM61s8HHcTIf0xoHkxEP7eqaNYB6ls61YwSXiVzyA=";
     };
 
     propagatedBuildInputs = with super; [

From 63fd59fdcd7862c97f01986e8223f7478928cd50 Mon Sep 17 00:00:00 2001
From: tri-ler <tylerh689@gmail.com>
Date: Sat, 26 Apr 2025 16:47:11 -0400
Subject: [PATCH 083/117] octoprint: fix octoprint plugin build

---
 pkgs/by-name/oc/octoprint/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index c5b076bd2428..e8b1dd76e934 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -16,7 +16,7 @@ let
       // {
         pname = "octoprint-plugin-${args.pname}";
         inherit (args) version;
-        propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ self.octoprint ];
+        propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ];
         # none of the following have tests
         doCheck = false;
       }

From 719d2f46f69f6d8aec076296231f1cd2a9633ada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 20:48:52 +0000
Subject: [PATCH 084/117] steampipePackages.steampipe-plugin-github: 1.0.0 ->
 1.3.0

---
 .../steampipe-packages/steampipe-plugin-github/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
index a5d37bab6dcd..61eec29a263a 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-github";
-  version = "1.0.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-github";
     tag = "v${version}";
-    hash = "sha256-FEoDpiLlHwIRtrugaiVUrQzURFIB58iRQlQ6fuJatAg=";
+    hash = "sha256-5VFy1cmuadNcay1cqB5K9lPGrO++shkSSaaAGAOzt5w=";
   };
 
-  vendorHash = "sha256-EVcPpFzRd9EmyuPqZBQjSNEB4BEbU8Km6Y/f+ulfK5s=";
+  vendorHash = "sha256-zOIZRAbB6Hace1F0juxTlh2uApeW8r0A4XAe3SeeKoc=";
 
   ldflags = [
     "-s"

From f503fd25a09a87925ae34f04c7a4e66098fc245f Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 27 Apr 2025 00:00:57 +0300
Subject: [PATCH 085/117] openbao: Don't use explicit Go version

---
 pkgs/by-name/op/openbao/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index a66e487207dd..6d0f3262cf10 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  go_1_24,
   installShellFiles,
   versionCheckHook,
   nix-update-script,
@@ -13,7 +12,7 @@
   withHsm ? stdenvNoCC.hostPlatform.isLinux,
 }:
 
-buildGoModule.override { go = go_1_24; } (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "openbao";
   version = "2.2.1";
 

From 4c551df55e568aeb38b4c307e48579c293638505 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 27 Apr 2025 07:30:30 +1000
Subject: [PATCH 086/117] awsebcli: disable tests that fails on hydra

---
 pkgs/by-name/aw/awsebcli/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index bda6bc7941f3..be5509883db8 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -85,6 +85,10 @@ python.pkgs.buildPythonApplication rec {
 
     # AssertionError: Expected 'echo' to be called once. Called 2 times
     "test_multiple_modules__one_or_more_of_the_specified_modules_lacks_an_env_yaml"
+
+    # fails on hydra only on aarch64-linux
+    # ebcli.objects.exceptions.CredentialsError: Operation Denied. You appear to have no credentials
+    "test_aws_eb_profile_environment_variable_found__profile_exists_in_credentials_file"
   ];
 
   meta = with lib; {

From 66a535b2f753f6777d81a1ee14dc6faa33fd3cf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 22:14:39 +0000
Subject: [PATCH 087/117] python312Packages.scikit-hep-testdata: 0.5.3 -> 0.5.4

---
 .../python-modules/scikit-hep-testdata/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
index 4d76471e2d34..6f0d26e69d48 100644
--- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-hep-testdata";
-  version = "0.5.3";
+  version = "0.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "scikit-hep-testdata";
     tag = "v${version}";
-    hash = "sha256-T325BqQquuTwSKaei4O+UBzzB+OIXhubdPNaBmVkrCk=";
+    hash = "sha256-LDOBd+0Aw/x9qW30Tb0B9AlhckOkJhY+Mx4ERkvDbJc=";
   };
 
   build-system = [ setuptools-scm ];

From 76c5b6cc002a96d9cc10bf9cf052357d5ef022d5 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 26 Apr 2025 15:26:20 -0700
Subject: [PATCH 088/117] doc: remove useFetchCargoVendor

---
 doc/hooks/tauri.section.md               | 1 -
 doc/languages-frameworks/rust.section.md | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md
index b46b738d5c88..8382d8c27316 100644
--- a/doc/hooks/tauri.section.md
+++ b/doc/hooks/tauri.section.md
@@ -26,7 +26,6 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
 rustPlatform.buildRustPackage (finalAttrs: {
   # ...
 
-  useFetchCargoVendor = true;
   cargoHash = "...";
 
   # Assuming our app's frontend uses `npm` as a package manager
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 9f1f0603523a..5078de14d80f 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
 
   meta = {
@@ -113,7 +112,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4=";
   cargoDepsName = finalAttrs.pname;
 
@@ -1011,7 +1009,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
 
   # Tests require network access. Skipping.

From 4045aa876c9f941c8d09389058fb1a5de869ca27 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:30 +0200
Subject: [PATCH 089/117] clairvoyance: unbreak with pythonRelaxDeps

---
 pkgs/by-name/cl/clairvoyance/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix
index f8bbe77a1402..c54c6db6bbe0 100644
--- a/pkgs/by-name/cl/clairvoyance/package.nix
+++ b/pkgs/by-name/cl/clairvoyance/package.nix
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA=";
   };
 
+  pythonRelaxDeps = [ "rich" ];
+
   nativeBuildInputs = with python3.pkgs; [
     poetry-core
   ];

From 4905f36691b48ca527682763da44913322fd2a6d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:30 +0200
Subject: [PATCH 090/117] memtree: unbreak with pythonRelaxDeps

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

diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix
index 7a6ed7a323af..cecc37df961c 100644
--- a/pkgs/by-name/me/memtree/package.nix
+++ b/pkgs/by-name/me/memtree/package.nix
@@ -17,6 +17,8 @@ python3Packages.buildPythonApplication {
     hash = "sha256-Ifp8hwkuyBw57fGer3GbDiJaRjL4TD3hzj+ecGXWqI0=";
   };
 
+  pythonRelaxDeps = [ "rich" ];
+
   nativeBuildInputs = with python3Packages; [
     poetry-core
   ];

From 54c9fb735ed45fcb5aa80962ab915fa241eeedef Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:31 +0200
Subject: [PATCH 091/117] myfitnesspal: unbreak with pythonRelaxDeps

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

diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix
index eec0de5766d5..79ff95e4a560 100644
--- a/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/pkgs/development/python-modules/myfitnesspal/default.nix
@@ -31,6 +31,8 @@ buildPythonPackage rec {
     hash = "sha256-eE807M8qFDlSMAcE+GFJyve1YfmlWmB3ML9VJhMUeIE=";
   };
 
+  pythonRelaxDeps = [ "typing-extensions" ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [

From 89f3e17f5fb739f1593acb31efe996908b0eec5a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:31 +0200
Subject: [PATCH 092/117] python313Packages.awswrangler: unbreak with
 pythonRelaxDeps

---
 pkgs/development/python-modules/awswrangler/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index 9c614d27d542..dd1c755c047d 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -21,6 +21,7 @@
   pythonOlder,
   redshift-connector,
   requests-aws4auth,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -37,7 +38,10 @@ buildPythonPackage rec {
     hash = "sha256-dIdNrfhBrfrzXmspw25yd/y6MbXRrLfDveCQk+AERV0=";
   };
 
-  pythonRelaxDeps = [ "packaging" ];
+  pythonRelaxDeps = [
+    "packaging"
+    "pyarrow"
+  ];
 
   build-system = [ poetry-core ];
 
@@ -54,6 +58,7 @@ buildPythonPackage rec {
     pymysql
     redshift-connector
     requests-aws4auth
+    setuptools
   ];
 
   optional-dependencies = {

From d251222653394ff8a64ce8b285883d7033d793d2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:31 +0200
Subject: [PATCH 093/117] python313Packages.bilibili-api-python: unbreak with
 pythonRelaxDeps

---
 pkgs/development/python-modules/bilibili-api-python/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix
index 79d7854d1edb..1f524dab9ce5 100644
--- a/pkgs/development/python-modules/bilibili-api-python/default.nix
+++ b/pkgs/development/python-modules/bilibili-api-python/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "beautifulsoup4"
     "lxml"
+    "pillow"
   ];
 
   build-system = [

From 9530d7b9be82d327b1aca7e100aca07ac8b5fa82 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:32 +0200
Subject: [PATCH 094/117] python313Packages.bloodyad: unbreak with
 pythonRelaxDeps

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

diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 1d56dee30547..2c148cc8fd54 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -28,6 +28,8 @@ buildPythonPackage rec {
     hash = "sha256-XqCP2GfS8hxlFU4Mndeh+7Ll2kXJ3Dei+AGp/oy0PUg=";
   };
 
+  pythonRelaxDeps = [ "cryptography" ];
+
   build-system = [ hatchling ];
 
   dependencies = [

From 1fa78f6be7ba4d8d604b9e124ef4295fa1c2ad38 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:32 +0200
Subject: [PATCH 095/117] python313Packages.datamodel-code-generator: unbreak
 with pythonRelaxDeps

---
 .../python-modules/datamodel-code-generator/default.nix      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix
index d247304b8ee2..f4a8c4377666 100644
--- a/pkgs/development/python-modules/datamodel-code-generator/default.nix
+++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix
@@ -35,7 +35,10 @@ buildPythonPackage rec {
     hash = "sha256-CYNEpQFIWR7i7I7YJ5q/34KNhtQ7cjya97Z0fyeO5g8=";
   };
 
-  pythonRelaxDeps = [ "inflect" ];
+  pythonRelaxDeps = [
+    "inflect"
+    "isort"
+  ];
 
   build-system = [
     poetry-core

From 39fbf9cb709c357e305edb07e8cae862992ffb15 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:32 +0200
Subject: [PATCH 096/117] python313Packages.linien-common: unbreak with
 pythonRelaxDeps

---
 pkgs/development/python-modules/linien-common/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix
index 18b2160d98a6..8220badafc79 100644
--- a/pkgs/development/python-modules/linien-common/default.nix
+++ b/pkgs/development/python-modules/linien-common/default.nix
@@ -31,7 +31,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  pythonRelaxDeps = [ "importlib-metadata" ];
+  pythonRelaxDeps = [
+    "importlib-metadata"
+    "numpy"
+  ];
 
   dependencies = [
     importlib-metadata

From ca70ba25be6cc0cea19b1f13444ae0ac39597c58 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:33 +0200
Subject: [PATCH 097/117] python313Packages.mistral-common: unbreak with
 pythonRelaxDeps

---
 .../python-modules/mistral-common/default.nix          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 0ca7d66db6f1..c3b3ecabe620 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -25,12 +25,10 @@ buildPythonPackage rec {
     hash = "sha256-CvQSSrCdFAl2HpHsYWgUdogtRvlBjuqJCNOcASIuD2s=";
   };
 
-  # relax dependencies
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'pillow = "^10.3.0"' 'pillow = ">=10.3.0"' \
-      --replace-fail 'tiktoken = "^0.7.0"' 'tiktoken = ">=0.7.0"' \
-  '';
+  pythonRelaxDeps = [
+    "pillow"
+    "tiktoken"
+  ];
 
   build-system = [ poetry-core ];
 

From 0660f6e01cfef70119710337adeba0b6b3716662 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:33 +0200
Subject: [PATCH 098/117] python313Packages.notifications-android-tv: unbreak
 with pythonRelaxDeps

---
 .../python-modules/notifications-android-tv/default.nix         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/notifications-android-tv/default.nix b/pkgs/development/python-modules/notifications-android-tv/default.nix
index ae5e5417d76c..ee52b7e54eab 100644
--- a/pkgs/development/python-modules/notifications-android-tv/default.nix
+++ b/pkgs/development/python-modules/notifications-android-tv/default.nix
@@ -23,6 +23,8 @@ buildPythonPackage rec {
     hash = "sha256-JUvxxVCiQtywAWU5AYnPm4SueIWIXkzLxPYveVXpc2E=";
   };
 
+  pythonRelaxDeps = [ "httpx" ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [ httpx ];

From f1da306515bbec78bf1fd364d4414c84284384cb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:33 +0200
Subject: [PATCH 099/117] python313Packages.pygount: unbreak with
 pythonRelaxDeps

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

diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index c6c01e6988d5..f6d8cd3d55e2 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
     hash = "sha256-PFqcSnJoGL4bXFy3hu3Iurbb8QK1NqCDs8aJmMxP4Hc=";
   };
 
+  pythonRelaxDeps = [ "rich" ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [

From d8e7795af25e48b89d43fe69cd73b1ace6e87e03 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:34 +0200
Subject: [PATCH 100/117] python313Packages.sagemaker-core: unbreak with
 pythonRelaxDeps

---
 pkgs/development/python-modules/sagemaker-core/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 830451f1c4be..3f14d0c60b46 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -46,6 +46,7 @@ buildPythonPackage rec {
     "boto3"
     "importlib-metadata"
     "mock"
+    "rich"
   ];
 
   dependencies = [

From 2b1768ce7bb954989827963a6b2d4ad2998610ac Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:33:34 +0200
Subject: [PATCH 101/117] unblob: unbreak with pythonRelaxDeps

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

diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix
index 6bae7389f623..741d548a97f7 100644
--- a/pkgs/by-name/un/unblob/package.nix
+++ b/pkgs/by-name/un/unblob/package.nix
@@ -87,6 +87,8 @@ python3.pkgs.buildPythonApplication rec {
     "ubi-reader"
   ];
 
+  pythonRelaxDeps = [ "rich" ];
+
   pythonImportsCheck = [ "unblob" ];
 
   makeWrapperArgs = [

From 58a7293c16a90eef65b1d9c7a27372a546364a40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 03:03:57 +0000
Subject: [PATCH 102/117] serie: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 4f6840a43f06..8888b8870555 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-JTrXsakXsDuEzRs7y3OgdvfWw8vvF1IvajHi7KueoPI=";
+    hash = "sha256-26B/bwXz60fcZrh6H1RPROiML44S1Pt1J3VrJh2gRrI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+5mUMB4rqLePimfgWlV7UP8B1lPoKzfWCXBBN1q2WIU=";
+  cargoHash = "sha256-Bdk553tECJiMxJlXj147Sv2LzH+nM+/Cm5BpBr78I4o=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From 9b777e727a562bede4bffd5aed540eaac99863fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 03:36:50 +0000
Subject: [PATCH 103/117] python312Packages.json-repair: 0.40.0 -> 0.42.0

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index a78e244fbbf1..3a3505b41ab4 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.40.0";
+  version = "0.42.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-pM2Y0PAsSWXfcyCbWLNSZnpZTeDfN7F8WsY/jtH5I6o=";
+    hash = "sha256-gWZmDljbV1CbVjBDqImvhF2LF0uhqsiZ5mF3fuGf6HQ=";
   };
 
   build-system = [ setuptools ];

From 8bf18535f7d06af436dff70024ca977e42463684 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 03:55:40 +0000
Subject: [PATCH 104/117] remnote: 1.19.15 -> 1.19.22

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 10f945281650..28e43ea60c01 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.19.15";
+  version = "1.19.22";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-gmhpxh/u5Ror3V2BMjAJzaWs66+nrsUiBXkVd5G8B/E=";
+    hash = "sha256-ecMAHUD/qZaWquO65WcSoiAGQEXaJpTjm12z/raf0AA=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From 7d9badd4ccc9d26b3cac1fde61ea025d957eb87b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 05:10:48 +0000
Subject: [PATCH 105/117] inori: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix
index 69547bc0f439..27555ee4d410 100644
--- a/pkgs/by-name/in/inori/package.nix
+++ b/pkgs/by-name/in/inori/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inori";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "eshrh";
     repo = "inori";
     tag = "v${version}";
-    hash = "sha256-UKYRqiwqyYh1ZQH4yAm2ALJjxCkczHAURy/Pob4S29g=";
+    hash = "sha256-w+UsG4CHdug6TITJLjhHsQeAhHenzDFnZLICDT0Z1UM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0ITazN1eGAuuy0QR8GdnU0Z6Nz44R/8kByWyHIr0P60=";
+  cargoHash = "sha256-AvYNeWyitoi9hDqiy5hl/VM4LO8J2xmLgl0y8P4xYNA=";
 
   passthru.updateScript = nix-update-script { };
 

From 77607ff8c9606962e7154f4cc043d9ee172b77ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 05:54:23 +0000
Subject: [PATCH 106/117] application-title-bar: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix
index c34b69026b4f..e607dd3c9163 100644
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "application-title-bar";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "antroids";
     repo = "application-title-bar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VlZlcPBGwV8Gyqm8CjwUZdaQgTiPLsSxj0iIXKbLEpE=";
+    hash = "sha256-YSzXjFPCG/bs1Qm9YvoEDcM9GmlSosf2KAyz+7lx6Xg=";
   };
 
   propagatedUserEnvPkgs = with kdePackages; [ kconfig ];

From 16779339ec720a33f0db6cd80e2058745e93cb93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 06:41:31 +0000
Subject: [PATCH 107/117] drone-scp: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix
index 07d38d2e6623..7e8b3b83205c 100644
--- a/pkgs/by-name/dr/drone-scp/package.nix
+++ b/pkgs/by-name/dr/drone-scp/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "drone-scp";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "appleboy";
     repo = "drone-scp";
     rev = "v${version}";
-    hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg=";
+    hash = "sha256-qIIPvh+y1xPTXRGqUyCG2BnHQsgFlkbfi46vfM/Zgjg=";
   };
 
-  vendorHash = "sha256-2FEHklEa6TIB3jhmxR2yosPbtqMJcxeIDDnT2X2Xm+U=";
+  vendorHash = "sha256-OCxqdb0VQP1jIRkiiAiyhRy15MiW2i9JbEATMedM0Bg=";
 
   # Needs a specific user...
   doCheck = false;

From 758c4dbcbd50c91c151fb68ac22725d1ca86816c Mon Sep 17 00:00:00 2001
From: deftdawg <deftdawg@gmail.com>
Date: Sun, 27 Apr 2025 02:47:34 -0400
Subject: [PATCH 108/117] lmstudio: 0.3.14-5 -> 0.3.15-11 (#401615)

- lmstudio: 0.3.14-5 -> 0.3.15-11
- Fixes to update.sh
- Fixes to derivation updateScript handling (thanks @numinit)
---
 pkgs/by-name/lm/lmstudio/darwin.nix  |  3 +++
 pkgs/by-name/lm/lmstudio/linux.nix   |  3 ++-
 pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------
 pkgs/by-name/lm/lmstudio/update.sh   |  6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix
index 9b2acdf5929a..f18a880feabe 100644
--- a/pkgs/by-name/lm/lmstudio/darwin.nix
+++ b/pkgs/by-name/lm/lmstudio/darwin.nix
@@ -7,6 +7,7 @@
   version,
   url,
   hash,
+  passthru,
 }:
 stdenv.mkDerivation {
   inherit meta pname version;
@@ -47,4 +48,6 @@ stdenv.mkDerivation {
     echo 'Copying extracted content into "sourceRoot"'
     cp -a $mnt/LM\ Studio.app $PWD/
   '';
+
+  inherit passthru;
 }
diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix
index df9421c581c4..5b6e09171819 100644
--- a/pkgs/by-name/lm/lmstudio/linux.nix
+++ b/pkgs/by-name/lm/lmstudio/linux.nix
@@ -8,7 +8,7 @@
   meta,
   stdenv,
   lib,
-  patchelf,
+  passthru,
 }:
 let
   src = fetchurl { inherit url hash; };
@@ -21,6 +21,7 @@ appimageTools.wrapType2 {
     pname
     version
     src
+    passthru
     ;
 
   extraPkgs = pkgs: [ pkgs.ocl-icd ];
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index ba5eb9c4d2b0..5da2f785865f 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,12 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.14-5";
-  hash_aarch64-darwin = "sha256-8OTfjEZ27ubRFvRQ84em2Gz3mS9w3oev41Qg6MMNjNU=";
-  version_x86_64-linux = "0.3.14-5";
-  hash_x86_64-linux = "sha256-WrO95ez81/A0U1Tt1Oi2PyUp6nvsmQMzK0VUVH1TYbg=";
-
-  passthru.updateScript = ./update.sh;
+  version_aarch64-darwin = "0.3.15-11";
+  hash_aarch64-darwin = "sha256-Bi5UbZR0fDYF+x9mtFaqZsOZZ1gMQAJN+IS/ST/5Wkc=";
+  version_x86_64-linux = "0.3.15-11";
+  hash_x86_64-linux = "sha256-EfynIN6DGSvzOgI+E7CxycJ2KUlFZx2YRwRihjhE3SM=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
@@ -31,6 +29,7 @@ in
 if stdenv.hostPlatform.isDarwin then
   callPackage ./darwin.nix {
     inherit pname meta;
+    passthru.updateScript = ./update.sh;
     version = version_aarch64-darwin;
     url =
       args.url
@@ -40,6 +39,7 @@ if stdenv.hostPlatform.isDarwin then
 else
   callPackage ./linux.nix {
     inherit pname meta;
+    passthru.updateScript = ./update.sh;
     version = version_x86_64-linux;
     url =
       args.url
diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh
index efbaf5a7d8d2..4b9f5ef47560 100755
--- a/pkgs/by-name/lm/lmstudio/update.sh
+++ b/pkgs/by-name/lm/lmstudio/update.sh
@@ -5,12 +5,14 @@ set -euo pipefail
 
 packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)"
 for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do
-  set -- ${system}
+  # shellcheck disable=SC2086
+  set -- ${system} # split string into variables $1 and $2
 
   arch="${1}"
   url=$(echo "${packages}" | grep "${2}")
   version="$(echo "${url}" | cut -d/ -f6)"
   hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")")
 
-  update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}"
+  update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" \
+    2> >(tee /dev/stderr) | grep -q "nothing to do" && exit
 done

From b440303b0d0455d72cc4b3b443e1851a0e468585 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 06:58:14 +0000
Subject: [PATCH 109/117] gitlab-ci-local: 4.58.0 -> 4.59.0

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

diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index 0e1250e287f1..bfe81443feaa 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -12,16 +12,16 @@
 
 buildNpmPackage rec {
   pname = "gitlab-ci-local";
-  version = "4.58.0";
+  version = "4.59.0";
 
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
     rev = version;
-    hash = "sha256-4Hn/I0PJ5w+Wb3tI8szy4I/vHso85GTFyT2Ek+WbYxs=";
+    hash = "sha256-4C+96rPtEFDJc08D5qXEuNvoDWJR5drvsvZ6mCGd5Vo=";
   };
 
-  npmDepsHash = "sha256-fndSJd15sZ/sIFvh+MzNw25kuP9D9+Qc0mDqgnvjnPo=";
+  npmDepsHash = "sha256-brzCPG/keYOGfjqnj8mP28OdSAKTbDQWBxN4oMLHoNU=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 36ea1b4b534724b9cca3ff45347663752f429a8e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 27 Apr 2025 06:38:30 +0100
Subject: [PATCH 110/117] diffstat: 1.67 -> 1.68

Changes: https://invisible-island.net/diffstat/CHANGES.html#t20250424
---
 pkgs/by-name/di/diffstat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix
index e1d8a43e804b..acecb08db22d 100644
--- a/pkgs/by-name/di/diffstat/package.nix
+++ b/pkgs/by-name/di/diffstat/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "diffstat";
-  version = "1.67";
+  version = "1.68";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz"
       "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz"
     ];
-    hash = "sha256-dg7QyZxtZDI41BuA5gJ4zxaD/7lKKDlUrH7xaMhSdmo=";
+    hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc=";
   };
 
   buildInputs = [ zstd ];

From 75f676844c9002d6317404da606257694a5a8321 Mon Sep 17 00:00:00 2001
From: Xarvex <dev.ellz6@xarvex.simplelogin.com>
Date: Sun, 27 Apr 2025 02:33:20 -0500
Subject: [PATCH 111/117] vencord: include `package.json` checked by Vesktop

Check for package.json is now being done in 1.5.6 of Vesktop, add this file to
the package output so the validity check passes.

See: https://github.com/Vencord/Vesktop/commit/d39c54b3ee5a2c8374af6d6586261b12e9fca489
---
 pkgs/by-name/ve/vencord/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 099f7996246a..b0dbbf1433d9 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
+    cp package.json $out # Presence is checked by Vesktop.
     cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out
 
     runHook postInstall

From 4684b386d10b81b26fea96713f6eeff567bd1bf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 07:57:28 +0000
Subject: [PATCH 112/117] rasm: 2.3.5 -> 2.3.6

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index dc54feb8c222..caf7289e1e73 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasm";
-  version = "2.3.5";
+  version = "2.3.6";
 
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
     rev = "v${version}";
-    hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74=";
+    hash = "sha256-U4bsOU76eNGBSDVEduxqbKqxcq7tIHQZldbe/ElZm+A=";
   };
 
   # by default the EXEC variable contains `rasm.exe`

From 0c705f5b328462ccf492d9f6ecfe6ecba5a7d366 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 09:23:42 +0000
Subject: [PATCH 113/117] bitrise: 2.30.6 -> 2.31.0

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

diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 5b0fc36cc8ab..0d9185aa383e 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.30.6";
+  version = "2.31.0";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${version}";
-    hash = "sha256-XMfBkn139BPdcSzC1ByXFxIKXNXgj2ktHjp29DO6API=";
+    hash = "sha256-zCa8qOrjavrUDi2n7KpSS5+hgDH9dCMwb6AjQ3bKACs=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

From a9d1b88cb30d90667c9995ef7bd8e4a81d79943c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 08:44:44 +0000
Subject: [PATCH 114/117] python312Packages.momepy: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix
index 5e0998cb4917..40e17a6ef446 100644
--- a/pkgs/development/python-modules/momepy/default.nix
+++ b/pkgs/development/python-modules/momepy/default.nix
@@ -19,15 +19,15 @@
 
 buildPythonPackage rec {
   pname = "momepy";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "pysal";
     repo = "momepy";
     tag = "v${version}";
-    hash = "sha256-9bFPxpopmrwNKdCEF+jlPRoNiVFrngW+sMeshq2EDYU=";
+    hash = "sha256-9A1g2WSH1kIXO/BeF8ebcigshfcR8MrT2Ut5K/oxVM4=";
   };
 
   build-system = [ setuptools-scm ];

From 3e759afd5bffe086e40f62bc57105da3de799172 Mon Sep 17 00:00:00 2001
From: Xarvex <dev.ellz6@xarvex.simplelogin.com>
Date: Sun, 27 Apr 2025 04:51:45 -0500
Subject: [PATCH 115/117] vencord: fixup cp order,  does not exist

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

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index b0dbbf1433d9..2615406b4c61 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    cp package.json $out # Presence is checked by Vesktop.
     cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out
+    cp package.json $out # Presence is checked by Vesktop.
 
     runHook postInstall
   '';

From 6c4024ba169d194c9ca4bb11a926da73df914b11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 10:43:10 +0000
Subject: [PATCH 116/117] signal-desktop: 7.51.0 -> 7.52.0

---
 pkgs/by-name/si/signal-desktop/package.nix    |  10 +-
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |   6 +-
 .../si/signal-desktop/signal-sqlcipher.nix    |   4 +-
 .../si/signal-desktop/webrtc-sources.json     | 132 ++++++++++--------
 4 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 8e34eba56767..57b5baece03b 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -65,13 +65,13 @@ let
     '';
   });
 
-  version = "7.51.0";
+  version = "7.52.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-q857FcZgBGjB7/IKr+oD7wmOCUV8lso6kch4nIYtrCA=";
+    hash = "sha256-dV99PUcXhFwdI6VmS3tuvLYNkPMJOFhxg+lbDqIV7Ms=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -131,15 +131,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-cWXbymy+AqaqDvK8szRWzFPH9jrMjQ9WEw2lRFcCnz8="
+        "sha256-fCA1tBpj0l3Ur9z1o1IAz+HtfDlC5DzPa3m1/8NsFkY="
       else
-        "sha256-oTH4wy5RIgrZcMuO/AB/561lvx6JZ4BM9xjjOzl/CA4=";
+        "sha256-XQzjctXrpIy1zCWshJY2bA1BvKJ2o2cBA8/ikNYKXok=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1744907672;
+    SOURCE_DATE_EPOCH = 1745425141;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 011a4988ba2f..88cb30cf4ae0 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.50.4";
+  version = "2.50.5";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r2HyhrYCCPdV5tFayHyY4R3qjK8ksF56Wq98GuQWmO0=";
+    hash = "sha256-qBIm5gMwnTHR0PjO4xjyka0ebR6JAOcCJ/JqcyhPP6Q=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QkEqtv/novbQOcaHKE51ivQjY4mf6Gju4uM7AT7j1P0=";
+  cargoHash = "sha256-VLefmYCotBwppcKUrVfi1ikfompQsaYZ9cYbHU93iwA=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 37ebead94a60..bc75d98c8421 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fuChNio2iWYuxIj40jW1lJCZItnQKrzX7m1gJeeajvs=";
+    hash = "sha256-piHgAcUdmJo09UG/840GOim3TrlM1Wbzh2wceC1xb9k=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index f72ef145f67c..83a70c93778c 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,33 +1,33 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-xKv606lqGgC27sf5WVPxkVRI5wixmRxQvOs1+pgORxc=",
+            "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "rev": "6834g"
+            "rev": "6998a"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/base": {
         "args": {
-            "hash": "sha256-1e9jieGg8q0jrVkxN5chnslHTVkuul6ZAkaNrphF75s=",
-            "rev": "69f3676cdbd05660c136a6cc3b23383cbabe53d8",
+            "hash": "sha256-hglQbmk4pfkzhHPXPGPrjN60VfpEbCn3mbOkM1kcjhE=",
+            "rev": "e0914b7606a151a3a12e994c400519f2e291c53f",
             "url": "https://chromium.googlesource.com/chromium/src/base"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/build": {
         "args": {
-            "hash": "sha256-Si7wgZ895XWALVdMLiKoACB8w6H5IUvpKIOdtasfbCs=",
-            "rev": "05874e6c9429039f1747034af61de1fe2ea1ed06",
+            "hash": "sha256-f7sLdyVzuWsVMsH21tLBDPadEJPyzSWhk8f97P7Meko=",
+            "rev": "64e296c42a93fbd27acc9a94713e4289273409b2",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-XbY2NHW5twzMpACa689F0n3Pie2RJOFeu2JNOM1yERM=",
-            "rev": "db0eae9640184fb132061f248f6108771a6ea2d4",
+            "hash": "sha256-w6CVjFp5hkRHscXF7qUJ/Ei9Nl7lqBcGnwHXmjrehHw=",
+            "rev": "a660247d3c14a172b74b8e832ba1066b30183c97",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -43,40 +43,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-P8zXemUOv6dpElAW7zmiy6L26nPeQk7R08zqz3Iatls=",
-            "rev": "eac4c18f749488d7232af275405e0e1b67d84cb3",
+            "hash": "sha256-VQJ0hqEI2QIFPKZwLCAtUtKuPkJndvndtK4lGRiX20M=",
+            "rev": "63412fdcdfe281e6b9531a5e1086a59c0b9e6909",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-6Hhx+aLqZgs8/Ykn5YilzsRlqbh48Uj5W5rY5CBMwf8=",
-            "rev": "9d80a193fbfe8e2f2a29be2efeee93de9a826dcb",
+            "hash": "sha256-88mIRDQvFeCcwiLPt4cyFE/xfmEJ95xB93uUcRPe670=",
+            "rev": "d212a71416ad7c6ceca04d6d27dfdd84fd00c04c",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-glHy/C18/oHy77IUC9uHaMA9IhbcaO0X/Ek+RoFwZFg=",
-            "rev": "0fa9014d861f024e28fb491ed7b1cfd44103dee7",
+            "hash": "sha256-Mrv/aV7RjDLPVi0QN7p1qJ3M8zHWogcq+u2F+S1LoNE=",
+            "rev": "d4b6eb542d4fd109baacd550935efd00c521e674",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=",
-            "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374",
+            "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=",
+            "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M=",
-            "rev": "44791916611acec1cd74c492c7453e46d9b0dbd2",
+            "hash": "sha256-XtQclu96NHJxt8kJCyp8iaJUkTI2bS+q6NRwvIgmhX8=",
+            "rev": "b15611f18b506cf9dbc03e9bf87dbc8df549ccce",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -91,8 +91,8 @@
     },
     "src/third_party/clang-format/script": {
         "args": {
-            "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=",
-            "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
+            "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
+            "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -115,24 +115,24 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo=",
-            "rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2",
+            "hash": "sha256-Ft71Ubirlpi7IJcNDFIfyZqmR2Xxv68PiEOfg7JhLuU=",
+            "rev": "edb16889d16f5e13161b6e8f7a839cd82d7d655d",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=",
-            "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
+            "hash": "sha256-Qea35ZMbVtvdFPmge0ShrEW0p17Z1UJUGdBTaxaZ5gQ=",
+            "rev": "80d1969422e75e8e9eecafa46074074b289e2568",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM=",
-            "rev": "686d6944501a6ee9c849581e3fe343273d4af3f6",
+            "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=",
+            "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -155,40 +155,40 @@
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA=",
-            "rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0",
+            "hash": "sha256-wKzsJ5SXicsLXs0M2+usPz72gy8IsmQGTD3RGKYnhgo=",
+            "rev": "a059b237bb01eb3e4f9f8b1618dda8c117498bab",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o=",
-            "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
+            "hash": "sha256-KjO8h5KS7/3vP8zRY2I09nIA/eJHKnmBuY8i8KU81KQ=",
+            "rev": "00edfa0dd94d7e00a89684e950015c30d3b7ae07",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/google_benchmark/src": {
         "args": {
-            "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=",
-            "rev": "344117638c8ff7e239044fd0fa7085839fc03021",
+            "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+            "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
             "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M=",
-            "rev": "62df7bdbc10887e094661e07ec2595b7920376fd",
+            "hash": "sha256-9hPtc5kLEaetJXqtcneXFOcC2z5AdkvWGYgKMSB+vbs=",
+            "rev": "2b6b042a77446ff322cd7522ca068d9f2a21c1d1",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
-            "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
+            "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=",
+            "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -203,24 +203,24 @@
     },
     "src/third_party/harfbuzz-ng/src": {
         "args": {
-            "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=",
-            "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
+            "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4=",
+            "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
             "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-7568UHNDOzyTCLy3TAwxZLUrKfB6A1yKA0wVZQJjKoI=",
-            "rev": "4239b1559d11d4fa66c100543eda4161e060311e",
+            "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=",
+            "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/instrumented_libs": {
         "args": {
-            "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
-            "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
+            "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=",
+            "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
             "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -233,26 +233,34 @@
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/libFuzzer/src": {
+        "args": {
+            "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
+            "rev": "e31b99917861f891308269c36a32363b120126bb",
+            "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk=",
-            "rev": "840f8797871cc587f7113ea9d2483a1156d57c0e",
+            "hash": "sha256-oceORERaQDEQkssZwiWGOtAsbuI0YeOciwb9FgtFuHw=",
+            "rev": "d737ca3ebe92feec465876a8fc98950cecd08fd8",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ=",
-            "rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96",
+            "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=",
+            "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA=",
-            "rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221",
+            "hash": "sha256-RIPejJnlQE5S8ss3WijR4uLVC+yRL9Ba0vslQeJFNiE=",
+            "rev": "8205ccf0f23545ebcd8846363ea1d29e77917a22",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -267,40 +275,40 @@
     },
     "src/third_party/libsrtp": {
         "args": {
-            "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
-            "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
+            "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
+            "rev": "a52756acb1c5e133089c798736dd171567df11f5",
             "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo=",
-            "rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c",
+            "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=",
+            "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc=",
-            "rev": "906334ac1de2b0afa666472dce5545b82c1251fb",
+            "hash": "sha256-8/Ttkc1ZLQ9WvQf+0/BW9zlmWvlyGDujELyLDqNmQxI=",
+            "rev": "7a65480684b1b28bb9defae164bf0dc78b32653e",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM=",
-            "rev": "a8e59d207483f75b87dd5fc670e937672cdf5776",
+            "hash": "sha256-hHwJLMI/leUm8RjkBsSQn/GaNU8Aan1yllGnXvdfG78=",
+            "rev": "10592b60c0b2c33210b7752454253dc2625b4305",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-Q0Y/jvAOovOGYTgdDivVQD0CJciuEAt91DCBNNQHwnE=",
-            "rev": "98ed09318387deb45282ca1c92a384499860b76a",
+            "hash": "sha256-OtNt+IRn2AFRTKvrA+c9AD+mbfBD37K2S9PXk3UI99A=",
+            "rev": "12809bfa855813dcef51871e2ee3155e53ed35ea",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -331,8 +339,8 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-WXBjGcWZQWrfSQRVv7NfxVv483cf04rNfmXzqyuy9bk=",
-            "rev": "e57316a6ae4e85e9bc8ba82a6c6a93eb5d9a72aa",
+            "hash": "sha256-ogrB+n5F4UnmL3nHJRyMFOLYVUvjirT9BClg20mTZkc=",
+            "rev": "a0c2bc7919f7467cf4a8287c8389c3f96a3fcbac",
             "url": "https://android.googlesource.com/platform/external/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -355,8 +363,8 @@
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-o4Q+uDF+TUDlu/bcjBEn3o3UuF5q9h1Vf/gx16bnlYs=",
-            "rev": "c809c4133185094fbd75508202221ff14fc92f7c",
+            "hash": "sha256-C3bzAAJp8OpKAHhM54P/sTBVFf3K6ffxvrpfKKxLRII=",
+            "rev": "6820cc03cc8a4b1fb99747f30e8249d138a70981",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"

From c47b4cf7ede94a62917635d65b1b077243c832e7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 27 Apr 2025 09:58:52 +0200
Subject: [PATCH 117/117] unifont: 16.0.02 -> 16.0.03

Also bumps unifont-csur and unifont_upper.
---
 pkgs/by-name/un/unifont-csur/package.nix  | 4 ++--
 pkgs/by-name/un/unifont/package.nix       | 8 ++++----
 pkgs/by-name/un/unifont_upper/package.nix | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/un/unifont-csur/package.nix b/pkgs/by-name/un/unifont-csur/package.nix
index 576f48bd0d22..f2bbc5946036 100644
--- a/pkgs/by-name/un/unifont-csur/package.nix
+++ b/pkgs/by-name/un/unifont-csur/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "unifont-csur";
-  version = "16.0.02";
+  version = "16.0.03";
 
   src = fetchurl {
     url = "https://unifoundry.com/pub/unifont/unifont-${finalAttrs.version}/font-builds/unifont_csur-${finalAttrs.version}.otf";
-    hash = "sha256-orLV0a0dQUAnzWnSTD1ALfbAsqWtFscH3rMCDyaXNfo=";
+    hash = "sha256-41MXxHHohZFm42LMePmLSZp3bytsxMJmWh/0psIgWt4=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix
index ba12316c0a2c..5c14b45ca3c5 100644
--- a/pkgs/by-name/un/unifont/package.nix
+++ b/pkgs/by-name/un/unifont/package.nix
@@ -8,21 +8,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unifont";
-  version = "16.0.02";
+  version = "16.0.03";
 
   otf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.otf";
-    hash = "sha256-3oI6EOZeIkOt56mK+CuC68a71c89CqPjjtTMzTa8qzM=";
+    hash = "sha256-9TnyHLrjkWoJP4GdNsR3EtVwGshtrO2KaOzPe9nTPAw=";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.pcf.gz";
-    hash = "sha256-AqP+EZlNPNrx1L1dK2tglzXmgj4BdkroO3BOAuwvZA0=";
+    hash = "sha256-ysKULOBusx4n7NfYRAzEoRfqaTNn5JtjigTVmb7wozY=";
   };
 
   bdf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.bdf.gz";
-    hash = "sha256-Uh8rkui2vU6hkM6gSaA53eNZpuLK6UWORdaWAI+mmX8=";
+    hash = "sha256-fz0WZKwcBR9ZoaE2DdZU942CwkamiMNC6GPOx/a6ldQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unifont_upper/package.nix b/pkgs/by-name/un/unifont_upper/package.nix
index e7e8b8663c1a..bb7453f5d53c 100644
--- a/pkgs/by-name/un/unifont_upper/package.nix
+++ b/pkgs/by-name/un/unifont_upper/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "unifont_upper";
-  version = "16.0.02";
+  version = "16.0.03";
 
   src = fetchurl {
     url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf";
-    hash = "sha256-QBc6oiQ6aTiWrqMwyY/YesG+s1JPMggsLT9mZzJsud4=";
+    hash = "sha256-ACW+6xiQAd9QMidqJ2MQGTkYbW9fvateIR2FyoM7rIs=";
   };
 
   dontUnpack = true;