From 71ce6b582b473982c66eadc91081b5601dda7819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ku=C4=8Da?= <tomas@kuca.cz>
Date: Fri, 17 May 2024 01:02:29 +0200
Subject: [PATCH 01/74] nixos/network-interfaces: prevent failure when a
 network address already exists

The original code tests output of `ip addr add` command to detect if an
adress already exists. The error message was changed in the past and the
test no longer works.

The patch replaces `ip addr add` with `ip addr replace`. The new command
replaces an existing address or creates a new one if there isn't any.

fixes 306841
---
 nixos/modules/tasks/network-interfaces-scripted.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 2f2d282fbefb..bbf2d337aac6 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -203,10 +203,10 @@ let
                   ''
                     echo "${cidr}" >> $state
                     echo -n "adding address ${cidr}... "
-                    if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then
+                    if out=$(ip addr replace "${cidr}" dev "${i.name}" 2>&1); then
                       echo "done"
-                    elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
-                      echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out"
+                    else
+                      echo "'ip addr replace "${cidr}" dev "${i.name}"' failed: $out"
                       exit 1
                     fi
                   ''

From 31a42541af1866336297216b421d7abbc3566018 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 17 May 2024 15:45:44 +0200
Subject: [PATCH 02/74] changelog-d: 0.1-git-2816ddb -> 1.0

---
 pkgs/by-name/ch/changelog-d/package.nix       |  6 ------
 pkgs/by-name/ch/changelog-d/updateScript.nix  | 12 -----------
 .../misc/haskell/changelog-d/default.nix      | 21 ++++++++++---------
 3 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/by-name/ch/changelog-d/updateScript.nix

diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix
index 380f4a801afa..a5bff1bfe1de 100644
--- a/pkgs/by-name/ch/changelog-d/package.nix
+++ b/pkgs/by-name/ch/changelog-d/package.nix
@@ -13,17 +13,11 @@ let
   haskellModifications =
     lib.flip lib.pipe [
       addCompletions
-      haskell.lib.doJailbreak
       haskell.lib.justStaticExecutables
     ];
 
   mkDerivationOverrides = finalAttrs: oldAttrs: {
 
-    version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}";
-
-    # nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d
-    passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { });
-
     # nix-build -A changelog-d.tests
     passthru.tests = {
       basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/ch/changelog-d/updateScript.nix b/pkgs/by-name/ch/changelog-d/updateScript.nix
deleted file mode 100644
index fae22a161b6d..000000000000
--- a/pkgs/by-name/ch/changelog-d/updateScript.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ writeShellApplication, cabal2nix }:
-
-writeShellApplication {
-  name = "update-changelog-d";
-  runtimeInputs = [
-    cabal2nix
-  ];
-  text = ''
-    cd pkgs/development/misc/haskell/changelog-d
-    cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix
-  '';
-}
diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix
index 7abc707540ce..8f44ed950067 100644
--- a/pkgs/development/misc/haskell/changelog-d/default.nix
+++ b/pkgs/development/misc/haskell/changelog-d/default.nix
@@ -1,23 +1,24 @@
 { mkDerivation, base, bytestring, cabal-install-parsers
-, Cabal-syntax, containers, directory, fetchgit, filepath
+, Cabal-syntax, containers, directory, fetchFromGitea, filepath
 , generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty
-, regex-applicative
+, regex-applicative, frontmatter
 }:
-mkDerivation {
+mkDerivation rec {
   pname = "changelog-d";
-  version = "0.1";
-  src = fetchgit {
-    url = "https://codeberg.org/fgaz/changelog-d";
-    sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7";
-    rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314";
-    fetchSubmodules = true;
+  version = "1.0";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "fgaz";
+    repo = "changelog-d";
+    rev = "v${version}";
+    hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y=";
   };
   isLibrary = false;
   isExecutable = true;
   libraryHaskellDepends = [
     base bytestring cabal-install-parsers Cabal-syntax containers
     directory filepath generic-lens-lite mtl parsec pretty
-    regex-applicative
+    regex-applicative frontmatter
   ];
   executableHaskellDepends = [
     base bytestring Cabal-syntax directory filepath

From 82522c99d46e35fcc9e8ee7bb66d2bc9eaecee43 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 23 May 2024 16:54:26 -0700
Subject: [PATCH 03/74] probe-rs: 0.23.0 -> 0.24.0; rename

---
 pkgs/by-name/pr/probe-rs-tools/package.nix    | 69 +++++++++++++++++++
 .../tools/rust/probe-rs/default.nix           | 38 ----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/pr/probe-rs-tools/package.nix
 delete mode 100644 pkgs/development/tools/rust/probe-rs/default.nix

diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
new file mode 100644
index 000000000000..64b014517c63
--- /dev/null
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -0,0 +1,69 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, cmake
+, gitMinimal
+, pkg-config
+, libusb1
+, openssl
+, DarwinTools
+, AppKit
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "probe-rs-tools";
+  version = "0.24.0";
+
+  src = fetchFromGitHub {
+    owner = "probe-rs";
+    repo = "probe-rs";
+    rev = "v${version}";
+    hash = "sha256-H1RT+H7aQjZmesW+/0mjPH2M01J1eBZ47Rern5lCqWk=";
+  };
+
+  cargoHash = "sha256-aTBtWPcOYT5koIu/uw5S2oKTnsvXcqB39SFbe8U1NJY=";
+
+  buildAndTestSubdir = pname;
+
+  nativeBuildInputs = [
+    # required by libz-sys, no option for dynamic linking
+    # https://github.com/rust-lang/libz-sys/issues/158
+    cmake
+    # build.rs fails without git
+    # https://github.com/probe-rs/probe-rs/pull/2492
+    gitMinimal
+    pkg-config
+  ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
+
+  buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
+
+  checkFlags = [
+    # require a physical probe
+    "--skip=cmd::dap_server::server::debugger::test::attach_request"
+    "--skip=cmd::dap_server::server::debugger::test::attach_with_flashing"
+    "--skip=cmd::dap_server::server::debugger::test::launch_and_threads"
+    "--skip=cmd::dap_server::server::debugger::test::launch_with_config_error"
+    "--skip=cmd::dap_server::server::debugger::test::test_initalize_request"
+    "--skip=cmd::dap_server::server::debugger::test::test_launch_and_terminate"
+    "--skip=cmd::dap_server::server::debugger::test::test_launch_no_probes"
+    "--skip=cmd::dap_server::server::debugger::test::wrong_request_after_init"
+    # compiles an image for an embedded target which we do not have a toolchain for
+    "--skip=util::cargo::test::get_binary_artifact_with_cargo_config"
+    "--skip=util::cargo::test::get_binary_artifact_with_cargo_config_toml"
+    # requires other crates in the workspace
+    "--skip=util::cargo::test::get_binary_artifact"
+    "--skip=util::cargo::test::library_with_example_specified"
+    "--skip=util::cargo::test::multiple_binaries_in_crate_select_binary"
+    "--skip=util::cargo::test::workspace_binary_package"
+    "--skip=util::cargo::test::workspace_root"
+  ];
+
+  meta = with lib; {
+    description = "CLI tool for on-chip debugging and flashing of ARM chips";
+    homepage = "https://probe.rs/";
+    changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ xgroleau newam ];
+  };
+}
diff --git a/pkgs/development/tools/rust/probe-rs/default.nix b/pkgs/development/tools/rust/probe-rs/default.nix
deleted file mode 100644
index cb26888f1b05..000000000000
--- a/pkgs/development/tools/rust/probe-rs/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, libusb1
-, openssl
-, DarwinTools
-, AppKit
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "probe-rs";
-  version = "0.23.0";
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-5V7eLnukVAcOSX52myvaTlDbemGp6mDaWrQc3w4P5MI=";
-  };
-
-  cargoHash = "sha256-sZl4FhaKIMJe7v5AAIM2w7M8Ev7vCht3owkvt0UhOu8=";
-
-  cargoBuildFlags = [ "--features=cli" ];
-
-  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
-
-  buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
-
-  meta = with lib; {
-    description = "CLI tool for on-chip debugging and flashing of ARM chips";
-    homepage = "https://probe.rs/";
-    changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ xgroleau newam ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ffbaf10eb743..78a78dc7d5e2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1040,6 +1040,7 @@ mapAliases ({
   prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
   prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
   privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31
+  probe-rs = probe-rs-tools; # Added 2024-05-23
   probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03
   processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10
   prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bf66cd84be..49e3f7e253a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -706,7 +706,7 @@ with pkgs;
 
   buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
 
-  probe-rs = callPackage ../development/tools/rust/probe-rs {
+  probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit;
     inherit (darwin) DarwinTools;
   };

From b7c0afd1fa6e85e802d642dcb68703ace4ae4fd3 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 28 May 2024 22:34:38 -0700
Subject: [PATCH 04/74] pkcs11-provider: 0.3 -> 0.4

---
 pkgs/by-name/pk/pkcs11-provider/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index 37f622bc9480..8d5704d99d7b 100644
--- a/pkgs/by-name/pk/pkcs11-provider/package.nix
+++ b/pkgs/by-name/pk/pkcs11-provider/package.nix
@@ -1,33 +1,38 @@
 { lib, stdenv, fetchFromGitHub
 , openssl, nss, p11-kit
 , opensc, gnutls, expect
-, autoreconfHook, autoconf-archive, pkg-config
+, meson, ninja, pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "pkcs11-provider";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "pkcs11-provider";
     rev = "v${version}";
-    hash = "sha256-jEQYsINRZ7bi2UqOXUUmGpm+1h+1qBNe18KvfAw2JzU=";
+    hash = "sha256-f4BbW2awSXS1srSkn1CTRCqNp+2pvVpc4YL79Ht0w0A=";
   };
 
   buildInputs = [ openssl nss p11-kit ];
-  nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
 
   # don't add SoftHSM to here: https://github.com/openssl/openssl/issues/22508
   nativeCheckInputs = [ p11-kit.bin opensc nss.tools gnutls openssl.bin expect ];
 
   postPatch = ''
     patchShebangs --build .
+  '';
 
-    # Makefile redirects to logfiles; make sure we can catch them.
-    for name in softokn softhsm; do
-      ln -s /dev/stderr tests/setup-$name.log
+  preInstall = ''
+    # Meson tries to install to `$out/$out` and `$out/''${openssl.out}`; so join them.
+    mkdir -p "$out"
+    for dir in "$out" "${openssl.out}"; do
+      mkdir -p .install/"$(dirname -- "$dir")"
+      ln -s "$out" ".install/$dir"
     done
+    export DESTDIR="$(realpath .install)"
   '';
 
   enableParallelBuilding = true;

From cfe52e8a5c47bdf9eb02014b6f09aba5eeba84c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 May 2024 02:49:20 +0000
Subject: [PATCH 05/74] reaction: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index 0451c1b9ddf7..9b28132789d3 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitLab,
 }:
 let
-  version = "1.3.0";
+  version = "1.3.1";
 in buildGoModule {
   inherit version;
   pname = "reaction";
@@ -15,7 +15,7 @@ in buildGoModule {
     owner = "ppom";
     repo = "reaction";
     rev = "v${version}";
-    sha256 = "sha256-hlrso4dCGwn5/jOEPvjrK0RgctB4a70UhQkF+cv6NMc=";
+    sha256 = "sha256-hBEtXaTpubb5sKSrA8bhw3MW6YLszuESWrFZYf/+RvM=";
   };
 
   vendorHash = "sha256-THUIoWFzkqaTofwH4clBgsmtUlLS9WIB2xjqW7vkhpg=";

From 91c4c979a93f131aca7dd36db77b4b19ffd9468f Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 30 May 2024 11:10:05 +0200
Subject: [PATCH 06/74] simpleBluez: init at 0.7.3

---
 pkgs/by-name/si/simpleBluez/package.nix | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/si/simpleBluez/package.nix

diff --git a/pkgs/by-name/si/simpleBluez/package.nix b/pkgs/by-name/si/simpleBluez/package.nix
new file mode 100644
index 000000000000..ab5b5f74b072
--- /dev/null
+++ b/pkgs/by-name/si/simpleBluez/package.nix
@@ -0,0 +1,47 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  dbus,
+  fmt_9,
+  lib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simpleBluez";
+
+  version = "0.7.3";
+
+  src = fetchFromGitHub {
+    owner = "OpenBluetoothToolbox";
+    repo = "SimpleBLE";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  sourceRoot = "${finalAttrs.src.name}/simplebluez";
+
+  cmakeFlags = [ "-DLIBFMT_LOCAL_PATH=${fmt_9.src}" ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+  ];
+
+  meta = with lib; {
+    description = "C++ abstraction layer for BlueZ over DBus";
+    homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ aciceri ];
+  };
+})

From ac56a9d7a28a0e6fef38a854e0fd44cb53c7c486 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 30 May 2024 16:30:56 +0200
Subject: [PATCH 07/74] simpleDBus: init at 0.7.3

---
 pkgs/by-name/si/simpleDBus/package.nix | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/si/simpleDBus/package.nix

diff --git a/pkgs/by-name/si/simpleDBus/package.nix b/pkgs/by-name/si/simpleDBus/package.nix
new file mode 100644
index 000000000000..1e2cbaa0b2a3
--- /dev/null
+++ b/pkgs/by-name/si/simpleDBus/package.nix
@@ -0,0 +1,47 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  dbus,
+  fmt_9,
+  lib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simpleDBus";
+
+  version = "0.7.3";
+
+  src = fetchFromGitHub {
+    owner = "OpenBluetoothToolbox";
+    repo = "SimpleBLE";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  sourceRoot = "${finalAttrs.src.name}/simpledbus";
+
+  cmakeFlags = [ "-DLIBFMT_LOCAL_PATH=${fmt_9.src}" ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+  ];
+
+  meta = with lib; {
+    description = "C++ wrapper for libdbus-1";
+    homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ aciceri ];
+  };
+})

From 09f960efb7108cf011ccf9cd3a07764201211847 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 30 May 2024 11:11:26 +0200
Subject: [PATCH 08/74] zmkBATx: init at 1.0.1

---
 pkgs/by-name/zm/zmkBATx/package.nix | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/zm/zmkBATx/package.nix

diff --git a/pkgs/by-name/zm/zmkBATx/package.nix b/pkgs/by-name/zm/zmkBATx/package.nix
new file mode 100644
index 000000000000..82e49e99c95e
--- /dev/null
+++ b/pkgs/by-name/zm/zmkBATx/package.nix
@@ -0,0 +1,51 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  qt6,
+  pkg-config,
+  dbus,
+  simpleBluez,
+  simpleDBus,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zmkBATx";
+
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "mh4x0f";
+    repo = "zmkBATx";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-xbiwRHVTuaZDH3RZlMK2CpKBThtS8g6q5r3C+OccDZg=";
+  };
+
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+    pkg-config
+    qt6.qmake
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtconnectivity
+    dbus.lib
+    simpleBluez
+    simpleDBus
+  ];
+
+  postPatch = ''
+    substituteInPlace zmkBATx.pro --replace-fail "/usr/include/dbus-1.0" "${dbus.dev}/include/dbus-1.0"
+    substituteInPlace zmkBATx.pro --replace-fail "/usr/lib/x86_64-linux-gnu/dbus-1.0/include" "${dbus.lib}/lib/dbus-1.0/include"
+  '';
+
+  meta = with lib; {
+    description = "Battery monitoring for ZMK split keyboards";
+    longDescription = "Opensource tool for peripheral battery monitoring zmk split keyboard over BLE for linux.";
+    homepage = "https://github.com/mh4x0f/zmkBATx";
+    license = licenses.mit;
+    mainProgram = "zmkbatx";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ aciceri ];
+  };
+})

From 41227222a213d0c6d76374c5090da9751efb21dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 May 2024 02:30:49 +0000
Subject: [PATCH 09/74] bkcrack: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/tools/security/bkcrack/default.nix b/pkgs/tools/security/bkcrack/default.nix
index afc18759c78d..5bebb8618b7e 100644
--- a/pkgs/tools/security/bkcrack/default.nix
+++ b/pkgs/tools/security/bkcrack/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bkcrack";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "kimci86";
     repo = "bkcrack";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-x7JK7+DcD2uSWZRTJQPGCcF2mHBlu6FwYUbuYzbvD+s=";
+    hash = "sha256-smDmnqmYuFT3ip3ULQfiiF5YxkwzPwPYBujqq9GUyMs=";
   };
 
   passthru.updateScript = nix-update-script { };

From cbf30c16c96ac37ee2281ade8361c8ed9a85683e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 May 2024 11:35:47 +0000
Subject: [PATCH 10/74] gnustep.make: 2.9.1 -> 2.9.2

---
 pkgs/desktops/gnustep/make/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 290e3004497f..a4c8d2db82c1 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnustep-make";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc=";
+    sha256 = "sha256-9UDfnw4drrPSOwjhSyBLKkbx0KQAXLFxyVMjQTgG5OE=";
   };
 
   configureFlags = [

From a65eead717aa6d13c4746836bf972e4b5a789cc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 May 2024 12:50:52 +0000
Subject: [PATCH 11/74] freeipa: 4.11.1 -> 4.12.0

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

diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix
index e94f6370da98..7311261780f1 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/os-specific/linux/freeipa/default.nix
@@ -64,11 +64,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "freeipa";
-  version = "4.11.1";
+  version = "4.12.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
-    sha256 = "sha256-Ubq2xAqBvjUwrzD2R6tB0i1WsdA0Y0jnJLgi4p4r8D4=";
+    sha256 = "sha256-FEDGPhgxr5kV8BeeM10C92yLbZPE7KGPmUUwyvZCkQA=";
   };
 
   nativeBuildInputs = [

From 7b5c2133b0491de75a20ff794e4381d2cab5f29d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 31 May 2024 19:50:23 +0200
Subject: [PATCH 12/74] python311Packages.gradio-pdf: 0.0.7 -> 0.0.9

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

diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix
index 2a054ff9dde5..440b9dd861f2 100644
--- a/pkgs/development/python-modules/gradio-pdf/default.nix
+++ b/pkgs/development/python-modules/gradio-pdf/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "gradio-pdf";
-  version = "0.0.7";
+  version = "0.0.9";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "gradio_pdf";
     inherit version;
-    hash = "sha256-3OJiBnp79woCUtiNiaePwfJCAS42WYkv9GFeScesFv8=";
+    hash = "sha256-3mua+cZBzseXp5jONIy2OSmNpqz4s0Uvx5oW/eKgP1Y=";
   };
 
   nativeBuildInputs = [

From ddff8a6e51eb7ede69ce33779af4ac0f5a9d0145 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 31 May 2024 20:28:51 +0200
Subject: [PATCH 13/74] python311Packages.gradio-client: 0.16.1 -> 0.20.1

---
 pkgs/development/python-modules/gradio/client.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix
index ed16c4cbace6..79b3643629ab 100644
--- a/pkgs/development/python-modules/gradio/client.nix
+++ b/pkgs/development/python-modules/gradio/client.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
   pythonOlder,
   pythonRelaxDepsHook,
   # pyproject
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "gradio-client";
-  version = "0.16.1";
+  version = "0.20.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,9 +38,9 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gradio-app";
     repo = "gradio";
-    rev = "refs/tags/gradio_client@${version}";
+    rev = "refs/tags/@gradio/client@${version}";
     sparseCheckout = [ "client/python" ];
-    hash = "sha256-SVUm9LrjYG0r3U1yOd3rctxVMYlnAOW+Opqy9c3osnw=";
+    hash = "sha256-55RxoZR/A6WCWGgYggdwjGornIxF8BcjJpWw3p6jrzU=";
   };
   prePatch = ''
     cd client/python
@@ -97,7 +97,9 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  passthru.updateScript = gitUpdater { rev-prefix = "@gradio/client@"; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex" "@gradio/client@(.*)" ];
+  };
 
   meta = with lib; {
     homepage = "https://www.gradio.app/";

From 88dcf659122b529a0614407865f908120d0b984b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 31 May 2024 20:29:20 +0200
Subject: [PATCH 14/74] python311Packages.gradio: 4.29.0 -> 4.32.1

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

diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index 3568ae9d1d82..a6bcf2efdee8 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -63,16 +63,15 @@
 
 buildPythonPackage rec {
   pname = "gradio";
-  version = "4.29.0";
+  version = "4.32.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
-  # We use the Pypi release, since it provides prebuilt webui assets,
-  # and upstream has stopped tagging releases since 3.41.0
+  # We use the Pypi release, since it provides prebuilt webui assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-17KT0b9kBO+xLgIgxfpwjETDoRM4aTJPlJv7HjkJXjo=";
+    hash = "sha256-t8C8BwE2xfVI2eKyST1jCZgrbytxiKcrsbVhfX07nA4=";
   };
 
   # fix packaging.ParserSyntaxError, which can't handle comments

From cf2847ee7c820adf2169ee543ede9ac540fe9227 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Jun 2024 02:41:13 +0000
Subject: [PATCH 15/74] rain: 1.9.0 -> 1.10.0

---
 pkgs/development/tools/rain/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix
index 58fdb1f97f55..3d6122355c49 100644
--- a/pkgs/development/tools/rain/default.nix
+++ b/pkgs/development/tools/rain/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "rain";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-a+oKQB2pbheC1wLIQh+g5E/dYCIfdnGEZ7hKsHZrNxs=";
+    sha256 = "sha256-2+bbTHblACG9yLBgdQ4P6PHXF06tLeVpsnuKCju8fV0=";
   };
 
-  vendorHash = "sha256-UBFOtgHf1HNERLWQGJqYlmAd8PKu2Qk49R+gVpdosuk=";
+  vendorHash = "sha256-YDY9Acp8bi0Pvjdjn1hTzChCVs5E1yximIrgyd7J/7w=";
 
   subPackages = [ "cmd/rain" ];
 

From adb421589c9817662a832a1f5fd70cc90a09d40b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Jun 2024 03:38:29 +0000
Subject: [PATCH 16/74] eigenlayer: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
index e7811b782b4e..b72f6b5999a3 100644
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "eigenlayer";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "Layr-Labs";
     repo = "eigenlayer-cli";
     rev = "v${version}";
-    hash = "sha256-bj1+gm11gYwvuut8tUrML7Sg1W5rmGH49tZ4u/76s84=";
+    hash = "sha256-YImQNqOPtHjFJz9mLrgoU0HUWZ4Pnkiff+5A8wYXxpA=";
   };
 
-  vendorHash = "sha256-Hws6qlt0O/1xP94ghiIBIF/FwvYGu0fY8LWjVgAp/pQ=";
+  vendorHash = "sha256-+VKjsHFqWVqOxzC49GToxymD5AyI0j1ZDXQW2YnJysw=";
 
   ldflags = ["-s" "-w"];
   subPackages = ["cmd/eigenlayer"];

From 5c5245230f956b3238c19a77c8a77494ffd12bbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Jun 2024 07:03:30 +0000
Subject: [PATCH 17/74] dart-sass: 1.77.2 -> 1.77.4

---
 .../development/tools/misc/dart-sass/default.nix |  8 ++++----
 .../tools/misc/dart-sass/pubspec.lock.json       | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix
index df446387b93a..676ff5a9ace1 100644
--- a/pkgs/development/tools/misc/dart-sass/default.nix
+++ b/pkgs/development/tools/misc/dart-sass/default.nix
@@ -10,24 +10,24 @@
 }:
 
 let
-  embedded-protocol-version = "2.7.0";
+  embedded-protocol-version = "2.7.1";
 
   embedded-protocol = fetchFromGitHub {
     owner = "sass";
     repo = "sass";
     rev = "refs/tags/embedded-protocol-${embedded-protocol-version}";
-    hash = "sha256-BQCQ4GE85teRkCY2iuvqFT4vyf6RzZ1ztoRhBCAwA4w=";
+    hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ=";
   };
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.77.2";
+  version = "1.77.4";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
     rev = version;
-    hash = "sha256-Spd21/IRNDtpgMecoO2ozKWEVSQneMGCOVCCePaFzus=";
+    hash = "sha256-xHOZDeK6xYnfrb6yih6jzRDZLRvyp0EeKZynEq3A4aI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json
index 22f85b690231..da5e7ea435f1 100644
--- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json
+++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json
@@ -24,11 +24,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "archive",
-        "sha256": "ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265",
+        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.5.1"
+      "version": "3.6.1"
     },
     "args": {
       "dependency": "direct main",
@@ -524,11 +524,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
+        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "quiver": {
       "dependency": "transitive",
@@ -754,11 +754,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b",
+        "sha256": "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.2"
+      "version": "14.2.3"
     },
     "watcher": {
       "dependency": "direct main",
@@ -784,11 +784,11 @@
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712",
+        "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.4"
+      "version": "0.1.5"
     },
     "web_socket_channel": {
       "dependency": "transitive",

From f6660806b85f3c3e03d170f0022aa004ab68092d Mon Sep 17 00:00:00 2001
From: George Macon <george@themacons.net>
Date: Sat, 1 Jun 2024 13:14:28 -0400
Subject: [PATCH 18/74] tarsnapper: use pynose to run tests

The nosetests support was removed from pytest in version 8, so revert to
using the nosetests entry point to run tests.

While I'm in here already, update to use pynose to avoid future failures
when nose is removed from nixpkgs (see #311054).
---
 pkgs/tools/backup/tarsnapper/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix
index b4d731984f71..843e61ecea57 100644
--- a/pkgs/tools/backup/tarsnapper/default.nix
+++ b/pkgs/tools/backup/tarsnapper/default.nix
@@ -37,8 +37,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-    nose
+    pynose
   ];
 
   # Remove standard module argparse from requirements
@@ -46,6 +45,12 @@ python3Packages.buildPythonApplication rec {
 
   makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ];
 
+  checkPhase = ''
+    runHook preCheck
+    nosetests tests
+    runHook postCheck
+  '';
+
   pythonImportsCheck = [ "tarsnapper" ];
 
   meta = with lib; {

From 501d7c532b9ce21baf21259e096c284a7e7be977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Jun 2024 22:12:13 +0000
Subject: [PATCH 19/74] qownnotes: 24.5.8 -> 24.6.0

---
 pkgs/applications/office/qownnotes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 3003475b2277..88201eda7c46 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -21,14 +21,14 @@
 let
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "24.5.8";
+  version = "24.6.0";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
-    hash = "sha256-ciTgJxDRQdPiQuXsiesYgvwSIdtJnkzYwQhvoKYS6mo=";
+    hash = "sha256-rgnFqYqiItTd86K8U7O2sI+q3lF/PiJWU/e2C2O5mJI=";
   };
 
   nativeBuildInputs = [

From 3eba04d862e778f218c2c08ff8e4b7e387daebb0 Mon Sep 17 00:00:00 2001
From: DS <commits@sidhion.com>
Date: Sun, 2 Jun 2024 01:46:08 -0700
Subject: [PATCH 20/74] clips: 6.40 -> 6.4.1

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

diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index e79f4a92481f..03f6dcd486cc 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.40";
+  version = "6.4.1";
   pname = "clips";
 
   src = fetchurl {
     url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
         builtins.replaceStrings [ "." ] [ "" ] version
       }.tar.gz";
-    sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d";
+    hash = "sha256-qk87uLFZZL9HNPNlyVh+Mplr3dP1C/z1O5UVS+rnbuM=";
   };
 
   postPatch = ''

From e1d079982c5eaad312073277c977a587fb322c7d Mon Sep 17 00:00:00 2001
From: DS <commits@sidhion.com>
Date: Sun, 2 Jun 2024 01:46:35 -0700
Subject: [PATCH 21/74] clips: expose library and headers

---
 pkgs/development/interpreters/clips/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index 03f6dcd486cc..cc66c87cee73 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -D -t $out/bin core/clips
+    install -D -t $out/lib core/libclips.a
+    install -D -t $out/include core/*.h
     runHook postInstall
   '';
 

From 1e69af82ed24d525055b695853cb8db63a7fec97 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 2 Jun 2024 13:58:12 +0900
Subject: [PATCH 22/74] python311Packages.diffusers: 0.27.2 -> 0.28.0

Diff: https://github.com/huggingface/diffusers/compare/refs/tags/v0.27.2...v0.28.0

Changelog: https://github.com/huggingface/diffusers/releases/tag/refs/tags/v0.28.0
---
 .../python-modules/diffusers/default.nix      | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index 8762022b0651..f9c634da8c2e 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -4,10 +4,8 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
   writeText,
   setuptools,
-  wheel,
   filelock,
   huggingface-hub,
   importlib-metadata,
@@ -42,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "diffusers";
-  version = "0.27.2";
+  version = "0.28.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -51,29 +49,10 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "diffusers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aRnbU3jN40xaCsoMFyRt1XB+hyIYMJP2b/T1yZho90c=";
+    hash = "sha256-DYUVg96oHYoRqw/RGoH48YXfK/kfkYoqGQfkiOUr8DU=";
   };
 
-  patches = [
-    # fix python3.12 build
-    (fetchpatch {
-      # https://github.com/huggingface/diffusers/pull/7455
-      name = "001-remove-distutils.patch";
-      url = "https://github.com/huggingface/diffusers/compare/363699044e365ef977a7646b500402fa585e1b6b...3c67864c5acb30413911730b1ed4a9ad47c0a15c.patch";
-      hash = "sha256-Qyvyp1GyTVXN+A+lA1r2hf887ubTtaUknbKd4r46NZQ=";
-    })
-    (fetchpatch {
-      # https://github.com/huggingface/diffusers/pull/7461
-      name = "002-fix-removed-distutils.patch";
-      url = "https://github.com/huggingface/diffusers/commit/efbbbc38e436a1abb1df41a6eccfd6f9f0333f97.patch";
-      hash = "sha256-scdtpX1RYFFEDHcaMb+gDZSsPafkvnIO/wQlpzrQhLA=";
-    })
-  ];
-
-  build-system = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     filelock

From d2767bbd2432456c825aeb3edc64c6e68d593486 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 2 Jun 2024 14:08:43 +0900
Subject: [PATCH 23/74] python311Packages.diffusers: move tests to
 passthru.tests

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

diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index f9c634da8c2e..855547d5226e 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
@@ -36,6 +35,7 @@
   torchsde,
   transformers,
   pythonAtLeast,
+  diffusers,
 }:
 
 buildPythonPackage rec {
@@ -87,8 +87,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "diffusers" ];
 
-  # tests crash due to torch segmentation fault
-  doCheck = !(stdenv.isLinux && stdenv.isAarch64);
+  # it takes a few hours
+  doCheck = false;
+
+  passthru.tests.pytest = diffusers.overridePythonAttrs { doCheck = true; };
 
   nativeCheckInputs = [
     parameterized

From 778f4b076ced4e63b6d3390866a6922ae69e2281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 16:06:26 +0000
Subject: [PATCH 24/74] xpipe: 9.3 -> 9.4

---
 pkgs/applications/networking/xpipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix
index c099f1c5d14c..6508aed76b37 100644
--- a/pkgs/applications/networking/xpipe/default.nix
+++ b/pkgs/applications/networking/xpipe/default.nix
@@ -33,14 +33,14 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    x86_64-linux = "sha256-PFAs/HoQsTqgThN5jdfwU07QNxThBrO7ES1D7GZCPH0=";
+    x86_64-linux = "sha256-E28OeidntQV5Zx6BQjlYxgTXSuQM0ZLCLdb+bIYz8fY=";
   }.${system} or throwSystem;
 
   displayname = "XPipe";
 
 in stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "9.3";
+  version = "9.4";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From d8f7c592846d18d7732bc5b1156fadd4a60421fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 17:52:56 +0000
Subject: [PATCH 25/74] python311Packages.stripe: 9.8.0 -> 9.9.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 4efdf348ecc0..51b956b1a547 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "9.8.0";
+  version = "9.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YxYfynRstqgeIVi/YZUMy4118bcjHH9KyeBYF6q1hrQ=";
+    hash = "sha256-xC2Pa0RjpU86AlWBgQ9OYy4tWnHeYQD8WV11WB9ppJI=";
   };
 
   build-system = [ setuptools ];

From 9ad87bb974292c29306866d73d5ea78f2db1bdc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 17:57:30 +0000
Subject: [PATCH 26/74] algolia-cli: 1.6.10 -> 1.6.11

---
 pkgs/development/tools/algolia-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix
index 91a78a78fdce..f8572eeb1941 100644
--- a/pkgs/development/tools/algolia-cli/default.nix
+++ b/pkgs/development/tools/algolia-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "algolia-cli";
-  version = "1.6.10";
+  version = "1.6.11";
 
   src = fetchFromGitHub {
     owner = "algolia";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-hYr2T3BLoBJzcVcINNVdnK3T0Hvs+zwsDkk9iE/csTY=";
+    hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0=";
   };
 
   vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";

From ef56def164e128b6e308268a84b9b8b12cfc7709 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Sun, 2 Jun 2024 20:11:37 +0200
Subject: [PATCH 27/74] jitterentropy: 3.4.1 -> 3.5.0

Changes:
- add distinction between intermittent and permanent health failure
- add compile time option to allow configuring a mask to reduce the size of the time stamp used for the APT

Upstream changelog: https://github.com/smuellerDD/jitterentropy-library/releases/tag/v3.5.0

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/jitterentropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index edf46fa4f51b..fb6dbcea6478 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jitterentropy";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-library";
     rev = "v${version}";
-    hash = "sha256-GSGlupTN1o8BbTN287beqYSRFDaXOk6SlIRvtjpvmhQ=";
+    hash = "sha256-USc9e/GyajJe58/Z201AO3Y+t3IPOOdJAaifEwvgm2Q=";
   };
 
   outputs = [ "out" "dev" ];

From 56edbd693fea404435b054c612496c1f9055406f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 18:37:41 +0000
Subject: [PATCH 28/74] fflogs: 8.5.9 -> 8.5.10

---
 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 709f8d6d807a..ae8bdde6bb72 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "fflogs";
-  version = "8.5.9";
+  version = "8.5.10";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-rVkrjDocAfOI2ymsa0XMsVvbVtUa72C314InN7ZTkZc=";
+    hash = "sha256-HDfmTAKOphxcoRpQDxbytQqOhhVa9Jof9D63YlH7ezQ=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 7a4ccc54941c15fd9c8cb04b8144e03ebba0d367 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 21:02:25 +0000
Subject: [PATCH 29/74] python311Packages.riscv-config: 3.18.2 -> 3.18.3

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

diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix
index 120f9fd5c537..b8762769b10c 100644
--- a/pkgs/development/python-modules/riscv-config/default.nix
+++ b/pkgs/development/python-modules/riscv-config/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "riscv-config";
-  version = "3.18.2";
+  version = "3.18.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "riscv-software-src";
     repo = "riscv-config";
     rev = "refs/tags/${version}";
-    hash = "sha256-ADmf7EN3D+8isZRFx6WRMYq91YHunGavuwy3a3M3gCc=";
+    hash = "sha256-eaHi6ezgU8gQYH97gCS2TzEzIP3F4zfn7uiA/To2Gmc=";
   };
 
   pythonRelaxDeps = [ "pyyaml" ];

From 2f1f6c3b509d920a0af987ce8dc68cc64238cd91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 22:33:50 +0000
Subject: [PATCH 30/74] volatility3: 2.5.2 -> 2.7.0

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

diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/tools/security/volatility3/default.nix
index 7f6307687323..2d16c03e8956 100644
--- a/pkgs/tools/security/volatility3/default.nix
+++ b/pkgs/tools/security/volatility3/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "volatility3";
-  version = "2.5.2";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "volatilityfoundation";
     repo = "volatility3";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tghwDDfy8TohqTn9WQvmEal3qK0OKKq7GvGnPGTble0=";
+    hash = "sha256-elTUAvSe91TqpsTXg08SPKaVr6iM7FKcBaVNunv+HfU=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 1ecfccd265c868c79792d87916a1b391a5ee125e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Mon, 3 Jun 2024 10:31:59 +1000
Subject: [PATCH 31/74] python311Packages.k5test: works on darwin

---
 pkgs/development/python-modules/k5test/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix
index 3a6c340e00a7..a7366d3851fb 100644
--- a/pkgs/development/python-modules/k5test/default.nix
+++ b/pkgs/development/python-modules/k5test/default.nix
@@ -44,6 +44,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/pythongssapi/k5test/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
-    broken = stdenv.isDarwin;
   };
 }

From 83fbdd8c85707fc03bbef36e40cfdd6f7bc33296 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 01:28:56 +0000
Subject: [PATCH 32/74] ast-grep: 0.22.4 -> 0.22.5

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index b62c88d05a59..81d2dfa3a17a 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ast-grep";
-  version = "0.22.4";
+  version = "0.22.5";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     rev = version;
-    hash = "sha256-AzwwOJ2SS+5wM/+357mXg+QMwXVPToKiTaFP+LZXP+U=";
+    hash = "sha256-BBF4gnsZmQ36NDX7X/CTGb9+N79S5lLmBaq5keGeNfA=";
   };
 
-  cargoHash = "sha256-fyEncz5eVe8OPNQO4TJQXBMfOcybesoBBNRv3T1EooU=";
+  cargoHash = "sha256-bpwZ1yDeevjMlrLLBPQa9H5NIN99o39kicsOnp+kj9M=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4a1330b47741816964c60c8edb0cde327ff0315d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 02:44:44 +0000
Subject: [PATCH 33/74] flawz: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index 504dd849b5d9..f0dddceaed80 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flawz";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "flawz";
     rev = "v${version}";
-    hash = "sha256-eIZUKI/fdaSPHHEEaN/5s4I2LRX44FijUlKzzvuD42E=";
+    hash = "sha256-zzZh9MjLbhvnuJEaKPtF5Rzfcu9VbeQCMiJ8MLvJBXg=";
   };
 
-  cargoHash = "sha256-UWjrVA5T78QLJtMug38y+egLnM+G7zmAIsNmqn2ZE5I=";
+  cargoHash = "sha256-Dur8AcOT9sPiGg+rfcxfS2m4CeEk59tISxU+dc87urI=";
 
   nativeBuildInputs = [ pkg-config installShellFiles ];
 

From 09c5ca7d212dd5acdf7f8771a23a31654c239fe6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 02:45:25 +0000
Subject: [PATCH 34/74] gomplate: 3.11.7 -> 3.11.8

---
 pkgs/development/tools/gomplate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
index 9be7b5a87fc7..71773213c1a5 100644
--- a/pkgs/development/tools/gomplate/default.nix
+++ b/pkgs/development/tools/gomplate/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "gomplate";
-  version = "3.11.7";
+  version = "3.11.8";
 
   src = fetchFromGitHub {
     owner = "hairyhenderson";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-0cYQ44SF8fQ5Ml0tRUbqTFZ+zDVTV6elox1q6tNsG7Q=";
+    hash = "sha256-pE9TLEBY1KQvgMFwVJfn5kojESqZURcbCwRt4jrexhk=";
   };
 
-  vendorHash = "sha256-8siITXKIqDbph/74aBEvkbLVqHE30VyRompFL6z92zA=";
+  vendorHash = "sha256-09QUEudbWnO11iwJafF9zoYqbTr7SVBUiPWTHGnZ06Q=";
 
   postPatch = ''
     # some tests require network access

From e8bdfaf8a1673f49319d33d83a5f92fa6631c49a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 02:52:06 +0000
Subject: [PATCH 35/74] osl: 1.13.9.0 -> 1.13.10.0

---
 pkgs/development/compilers/osl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index d05d01bc6c07..b7ad7537c7e1 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "openshadinglanguage";
-  version = "1.13.9.0";
+  version = "1.13.10.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${version}";
-    hash = "sha256-3HSmiIvGk+C5rnHzCXnYlFVeOWYa5M0WZRLTSb8Zsh8=";
+    hash = "sha256-tjfg9cGbfL0D+KcxtWgQF6gY9sCjxEjyGNxFZyPhJ/U=";
   };
 
   cmakeFlags = [

From e685d1d043eea8601881350ece7f64c0d65bd99f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 02:54:27 +0000
Subject: [PATCH 36/74] gitui: 0.26.2 -> 0.26.3

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

diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index de1eb48edaac..a93cad786827 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitui";
-  version = "0.26.2";
+  version = "0.26.3";
 
   src = fetchFromGitHub {
     owner = "extrawurst";
     repo = "gitui";
     rev = "v${version}";
-    hash = "sha256-eXkbvBdymwOUPLimv2zaJr9zqc+5LGK3hghZ2aUVWA0=";
+    hash = "sha256-j3y+KjC+o9p2omf4bN8+XevwU7WqiaQ0sfPqHySD2ik=";
   };
 
-  cargoHash = "sha256-Cb3/4l7fECVfmvPIw3n1QT8CoC+Kuohtfk+huKv9Yrg=";
+  cargoHash = "sha256-vVEo0kSghOQsH3T6ZTAzN7gIUku0n7rDbKwNmOM9GZc=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 346e0f6be178d576728417558ca28458c83035fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 04:03:40 +0000
Subject: [PATCH 37/74] ticker: 4.6.2 -> 4.6.3

---
 pkgs/applications/misc/ticker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix
index a717135f48b4..da8624a06baa 100644
--- a/pkgs/applications/misc/ticker/default.nix
+++ b/pkgs/applications/misc/ticker/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "ticker";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "achannarasappa";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-bNqwQwYuaWThpVVlZji0uiNKf8Ynxs00bAD+iSnbtm8=";
+    hash = "sha256-EjQLJG1/AEnOKGcGh2C1HdRAVUnZLhehxTtpWlvD+jw=";
   };
 
-  vendorHash = "sha256-cTJa170oFFPRQSg3njZk26XvzsRRdJqcsFokKUWJr6Q=";
+  vendorHash = "sha256-bWdyypcIagbKTMnhT0X4UmoPVjyTasCSud6pX1L3oIc=";
 
   ldflags = [
     "-s"

From d6401eeda1f9845bf7bcb81082d4e1d3572f40da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 04:10:09 +0000
Subject: [PATCH 38/74] steamguard-cli: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 748c0c1e97db..921fde3cbc76 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "steamguard-cli";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-+Lax9MaNyrsckgx7HtpXC1zBWcZNt16inY8qil0CVLQ=";
+    hash = "sha256-MTNp4LQtFUOvlcic+EgrMaJPq0aEa6YqwwdrKkpv87Q=";
   };
 
-  cargoHash = "sha256-4QyFNy7oGWKScKZXQc63TxsI3avyEVSlqJAmv+lg1GE=";
+  cargoHash = "sha256-FBKHvkUJcjrUxuCDrra5VKBdK95IssVw7g9zzldX6jU=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''

From 9f3c5f53d29f4e887b5a3d3a47cfaf1bba63acab Mon Sep 17 00:00:00 2001
From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com>
Date: Mon, 3 Jun 2024 07:18:48 +0200
Subject: [PATCH 39/74] linuxKernel.kernels.linux_zen: 6.9.2-zen1 -> 6.9.3-zen1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 89c776e611e5..b3ac6af08736 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,9 +4,9 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "6.9.2"; #zen
+    version = "6.9.3"; #zen
     suffix = "zen1"; #zen
-    sha256 = "1fsmpryk7an6xqppvilcf3bmxs41mqpc3v4f4c81jgrikg21gxbb"; #zen
+    sha256 = "0vgy249zrzm6kn8wqisnbgbq8h6sffmk1zs6cx57annab9w0sb57"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx

From f450173677a97317a044cafdac258622c25ac94c Mon Sep 17 00:00:00 2001
From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com>
Date: Mon, 3 Jun 2024 07:20:52 +0200
Subject: [PATCH 40/74] linuxKernel.kernels.linux_lqx: 6.8.11-lqx1 ->
 6.9.3-lqx1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index b3ac6af08736..072416007e72 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "6.8.11"; #lqx
+    version = "6.9.3"; #lqx
     suffix = "lqx1"; #lqx
-    sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx
+    sha256 = "1wfjw5fq7myvhfb6srina0b7b76a08ib9x8hd8bdfr4zr6al8zq8"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

From 57e5f84dd8bc0137dd10143075655555f635b1ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 08:38:50 +0200
Subject: [PATCH 41/74] python311Packages.reolink-aio: 0.8.11 -> 0.9.0

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.8.11...0.9.0

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.9.0
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 90c58a9891fc..7bccaef94720 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.8.11";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-i3X3+JonqnR2mvJc9SFQno8HBvZUA9R6JCjEhL/5Aow=";
+    hash = "sha256-5rlPGmyBdEG9qjJPpEPr1oXLYlZiBtXzupPpVRrR9wA=";
   };
 
   build-system = [ setuptools ];

From 1f8ea9a702725d47ab14da0bcf8834988d229978 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 08:40:30 +0200
Subject: [PATCH 42/74] python312Packages.tencentcloud-sdk-python: 3.0.1159 ->
 3.0.1160

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1159...3.0.1160

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 0c6ae51ac3cf..a6d07cc90945 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1159";
+  version = "3.0.1160";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-gePrTn1LR28A2C1lZgEGTxSicXW0e6G6rxgh28kBBls=";
+    hash = "sha256-G0qft2hz9LfN0QKarANtJavxKVTx3rMNG6i8rJmlGnU=";
   };
 
   build-system = [ setuptools ];

From d9d37f73b5eb1c8d063ff9cf272a8b498ab55b55 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 08:41:56 +0200
Subject: [PATCH 43/74] usort: 1.0.7 -> 1.0.8

Diff: https://github.com/facebook/usort/compare/refs/tags/v1.0.7...v1.0.8

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

diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix
index a32ad97cc465..bfb650c91c0b 100644
--- a/pkgs/development/python-modules/usort/default.nix
+++ b/pkgs/development/python-modules/usort/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "usort";
-  version = "1.0.7";
+  version = "1.0.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "facebook";
     repo = "usort";
     rev = "refs/tags/v${version}";
-    hash = "sha256-emnrghdsUs+VfvYiJExG13SKQNrXAEtGNAJQLScADnw=";
+    hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM=";
   };
 
   nativeBuildInputs = [

From 5f8cd4575263332705c90a49b1297e9feb63d064 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 14 Feb 2024 23:58:29 +0100
Subject: [PATCH 44/74] python311Packages.tf-keras: init at 2.16.0

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

diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix
new file mode 100644
index 000000000000..0e0401159210
--- /dev/null
+++ b/pkgs/development/python-modules/tf-keras/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  pythonRelaxDepsHook,
+  setuptools,
+  wheel,
+  numpy,
+  tensorflow,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "tf-keras";
+  version = "2.16.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    pname = "tf_keras";
+    inherit version;
+    hash = "sha256-21OJHxrJgZfCrM7ZjNyowGuoJVZVpst+uV7UlnYRgoA=";
+  };
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "tensorflow"
+  ];
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    numpy
+    tensorflow
+  ];
+
+  pythonImportsCheck = [ "tf_keras" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Deep learning for humans";
+    homepage = "https://pypi.org/project/tf-keras/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 850907d3580b..760148562c87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15091,6 +15091,8 @@ self: super: with self; {
 
   textx = callPackage ../development/python-modules/textx { };
 
+  tf-keras = callPackage ../development/python-modules/tf-keras { };
+
   tf2onnx = callPackage ../development/python-modules/tf2onnx { };
 
   tflearn = callPackage ../development/python-modules/tflearn { };

From 01ac08654164ec1474fba7c75a7be3efa7ffd538 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 31 May 2024 23:14:33 +0200
Subject: [PATCH 45/74] python311Packages.dask: 2024.5.1 -> 2024.5.2

Diff: https://github.com/dask/dask/compare/refs/tags/2024.5.1...2024.5.2

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 pkgs/development/python-modules/dask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index c713c7f2dd64..851bc43241dd 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -41,7 +41,7 @@
 let
   self = buildPythonPackage rec {
     pname = "dask";
-    version = "2024.5.1";
+    version = "2024.5.2";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -50,7 +50,7 @@ let
       owner = "dask";
       repo = "dask";
       rev = "refs/tags/${version}";
-      hash = "sha256-FzvzmQa9kJAZw67HY+d+3uC6Bd246vp5QsyXepGnKH8=";
+      hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw=";
     };
 
     build-system = [

From 232513f379cf8977b5405da5dac97cf333b700a4 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 3 Jun 2024 00:35:46 -0700
Subject: [PATCH 46/74] pkcs11-provider: add nix-update-script

---
 pkgs/by-name/pk/pkcs11-provider/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index 8d5704d99d7b..62a9b2170044 100644
--- a/pkgs/by-name/pk/pkcs11-provider/package.nix
+++ b/pkgs/by-name/pk/pkcs11-provider/package.nix
@@ -2,6 +2,7 @@
 , openssl, nss, p11-kit
 , opensc, gnutls, expect
 , meson, ninja, pkg-config
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
@@ -42,6 +43,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex" "v(\d\.\d)"];
+  };
+
   meta = with lib; {
     homepage = "https://github.com/latchset/pkcs11-provider";
     description = "An OpenSSL 3.x provider to access hardware or software tokens using the PKCS#11 Cryptographic Token Interface";

From 7aa1c9dca2e1cc41be4635fd103ee555e4191ff8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 31 May 2024 23:23:22 +0200
Subject: [PATCH 47/74] python311Packages.dask-expr: 1.1.1 -> 1.1.2

Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.1...v1.1.2
---
 pkgs/development/python-modules/dask-expr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
index ea2de99a21e2..67cc5f26947a 100644
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dask-expr";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = "dask-expr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-N+hvalSn8mwlAaN3Xhu+YxECORfLN4UHutwmeiGR9WI=";
+    hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU=";
   };
 
   postPatch = ''

From b75e904686fbd4fab73865866a05886be92e7da6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 09:05:21 +0000
Subject: [PATCH 48/74] python311Packages.model-bakery: 1.18.0 -> 1.18.1

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

diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix
index 82b91dd10da5..0729ec702479 100644
--- a/pkgs/development/python-modules/model-bakery/default.nix
+++ b/pkgs/development/python-modules/model-bakery/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-bakery";
-  version = "1.18.0";
+  version = "1.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "model-bakers";
     repo = "model_bakery";
     rev = "refs/tags/${version}";
-    hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ=";
+    hash = "sha256-QsfVKPasGFzcLIwx7t9H9I2o2JNUFLKbKc86tntltg8=";
   };
 
   build-system = [ hatchling ];

From f42fa63d192d4678210e4ed65fd91dead062e0bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 09:05:22 +0000
Subject: [PATCH 49/74] python311Packages.etils: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index ad33c111ad92..834b2ae93be0 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+0ePV/7CAuJg5UyRkrMXaS/WPbLRHZk+cLzf+inMzVg=";
+    hash = "sha256-XQ+N2qjg5kDGhe16f+H8XIFiUz+hL7lF8J7MU5sLNmw=";
   };
 
   nativeBuildInputs = [ flit-core ];

From c5b09348a6ebb1560646bea695bcbd57c32310f3 Mon Sep 17 00:00:00 2001
From: useranon350 <useranon350@gmail.com>
Date: Sun, 2 Jun 2024 17:33:39 -0400
Subject: [PATCH 50/74] xfce.xfce4-sensors-plugin: Enable xnvctrl by default

Have to be explicitly enabled since this tries to figure out the default
based on the existence of a hardcoded `/usr/include/NVCtrl` path, though
it looks like `NIX_CFLAGS_COMPILE` is properly (?) set so we don't need to
further patch it.

Format with nixfmt-rfc-style at the same time.
---
 pkgs/desktops/xfce/default.nix                |  5 ++-
 .../xfce4-sensors-plugin/default.nix          | 37 +++++++++++++++----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 77d783cd9039..c739ac6ea04a 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -1,5 +1,6 @@
 { config
 , lib
+, linuxPackages
 , pkgs
 , generateSplicesForMkScope
 , makeScopeWithSplicing'
@@ -140,7 +141,9 @@ makeScopeWithSplicing' {
 
       xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
 
-      xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
+      xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin {
+        libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+      };
 
       xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
index 4a3148962efd..07445ffb1c99 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
@@ -1,5 +1,20 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui,
-  libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater
+{
+  stdenv,
+  lib,
+  fetchurl,
+  pkg-config,
+  intltool,
+  gtk3,
+  libxfce4ui,
+  libxfce4util,
+  xfce4-panel,
+  libnotify,
+  lm_sensors,
+  hddtemp,
+  netcat-gnu,
+  nvidiaSupport ? true,
+  libXNVCtrl,
+  gitUpdater,
 }:
 
 let
@@ -7,7 +22,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  pname  = "xfce4-sensors-plugin";
+  pname = "xfce4-sensors-plugin";
   version = "1.4.4";
 
   src = fetchurl {
@@ -29,14 +44,20 @@ stdenv.mkDerivation rec {
     lm_sensors
     hddtemp
     netcat-gnu
-   ];
+  ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
-    "--with-pathnetcat=${netcat-gnu}/bin/netcat"
-  ];
+  configureFlags =
+    [
+      "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
+      "--with-pathnetcat=${netcat-gnu}/bin/netcat"
+    ]
+    ++ lib.optionals nvidiaSupport [
+      # Have to be explicitly enabled since this tries to figure out the default
+      # based on the existence of a hardcoded `/usr/include/NVCtrl` path.
+      "--enable-xnvctrl"
+    ];
 
   passthru.updateScript = gitUpdater {
     url = "https://gitlab.xfce.org/panel-plugins/${pname}";

From 858788722e7f1a83b2a02eba6fa22bfa739504fe Mon Sep 17 00:00:00 2001
From: Defelo <elodef42@gmail.com>
Date: Mon, 3 Jun 2024 12:09:43 +0200
Subject: [PATCH 51/74] uiua: 0.10.3 -> 0.11.0

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

diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index e6f518fc0958..686e3768f14c 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "uiua";
-  version = "0.10.3";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "uiua-lang";
     repo = "uiua";
     rev = version;
-    hash = "sha256-lqFDzM6EscC8cFPGq/JnEybctaurNRoEQi0zxFaKgwI=";
+    hash = "sha256-zSSUXJtIyVUUo2g1DTdnUCbCqtelphYRRLaJXbQBgIw=";
   };
 
-  cargoHash = "sha256-R97KO3MYmtO9C1Hi9kU+1FDdbOCVQk+gwVXTTvbeok4=";
+  cargoHash = "sha256-1J8Z6gmn1d4v15q9Jrp5usY2MTQDdexaa89PY3lTDxw=";
 
   nativeBuildInputs =
     lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]

From fc4f5b6f1f343c7a3b750a9358ee2929ecc754ff Mon Sep 17 00:00:00 2001
From: Defelo <elodef42@gmail.com>
Date: Mon, 3 Jun 2024 12:10:08 +0200
Subject: [PATCH 52/74] vscode-extensions.uiua-lang.uiua-vscode: 0.0.42 ->
 0.0.44

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 027ddee6c7e0..a05bb510c6eb 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4319,8 +4319,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.42";
-          hash = "sha256-cgLWgMej1Nv8kNK2MfgO3Z/xJPXdcmYs8LXrFNfc3jQ=";
+          version = "0.0.44";
+          hash = "sha256-lumK7gcj/NIhiZKT6F++ZsTFKWw7ZVaKZgIsQvZAGs4=";
         };
         meta = {
           description = "VSCode language extension for Uiua";

From 0ffca9772fe6479ebdb1bc8b7b054a5191c99f8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 10:33:47 +0000
Subject: [PATCH 53/74] tftui: 0.13.2 -> 0.13.3

---
 pkgs/applications/networking/cluster/tftui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix
index e72723425f66..3bd2c2a13868 100644
--- a/pkgs/applications/networking/cluster/tftui/default.nix
+++ b/pkgs/applications/networking/cluster/tftui/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "tftui";
-  version = "0.13.2";
+  version = "0.13.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "idoavrah";
     repo = "terraform-tui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/y1dgQtpaIRVvhb/esJns3UPwKU1bAFHSQ8tCWzIuIw=";
+    hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0=";
   };
 
   pythonRelaxDeps = [

From 73ef41b931b4615d1b4038d0ba07637d2d6ce973 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 10:33:58 +0000
Subject: [PATCH 54/74] python311Packages.pyomo: 6.7.2 -> 6.7.3

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

diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index b96dcac4fd35..f91ae1753966 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyomo";
-  version = "6.7.2";
+  version = "6.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "pyomo";
     owner = "pyomo";
     rev = "refs/tags/${version}";
-    hash = "sha256-v3KVb9KZPbUlpRySzJV8dmApScKT06aJc8SULCHcnPI=";
+    hash = "sha256-6qpJH6WkrTzsDCtvoGMzZgw1UeSIIyI3jSA8JMsUC4E=";
   };
 
   build-system = [ setuptools ];

From 87cb6c5abd5097096e2b2b54dfd8ec7ba9ff134f Mon Sep 17 00:00:00 2001
From: Niklas <44636701+MayNiklas@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:28:33 +0200
Subject: [PATCH 55/74] papermc: fix update script

---
 pkgs/games/papermc/update.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/update.py b/pkgs/games/papermc/update.py
index 6e2d0ec9274e..2eb4e7c2790e 100755
--- a/pkgs/games/papermc/update.py
+++ b/pkgs/games/papermc/update.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i python -p "python3.withPackages (ps: with ps; [ps.requests ])"
 
+import os
 import hashlib
 import base64
 import json
@@ -95,7 +96,13 @@ class VersionManager:
             indent=4
         )
 
-    def write_versions(self, file_name: str):
+    def find_version_json() -> str:
+        """
+        Find the versions.json file in the same directory as this script
+        """
+        return os.path.join(os.path.dirname(os.path.realpath(__file__)), "versions.json")
+
+    def write_versions(self, file_name: str = find_version_json()):
         """ write all processed versions to json """
         # save json to versions.json
         with open(file_name, 'w') as f:
@@ -142,4 +149,4 @@ if __name__ == '__main__':
     version_manager.fetch_versions()
     version_manager.fetch_latest_version_builds()
     version_manager.generate_version_hashes()
-    version_manager.write_versions(file_name="versions.json")
+    version_manager.write_versions()

From 41452802cb03853e797d0ecc3621cb71bf0be21f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Jun 2024 13:20:32 +0200
Subject: [PATCH 56/74] treewide: fix all obviously wrong mkEnableOptions

---
 nixos/modules/services/hardware/handheld-daemon.nix  | 2 +-
 nixos/modules/services/networking/tailscale-auth.nix | 2 +-
 nixos/modules/services/video/photonvision.nix        | 2 +-
 nixos/modules/services/web-apps/slskd.nix            | 2 +-
 nixos/modules/virtualisation/lxd-agent.nix           | 2 +-
 pkgs/by-name/lo/local-ai/module.nix                  | 2 +-
 pkgs/misc/cups/drivers/samsung/1.00.36/module.nix    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 6c9d5aa3e22c..a5ba1856d015 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -8,7 +8,7 @@ with lib; let
 in
 {
   options.services.handheld-daemon = {
-    enable = mkEnableOption "Enable Handheld Daemon";
+    enable = mkEnableOption "Handheld Daemon";
     package = mkPackageOption pkgs "handheld-daemon" { };
 
     user = mkOption {
diff --git a/nixos/modules/services/networking/tailscale-auth.nix b/nixos/modules/services/networking/tailscale-auth.nix
index c3a515212e78..f21d1f108911 100644
--- a/nixos/modules/services/networking/tailscale-auth.nix
+++ b/nixos/modules/services/networking/tailscale-auth.nix
@@ -14,7 +14,7 @@ let
 in
 {
   options.services.tailscaleAuth = {
-    enable = mkEnableOption "Enable tailscale.nginx-auth, to authenticate users via tailscale.";
+    enable = mkEnableOption "tailscale.nginx-auth, to authenticate users via tailscale";
 
     package = mkPackageOption pkgs "tailscale-nginx-auth" {};
 
diff --git a/nixos/modules/services/video/photonvision.nix b/nixos/modules/services/video/photonvision.nix
index d4568258db7d..e2b27b3cc410 100644
--- a/nixos/modules/services/video/photonvision.nix
+++ b/nixos/modules/services/video/photonvision.nix
@@ -6,7 +6,7 @@ in
 {
   options = {
     services.photonvision = {
-      enable = lib.mkEnableOption "Enable PhotonVision";
+      enable = lib.mkEnableOption "PhotonVision";
 
       package = lib.mkPackageOption pkgs "photonvision" {};
 
diff --git a/nixos/modules/services/web-apps/slskd.nix b/nixos/modules/services/web-apps/slskd.nix
index 15a5fd1177ad..6254fe294eee 100644
--- a/nixos/modules/services/web-apps/slskd.nix
+++ b/nixos/modules/services/web-apps/slskd.nix
@@ -5,7 +5,7 @@ let
   defaultUser = "slskd";
 in {
   options.services.slskd = with lib; with types; {
-    enable = mkEnableOption "enable slskd";
+    enable = mkEnableOption "slskd";
 
     package = mkPackageOptionMD pkgs "slskd" { };
 
diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix
index 8d536e18a34e..d31937147848 100644
--- a/nixos/modules/virtualisation/lxd-agent.nix
+++ b/nixos/modules/virtualisation/lxd-agent.nix
@@ -50,7 +50,7 @@ in {
   };
 
   options = {
-    virtualisation.lxd.agent.enable = lib.mkEnableOption "Enable LXD agent";
+    virtualisation.lxd.agent.enable = lib.mkEnableOption "LXD agent";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/pkgs/by-name/lo/local-ai/module.nix b/pkgs/by-name/lo/local-ai/module.nix
index 70f486b43b1a..e26a3637820f 100644
--- a/pkgs/by-name/lo/local-ai/module.nix
+++ b/pkgs/by-name/lo/local-ai/module.nix
@@ -5,7 +5,7 @@ let
 in
 {
   options.services.local-ai = {
-    enable = lib.mkEnableOption "Enable service";
+    enable = lib.mkEnableOption "local-ai";
 
     package = lib.mkPackageOption pkgs "local-ai" { };
 
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
index e98da9de2b60..3cf7c62c4e72 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
@@ -22,7 +22,7 @@ let
 in {
   options = {
     services.samsung-unified-linux-driver_1_00_36 = {
-      enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36";
+      enable = mkEnableOption "samsung-unified-linux-driver_1_00_36";
     };
   };
   config = mkIf cfg.enable {

From 35d3f8e1c2bd446752014833a695b53c8d8d235f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Mon, 3 Jun 2024 13:31:32 +0200
Subject: [PATCH 57/74] mueval: remove check

Removes the check introduced in https://github.com/NixOS/nixpkgs/pull/301484
as it fails too often on resource-constrained machines.
---
 pkgs/development/tools/haskell/mueval/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix
index 48144b038c98..f763c69c3737 100644
--- a/pkgs/development/tools/haskell/mueval/default.nix
+++ b/pkgs/development/tools/haskell/mueval/default.nix
@@ -29,12 +29,6 @@ in stdenv.mkDerivation {
     runHook postBuild
   '';
 
-  doCheck = true;
-
-  checkPhase = ''
-    [[ $($out/bin/mueval -e 42) == 42 ]]
-  '';
-
   passthru = { inherit defaultPkgs; };
   meta.mainProgram = "mueval";
 }

From ae5ef9e6d054c8115c7f4f3342e73c71e7aacbdc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 11:54:32 +0000
Subject: [PATCH 58/74] retroarch-assets: 1.17.0-unstable-2024-04-24 ->
 1.19.0-unstable-2024-05-30

---
 pkgs/applications/emulators/retroarch/retroarch-assets.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix
index b97d551a6c86..f1d34f9f5ac1 100644
--- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix
+++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.17.0-unstable-2024-04-24";
+  version = "1.19.0-unstable-2024-05-30";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "9c0bd0d1015889592ad4362b800ac90ff4d019e1";
-    hash = "sha256-DB4i4iKx174822OJwJ5QIuMBLywufcR4+4Y+R01W+KQ=";
+    rev = "771e60b1eacd4edc57c19b61ab2c713200af0a3f";
+    hash = "sha256-304xYXY5cESjSxepb5xpfMeJBnG+EJBiaVnhSUE3icQ=";
   };
 
   makeFlags = [

From e7ad6bf7a1e0d9af2ed9c221d788d73ce22bcb6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 11:54:55 +0000
Subject: [PATCH 59/74] libretro.play: unstable-2024-05-27 ->
 unstable-2024-05-28

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..98bc0e27c63f 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -652,11 +652,11 @@
         "src": {
             "owner": "jpd002",
             "repo": "Play-",
-            "rev": "5b80de936ee267b5bfcbaf3a25f8307d718e09d6",
-            "hash": "sha256-ATTNivOCLp0Ze1RJfO7YWZzw7foPz/6OjVoa/4P3M4E=",
+            "rev": "18c0a6b17d074c662bebea87684d025636862d64",
+            "hash": "sha256-UOH3f3HkN6ak4AMH7C6E5Lqrj/WF8bqSjv0JTj7HqFU=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-05-27"
+        "version": "unstable-2024-05-28"
     },
     "ppsspp": {
         "fetcher": "fetchFromGitHub",

From 72650edecf7c16f21dc7940768fbfeb81be8e0ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 11:55:04 +0000
Subject: [PATCH 60/74] simplex-chat-desktop: 5.7.4 -> 5.7.5

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

diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index 7f3a516a4b42..f057a71e3ff0 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "5.7.4";
+  version = "5.7.5";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-byns0F3i1YiYekO5KoAek5LXCU8bvPK/tzl+xExQM4g=";
+    hash = "sha256-riJHJbl19UHJskQjWxSJUNhDEBE7FSoGE2lQecs/qvM=";
   };
 
   appimageContents = appimageTools.extract {

From fb8ffb1d4cc60e98f1ccde9c2593cd54652679d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 11:55:16 +0000
Subject: [PATCH 61/74] libretro.pcsx-rearmed: unstable-2024-05-20 ->
 unstable-2024-05-30

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..a085592445b1 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -631,10 +631,10 @@
         "src": {
             "owner": "libretro",
             "repo": "pcsx_rearmed",
-            "rev": "87f07621f8f864204d15e5514b7dcda7ed458fd4",
-            "hash": "sha256-J9HzZzzeih/Hv/hi+JmGloPMTgtRSdAubnipMDUOpIM="
+            "rev": "1f8c6be323aa8fad329e38682158197e822d27c1",
+            "hash": "sha256-f1U7hmSywECmXwRi6vhAFjG971XsDXhsYzSAKMa2ZVY="
         },
-        "version": "unstable-2024-05-20"
+        "version": "unstable-2024-05-30"
     },
     "picodrive": {
         "fetcher": "fetchFromGitHub",

From 5417906fa0bd6bdc06bb48f99e16f5dec07c6473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Jun 2024 14:12:55 +0200
Subject: [PATCH 62/74] nix-direnv: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix
index 74fc9d9c6336..42569d8e7973 100644
--- a/pkgs/by-name/ni/nix-direnv/package.nix
+++ b/pkgs/by-name/ni/nix-direnv/package.nix
@@ -4,13 +4,13 @@
 # https://github.com/abathur/resholve/issues/107
 resholve.mkDerivation rec {
   pname = "nix-direnv";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
     rev = version;
-    hash = "sha256-3Fkat0HWU/hdQKwJYx5KWVzX8sVbGtFTon6G6/F9zFk=";
+    hash = "sha256-imUlc5v/Ow7dgjCjTyEeet+4lNHLeEwfqGQcB4dKcao=";
   };
 
   # skip min version checks which are redundant when built with nix

From 200514ec0b45a21387d49ff2fa8ac99c71270cd3 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 3 Jun 2024 14:36:42 +0200
Subject: [PATCH 63/74] hugo: 0.126.2 -> 0.126.3

https://github.com/gohugoio/hugo/releases/tag/v0.126.3
---
 pkgs/by-name/hu/hugo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 6b6a9088f162..5bc5c26b0f35 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.126.2";
+  version = "0.126.3";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ySXnJJJDjZqZkWOiq9ByflfUG6bg+0GSzuXpNnuyMZc=";
+    hash = "sha256-WWpcbY8KA/62AeIt1hH+xfgEoPle4hfH+/K7I+1xdEc=";
   };
 
   vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs=";

From 809ee9baa298af79e9ca71e40c63695463ffc6fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 12:45:20 +0000
Subject: [PATCH 64/74] libretro.mame2003: unstable-2024-05-27 ->
 unstable-2024-06-01

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..1b31bf7cf2a8 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -429,10 +429,10 @@
         "src": {
             "owner": "libretro",
             "repo": "mame2003-libretro",
-            "rev": "73e97290df6d3c4148c73e849a1f274ae1571da2",
-            "hash": "sha256-osVwOUFygdsxHXKx5eg3TxJeRBiv3PmXMlAO0x/p1EY="
+            "rev": "9ed9b3bdf4439d222b2b1a8c89e01fa3a6d2cc51",
+            "hash": "sha256-E6/NYG+Uw+At2iAziEsl95NOwVSOs2otye+MDl+SQA0="
         },
-        "version": "unstable-2024-05-27"
+        "version": "unstable-2024-06-01"
     },
     "mame2003-plus": {
         "fetcher": "fetchFromGitHub",

From fe6b43e366a1520179fb75f924f29770f0277e1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 12:45:32 +0000
Subject: [PATCH 65/74] libretro.ppsspp: unstable-2024-05-28 ->
 unstable-2024-06-03

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..f7cd7c482e51 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -663,11 +663,11 @@
         "src": {
             "owner": "hrydgard",
             "repo": "ppsspp",
-            "rev": "e69870033ef07831ecea1e68ff8ac49da1dd7fff",
-            "hash": "sha256-L9NfESAHjCzdRzNoyzPZ0CJXZ8VguD91SVDlSSGGx0I=",
+            "rev": "8600e81c62eaf9ea36c06d9e7d4a8b731947e255",
+            "hash": "sha256-qPmJMtaUzr9pepeIl+bOgOUrxSxy4Khiq3jtXwnIZSI=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-05-28"
+        "version": "unstable-2024-06-03"
     },
     "prboom": {
         "fetcher": "fetchFromGitHub",

From 2219465989823c1652f0c32926d89d0824f076d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 12:45:38 +0000
Subject: [PATCH 66/74] libretro.mame2003-plus: unstable-2024-05-28 ->
 unstable-2024-05-29

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..5219e2bc1898 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -439,10 +439,10 @@
         "src": {
             "owner": "libretro",
             "repo": "mame2003-plus-libretro",
-            "rev": "7e0673fb35f716a5c0aab601c23118f8a2c4f7d2",
-            "hash": "sha256-6tzUIyrmsGIXY1MiikcP6cfeVrvx+3LxhHBBKvyDRPU="
+            "rev": "b37ce123034084fa14709fb0f33c505737b3bfda",
+            "hash": "sha256-vrVuUgkwZDLdFLo+bhJwXEuNWcS9ncQbjOspx6LVqhQ="
         },
-        "version": "unstable-2024-05-28"
+        "version": "unstable-2024-05-29"
     },
     "mame2010": {
         "fetcher": "fetchFromGitHub",

From 56cf1db80834df347426d5f52d8bc1aae62cd20e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 12:46:17 +0000
Subject: [PATCH 67/74] fnm: 1.36.0 -> 1.37.0

---
 pkgs/development/tools/fnm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix
index 84cc6323e731..010f95e76ddc 100644
--- a/pkgs/development/tools/fnm/default.nix
+++ b/pkgs/development/tools/fnm/default.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fnm";
-  version = "1.36.0";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner = "Schniz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gW/KpoogFbAkOIBnJHTDYyqvxpYeCCabwftCb+T4rnE=";
+    sha256 = "sha256-ruEv46jzO79l2Nvs3UjWHal2lBmhjdIKC99va/2cGio=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
 
-  cargoHash = "sha256-x66R32vbBakBlrE0eZ+sFJ2/JZ30UTIAvh3goeWkI10=";
+  cargoHash = "sha256-ez6rzmVa/eRcd4bdCM4JEaNILpavub34kaonX4BRjW8=";
 
   doCheck = false;
 

From cd66ee7bc746aba4a0a5303791d496f01bfc6fd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 14:01:12 +0000
Subject: [PATCH 68/74] httpx: 1.6.2 -> 1.6.3

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

diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix
index 7b791fda2ebc..d0d78c3047fa 100644
--- a/pkgs/tools/security/httpx/default.nix
+++ b/pkgs/tools/security/httpx/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "httpx";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "httpx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xNKfqPPTsnEzDapBZpfmTPWc6dirOqxUDYOOdIVUzOY=";
+    hash = "sha256-N2Fym3OwTHjdaJ1fzGWL+BoUYsQ5216d3Ohz5Yrf558=";
   };
 
   vendorHash = "sha256-jD5LQ9HZbWpoXgnyA7RacaDdyBPMbK02PhKQT+1il4Q=";

From 128a21ae7aa246d01b18b3452bf8c5c27ad5c5e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 14:05:43 +0000
Subject: [PATCH 69/74] libretro.fbneo: unstable-2024-05-28 ->
 unstable-2024-06-02

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index e27eafce9d51..40e869d1d08e 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -287,10 +287,10 @@
         "src": {
             "owner": "libretro",
             "repo": "fbneo",
-            "rev": "4e0738a16d64adb4c468db4144ec3b51f9217660",
-            "hash": "sha256-Se7QLJ1YVbEcwLOrKwTKTS6rgBw5Q9B4T2J40IgvOk0="
+            "rev": "634d207adade213bbe83684be2a183d158f56e52",
+            "hash": "sha256-hmnb7euH2VfGnF8ztGFhXYmqaCY49APDG0Y3s4ku7Ac="
         },
-        "version": "unstable-2024-05-28"
+        "version": "unstable-2024-06-02"
     },
     "fceumm": {
         "fetcher": "fetchFromGitHub",

From a88fb925bb26327644e0877e27720fadfd471925 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 3 Jun 2024 16:22:12 +0200
Subject: [PATCH 70/74] nixos/installation-cd-plasma5: don't use alias for
 konsole

---
 .../cd-dvd/installation-cd-graphical-calamares-plasma5.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
index 61e94ffed889..bb22dd4184ae 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
@@ -40,7 +40,7 @@
 
     ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
     ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
-    ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
+    ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
     ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}
   '';
 

From 1c2132f7146a3f94370ae1e70f39b9a69015a3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Jun 2024 16:26:54 +0200
Subject: [PATCH 71/74] nixos/installation-cd-plasma5: fix even more aliases

---
 .../cd-dvd/installation-cd-graphical-calamares-plasma5.nix    | 2 +-
 .../installer/cd-dvd/installation-cd-graphical-plasma5.nix    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
index bb22dd4184ae..d1a42fc7a713 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
@@ -23,7 +23,7 @@
 
   environment.systemPackages = with pkgs; [
     # Graphical text editor
-    kate
+    plasma5Packages.kate
   ];
 
   system.activationScripts.installerDesktop = let
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
index ce111bcebd5c..770df5bb997b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
@@ -23,7 +23,7 @@
 
   environment.systemPackages = with pkgs; [
     # Graphical text editor
-    kate
+    plasma5Packages.kate
   ];
 
   system.activationScripts.installerDesktop = let
@@ -40,7 +40,7 @@
 
     ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
     ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
-    ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
+    ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
   '';
 
 }

From 0541ecf38104477926574d7932c526b6625ace14 Mon Sep 17 00:00:00 2001
From: Aman9das <39594914+Aman9das@users.noreply.github.com>
Date: Mon, 3 Jun 2024 20:00:12 +0530
Subject: [PATCH 72/74] bitwarden-menu: refactor

---
 pkgs/applications/misc/bitwarden-menu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix
index 4c6eb0f1686b..b1ea4d9e6690 100644
--- a/pkgs/applications/misc/bitwarden-menu/default.nix
+++ b/pkgs/applications/misc/bitwarden-menu/default.nix
@@ -9,7 +9,7 @@
 buildPythonApplication rec {
   pname = "bitwarden-menu";
   version = "0.4.3";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "bitwarden_menu";

From d768cbfa4c31f0d5fcd31263dca2e7e70453e5c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Jun 2024 17:01:46 +0200
Subject: [PATCH 73/74] volatility3: refactor

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

diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/tools/security/volatility3/default.nix
index 2d16c03e8956..ffc0a0c93280 100644
--- a/pkgs/tools/security/volatility3/default.nix
+++ b/pkgs/tools/security/volatility3/default.nix
@@ -15,11 +15,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-elTUAvSe91TqpsTXg08SPKaVr6iM7FKcBaVNunv+HfU=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     capstone
     jsonschema
     pefile

From adca0283c21390b700b0c4099427f871079f44a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Jun 2024 15:20:28 +0000
Subject: [PATCH 74/74] pfetch-rs: 2.9.1 -> 2.9.2

---
 pkgs/tools/misc/pfetch-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix
index 0f1d5b2f1d33..433308c0c48b 100644
--- a/pkgs/tools/misc/pfetch-rs/default.nix
+++ b/pkgs/tools/misc/pfetch-rs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pfetch-rs";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "Gobidev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tpJk31Z7QzZNLmEv/L1008tf6hpJJI6b7E1o/kwbJe0=";
+    hash = "sha256-1Mw20O64I0UeAOO4Gea8cAbNnHkWOMvoRawIAZ62kTI=";
   };
 
-  cargoHash = "sha256-CQVPEUpblypDyr48MrLY3roGunOxem0eM1OtbcKlnsw=";
+  cargoHash = "sha256-Jx8g49rMatXMV1KvoFGBhXKmf77WR4uE/Xewl5TMeWM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.AppKit