From a447ebb01b24ae1e7e30f9aeef7e4fabe0d15e68 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Tue, 18 Jun 2024 09:51:10 -0700
Subject: [PATCH 01/79] google-cloud-sql-proxy: add passthru.updateScript

---
 pkgs/tools/misc/google-cloud-sql-proxy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
index 3bf76cc5bf3c..cfca113bc8df 100644
--- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildGo122Module
 , fetchFromGitHub
+, nix-update-script
 }:
 
 buildGo122Module rec {
@@ -22,6 +23,8 @@ buildGo122Module rec {
     "-short"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Utility for ensuring secure connections to Google Cloud SQL instances";
     longDescription = ''

From 9e5e340fb8e44cb1aa409c7f3e44c4b6077747cc Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 8 Jul 2024 14:04:19 +0100
Subject: [PATCH 02/79] multipass: reformat with nixfmt-rfc-style

---
 .../virtualization/multipass/default.nix      | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix
index e7875f00bb6a..e2fea0689c8f 100644
--- a/pkgs/tools/virtualization/multipass/default.nix
+++ b/pkgs/tools/virtualization/multipass/default.nix
@@ -1,26 +1,27 @@
-{ cmake
-, dnsmasq
-, fetchFromGitHub
-, git
-, gtest
-, iproute2
-, iptables
-, lib
-, libapparmor
-, libvirt
-, libxml2
-, nixosTests
-, openssl
-, OVMF
-, pkg-config
-, qemu
-, qemu-utils
-, qtbase
-, qtwayland
-, wrapQtAppsHook
-, slang
-, stdenv
-, xterm
+{
+  cmake,
+  dnsmasq,
+  fetchFromGitHub,
+  git,
+  gtest,
+  iproute2,
+  iptables,
+  lib,
+  libapparmor,
+  libvirt,
+  libxml2,
+  nixosTests,
+  openssl,
+  OVMF,
+  pkg-config,
+  qemu,
+  qemu-utils,
+  qtbase,
+  qtwayland,
+  wrapQtAppsHook,
+  slang,
+  stdenv,
+  xterm,
 }:
 
 let
@@ -38,8 +39,7 @@ let
     fetchSubmodules = true;
   };
 in
-stdenv.mkDerivation
-{
+stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchFromGitHub {
@@ -118,15 +118,17 @@ stdenv.mkDerivation
   nativeCheckInputs = [ gtest ];
 
   postInstall = ''
-    wrapProgram $out/bin/multipassd --prefix PATH : ${lib.makeBinPath [
-      dnsmasq
-      iproute2
-      iptables
-      OVMF.fd
-      qemu
-      qemu-utils
-      xterm
-    ]}
+    wrapProgram $out/bin/multipassd --prefix PATH : ${
+      lib.makeBinPath [
+        dnsmasq
+        iproute2
+        iptables
+        OVMF.fd
+        qemu
+        qemu-utils
+        xterm
+      ]
+    }
   '';
 
   passthru.tests = {

From 816ff1ce7518e2df87f824d0839774bc1a7d5ab7 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 8 Jul 2024 14:24:26 +0100
Subject: [PATCH 03/79] multipass: use `--replace-fail` in calls to
 `substituteInPlace`

---
 pkgs/tools/virtualization/multipass/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix
index e2fea0689c8f..851ee7cfd69d 100644
--- a/pkgs/tools/virtualization/multipass/default.nix
+++ b/pkgs/tools/virtualization/multipass/default.nix
@@ -65,13 +65,13 @@ stdenv.mkDerivation {
   postPatch = ''
     # Make sure the version is reported correctly in the compiled binary.
     substituteInPlace ./CMakeLists.txt \
-      --replace "determine_version(MULTIPASS_VERSION)" "" \
-      --replace 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'
+      --replace-fail "determine_version(MULTIPASS_VERSION)" "" \
+      --replace-fail 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'
 
     # Patch the patch of the OVMF binaries to use paths from the nix store.
     substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
-      --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
-      --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
+      --replace-fail "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
+      --replace-fail "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
 
     # Copy the grpc submodule we fetched into the source code.
     cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc

From 6c879c9e5e207201408f163322e7ec6b0b2de4c3 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Tue, 9 Jul 2024 17:23:32 -0400
Subject: [PATCH 04/79] mongodb: pin scons to python311

Building mongodb with python312 fails:

ModuleNotFoundError: No module named 'imp':
  File "/build/source/SConstruct", line 46:
    from buildscripts import moduleconfig
  File "/build/source/buildscripts/moduleconfig.py", line 30:
    import imp
---
 pkgs/servers/nosql/mongodb/mongodb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 2b304aa212ee..3d0bf072ff04 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -13,7 +13,7 @@
 , openldap
 , openssl
 , libpcap
-, python3
+, python311
 , curl
 , Security
 , CoreFoundation
@@ -33,7 +33,7 @@ with lib;
 }:
 
 let
-  scons = buildPackages.scons;
+  scons = buildPackages.scons.override{ python3 = python311; };
   python = scons.python.withPackages (ps: with ps; [
     pyyaml
     cheetah3

From 2279f8b2808d3514e09e27657abbaa695a9b44fa Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:30:00 +0200
Subject: [PATCH 05/79] narsil: refactor

---
 pkgs/by-name/na/narsil/package.nix | 45 +++++++++++++++---------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 9e6d3ba1dc02..465766da6fb2 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -1,16 +1,16 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, ncurses
-, enableSdl2 ? true
-, SDL2
-, SDL2_image
-, SDL2_sound
-, SDL2_mixer
-, SDL2_ttf
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  ncurses,
+  enableSdl2 ? true,
+  SDL2,
+  SDL2_image,
+  SDL2_sound,
+  SDL2_mixer,
+  SDL2_ttf,
 }:
-
 stdenv.mkDerivation rec {
   pname = "narsil";
   version = "1.3.0-49-gc042b573a";
@@ -23,14 +23,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ncurses ]
+  buildInputs =
+    [ ncurses ]
     ++ lib.optionals enableSdl2 [
-    SDL2
-    SDL2_image
-    SDL2_sound
-    SDL2_mixer
-    SDL2_ttf
-  ];
+      SDL2
+      SDL2_image
+      SDL2_sound
+      SDL2_mixer
+      SDL2_ttf
+    ];
 
   enableParallelBuilding = true;
 
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "bindir=$(out)/bin" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/NickMcConnell/NarSil/";
     description = "Unofficial rewrite of Sil, a roguelike influenced by Angband";
     mainProgram = "narsil";
@@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
       NarSil attempts to be an almost-faithful recreation of Sil 1.3.0,
       but based on the codebase of modern Angband.
     '';
-    maintainers = [ maintainers.nanotwerp ];
-    license = licenses.gpl2;
+    maintainers = with lib.maintainers; [ nanotwerp ];
+    license = lib.licenses.gpl2;
   };
 }

From 3695eebfd4cbfab1f58f4d0ee12e317cc33fe938 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:31:29 +0200
Subject: [PATCH 06/79] narsil: add changelog

---
 pkgs/by-name/na/narsil/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 465766da6fb2..d5214dbfd751 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/NickMcConnell/NarSil/";
     description = "Unofficial rewrite of Sil, a roguelike influenced by Angband";
     mainProgram = "narsil";
+    changelog = "https://github.com/NickMcConnell/NarSil/releases/tag/${version}";
     longDescription = ''
       NarSil attempts to be an almost-faithful recreation of Sil 1.3.0,
       but based on the codebase of modern Angband.

From 504308e427630aa14e2fb434f4e135561131b1c7 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:58:09 +0200
Subject: [PATCH 07/79] narsil: set updateScript

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

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index d5214dbfd751..e9f6b84063a3 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  nix-update-script,
   ncurses,
   enableSdl2 ? true,
   SDL2,
@@ -22,6 +23,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-lVGG4mppsnDmjMFO8YWsLEJEhI3T+QO3z/pCebe0Ai8=";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
     [ ncurses ]

From 7640cf52d5307b909ea5f6848f209c0c2ed676e6 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:32:56 +0200
Subject: [PATCH 08/79] narsil: 1.3.0-49-gc042b573a -> 1.3.0-84-g042c39e9c

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

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index e9f6b84063a3..3a3c98c3b8ee 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "narsil";
-  version = "1.3.0-49-gc042b573a";
+  version = "1.3.0-84-g042c39e9c";
 
   src = fetchFromGitHub {
     owner = "NickMcConnell";
     repo = "NarSil";
     rev = version;
-    hash = "sha256-lVGG4mppsnDmjMFO8YWsLEJEhI3T+QO3z/pCebe0Ai8=";
+    hash = "sha256-P+J+1KR5ZIUSXq8FXHGcIllGH3iEFlNniHWzlT4WZUM=";
   };
 
   passthru.updateScript = nix-update-script { };

From 6e44ea5353d9af063089206cdc2460dc429bb334 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:33:55 +0200
Subject: [PATCH 09/79] narsil: add x123 as maintainer

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

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 3a3c98c3b8ee..be166c4b445c 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       NarSil attempts to be an almost-faithful recreation of Sil 1.3.0,
       but based on the codebase of modern Angband.
     '';
-    maintainers = with lib.maintainers; [ nanotwerp ];
+    maintainers = with lib.maintainers; [ nanotwerp x123 ];
     license = lib.licenses.gpl2;
   };
 }

From b29e3ae839a43c0441daf4cb9bb66730c9525ea7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 14:24:26 +0000
Subject: [PATCH 10/79] msolve: 0.6.6 -> 0.6.7

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

diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix
index bdaec94e66d9..53bcc9da2cbc 100644
--- a/pkgs/by-name/ms/msolve/package.nix
+++ b/pkgs/by-name/ms/msolve/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msolve";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "algebraic-solving";
     repo = "msolve";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Zr9mC/klhyef6xYV8EyoNfM1h4Z0WDtg+OdaarLDBAM=";
+    hash = "sha256-w7+7Ef5X+pRUW9+2akXv7By37ROB7nTij6J1Iy8P/eU=";
   };
 
   postPatch = ''

From 2834aef384ccba94a1368a54148a0815aa543c53 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Sat, 20 Jul 2024 10:08:24 +0100
Subject: [PATCH 11/79] pcsx2-bin: derivation improvements

---
 pkgs/by-name/pc/pcsx2-bin/package.nix | 33 +++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index ec71fc9955ec..c30d5f4cd50c 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -3,12 +3,10 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  # To grab metadata
-  pcsx2,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "pcsx2";
+  pname = "pcsx2-bin";
   version = "1.7.5919";
 
   src = fetchurl {
@@ -26,9 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/{bin,Applications}
+    mkdir -p $out/Applications
     cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app
-    makeWrapper $out/Applications/PCSX2.app/Contents/MacOS/PCSX2 $out/bin/pcsx2-qt
     runHook postInstall
   '';
 
@@ -37,17 +34,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    inherit (pcsx2.meta)
-      homepage
-      longDescription
-      license
-      changelog
-      downloadPage
-      ;
-    description = "Playstation 2 emulator; precompiled binary for MacOS, repacked from official website";
+    homepage = "https://pcsx2.net";
+    description = "Playstation 2 emulator (precompiled binary, repacked from official website)";
+    longDescription = ''
+      PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is
+      to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters,
+      Recompilers and a Virtual Machine which manages hardware states and PS2
+      system memory. This allows you to play PS2 games on your PC, with many
+      additional features and benefits.
+    '';
+    changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/PCSX2/pcsx2";
+    license = with lib.licenses; [
+      gpl3Plus
+      lgpl3Plus
+    ];
     maintainers = with lib.maintainers; [ matteopacini ];
-    mainProgram = "pcsx2-qt";
-    platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isDarwin lib.systems.inspect.patterns.isx86_64;
+    platforms = [ "x86_64-darwin" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From 88011bc9bd49c6f4c01c8cb198971cea9c03540e Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Sat, 20 Jul 2024 10:09:00 +0100
Subject: [PATCH 12/79] pcsx2-bin: 1.7.5919 -> 2.1.17

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

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index c30d5f4cd50c..cb38ebac1c76 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pcsx2-bin";
-  version = "1.7.5919";
+  version = "2.1.17";
 
   src = fetchurl {
     url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-NYgHsYXoIhI2pxqqiMgz5sKBAezEFf4AfEfu5S3diMg=";
+    hash = "sha256-WuxvMcGuCyTAc99JkUjG0qcV7SXWy9fmaZR0+8iGepQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4226b1ddf711b0ed429f8885c22ee5cca281f189 Mon Sep 17 00:00:00 2001
From: mimvoid <mimvoid@proton.me>
Date: Sat, 20 Jul 2024 19:33:03 -0400
Subject: [PATCH 13/79] major-mono-display: init at 2.000

---
 .../by-name/ma/major-mono-display/package.nix | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/ma/major-mono-display/package.nix

diff --git a/pkgs/by-name/ma/major-mono-display/package.nix b/pkgs/by-name/ma/major-mono-display/package.nix
new file mode 100644
index 000000000000..1bfca85b1c54
--- /dev/null
+++ b/pkgs/by-name/ma/major-mono-display/package.nix
@@ -0,0 +1,39 @@
+{ lib, stdenvNoCC, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation {
+  pname = "major-mono-display";
+  version = "2.000";
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "majormono";
+    rev = "fae0bb9c728fe082097baedaf23604e290ddac16";
+    hash = "sha256-ishGGr8bY6UjEG/Hn5We8hOO5mcDq/41+DMn+dQGGUA=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 -t $out/share/fonts/truetype fonts/*.ttf
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Monospaced geometric sans serif all-uppercase typeface";
+    longDescription = ''
+      Majör is a monospaced geometric sans serif all-uppercase typeface
+      which also has a complete set of constructivist display characters
+      with a playful attitude. It has many Opentype features but the basic
+      variation between serious/playful faces can be implemented on web use
+      where Opentype features can be hard to apply, thanks to the fact that
+      the sans serif and the display versions of the letterforms can be
+      reached via lowercase and uppercase options. This makes Majör a great
+      choice for web typography, especially at large point-sizes.
+    '';
+    homepage = "https://github.com/googlefonts/majormono";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ mimvoid ];
+  };
+}

From 7667d760f1e89978de903f2c0c2755a83d6e095f Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 21 Jul 2024 20:48:09 +0200
Subject: [PATCH 14/79] sonarr: 4.0.7.1863 -> 4.0.8.1874

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

diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
index 3491ca44c249..6ba68993bf49 100644
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -17,12 +17,12 @@
 , prefetch-yarn-deps
 }:
 let
-  version = "4.0.7.1863";
+  version = "4.0.8.1874";
   src = fetchFromGitHub {
     owner = "Sonarr";
     repo = "Sonarr";
     rev = "v${version}";
-    hash = "sha256-wleqBvwglU7RonBa1ZWV3C0wB8cUpBlSU2ENDfi26Yo=";
+    hash = "sha256-4WjeuVqzuUmgbKIjcQOJCNrTnT9Wn6kpVxS+1T1hqyQ=";
   };
 in
 buildDotnetModule {

From 9ab8fb342a04b23b1a8ffd94b6b117ce2fcf12e5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 19 Jul 2024 17:23:53 +0200
Subject: [PATCH 15/79] sane-backends: 1.2.1 -> 1.3.1

---
 .../graphics/sane/backends/default.nix        | 95 ++++++++++++-------
 .../sane/backends/sane-desc-cross.patch       | 12 +++
 2 files changed, 73 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/applications/graphics/sane/backends/sane-desc-cross.patch

diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 3038d2be2123..4b4850dd07e0 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -1,49 +1,72 @@
-{ stdenv, lib, fetchurl, fetchpatch, runtimeShell, buildPackages
-, gettext, pkg-config, python3
-, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
-, curl, systemd, libxml2, poppler, gawk
-, sane-drivers
-, nixosTests
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  runtimeShell,
+  buildPackages,
+  gettext,
+  pkg-config,
+  python3,
+  avahi,
+  libgphoto2,
+  libieee1284,
+  libjpeg,
+  libpng,
+  libtiff,
+  libusb1,
+  libv4l,
+  net-snmp,
+  curl,
+  systemd,
+  libxml2,
+  poppler,
+  gawk,
+  sane-drivers,
+  nixosTests,
+  autoconf,
+  automake,
+  libtool,
+  autoconf-archive,
 
 # List of { src name backend } attibute sets - see installFirmware below:
-, extraFirmware ? []
+  extraFirmware ? [],
 
 # For backwards compatibility with older setups; use extraFirmware instead:
-, gt68xxFirmware ? null, snapscanFirmware ? null
+  gt68xxFirmware ? null, snapscanFirmware ? null,
 
 # Not included by default, scan snap drivers require fetching of unfree binaries.
-, scanSnapDriversUnfree ? false, scanSnapDriversPackage ? sane-drivers.epjitsu
+  scanSnapDriversUnfree ? false, scanSnapDriversPackage ? sane-drivers.epjitsu,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "sane-backends";
-  version = "1.2.1";
+  version = "1.3.1";
 
-  src = fetchurl {
-    # raw checkouts of the repo do not work because, the configure script is
-    # only functional in manually uploaded release tarballs.
-    # https://gitlab.com/sane-project/backends/-/issues/440
-    # unfortunately this make the url unpredictable on update, to find the link
-    # go to https://gitlab.com/sane-project/backends/-/releases and choose
-    # the link under the heading "Other".
-    url = "https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-1.2.1.tar.gz";
-    sha256 = "f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524";
+  src = fetchFromGitLab {
+    owner = "sane-project";
+    repo = "backends";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4mwPGeRsyzngDxBQ8/48mK+VR9LYV6082xr8lTrUZrk=";
   };
 
-  patches = [
-    # sane-desc will be used in postInstall so compile it for build
-    # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch
-    (fetchpatch {
-      name = "compile-sane-desc-for-build.patch";
-      url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch";
-      sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI=";
-    })
-  ];
+  preConfigure = ''
+    # create version files, so that autotools macros can use them:
+    # https://gitlab.com/sane-project/backends/-/issues/440
+    printf "%s\n" "$version" > .tarball-version
+    printf "%s\n" "$version" > .version
+
+    autoreconf -fiv
+
+    # Fixes for cross compilation
+    # https://github.com/NixOS/nixpkgs/issues/308283
 
-  postPatch = ''
     # related to the compile-sane-desc-for-build
     substituteInPlace tools/Makefile.in \
       --replace 'cc -I' '$(CC_FOR_BUILD) -I'
+
+    # sane-desc will be used in postInstall so compile it for build
+    # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch
+    patch -p1 -i ${./sane-desc-cross.patch}
   '';
 
   outputs = [ "out" "doc" "man" ];
@@ -51,7 +74,11 @@ stdenv.mkDerivation {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [
+    autoconf
+    autoconf-archive
+    automake
     gettext
+    libtool
     pkg-config
     python3
   ];
@@ -134,7 +161,7 @@ stdenv.mkDerivation {
     inherit (nixosTests) sane;
   };
 
-  meta = with lib; {
+  meta = {
     description = "SANE (Scanner Access Now Easy) backends";
     longDescription = ''
       Collection of open-source SANE backends (device drivers).
@@ -144,8 +171,8 @@ stdenv.mkDerivation {
       scanners, see http://www.sane-project.org/sane-backends.html.
     '';
     homepage = "http://www.sane-project.org/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = [ maintainers.symphorien ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = [ lib.maintainers.symphorien ];
   };
 }
diff --git a/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch b/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch
new file mode 100644
index 000000000000..6acee77c0e7a
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch
@@ -0,0 +1,12 @@
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -586,7 +586,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC
+ 
+ sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) 
+ 	@rm -f sane-desc$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS)
++	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c -o $@
+ 
+ sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) 
+ 	@rm -f sane-find-scanner$(EXEEXT)
+

From 4edef1362fc2656c00e80d690956f46d6f34119d Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 22 Jul 2024 12:46:25 +0200
Subject: [PATCH 16/79] sane-backends: configure and use lock dir

---
 nixos/modules/services/hardware/sane.nix         |  4 ++++
 .../graphics/sane/backends/default.nix           | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 5f166bb320ba..b6b36b6b60f4 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -177,6 +177,10 @@ in
 
       users.groups.scanner.gid = config.ids.gids.scanner;
       networking.firewall.allowedUDPPorts = mkIf config.hardware.sane.openFirewall [ 8612 ];
+
+      systemd.tmpfiles.rules = [
+        "d /var/lock/sane 0770 root scanner - -"
+      ];
     })
 
     (mkIf config.services.saned.enable {
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 4b4850dd07e0..1581b2f5b7b2 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-4mwPGeRsyzngDxBQ8/48mK+VR9LYV6082xr8lTrUZrk=";
   };
 
+  postPatch = ''
+    # Do not create lock dir in install phase
+    sed -i '/^install-lockpath:/!b;n;c\       # pass' backend/Makefile.am
+  '';
+
   preConfigure = ''
     # create version files, so that autotools macros can use them:
     # https://gitlab.com/sane-project/backends/-/issues/440
@@ -103,14 +108,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags =
-    lib.optional (avahi != null)   "--with-avahi"
-    ++ lib.optional (libusb1 != null) "--with-usb"
-  ;
+  configureFlags = [ "--with-lockdir=/var/lock/sane" ]
+    ++ lib.optional (avahi != null)   "--with-avahi"
+    ++ lib.optional (libusb1 != null) "--with-usb";
 
   # autoconf check for HAVE_MMAP is never set on cross compilation.
   # The pieusb backend fails compilation if HAVE_MMAP is not set.
-  buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ];
+  buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}"
+  ];
 
   postInstall = let
 

From 45641f527581da6743b5af5cba29e8acf995e134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 03:06:41 -0700
Subject: [PATCH 17/79] checkbashisms: 2.22.1 -> 2.23.7

Changelog: https://salsa.debian.org/debian/devscripts/-/blob/v2.23.7/debian/changelog
---
 .../tools/misc/checkbashisms/default.nix      | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index a9840a7cf277..1890b21d7cf1 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,11 +1,19 @@
-{ lib, stdenv, fetchurl, perl, installShellFiles }:
-stdenv.mkDerivation rec {
-  version = "2.22.1";
+{
+  lib,
+  stdenv,
+  fetchurl,
+  installShellFiles,
+  perl,
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  version = "2.23.7";
   pname = "checkbashisms";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    hash = "sha256-Nd1eYCnSe+NblujG44uKpvunkaITcdrC3g+M3uX+M9U=";
+    url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
+    hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -29,12 +37,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    version = testers.testVersion { package = finalAttrs.finalPackage; };
+  };
+
   meta = {
     homepage = "https://sourceforge.net/projects/checkbaskisms/";
+    changelog = "https://salsa.debian.org/debian/devscripts/-/blob/v${finalAttrs.version}/debian/changelog";
     description = "Check shell scripts for non-portable syntax";
     mainProgram = "checkbashisms";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ kaction ];
     platforms = lib.platforms.unix;
   };
-}
+})

From e70719a8e0224a3b1ab7848958ce377d2d68834d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 04:42:15 -0700
Subject: [PATCH 18/79] python312Packages.ocrmypdf: 16.4.1 -> 16.4.2

Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v16.4.1...v16.4.2

Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v16.4.2/docs/release_notes.rst
---
 pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 37980cd904a1..794b46f57e7e 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "16.4.1";
+  version = "16.4.2";
 
   disabled = pythonOlder "3.10";
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-C/xyinjiJgwdLHTLqFQApgr7q1gmmWoYBPfAq4iPUi0=";
+    hash = "sha256-zU3Yzdu5iF6USGj7bpf52+UMyeJuC7LFvR9NOrd8gXE=";
   };
 
   patches = [

From c8d5c486804d9fd07248b629e7031152528666e1 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:39:29 +0300
Subject: [PATCH 19/79] arc-browser: 1.51.0-51691 -> 1.52.0-51895

Changelog: https://arc.net/e/60112968-86B0-4696-9438-5DAB53B397C3
---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index a3b7f014473d..e9d5e81db5ad 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.51.0-51691";
+  version = "1.52.0-51895";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-d1dCx9knh7LqtRWzDsuPW1OD65CuZ9SPkOvyoDT4Q6c=";
+    hash = "sha256-IGUrU6J7xI0ay/ZQaC6xaI+Tl7ateAVOpGxtmR0yGIA=";
   };
 
   nativeBuildInputs = [ undmg ];

From 1440362eb9462ebdcbdb158b0eb90dde93db1870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 06:50:52 -0700
Subject: [PATCH 20/79] python312Packages.agate: 1.9.1 -> 1.11.0

Diff: https://github.com/wireservice/agate/compare/refs/tags/1.9.1...1.11.0

Changelog: https://github.com/wireservice/agate/blob/1.11.0/CHANGELOG.rst
---
 pkgs/development/python-modules/agate/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
index 4581a22cbf4f..f5a0e1f19be9 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -14,22 +14,21 @@
   python-slugify,
   pythonOlder,
   pytimeparse,
-  pytz,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "agate";
-  version = "1.9.1";
+  version = "1.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "wireservice";
     repo = "agate";
     rev = "refs/tags/${version}";
-    hash = "sha256-I7jvZA/m06kUuUcfglySaroDbJ5wbgiF2lb84EFPmpw=";
+    hash = "sha256-JVBf21as4DNmGT84dSG+54RIU6PbRBoLPSsWj2FGXxc=";
   };
 
   build-system = [ setuptools ];
@@ -49,7 +48,6 @@ buildPythonPackage rec {
     lxml
     pyicu
     pytestCheckHook
-    pytz
   ];
 
   pythonImportsCheck = [ "agate" ];

From 4d506759feaf2865475b21199dcd7f5e240ef6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 07:02:22 -0700
Subject: [PATCH 21/79] python312Packages.dbt-common: relax agate version
 constraint

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

diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index be1246264845..22bd2e40799d 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -33,6 +33,8 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
+  pythonRelaxDeps = [ "agate" ];
+
   dependencies = [
     agate
     colorama

From f46e45c1036b27d22a26921d9ac158a26f6bce7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 07:22:22 -0700
Subject: [PATCH 22/79] python312Packages.python-linux-procfs: 0.6.3 -> 0.7.3

---
 .../python-linux-procfs/default.nix               | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix
index f4306acedf71..3a0ed111cb5c 100644
--- a/pkgs/development/python-modules/python-linux-procfs/default.nix
+++ b/pkgs/development/python-modules/python-linux-procfs/default.nix
@@ -1,21 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchzip,
+  fetchurl,
+  setuptools,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "python-linux-procfs";
-  version = "0.6.3";
-  format = "setuptools";
+  version = "0.7.3";
+  pyproject = true;
 
-  src = fetchzip {
+  src = fetchurl {
     url = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/snapshot/python-linux-procfs-v${version}.tar.gz";
-    hash = "sha256-iaKL7CWJbIvvcUCah7bKdwKZoZJehbQpZ7n0liO8N64=";
+    hash = "sha256-6js8+PBqMwNYSe74zqZP8CZ5nt1ByjCWnex+wBY/LZU=";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
+
+  dependencies = [ six ];
 
   # contains no tests
   doCheck = false;

From 78b9e2d78f03f20285dd247ee72d3508004ec1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 07:27:44 -0700
Subject: [PATCH 23/79] python312Packages.ethtool: rename from python-ethtool

---
 .../python-modules/{python-ethtool => ethtool}/default.nix    | 4 ++--
 pkgs/os-specific/linux/tuna/default.nix                       | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/development/python-modules/{python-ethtool => ethtool}/default.nix (93%)

diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix
similarity index 93%
rename from pkgs/development/python-modules/python-ethtool/default.nix
rename to pkgs/development/python-modules/ethtool/default.nix
index b140db8c9f22..2b64672a264d 100644
--- a/pkgs/development/python-modules/python-ethtool/default.nix
+++ b/pkgs/development/python-modules/ethtool/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "python-ethtool";
+  pname = "ethtool";
   version = "0.15";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "fedora-python";
-    repo = pname;
+    repo = "python-ethtool";
     rev = "v${version}";
     sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i";
   };
diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix
index a75e9ec4f6a1..3e326eed8489 100644
--- a/pkgs/os-specific/linux/tuna/default.nix
+++ b/pkgs/os-specific/linux/tuna/default.nix
@@ -6,7 +6,7 @@
 , gobject-introspection
 , gtk3
 , python-linux-procfs
-, python-ethtool
+, ethtool
 , wrapGAppsHook3
 }:
 
@@ -38,7 +38,7 @@ buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = [ pygobject3 python-linux-procfs python-ethtool ];
+  propagatedBuildInputs = [ pygobject3 python-linux-procfs ethtool ];
 
   postInstall = ''
     mkdir -p $out/share/tuna
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 8824c33ed1a4..1798f32356a7 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -406,6 +406,7 @@ mapAliases ({
   PyMVGLive = pymvglive; # added 2023-02-19
   pymyq = python-myq; # added 2023-10-20
   pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
+  python-ethtool = ethtool; # added 2024-07-23
   python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
   pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
   pyqt5_sip = pyqt5-sip; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d6400d36b332..8e02e17c4c90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4000,6 +4000,8 @@ self: super: with self; {
 
   eth-utils = callPackage ../development/python-modules/eth-utils { };
 
+  ethtool = callPackage ../development/python-modules/ethtool { };
+
   etils = callPackage ../development/python-modules/etils { };
 
   etuples = callPackage ../development/python-modules/etuples { };
@@ -12644,8 +12646,6 @@ self: super: with self; {
 
   python-etcd = callPackage ../development/python-modules/python-etcd { };
 
-  python-ethtool = callPackage ../development/python-modules/python-ethtool { };
-
   python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { };
 
   python-fedora = callPackage ../development/python-modules/python-fedora { };

From 026dd53d499fcfd078ef2255d9c7b615512bc4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 07:41:41 -0700
Subject: [PATCH 24/79] python312Packages.ethtool: fix tests

---
 .../python-modules/ethtool/default.nix        | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix
index 2b64672a264d..497e6cc88851 100644
--- a/pkgs/development/python-modules/ethtool/default.nix
+++ b/pkgs/development/python-modules/ethtool/default.nix
@@ -2,32 +2,54 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
+  setuptools,
   pkg-config,
   libnl,
   nettools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "ethtool";
   version = "0.15";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fedora-python";
     repo = "python-ethtool";
-    rev = "v${version}";
-    sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-0XzGaqpkEv3mpUsbfOtRl8E62iNdS7kRoo4oYrBjMys=";
   };
 
+  patches = [
+    # https://github.com/fedora-python/python-ethtool/pull/60
+    (fetchpatch2 {
+      url = "https://github.com/fedora-python/python-ethtool/commit/f82dd763bd50affda993b9afe3b141069a1a7466.patch";
+      hash = "sha256-mtI7XsoyM43s2DFQdsBNpB8jJff7ZyO2J6SHodBrdrI=";
+    })
+  ];
+
   postPatch = ''
-    substituteInPlace tests/parse_ifconfig.py --replace "Popen('ifconfig'," "Popen('${nettools}/bin/ifconfig',"
+    substituteInPlace tests/parse_ifconfig.py \
+      --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' nettools "ifconfig"}',"
   '';
 
-  buildInputs = [ libnl ];
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libnl ];
+
   pythonImportsCheck = [ "ethtool" ];
 
+  nativeCheckInputs = [
+    nettools
+    pytestCheckHook
+  ];
+
   meta = with lib; {
+    changelog = "https://github.com/fedora-python/python-ethtool/blob/${src.rev}/CHANGES.rst";
     description = "Python bindings for the ethtool kernel interface";
     homepage = "https://github.com/fedora-python/python-ethtool";
     license = licenses.gpl2Plus;

From b60dd6b426b545b9b71bb4f3db5efeca9c60efd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 08:02:43 -0700
Subject: [PATCH 25/79] tuna: 0.15 -> 0.19

---
 pkgs/os-specific/linux/tuna/default.nix | 43 ++++++++++++++-----------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix
index 3e326eed8489..18b907aacb13 100644
--- a/pkgs/os-specific/linux/tuna/default.nix
+++ b/pkgs/os-specific/linux/tuna/default.nix
@@ -1,36 +1,37 @@
-{ lib
-, buildPythonApplication
-, fetchzip
-, pygobject3
-, glib
-, gobject-introspection
-, gtk3
-, python-linux-procfs
-, ethtool
-, wrapGAppsHook3
+{
+  lib,
+  python3,
+  fetchurl,
+  glib,
+  gobject-introspection,
+  gtk3,
+  wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "tuna";
-  version = "0.15";
+  version = "0.19";
+  pyproject = true;
 
-  src = fetchzip {
+  src = fetchurl {
     url = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git/snapshot/tuna-v${version}.tar.gz";
-    sha256 = "MwyLBwKz5ur1sBXHiCLq/Nq2u5aaiC+KzXqvGBmQii8=";
+    hash = "sha256-t10CxtwnTOg1uQgm6mTrNUIU8LkXJ3BkTycjWteQvuU=";
   };
 
   postPatch = ''
     mv tuna-cmd.py tuna/cmd.py
 
     substituteInPlace setup.py \
-      --replace 'packages = ["tuna", "tuna/gui"],' \
-                'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},'
+      --replace-fail 'packages = ["tuna", "tuna/gui"],' \
+                     'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},'
 
     substituteInPlace tuna/tuna_gui.py \
-      --replace "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \
-      --replace 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]"
+      --replace-fail "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \
+      --replace-fail 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]"
   '';
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   nativeBuildInputs = [
     glib.dev
     gobject-introspection
@@ -38,7 +39,11 @@ buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = [ pygobject3 python-linux-procfs ethtool ];
+  dependencies = with python3.pkgs; [
+    pygobject3
+    python-linux-procfs
+    ethtool
+  ];
 
   postInstall = ''
     mkdir -p $out/share/tuna
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24c05bba8f60..e7cc53465429 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34471,7 +34471,7 @@ with pkgs;
 
   tudu = callPackage ../applications/office/tudu { };
 
-  tuna = python3Packages.callPackage ../os-specific/linux/tuna { };
+  tuna = callPackage ../os-specific/linux/tuna { };
 
   tunefish = callPackage ../applications/audio/tunefish {
     stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4

From e051cb0f85ed106a642c6f9c6004caaeb4ff6143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 18:25:39 +0000
Subject: [PATCH 26/79] any-nix-shell: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix
index 16fe36cecf24..3ef59864af47 100644
--- a/pkgs/by-name/an/any-nix-shell/package.nix
+++ b/pkgs/by-name/an/any-nix-shell/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "any-nix-shell";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "haslersn";
     repo = "any-nix-shell";
     rev = "v${version}";
-    hash = "sha256-n4+aokW5o3EuXKqyc12vRsn5Mlkvdso27AdpahhySYw=";
+    hash = "sha256-t6+LKSGWmkHQhfqw/4Ztz4QgDXQ2RZr9R/mMEEA3jlY=";
   };
 
   strictDeps = true;

From cd816f7520afaa2ac5a4be82de17706b28a6eea4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:16:37 +0200
Subject: [PATCH 27/79] python312Packages.archinfo: 9.2.110 -> 9.2.112

Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.110...v9.2.112
---
 pkgs/development/python-modules/archinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index e18244d15049..dc417d723e99 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.110";
+  version = "9.2.112";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+v1EbHW619wI+pUucQuhn6/8BmWZ2LBtsxN6CMxDZI8=";
+    hash = "sha256-L//vOpW3iKQyWnB0rjBIXMeL/9meMcv58DBD/84GGR0=";
   };
 
   build-system = [ setuptools ];

From 7289fa7adab7b786417e82ae151dace3e9c73525 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:17:39 +0200
Subject: [PATCH 28/79] python312Packages.ailment: 9.2.110 -> 9.2.112

Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.110...v9.2.112
---
 pkgs/development/python-modules/ailment/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index a957515fdc3a..96c4708c3145 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.110";
+  version = "9.2.112";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hW76M2Vzpyx2p0VHNKRKxH2Ec5aF0WJ5y7zkbteS9YE=";
+    hash = "sha256-R1Tvo4xqxKB2yQypiOtmuCzujE1DhHo2kPQUL7RuWGk=";
   };
 
   build-system = [ setuptools ];

From e3d3eaaf3cc16dce9e9ff4c061f6f009dd3a1d8c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:19:47 +0200
Subject: [PATCH 29/79] python312Packages.cle: 9.2.110 -> 9.2.112

Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.110...v9.2.112
---
 pkgs/development/python-modules/cle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index b0ec6b2eba2a..bd7a2ba4d703 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -18,14 +18,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.110";
+  version = "9.2.112";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pxyFTIMMlROcqa1h9vOJ0Ka6NcgsZNMnaW5QSMqF8Yk=";
+    hash = "sha256-uVoM6Ae8r9xQ4+EzdQ5A3OrpOdt6hhJATvuzSZVxvy8=";
   };
 in
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vr5qj2wDUKoo/IQtaD9JuT1hv+u6M6d7OHmTP96mixI=";
+    hash = "sha256-Gdj3LVIYQKhDN5Dnw06D96wmvExyN5/OmNPu/EJeKw0=";
   };
 
   build-system = [ setuptools ];

From ab70128eb74a1d1a9c1522cab9d4d19b6c7e3c56 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:24:02 +0200
Subject: [PATCH 30/79] python312Packages.pyvex: 9.2.110 -> 9.2.112

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 0e9eccd0cbb5..fc0a3830e73f 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.110";
+  version = "9.2.112";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-odUalRvkRkS6rqh+x/qjCor629nIQNZnXiHJ4wYxDFU=";
+    hash = "sha256-IxrH8Ej1PmyQXtS7CROvxopf9tmjKiOYqwfAc6mLMnw=";
   };
 
   build-system = [ setuptools ];

From a5260070e8d97c6d12980747ea5564819bd7f11e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:24:50 +0200
Subject: [PATCH 31/79] python312Packages.claripy: 9.2.110 -> 9.2.112

Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.110...v9.2.112
---
 pkgs/development/python-modules/claripy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 974435e16955..efcf200f4d41 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.110";
+  version = "9.2.112";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6bozYqTt90sieBYK/RBw28m95BGeMeMEDe07AL6r+eI=";
+    hash = "sha256-UfHTV1I3V5NpeKAjXkQmaX6d/f7o+9QOsh1y2Ws02DA=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From db67864ee95ca045a12bd42f0419be7b1237e032 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:25:58 +0200
Subject: [PATCH 32/79] python312Packages.angr: 9.2.110 -> 9.2.112

Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.110...v9.2.112
---
 pkgs/development/python-modules/angr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 980861ae05d1..6f715ccbf160 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.110";
+  version = "9.2.112";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-t0OgY8donh/axg3lgEENRxhx+qx9xNmV/oMBsy2DCa4=";
+    hash = "sha256-OrLkKPQFhcDv/9Rj8c6UYhS5QbpjfEXBSAK61Y1I6YQ=";
   };
 
   pythonRelaxDeps = [ "capstone" ];

From 809ce72c900cd9301da701ddc585701c7f49076e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:37:46 +0200
Subject: [PATCH 33/79] python312Packages.git-filter-repo: 2.38.0 -> 2.45.0

Changelog: https://github.com/newren/git-filter-repo/releases/tag/v2.45.0
---
 .../git-filter-repo/default.nix               | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix
index ceb49c027fb4..5591d87dd5a3 100644
--- a/pkgs/development/python-modules/git-filter-repo/default.nix
+++ b/pkgs/development/python-modules/git-filter-repo/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchPypi,
-  fetchpatch,
   installShellFiles,
   pythonOlder,
   setuptools-scm,
@@ -12,34 +11,25 @@
 
 buildPythonPackage rec {
   pname = "git-filter-repo";
-  version = "2.38.0";
-  docs_version = "01ead411966a83dfcfb35f9d2e8a9f7f215eaa65";
+  version = "2.45.0";
+  docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4=";
+    pname = "git_filter_repo";
+    inherit version;
+    hash = "sha256-L6gP+NpUOCpuGJvBUi3Jhu56UqvL6eKBkvc8D2yLXqk=";
   };
 
   docs = fetchFromGitHub {
     owner = "newren";
     repo = "git-filter-repo";
     rev = docs_version;
-    hash = "sha256-Z/3w3Rguo8sfuc/OQ25eFbMfiOHjxQqPY6S32zuvoY4=";
+    hash = "sha256-m9NI7bLR5F+G7f3Dyi4sP6n4qz2i8cdBRuIn0OcpHAw=";
   };
 
-  patches = [
-    # https://github.com/newren/git-filter-repo/pull/498
-    (fetchpatch {
-      name = "remove-duplicate-script.patch";
-      url = "https://github.com/newren/git-filter-repo/commit/a59e67e7918e577147ca36a70916741be029c878.patch";
-      hash = "sha256-b0QHy9wMWuBWQoptdvLRT+9SRx2u2+11PnzEEB5F0Yo=";
-      stripLen = 1;
-    })
-  ];
-
   postInstall = ''
     installManPage ${docs}/man1/git-filter-repo.1
   '';
@@ -56,8 +46,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Quickly rewrite git repository history";
-    mainProgram = "git-filter-repo";
     homepage = "https://github.com/newren/git-filter-repo";
+    changelog = "https://github.com/newren/git-filter-repo/releases/tag/v${version}";
     license = with licenses; [
       mit # or
       gpl2Plus
@@ -66,6 +56,7 @@ buildPythonPackage rec {
       aiotter
       fab
     ];
+    mainProgram = "git-filter-repo";
   };
 
   passthru.updateScript = writeScript "update-${pname}" ''

From 27e4abe7c70f415a673ed2059cafc2df1c2b9826 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:41:45 +0200
Subject: [PATCH 34/79] python312Packages.cloudsplaining: 0.6.2 -> 0.6.3

Diff: https://github.com/salesforce/cloudsplaining/compare/refs/tags/0.6.2...0.6.3
---
 pkgs/development/python-modules/cloudsplaining/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index a2a472836f2f..9f5ec4ce119d 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "cloudsplaining";
-  version = "0.6.2";
+  version = "0.6.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "salesforce";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-7aOPerqayuJTHItlpnVVSzOlSGNnqHvtIi5BdovNh3A=";
+    hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI=";
   };
 
   propagatedBuildInputs = [

From b104b418767e64291d365cbe26092163748ccc82 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:44:27 +0200
Subject: [PATCH 35/79] python312Packages.cloudsplaining: refactor

- add changelog to meta
---
 .../python-modules/cloudsplaining/default.nix | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index 9f5ec4ce119d..fa8b93558fb4 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -14,23 +14,31 @@
   pythonOlder,
   pyyaml,
   schema,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "cloudsplaining";
   version = "0.6.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "salesforce";
-    repo = pname;
+    repo = "cloudsplaining";
     rev = "refs/tags/${version}";
     hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    # Ignore pinned versions
+    sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     boto3
     botocore
     cached-property
@@ -45,11 +53,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    # Ignore pinned versions
-    sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt
-  '';
-
   disabledTests = [
     "test_policy_expansion"
     "test_statement_details_for_allow_not_action"
@@ -59,9 +62,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module for AWS IAM security assessment";
-    mainProgram = "cloudsplaining";
     homepage = "https://github.com/salesforce/cloudsplaining";
+    changelog = "https://github.com/salesforce/cloudsplaining/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "cloudsplaining";
   };
 }

From c9be78e4c93719440bbd56d9a16bd606203206da Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:49:42 +0200
Subject: [PATCH 36/79] python312Packages.lacuscore: 1.10.6 -> 1.10.7

Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.10.6...v1.10.7

Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.10.7
---
 pkgs/development/python-modules/lacuscore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 5525419d46ad..27faa7f1e706 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.10.6";
+  version = "1.10.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lFtj1xIvKnXMtb/fcQWSXKKV8Ne6cSHbKYwLFY4M07M=";
+    hash = "sha256-n2aEKTOPztrWV9/qxRzk5G/9I2JBSHa2I4JZWWMR3wA=";
   };
 
   pythonRelaxDeps = [

From 06a0a3353a1d8fe6f8f0e8d076296247ed141455 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 21:53:34 +0200
Subject: [PATCH 37/79] python312Packages.types-awscrt: 0.21.0 -> 0.21.2

Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.21.2
---
 pkgs/development/python-modules/types-awscrt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index 946a012d82bf..97f9f348d7e2 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.21.0";
+  version = "0.21.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-Bqokf+XM8LhkKOUomuq/Z/ln4Qhh8hHBbBnn0lQqcKk=";
+    hash = "sha256-hKn09CLsUlwxT99Uwjoec+37zsloVglDyi1Bz65iOzg=";
   };
 
   build-system = [ poetry-core ];

From c7cad7191d5ba14265ee466124d3be9daaa47905 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 22:06:19 +0200
Subject: [PATCH 38/79] checkov: 3.2.174 -> 3.2.201

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.174...3.2.201

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.201
---
 pkgs/development/tools/analysis/checkov/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 5b31e4ae2de7..9e09d7f9ec4f 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.174";
+  version = "3.2.201";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-5R5WKeXmT4hMhjd+Laafqx4UXfvGf+2lMh34XpMs3vQ=";
+    hash = "sha256-jt0JMwmk+M1S+vRvrFSm53IVMJ4aAec73K23wucOoS4=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];
@@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec {
     "packaging"
     "pycep-parser"
     "rustworkx"
+    "schema"
     "termcolor"
     "urllib3"
   ];

From 85457a95de3ab876732634c0e9434f64ff833c86 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 23 Jul 2024 16:19:20 -0400
Subject: [PATCH 39/79] helmfile-wrapped: use proxyVendor

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index d7c98c38eb4f..3a21260c0579 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -17,7 +17,9 @@ buildGoModule rec {
     hash = "sha256-TZskvZyNihklCJB0yMFXk1bLEuhetQvJ+6uLnYiLBs0=";
   };
 
-  vendorHash = "sha256-aQ/g7MWMWvxRcTHPUYRGjaaPX9ZH6m+TJ6BdsFeGOsY=";
+  vendorHash = "sha256-Ny7r9G3Y5SuigIKkXra5Xn08QIlhzFASXGMMc+g1S/E=";
+
+  proxyVendor = true; # darwin/linux hash mismatch
 
   doCheck = false;
 

From ecee8076d9950b06c903d2203b4fbe64317d87de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 22:43:54 +0200
Subject: [PATCH 40/79] python312Packages.pysolcast: 2.0.3 -> 2.0.5

Diff: https://github.com/mcaulifn/solcast/compare/refs/tags/v2.0.3...v2.0.5

Changelog: https://github.com/mcaulifn/solcast/releases/tag/v2.0.5
---
 .../development/python-modules/pysolcast/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix
index 395130f01636..84178ddb5b41 100644
--- a/pkgs/development/python-modules/pysolcast/default.nix
+++ b/pkgs/development/python-modules/pysolcast/default.nix
@@ -4,17 +4,18 @@
   buildPythonPackage,
   fetchFromGitHub,
   isodate,
+  poetry-core,
+  poetry-dynamic-versioning,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
   requests,
   responses,
-  poetry-core,
 }:
 
 buildPythonPackage rec {
   pname = "pysolcast";
-  version = "2.0.3";
+  version = "2.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,12 +24,15 @@ buildPythonPackage rec {
     owner = "mcaulifn";
     repo = "solcast";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BMM6eDloyLee7mkwUE9HpWcRUE62y43YivRjDbwAqIk=";
+    hash = "sha256-NssU1RZU5Xc9s6E4nnjYElAGZrE4ER2jSzamrCx/Yng=";
   };
 
   pythonRelaxDeps = [ "responses" ];
 
-  build-system = [ poetry-core ];
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
 
 
   dependencies = [

From 57e341c27d2ed85aad94b8d55efcd28e45041a3b Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Tue, 23 Jul 2024 18:09:48 -0300
Subject: [PATCH 41/79] affine: 0.15.6 -> 0.15.7

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

diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index ed2615ed7fab..19ebf5131e5f 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let
   };
 in {
   pname = "affine";
-  version = "0.15.6";
+  version = "0.15.7";
   src = fetchurl {
     url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip";
-    hash = "sha256-0XlKmjL9rYUYIMgpJ9knM+RbtLlzB1P5Rk62naTmznw=";
+    hash = "sha256-CbbCYcZ6z5Prj9GwIoneHU3LUsae0S4o40LgunLmQ8s=";
   };
   nativeBuildInputs = [
     copyDesktopItems

From 52441aa324b1a05ff7167fcede915c5b6d78ab7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 21:33:55 +0000
Subject: [PATCH 42/79] python312Packages.py-pdf-parser: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/py-pdf-parser/default.nix b/pkgs/development/python-modules/py-pdf-parser/default.nix
index 84d2e77d45af..551eaea8cc62 100644
--- a/pkgs/development/python-modules/py-pdf-parser/default.nix
+++ b/pkgs/development/python-modules/py-pdf-parser/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "py-pdf-parser";
-  version = "0.12.0";
+  version = "0.13.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nMEmzQVz1LR4omHyxhvrjBXDQQE23S62T0wxZeMnXhg=";
+    hash = "sha256-dssxWgbMrWFTK4b7oBezF77k9NmUTbdbQED9eyVQGlU=";
   };
 
   nativeBuildInputs = [

From 3564876be59f6cff8743f01d0ea227caaf7725e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 22:03:14 +0000
Subject: [PATCH 43/79] python312Packages.medpy: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/medpy/default.nix b/pkgs/development/python-modules/medpy/default.nix
index 0fc6d1fc97aa..239919e4eb35 100644
--- a/pkgs/development/python-modules/medpy/default.nix
+++ b/pkgs/development/python-modules/medpy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "medpy";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "loli";
     repo = "medpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-kzOTYBcXAAEYoe/m/BjWNaQX4ljG17NxndevAt5KxjQ=";
+    hash = "sha256-M46d8qiR3+ioiuRhzIaU5bV1dnfDm819pjn78RYlcG0=";
   };
 
   build-system = [ setuptools ];

From 091a931abeb3116e7cb5e658edf9916aff9f6feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 23:16:19 +0000
Subject: [PATCH 44/79] tflint-plugins.tflint-ruleset-google: 0.29.0 -> 0.30.0

---
 .../tools/analysis/tflint-plugins/tflint-ruleset-google.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
index 5fa8efd23a1c..7dfeea873ac2 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tflint-ruleset-google";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cflmuvILMJX7jsz6OKPcaN/KezvWiqiv20Sw4vJ/mUk=";
+    hash = "sha256-eE1KSfbMbNuHlzEi7+zTRdxq548+pB8p01iIWoE2NAQ=";
   };
 
-  vendorHash = "sha256-xxSOjnzqESCOWtXsAGuTwVEoinvBNuJFaxDrIVc1O08=";
+  vendorHash = "sha256-nuucBbqS+D12JEPoS/QHHTcPKaTjsD4oxnVLDMmLwNA=";
 
   # upstream Makefile also does a go test $(go list ./... | grep -v integration)
   preCheck = ''

From d6f1faab427b677c93ac5f85ec6be38aeb61ef9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 23:57:06 +0000
Subject: [PATCH 45/79] python312Packages.aioairzone-cloud: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix
index 901b1c31f055..27567cab2e23 100644
--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone-cloud";
-  version = "0.5.4";
+  version = "0.5.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone-cloud";
     rev = "refs/tags/${version}";
-    hash = "sha256-XQkrhLOvkYsX8+rb3qkeOcOev8WcB/6tchIfDF4N+i0=";
+    hash = "sha256-8IMEolbeXzqUHo139B9hu4FwelLZ4ENEDLHcaUjU/KE=";
   };
 
   build-system = [ setuptools ];

From a9ca0d35686366685ec80ce19cf3af2ea8020611 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 00:57:15 +0000
Subject: [PATCH 46/79] convco: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 59dc53509902..2564f3b06c1b 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "convco";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "convco";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-b05RO6x5hnxG6gepRTK4CDlnLqMdp8hl4KL+InzBH70=";
+    hash = "sha256-S5k0d29tuR0VkJrqCiWg1v+W2n9TrQCfMOInII4jxg0=";
   };
 
-  cargoHash = "sha256-pdnH/9Tda6PXf70W76mg5vVE2rzOI+M61UR+HMtgXC0=";
+  cargoHash = "sha256-cYb3syf+k4V0pCpekQ2tY73Gl6rDc9YMCXs3TKRtgpo=";
 
   nativeBuildInputs = [ cmake pkg-config ];
 

From d2a241a4ebc8649b085cf11bbd74e7e09e44db20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 02:13:55 +0000
Subject: [PATCH 47/79] python312Packages.boto3-stubs: 1.34.145 -> 1.34.147

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 21cf7f9303a0..bb464cf3e572 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -366,7 +366,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.34.145";
+  version = "1.34.147";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -374,7 +374,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-LRXM/ERAe6rol9OlMfnrCCbiB9cOkvUmjocDE5vsLbo=";
+    hash = "sha256-Okg9KlWyRwKdbl4EACFTmENTwMGYgmB69+NwOKfOcrA=";
   };
 
   build-system = [ setuptools ];

From 0c13ae8a1e764df42a574465697ca2e214aab578 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 02:14:18 +0000
Subject: [PATCH 48/79] python312Packages.botocore-stubs: 1.34.145 -> 1.34.147

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index af8afca0d46f..705f6072b2ba 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.34.145";
+  version = "1.34.147";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-abz8DIHu4pTmgdyASbfKKkeo8FELiMBXEPB9um0Hhcc=";
+    hash = "sha256-1px1txwv4UVrckZT9YatzVv2YP9tEE7LasXvtA/PNjs=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 0ee7510bddd73ffb81004015f0e90c67a4a0fd44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 02:50:34 +0000
Subject: [PATCH 49/79] odpic: 5.2.0 -> 5.3.0

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

diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 6ab232ae42e9..92b943dbdf2f 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 let
-  version = "5.2.0";
+  version = "5.3.0";
   libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
 in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     owner = "oracle";
     repo = "odpi";
     rev = "v${version}";
-    sha256 = "sha256-2oM78YgP14oyFBWZ8KdHlGsN3hjoWTBcIvOI+93sSyM=";
+    sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA=";
   };
 
   nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;

From 473c65e8fdf1b648f2de8b66c78ecff22bce53f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 03:36:52 +0000
Subject: [PATCH 50/79] python312Packages.deprecat: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix
index 62c05168c2cb..1635a99d7137 100644
--- a/pkgs/development/python-modules/deprecat/default.nix
+++ b/pkgs/development/python-modules/deprecat/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "deprecat";
-  version = "2.1.2";
+  version = "2.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "mjhajharia";
     repo = "deprecat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uAabZAtZDhcX6TfiM0LnrAzxxS64ys+vdodmxO//0x8=";
+    hash = "sha256-CvW4SQ78FG8GqBs6/a0yHWfTAn64sH54GVSETooMa6A=";
   };
 
   build-system = [ setuptools-scm ];

From e2c01076318b27bcb1148c01cd39f09cf6a5f76e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 03:54:45 +0000
Subject: [PATCH 51/79] python312Packages.resend: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix
index 3f17d6048a2d..849e5b1bee8f 100644
--- a/pkgs/development/python-modules/resend/default.nix
+++ b/pkgs/development/python-modules/resend/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "resend";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "resend";
     repo = "resend-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Kk80+3oub32jIj2epTeunAfvYSSoP0GyZC4dhnYb8SM=";
+    hash = "sha256-cgeHkueH060vDvx3r6QP6e72l10zZ6mhUosWxIakG2g=";
   };
 
   build-system = [ setuptools ];

From 359c28400b1109c7b030ced57ef4d3d7c0627a0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 04:46:56 +0000
Subject: [PATCH 52/79] enum4linux-ng: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix
index 956e71fed923..0f143671f4ec 100644
--- a/pkgs/tools/security/enum4linux-ng/default.nix
+++ b/pkgs/tools/security/enum4linux-ng/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "enum4linux-ng";
-  version = "1.3.3";
+  version = "1.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cddmp";
     repo = "enum4linux-ng";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VpNYgdgvsQG5UcxoyyLCj5ijJdIKKhCSqnHTvTgD4lA=";
+    hash = "sha256-MN3AUubro9CHkdPe/X1xcE11ye/D/A+Kf6zUOJTN4l0=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From ddb74cdb93dfca3c44c35459b383a76dfa61272d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 05:06:27 +0000
Subject: [PATCH 53/79] docker-credential-gcr: 2.1.22 -> 2.1.23

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

diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix
index 620cce774374..5f656f14eaad 100644
--- a/pkgs/by-name/do/docker-credential-gcr/package.nix
+++ b/pkgs/by-name/do/docker-credential-gcr/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "docker-credential-gcr";
-  version = "2.1.22";
+  version = "2.1.23";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "docker-credential-gcr";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-vGX6Jhh91dUqZ+y+h1SlPiFE3dL0UO3iJyyzvQVoUsQ=";
+    sha256 = "sha256-ViZxxqRZQPevuK/yueHKmg4CwnNpgfyXszGalzWucko=";
   };
 
   postPatch = ''

From 19a72ae52cfa46c828ced9e76cbcde11187ac353 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 24 Jul 2024 09:21:08 +0300
Subject: [PATCH 54/79] kdePackages.kirigami-addons: 1.3.0 -> 1.4.0

---
 pkgs/kde/misc/kirigami-addons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix
index f9105b4f16b7..5930357a7ee8 100644
--- a/pkgs/kde/misc/kirigami-addons/default.nix
+++ b/pkgs/kde/misc/kirigami-addons/default.nix
@@ -7,11 +7,11 @@
 }:
 mkKdeDerivation rec {
   pname = "kirigami-addons";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
-    hash = "sha256-9eRNen19/YZsUpuwBPcgQBNgmhbJdXCR/NssbFvgD/M=";
+    hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM=";
   };
 
   extraBuildInputs = [qtdeclarative];

From dd56092db0db686d43b463cf55873c44d79b10b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 06:29:05 +0000
Subject: [PATCH 55/79] libks: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix
index 520c8568ebc1..4122d4f57617 100644
--- a/pkgs/development/libraries/libks/default.nix
+++ b/pkgs/development/libraries/libks/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libks";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-cSBtNOJfau+7wQ5iUs4hnqSMoo8XYN9opwPfox2ke+E=";
+    sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0=";
   };
 
   patches = [

From 974c3a19562d2acc021f78b357c78ca863a23655 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 07:19:42 +0000
Subject: [PATCH 56/79] graalvm-ce: 22.0.1 -> 22.0.2

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

diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
index 47bd1bc92f8b..2c7e931a8a7b 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
@@ -1,22 +1,22 @@
 # Generated by update.sh script
 {
-  "version" = "22.0.1";
+  "version" = "22.0.2";
   "hashes" = {
     "aarch64-linux" = {
-      sha256 = "1kr8ch78570c3z5mcx10an96vdzril7wxq7bdaxx4qvbrhw06l9a";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-aarch64_bin.tar.gz";
+      sha256 = "1n8ln1xk60hjvr191pj1mpg793zmq531mkwx3la8d2x6by0lrji8";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      sha256 = "0x8za6h3bza5fpdds849v0mjy7yh0hz2r8sgmfcvp966x3lcfkp3";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-x64_bin.tar.gz";
+      sha256 = "0krnfhcnvhm809prdbhalj86652zh5cgl14qvp8vq3sydbcivb7b";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      sha256 = "1y1hxfgfmzyx8makzl98phjq4k8r1iidvx25gs8mzm7b7zzjsg2m";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_macos-x64_bin.tar.gz";
+      sha256 = "1r0j7n4k5ganyrxs9pxjwdbm8k9a20g6giixdhm9nmpan6hxs4h5";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      sha256 = "1h39qw97xcr4ii9kbgm41rczq759ma2vcg5xbypp80w0khsicsmr";
-      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_macos-aarch64_bin.tar.gz";
+      sha256 = "07qhym71n4v2744j9h6qx72v79mgkk266isn4kc9rgrb7x8gsgc8";
+      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-aarch64_bin.tar.gz";
     };
   };
 }

From 8d755a40fede3ad57ac59d90a341cb4cae26d336 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 24 Jul 2024 09:28:07 +0300
Subject: [PATCH 57/79] kdePackages: regenerate dependencies

---
 pkgs/kde/gear/filelight/default.nix        |   6 +-
 pkgs/kde/gear/francis/default.nix          |   3 +-
 pkgs/kde/gear/kmime/default.nix            |   7 +-
 pkgs/kde/generated/dependencies.json       |  89 ++++---
 pkgs/kde/generated/projects.json           | 262 ++++++++++++---------
 pkgs/kde/plasma/plasma-welcome/default.nix |   3 +-
 6 files changed, 219 insertions(+), 151 deletions(-)

diff --git a/pkgs/kde/gear/filelight/default.nix b/pkgs/kde/gear/filelight/default.nix
index 499fcfccfd37..b23926ff3e41 100644
--- a/pkgs/kde/gear/filelight/default.nix
+++ b/pkgs/kde/gear/filelight/default.nix
@@ -1,14 +1,16 @@
 {
   mkKdeDerivation,
-  kirigami,
+  kirigami-addons,
   kquickcharts,
+  kxmlgui,
 }:
 mkKdeDerivation {
   pname = "filelight";
 
   extraBuildInputs = [
-    kirigami
+    kirigami-addons
     kquickcharts
+    kxmlgui
   ];
   meta.mainProgram = "filelight";
 }
diff --git a/pkgs/kde/gear/francis/default.nix b/pkgs/kde/gear/francis/default.nix
index ae319e30209d..66dd02f7d112 100644
--- a/pkgs/kde/gear/francis/default.nix
+++ b/pkgs/kde/gear/francis/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   fetchpatch,
   qtsvg,
+  knotifications,
 }:
 mkKdeDerivation {
   pname = "francis";
@@ -15,5 +16,5 @@ mkKdeDerivation {
     })
   ];
 
-  extraBuildInputs = [qtsvg];
+  extraBuildInputs = [qtsvg knotifications];
 }
diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix
index 52e2b97da392..b816e462775b 100644
--- a/pkgs/kde/gear/kmime/default.nix
+++ b/pkgs/kde/gear/kmime/default.nix
@@ -1,4 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  ki18n,
+}:
 mkKdeDerivation {
   pname = "kmime";
+
+  extraBuildInputs = [ki18n];
 }
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index 371a13bf633b..0c0dae6d585a 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -600,6 +600,7 @@
       "kiconthemes",
       "knewstuff",
       "ktexteditor",
+      "ktexttemplate",
       "ktextwidgets",
       "kuserfeedback",
       "plasma-activities"
@@ -617,6 +618,10 @@
     "croutons": [
       "extra-cmake-modules"
     ],
+    "crow-translate": [
+      "extra-cmake-modules",
+      "kwayland"
+    ],
     "daykountdown": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -697,7 +702,6 @@
       "kwindowsystem",
       "packagekit-qt",
       "phonon",
-      "plasma-activities",
       "selenium-webdriver-at-spi",
       "solid"
     ],
@@ -754,6 +758,11 @@
       "solid",
       "syntax-highlighting"
     ],
+    "drkonqi-pk-debug-installer": [
+      "kcoreaddons",
+      "kdeclarative",
+      "ki18n"
+    ],
     "elf-dissector": [
       "extra-cmake-modules"
     ],
@@ -819,13 +828,12 @@
     ],
     "filelight": [
       "extra-cmake-modules",
-      "kcoreaddons",
+      "kcolorscheme",
+      "kconfig",
       "kcrash",
       "kdoctools",
       "ki18n",
-      "kio",
-      "kirigami-addons",
-      "kxmlgui"
+      "kio"
     ],
     "flatpak-kcm": [
       "extra-cmake-modules",
@@ -861,7 +869,6 @@
       "ki18n",
       "kirigami",
       "kirigami-addons",
-      "knotifications",
       "kwindowsystem",
       "qqc2-desktop-style"
     ],
@@ -978,7 +985,6 @@
       "ki18n",
       "kiconthemes",
       "kio",
-      "kitemmodels",
       "threadweaver"
     ],
     "incidenceeditor": [
@@ -1106,7 +1112,8 @@
       "kaccounts-integration",
       "ki18n",
       "kio",
-      "kpackage"
+      "kpackage",
+      "qcoro"
     ],
     "kactivitymanagerd": [
       "extra-cmake-modules",
@@ -1131,6 +1138,7 @@
       "akonadi-search",
       "extra-cmake-modules",
       "grantleetheme",
+      "kiconthemes",
       "kontactinterface",
       "kuserfeedback",
       "libkdepim",
@@ -1168,6 +1176,7 @@
       "kguiaddons",
       "kholidays",
       "ki18n",
+      "kiconthemes",
       "kidentitymanagement",
       "kio",
       "kitemmodels",
@@ -1181,8 +1190,7 @@
       "ktextaddons",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "kalgebra": [
       "analitza",
@@ -1201,7 +1209,8 @@
       "kcoreaddons",
       "ki18n",
       "kirigami",
-      "kunitconversion"
+      "kunitconversion",
+      "qqc2-desktop-style"
     ],
     "kalm": [
       "extra-cmake-modules",
@@ -1326,7 +1335,9 @@
       "knewstuff",
       "ktexteditor",
       "ktextwidgets",
-      "kuserfeedback"
+      "kuserfeedback",
+      "qtkeychain",
+      "selenium-webdriver-at-spi"
     ],
     "katomic": [
       "extra-cmake-modules",
@@ -1467,7 +1478,8 @@
       "kguiaddons",
       "ki18n",
       "knotifications",
-      "kxmlgui"
+      "kxmlgui",
+      "selenium-webdriver-at-spi"
     ],
     "kcalendarcore": [
       "extra-cmake-modules"
@@ -1667,6 +1679,7 @@
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
+      "kiconthemes",
       "kitemviews",
       "kwidgetsaddons",
       "kxmlgui",
@@ -1775,9 +1788,7 @@
       "akonadi-calendar",
       "akonadi-contacts",
       "akonadi-import-wizard",
-      "akonadi-notes",
       "calendarsupport",
-      "eventviews",
       "extra-cmake-modules",
       "grantleetheme",
       "incidenceeditor",
@@ -2007,13 +2018,18 @@
       "ktexteditor"
     ],
     "kdevelop": [
+      "kcmutils",
       "kdevelop-pg-qt",
       "kitemmodels",
+      "knewstuff",
       "knotifyconfig",
+      "krunner",
       "ktexteditor",
+      "ktexttemplate",
       "libkomparediff2",
       "libksysguard",
-      "okteta",
+      "libplasma",
+      "purpose",
       "threadweaver"
     ],
     "kdevelop-pg-qt": [
@@ -2490,7 +2506,6 @@
       "kio",
       "kjobwidgets",
       "kservice",
-      "kwidgetsaddons",
       "kwindowsystem",
       "plasma-systemmonitor",
       "selenium-webdriver-at-spi",
@@ -2608,6 +2623,9 @@
     "kirigami-addons": [
       "extra-cmake-modules",
       "kconfig",
+      "kcoreaddons",
+      "kglobalaccel",
+      "kguiaddons",
       "ki18n",
       "kirigami"
     ],
@@ -2729,6 +2747,7 @@
       "extra-cmake-modules",
       "kcmutils",
       "kcodecs",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
@@ -2911,8 +2930,7 @@
     ],
     "kmime": [
       "extra-cmake-modules",
-      "kcodecs",
-      "ki18n"
+      "kcodecs"
     ],
     "kmines": [
       "extra-cmake-modules",
@@ -2997,12 +3015,12 @@
       "kio",
       "knotifications",
       "kservice",
+      "kstatusnotifieritem",
       "ktextwidgets",
       "kwidgetsaddons",
       "kxmlgui"
     ],
     "kmymoney": [
-      "akonadi",
       "alkimia",
       "extra-cmake-modules",
       "kcmutils",
@@ -3015,7 +3033,6 @@
       "kholidays",
       "ki18n",
       "kiconthemes",
-      "kidentitymanagement",
       "kio",
       "kitemmodels",
       "kitemviews",
@@ -3200,6 +3217,7 @@
       "dolphin",
       "extra-cmake-modules",
       "kcoreaddons",
+      "kdbusaddons",
       "kdoctools",
       "ki18n",
       "kio",
@@ -3229,7 +3247,9 @@
       "kdbusaddons",
       "ki18n",
       "kirigami",
-      "knotifications"
+      "kirigami-addons",
+      "knotifications",
+      "kosmindoormap"
     ],
     "konqueror": [
       "extra-cmake-modules",
@@ -3289,6 +3309,7 @@
     "kontact": [
       "extra-cmake-modules",
       "grantleetheme",
+      "kiconthemes",
       "kontactinterface",
       "ktexttemplate",
       "libkdepim",
@@ -3345,6 +3366,8 @@
       "kservice",
       "ktextwidgets",
       "kwidgetsaddons",
+      "kxmlgui",
+      "purpose",
       "sonnet"
     ],
     "kookbook": [
@@ -4080,6 +4103,7 @@
       "extra-cmake-modules",
       "kcmutils",
       "kcoreaddons",
+      "ki18n",
       "kservice"
     ],
     "kunitconversion": [
@@ -4230,6 +4254,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcrash",
+      "kdbusaddons",
       "kdoctools",
       "ki18n",
       "kirigami-addons",
@@ -4561,6 +4586,7 @@
       "ki18n",
       "kirigami",
       "kirigami-addons",
+      "kmime",
       "kxmlgui"
     ],
     "massif-visualizer": [
@@ -4641,6 +4667,7 @@
     "mbox-importer": [
       "akonadi",
       "extra-cmake-modules",
+      "kiconthemes",
       "mailcommon",
       "mailimporter"
     ],
@@ -4920,6 +4947,8 @@
       "extra-cmake-modules",
       "kcalendarcore",
       "kcontacts",
+      "kdbusaddons",
+      "kiconthemes",
       "kidentitymanagement",
       "kmailtransport",
       "kmime",
@@ -4931,6 +4960,7 @@
     ],
     "pim-sieve-editor": [
       "extra-cmake-modules",
+      "kiconthemes",
       "kimap",
       "kmailtransport",
       "kuserfeedback",
@@ -5394,8 +5424,10 @@
       "knewstuff",
       "knotifications",
       "ksvg",
+      "kuserfeedback",
       "kwindowsystem",
-      "libplasma"
+      "libplasma",
+      "milou"
     ],
     "plasma-workspace": [
       "appstream-qt",
@@ -5479,11 +5511,8 @@
       "kcoreaddons",
       "kguiaddons",
       "ki18n",
-      "kio",
       "knotifications",
-      "kservice",
       "libksysguard",
-      "libplasma",
       "solid"
     ],
     "plasmatube": [
@@ -5852,6 +5881,7 @@
       "kwindowsystem",
       "kxmlgui",
       "libplasma",
+      "qtkeychain",
       "solid"
     ],
     "solid": [
@@ -5889,13 +5919,14 @@
       "kirigami",
       "knotifications",
       "kpipewire",
+      "kstatusnotifieritem",
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
       "layer-shell-qt",
+      "prison",
       "purpose",
-      "wayland",
-      "zxing-cpp"
+      "wayland"
     ],
     "step": [
       "extra-cmake-modules",
@@ -6207,5 +6238,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "558e00a4"
+  "version": "65b48b30"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 5af72a4c52d1..cba5dd484f00 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -578,7 +578,7 @@
   "brooklyn": {
     "description": "Protocol independent software which forwards messages between various chat services.",
     "name": "brooklyn",
-    "project_path": "playground/utils/brookyln",
+    "project_path": "playground/utils/brooklyn",
     "repo_path": "unmaintained/brooklyn"
   },
   "brprint3d": {
@@ -761,6 +761,12 @@
     "project_path": "extragear/libs/croutons",
     "repo_path": "libraries/croutons"
   },
+  "crow-translate": {
+    "description": "Application that allows you to translate and speak text",
+    "name": "crow-translate",
+    "project_path": "playground/office/crow-translate",
+    "repo_path": "office/crow-translate"
+  },
   "cutehmi": {
     "description": "Open-source HMI (Human Machine Interface) software written in C++ and QML",
     "name": "cutehmi",
@@ -857,6 +863,30 @@
     "project_path": "documentation/docs-kdenlive-org",
     "repo_path": "documentation/docs-kdenlive-org"
   },
+  "documentation-docs-krita-org": {
+    "description": "The Krita Manual. Built with Sphinx by Jenkins, available online at https://docs.krita.org\r\n\r\nCheck the krita_manual_readme.rst on how to help us!",
+    "name": "documentation-docs-krita-org",
+    "project_path": "documentation/docs-krita-org",
+    "repo_path": "documentation/docs-krita-org"
+  },
+  "documentation-docs-plasma-mobile-org": {
+    "description": "Plasma Mobile documentation based on Sphinx",
+    "name": "documentation-docs-plasma-mobile-org",
+    "project_path": "documentation/docs-plasma-mobile-org",
+    "repo_path": "documentation/docs-plasma-mobile-org"
+  },
+  "documentation-hig-kde-org": {
+    "description": "KDE Human Interface Guidelines website",
+    "name": "documentation-hig-kde-org",
+    "project_path": "documentation/hig-kde-org",
+    "repo_path": "documentation/hig-kde-org"
+  },
+  "documentation-openraster-org": {
+    "description": "Sphinx setup for the Openraster.org (ORA specification) website",
+    "name": "documentation-openraster-org",
+    "project_path": "documentation/openraster-org",
+    "repo_path": "documentation/openraster-org"
+  },
   "dolphin": {
     "description": "File manager by KDE",
     "name": "dolphin",
@@ -950,7 +980,7 @@
   "eyeos-style": {
     "description": "KStyle for EyeOS",
     "name": "eyeos-style",
-    "project_path": "playground/base/eyeos-style",
+    "project_path": "unmaintained/eyeos-style",
     "repo_path": "unmaintained/eyeos-style"
   },
   "falkon": {
@@ -1346,7 +1376,7 @@
   "kapa": {
     "description": "KDE Advanced Personal Assistant",
     "name": "kapa",
-    "project_path": "playground/base/kapa",
+    "project_path": "unmaintained/kapa",
     "repo_path": "unmaintained/kapa"
   },
   "kapidox": {
@@ -1616,7 +1646,7 @@
   "kcwsh": {
     "description": "This project provides a terminal wrapper, both abstracted and using a Qt based sample backend. It is used to make a windows port of konsole possible.",
     "name": "kcwsh",
-    "project_path": "playground/base/kcwsh",
+    "project_path": "unmaintained/kcwsh",
     "repo_path": "unmaintained/kcwsh"
   },
   "kdav": {
@@ -1655,6 +1685,12 @@
     "project_path": "unmaintained/kde-baseapps",
     "repo_path": "unmaintained/kde-baseapps"
   },
+  "kde-br-promo": {
+    "description": "General repository for KDE Brazil promo material (artwork, templates, talks, etc)",
+    "name": "kde-br-promo",
+    "project_path": "others/kde-br-promo",
+    "repo_path": "unmaintained/kde-br-promo"
+  },
   "kde-build-metadata": {
     "description": "DEPRECATED - CONTENT MOVED TO https://invent.kde.org/sysadmin/repo-metadata/-/tree/master/dependencies",
     "name": "kde-build-metadata",
@@ -1662,7 +1698,7 @@
     "repo_path": "sysadmin/kde-build-metadata"
   },
   "kde-builder": {
-    "description": "Script to streamline the process of setting up and maintaining a development environment for KDE software.",
+    "description": "A tool to streamline the process of setting up and maintaining a development environment for KDE software.",
     "name": "kde-builder",
     "project_path": "playground/sdk/kde-builder",
     "repo_path": "sdk/kde-builder"
@@ -1706,9 +1742,15 @@
   "kde-now": {
     "description": "Google Now alternative for the Plasma Desktop",
     "name": "kde-now",
-    "project_path": "playground/base/kde-now",
+    "project_path": "unmaintained/kde-now",
     "repo_path": "unmaintained/kde-now"
   },
+  "kde-promo": {
+    "description": "This is an easy method for organizing KDE Promo materials.",
+    "name": "kde-promo",
+    "project_path": "others/kde-promo",
+    "repo_path": "unmaintained/kde-promo"
+  },
   "kde-ruleset": {
     "description": "svn2git rules files and support scripts for KDE's SVN-to-Git migration",
     "name": "kde-ruleset",
@@ -1724,7 +1766,7 @@
   "kde-vdg-extras": {
     "description": "Colour schemes, avatars and other additional visual assets for KDE Software created by the KDE VDG",
     "name": "kde-vdg-extras",
-    "project_path": "playground/artwork/kde-xdg-extras",
+    "project_path": "playground/artwork/kde-vdg-extras",
     "repo_path": "plasma/kde-vdg-extras"
   },
   "kde-workspace": {
@@ -2549,6 +2591,12 @@
     "project_path": "kde/kdeedu/kig",
     "repo_path": "education/kig"
   },
+  "kig-data": {
+    "description": "Course data for Kig, provided by KDE Edu.",
+    "name": "kig-data",
+    "project_path": "others/kde-edu-courses/kig-data",
+    "repo_path": "unmaintained/kig-data"
+  },
   "kigo": {
     "description": "Kigo is an open-source implementation of the popular Go game",
     "name": "kigo",
@@ -2816,7 +2864,7 @@
   "klevernotes": {
     "description": "A note-taking and management application using markdown.",
     "name": "klevernotes",
-    "project_path": "kdereview/klevernotes",
+    "project_path": "extragear/office/klevernotes",
     "repo_path": "office/klevernotes"
   },
   "klickety": {
@@ -3557,6 +3605,12 @@
     "project_path": "extragear/graphics/krita-extensions/krita-linesampler",
     "repo_path": "unmaintained/krita-linesampler"
   },
+  "krita-marketing": {
+    "description": "Working together to creating marketing and introduction documents for Krita",
+    "name": "krita-marketing",
+    "project_path": "others/krita-marketing",
+    "repo_path": "unmaintained/krita-marketing"
+  },
   "krita-pyramidalsharpening": {
     "description": "Use a pyramid to reconstruct a sharper image.",
     "name": "krita-pyramidalsharpening",
@@ -3983,6 +4037,12 @@
     "project_path": "kde/kdeedu/kturtle",
     "repo_path": "education/kturtle"
   },
+  "kturtle-data": {
+    "description": "Course data for KTurtle, provided by KDE Edu.",
+    "name": "kturtle-data",
+    "project_path": "others/kde-edu-courses/kturtle-data",
+    "repo_path": "unmaintained/kturtle-data"
+  },
   "ktutorial": {
     "description": "A library and an editor for interactive tutorials in KDE applications",
     "name": "ktutorial",
@@ -4073,6 +4133,12 @@
     "project_path": "unmaintained/kvkbd",
     "repo_path": "unmaintained/kvkbd"
   },
+  "kvtml-data": {
+    "description": "Course data for Vocabulary trainers, provided by KDE Edu.",
+    "name": "kvtml-data",
+    "project_path": "others/kde-edu-courses/kvtml-data",
+    "repo_path": "unmaintained/kvtml-data"
+  },
   "kwallet": {
     "description": "KWallet: Credential Storage",
     "name": "kwallet",
@@ -4604,38 +4670,38 @@
   "maui-agenda": {
     "description": "Maui Calendar App",
     "name": "maui-agenda",
-    "project_path": "playground/base/agenda",
-    "repo_path": "maui/agenda"
+    "project_path": "playground/base/maui-agenda",
+    "repo_path": "maui/maui-agenda"
   },
   "maui-booth": {
     "description": "A convergent camera app",
     "name": "maui-booth",
     "project_path": "playground/base/maui-booth",
-    "repo_path": "maui/booth"
+    "repo_path": "maui/maui-booth"
   },
   "maui-clip": {
     "description": "Video player and video collection manager",
     "name": "maui-clip",
     "project_path": "playground/base/maui-clip",
-    "repo_path": "maui/clip"
+    "repo_path": "maui/maui-clip"
   },
   "maui-communicator": {
     "description": "Contacts and dialer application",
     "name": "maui-communicator",
     "project_path": "playground/base/maui-communicator",
-    "repo_path": "maui/communicator"
+    "repo_path": "maui/maui-communicator"
   },
   "maui-era": {
     "description": "Maui Clock app",
     "name": "maui-era",
-    "project_path": "playground/base/era",
-    "repo_path": "maui/era"
+    "project_path": "playground/base/maui-era",
+    "repo_path": "maui/maui-era"
   },
   "maui-fiery": {
     "description": "A convergent web browser",
     "name": "maui-fiery",
     "project_path": "playground/base/maui-fiery",
-    "repo_path": "maui/fiery"
+    "repo_path": "maui/maui-fiery"
   },
   "maui-libdavclient": {
     "description": "DAV protocol support for Maui applications",
@@ -4647,25 +4713,25 @@
     "description": "Image gallery application",
     "name": "maui-pix",
     "project_path": "playground/base/maui-pix",
-    "repo_path": "maui/pix"
+    "repo_path": "maui/maui-pix"
   },
   "maui-shelf": {
     "description": "Document and EBook collection manager",
     "name": "maui-shelf",
     "project_path": "playground/base/maui-shelf",
-    "repo_path": "maui/shelf"
+    "repo_path": "maui/maui-shelf"
   },
   "maui-station": {
     "description": "Convergent terminal emulator",
     "name": "maui-station",
     "project_path": "playground/base/maui-station",
-    "repo_path": "maui/station"
+    "repo_path": "maui/maui-station"
   },
   "maui-strike": {
     "description": "Strike is a simple minimal IDE for the Linux phones. Code, build, and run from the phone.",
     "name": "maui-strike",
-    "project_path": "playground/sdk/strike",
-    "repo_path": "maui/strike"
+    "project_path": "playground/sdk/maui-strike",
+    "repo_path": "maui/maui-strike"
   },
   "mauikit": {
     "description": "Templated convergent controls and multi-platform utilities for Maui applications",
@@ -4679,6 +4745,12 @@
     "project_path": "playground/libs/mauikit-accounts",
     "repo_path": "maui/mauikit-accounts"
   },
+  "mauikit-archiver": {
+    "description": "tQuick plugin for online archived/compressed files management",
+    "name": "mauikit-archiver",
+    "project_path": "playground/base/mauikit-archiver",
+    "repo_path": "maui/mauikit-archiver"
+  },
   "mauikit-calendar": {
     "description": "Calendar support components for Maui applications",
     "name": "mauikit-calendar",
@@ -4697,12 +4769,24 @@
     "project_path": "playground/libs/mauikit-filebrowsing",
     "repo_path": "maui/mauikit-filebrowsing"
   },
+  "mauikit-git": {
+    "description": "Git support components for Maui applications",
+    "name": "mauikit-git",
+    "project_path": "playground/base/mauikit-git",
+    "repo_path": "maui/mauikit-git"
+  },
   "mauikit-imagetools": {
     "description": "MauiKit Image Tools Components",
     "name": "mauikit-imagetools",
     "project_path": "playground/libs/mauikit-imagetools",
     "repo_path": "maui/mauikit-imagetools"
   },
+  "mauikit-sdk": {
+    "description": "SDK for Maui applications",
+    "name": "mauikit-sdk",
+    "project_path": "playground/base/mauikit-sdk",
+    "repo_path": "maui/mauikit-sdk"
+  },
   "mauikit-terminal": {
     "description": "Terminal support components for Maui applications",
     "name": "mauikit-terminal",
@@ -4734,7 +4818,7 @@
     "repo_path": "system/melon"
   },
   "merkuro": {
-    "description": "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)",
+    "description": "Merkuro is a application suite designed to make handling your emails, calendars, contacts, and tasks simple.",
     "name": "merkuro",
     "project_path": "kde/pim/merkuro",
     "repo_path": "pim/merkuro"
@@ -4829,6 +4913,12 @@
     "project_path": "extragear/utils/mycroft-plasmoid",
     "repo_path": "utilities/mycroft-plasmoid"
   },
+  "mycroft-plasmoid-mobile": {
+    "description": "Plasma Mobile integration of different Mycroft AI services",
+    "name": "mycroft-plasmoid-mobile",
+    "project_path": "playground/utils/mycroft-plasmoid-mobile",
+    "repo_path": "plasma-mobile/mycroft-plasmoid-mobile"
+  },
   "mycroft-ptt-client": {
     "description": "A simple push to talk client for mycroft based on libinput for USB remotes or external devices that wish to activate the mycroft listener with a button press for Plasma Bigscreen",
     "name": "mycroft-ptt-client",
@@ -5036,45 +5126,9 @@
   "osx-patches": {
     "description": "Fixes for KDE problems that occur on Apple OS X",
     "name": "osx-patches",
-    "project_path": "playground/base/osx-patches",
+    "project_path": "unmaintained/osx-patches",
     "repo_path": "unmaintained/osx-patches"
   },
-  "others-kde-br-promo": {
-    "description": "General repository for KDE Brazil promo material (artwork, templates, talks, etc)",
-    "name": "others-kde-br-promo",
-    "project_path": "others/kde-br-promo",
-    "repo_path": "unmaintained/kde-br-promo"
-  },
-  "others-kde-promo": {
-    "description": "This is an easy method for organizing KDE Promo materials.",
-    "name": "others-kde-promo",
-    "project_path": "others/kde-promo",
-    "repo_path": "unmaintained/kde-promo"
-  },
-  "others-kig-data": {
-    "description": "Course data for Kig, provided by KDE Edu.",
-    "name": "others-kig-data",
-    "project_path": "others/kde-edu-courses/kig-data",
-    "repo_path": "unmaintained/kig-data"
-  },
-  "others-krita-marketing": {
-    "description": "Working together to creating marketing and introduction documents for Krita",
-    "name": "others-krita-marketing",
-    "project_path": "others/krita-marketing",
-    "repo_path": "unmaintained/krita-marketing"
-  },
-  "others-kturtle-data": {
-    "description": "Course data for KTurtle, provided by KDE Edu.",
-    "name": "others-kturtle-data",
-    "project_path": "others/kde-edu-courses/kturtle-data",
-    "repo_path": "unmaintained/kturtle-data"
-  },
-  "others-kvtml-data": {
-    "description": "Course data for Vocabulary trainers, provided by KDE Edu.",
-    "name": "others-kvtml-data",
-    "project_path": "others/kde-edu-courses/kvtml-data",
-    "repo_path": "unmaintained/kvtml-data"
-  },
   "oxygen": {
     "description": "The Oxygen Style for Qt/KDE Applications",
     "name": "oxygen",
@@ -5285,6 +5339,12 @@
     "project_path": "unmaintained/pim-storage-service-manager",
     "repo_path": "unmaintained/pim-storage-service-manager"
   },
+  "pim-technical-roadmap": {
+    "description": "Project to track the PIM Technical Roadmap",
+    "name": "pim-technical-roadmap",
+    "project_path": "playground/pim/pim-technical-roadmap",
+    "repo_path": "pim/pim-technical-roadmap"
+  },
   "pimcommon": {
     "description": "Common library components for KDE PIM",
     "name": "pimcommon",
@@ -5306,7 +5366,7 @@
   "plasma-active-maliit": {
     "description": "QML plugin for the Maliit vitual keyboard using KDE Plasma components, intended to be used in Plasma Active",
     "name": "plasma-active-maliit",
-    "project_path": "playground/base/plasma-active-maliit",
+    "project_path": "unmaintained/plasma-active-maliit",
     "repo_path": "unmaintained/plasma-active-maliit"
   },
   "plasma-active-window-control": {
@@ -5435,12 +5495,6 @@
     "project_path": "playground/mobile/plasma-mobile-sounds",
     "repo_path": "plasma-mobile/plasma-mobile-sounds"
   },
-  "plasma-mycroft-mobile": {
-    "description": "Plasma Mobile integration of different Mycroft AI services",
-    "name": "plasma-mycroft-mobile",
-    "project_path": "playground/utils/mycroft-plasmoid-mobile",
-    "repo_path": "plasma-mobile/mycroft-plasmoid-mobile"
-  },
   "plasma-nano": {
     "description": "A minimal Plasma shell package",
     "name": "plasma-nano",
@@ -5696,7 +5750,7 @@
   "publictransport": {
     "description": "PublicTransport Applets, Runner, Data Engine & Tools.",
     "name": "publictransport",
-    "project_path": "playground/base/publictransport",
+    "project_path": "unmaintained/publictransport",
     "repo_path": "unmaintained/publictransport"
   },
   "pulseaudio-qt": {
@@ -5768,7 +5822,7 @@
   "qmlweb": {
     "description": "QmlWeb JavaScript Library",
     "name": "qmlweb",
-    "project_path": "playground/www/qmlweb",
+    "project_path": "unmaintained/qmlweb",
     "repo_path": "unmaintained/qmlweb"
   },
   "qqc2-breeze-style": {
@@ -6176,7 +6230,7 @@
   "sprinter-plugins": {
     "description": "Plugins for Sprinter",
     "name": "sprinter-plugins",
-    "project_path": "playground/libs/sprinter-plugins",
+    "project_path": "unmaintained/sprinter-plugins",
     "repo_path": "unmaintained/sprinter-plugins"
   },
   "stackfolder": {
@@ -7055,18 +7109,6 @@
     "project_path": "websites/docs-kde-org",
     "repo_path": "websites/docs-kde-org"
   },
-  "websites-docs-krita-org": {
-    "description": "The Krita Manual. Built with Sphinx by Jenkins, available online at https://docs.krita.org\r\n\r\nCheck the krita_manual_readme.rst on how to help us!",
-    "name": "websites-docs-krita-org",
-    "project_path": "websites/docs-krita-org",
-    "repo_path": "documentation/docs-krita-org"
-  },
-  "websites-docs-plasma-mobile-org": {
-    "description": "Plasma Mobile documentation based on Sphinx",
-    "name": "websites-docs-plasma-mobile-org",
-    "project_path": "websites/docs-plasma-mobile-org",
-    "repo_path": "documentation/docs-plasma-mobile-org"
-  },
   "websites-download-kde-org": {
     "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org",
     "name": "websites-download-kde-org",
@@ -7193,12 +7235,6 @@
     "project_path": "websites/haruna-kde-org",
     "repo_path": "websites/haruna-kde-org"
   },
-  "websites-hig-kde-org": {
-    "description": "KDE Human Interface Guidelines website",
-    "name": "websites-hig-kde-org",
-    "project_path": "websites/hig-kde-org",
-    "repo_path": "documentation/hig-kde-org"
-  },
   "websites-hugo-bootstrap": {
     "description": "Tooling to provide the Bootstrap CSS/JS framework for Hugo",
     "name": "websites-hugo-bootstrap",
@@ -7565,12 +7601,6 @@
     "project_path": "websites/okular-kde-org",
     "repo_path": "websites/okular-kde-org"
   },
-  "websites-openraster-org": {
-    "description": "Sphinx setup for the Openraster.org (ORA specification) website",
-    "name": "websites-openraster-org",
-    "project_path": "websites/openraster-org",
-    "repo_path": "documentation/openraster-org"
-  },
   "websites-paste-kde-org": {
     "description": "KDE Paste, powered by the Sticky Notes pastebin engine",
     "name": "websites-paste-kde-org",
@@ -7881,133 +7911,133 @@
     "description": "Backend for the Frontend System of WIkiToLearn",
     "name": "wikitolearn-backend-for-frontend",
     "project_path": "playground/www/wikitolearn-backend-for-frontend",
-    "repo_path": "wikitolearn/wikitolearn-backend-for-frontend"
+    "repo_path": "unmaintained/wikitolearn-backend-for-frontend"
   },
   "wikitolearn-chapters-backend": {
     "description": "Chapters Backend for WikiToLearn",
     "name": "wikitolearn-chapters-backend",
     "project_path": "playground/www/wikitolearn-chapters-backend",
-    "repo_path": "wikitolearn/wikitolearn-chapters-backend"
+    "repo_path": "unmaintained/wikitolearn-chapters-backend"
   },
   "wikitolearn-content-migration": {
     "description": "Content Migration Assistants for WikiToLearn",
     "name": "wikitolearn-content-migration",
     "project_path": "playground/www/wikitolearn-content-migration",
-    "repo_path": "wikitolearn/wikitolearn-content-migration"
+    "repo_path": "unmaintained/wikitolearn-content-migration"
   },
   "wikitolearn-course-midtier": {
     "description": "Mid Tier Course Support for WikiToLearn",
     "name": "wikitolearn-course-midtier",
     "project_path": "playground/www/wikitolearn-course-midtier",
-    "repo_path": "wikitolearn/wikitolearn-course-midtier"
+    "repo_path": "unmaintained/wikitolearn-course-midtier"
   },
   "wikitolearn-courses-backend": {
     "description": "Courses Backend for WikiToLearn",
     "name": "wikitolearn-courses-backend",
     "project_path": "playground/www/wikitolearn-courses-backend",
-    "repo_path": "wikitolearn/wikitolearn-courses-backend"
+    "repo_path": "unmaintained/wikitolearn-courses-backend"
   },
   "wikitolearn-coursessecurity-backend": {
     "description": "Backend Components of Course Security system for WikiToLearn",
     "name": "wikitolearn-coursessecurity-backend",
     "project_path": "playground/www/wikitolearn-coursessecurity-backend",
-    "repo_path": "wikitolearn/wikitolearn-coursessecurity-backend"
+    "repo_path": "unmaintained/wikitolearn-coursessecurity-backend"
   },
   "wikitolearn-docs": {
     "description": "Documentation for WikiToLearn",
     "name": "wikitolearn-docs",
     "project_path": "playground/www/wikitolearn-docs",
-    "repo_path": "wikitolearn/wikitolearn-docs"
+    "repo_path": "unmaintained/wikitolearn-docs"
   },
   "wikitolearn-docs-atundo": {
     "description": "Atundo Documentation for WikiToLearn",
     "name": "wikitolearn-docs-atundo",
     "project_path": "playground/www/wikitolearn-docs-atundo",
-    "repo_path": "wikitolearn/wikitolearn-docs-atundo"
+    "repo_path": "unmaintained/wikitolearn-docs-atundo"
   },
   "wikitolearn-frontend": {
     "description": "Frontend for WikiToLearn",
     "name": "wikitolearn-frontend",
     "project_path": "playground/www/wikitolearn-frontend",
-    "repo_path": "wikitolearn/wikitolearn-frontend"
+    "repo_path": "unmaintained/wikitolearn-frontend"
   },
   "wikitolearn-keycloak-mediawiki-btypepassword-patch": {
     "description": "btypepassword patch for Keycloak's Mediawiki integration",
     "name": "wikitolearn-keycloak-mediawiki-btypepassword-patch",
     "project_path": "playground/www/wikitolearn-keycloak-mediawiki-btypepassword-patch",
-    "repo_path": "wikitolearn/wikitolearn-keycloak-mediawiki-btypepassword-patch"
+    "repo_path": "unmaintained/wikitolearn-keycloak-mediawiki-btypepassword-patch"
   },
   "wikitolearn-keycloak-theme": {
     "description": "Keycloak Theme used by WikiToLearn",
     "name": "wikitolearn-keycloak-theme",
     "project_path": "playground/www/wikitolearn-keycloak-theme",
-    "repo_path": "wikitolearn/wikitolearn-keycloak-theme"
+    "repo_path": "unmaintained/wikitolearn-keycloak-theme"
   },
   "wikitolearn-math-backend": {
     "description": "Math Backend for WikiToLearn",
     "name": "wikitolearn-math-backend",
     "project_path": "playground/www/wikitolearn-math-backend",
-    "repo_path": "wikitolearn/wikitolearn-math-backend"
+    "repo_path": "unmaintained/wikitolearn-math-backend"
   },
   "wikitolearn-math-midtier": {
     "description": "Mid Tier Math Support for WikiToLearn",
     "name": "wikitolearn-math-midtier",
     "project_path": "playground/www/wikitolearn-math-midtier",
-    "repo_path": "wikitolearn/wikitolearn-math-midtier"
+    "repo_path": "unmaintained/wikitolearn-math-midtier"
   },
   "wikitolearn-media-midtier": {
     "description": "Mid Tier Media Support for WikiToLearn",
     "name": "wikitolearn-media-midtier",
     "project_path": "playground/www/wikitolearn-media-midtier",
-    "repo_path": "wikitolearn/wikitolearn-media-midtier"
+    "repo_path": "unmaintained/wikitolearn-media-midtier"
   },
   "wikitolearn-offline-extension": {
     "description": "OfflineExtension is an extension for WikiToLearn that will add offline support to the current Wiki Editor.",
     "name": "wikitolearn-offline-extension",
     "project_path": "playground/www/wikitolearn-offline-extension",
-    "repo_path": "wikitolearn/wikitolearn-offline-extension"
+    "repo_path": "unmaintained/wikitolearn-offline-extension"
   },
   "wikitolearn-pages-backend": {
     "description": "Pages Backend for WikiToLearn",
     "name": "wikitolearn-pages-backend",
     "project_path": "playground/www/wikitolearn-pages-backend",
-    "repo_path": "wikitolearn/wikitolearn-pages-backend"
+    "repo_path": "unmaintained/wikitolearn-pages-backend"
   },
   "wikitolearn-pdf-backend": {
     "description": "PDF Backend for WikiToLearn",
     "name": "wikitolearn-pdf-backend",
     "project_path": "playground/www/wikitolearn-pdf-backend",
-    "repo_path": "wikitolearn/wikitolearn-pdf-backend"
+    "repo_path": "unmaintained/wikitolearn-pdf-backend"
   },
   "wikitolearn-pwa-gateway": {
     "description": "PWA Gateway for WikiToLearn",
     "name": "wikitolearn-pwa-gateway",
     "project_path": "playground/www/wikitolearn-pwa-gateway",
-    "repo_path": "wikitolearn/wikitolearn-pwa-gateway"
+    "repo_path": "unmaintained/wikitolearn-pwa-gateway"
   },
   "wikitolearn-sdk": {
     "description": "SDK for WikiToLearn",
     "name": "wikitolearn-sdk",
     "project_path": "playground/www/wikitolearn-sdk",
-    "repo_path": "wikitolearn/wikitolearn-sdk"
+    "repo_path": "unmaintained/wikitolearn-sdk"
   },
   "wikitolearn-shared-services": {
     "description": "Shared Services for WikiToLearn",
     "name": "wikitolearn-shared-services",
     "project_path": "playground/www/wikitolearn-shared-services",
-    "repo_path": "wikitolearn/wikitolearn-shared-services"
+    "repo_path": "unmaintained/wikitolearn-shared-services"
   },
   "wikitolearn-shibboleth-discovery": {
     "description": "Shibboleth discovery support for WikiToLearn",
     "name": "wikitolearn-shibboleth-discovery",
     "project_path": "playground/www/wikitolearn-shibboleth-discovery",
-    "repo_path": "wikitolearn/wikitolearn-shibboleth-discovery"
+    "repo_path": "unmaintained/wikitolearn-shibboleth-discovery"
   },
   "wikitolearn-translation": {
     "description": "Translation Support for WikiToLearn",
     "name": "wikitolearn-translation",
     "project_path": "playground/www/wikitolearn-translation",
-    "repo_path": "wikitolearn/wikitolearn-translation"
+    "repo_path": "unmaintained/wikitolearn-translation"
   },
   "xbuilder": {
     "description": "SDK allowing creation of packages for Plasma Mobile",
@@ -8030,7 +8060,7 @@
   "xsettings-kde": {
     "description": "Allows XSettings aware applications (all GTK+ applications) to be informed instantly of changes in KDE configuration, such as theme name, default font and so on.",
     "name": "xsettings-kde",
-    "project_path": "playground/base/xsettings-kde",
+    "project_path": "unmaintained/xsettings-kde",
     "repo_path": "unmaintained/xsettings-kde"
   },
   "xutils": {
diff --git a/pkgs/kde/plasma/plasma-welcome/default.nix b/pkgs/kde/plasma/plasma-welcome/default.nix
index 89f06a817b34..7265a3f3f1ff 100644
--- a/pkgs/kde/plasma/plasma-welcome/default.nix
+++ b/pkgs/kde/plasma/plasma-welcome/default.nix
@@ -1,11 +1,10 @@
 {
   mkKdeDerivation,
   qtsvg,
-  kuserfeedback,
 }:
 mkKdeDerivation {
   pname = "plasma-welcome";
 
-  extraBuildInputs = [qtsvg kuserfeedback];
+  extraBuildInputs = [qtsvg];
   meta.mainProgram = "plasma-welcome";
 }

From f21e968455e32d019950b1a0839111183b6f479f Mon Sep 17 00:00:00 2001
From: Arseniy Zorin <me@wrbbz.com>
Date: Wed, 24 Jul 2024 12:07:17 +0300
Subject: [PATCH 58/79] pulumi-bin: 3.125.0 -> 3.126.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 82 ++++++++++++++--------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 977f110e5b4c..ce7d9351cad3 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.125.0";
+  version = "3.126.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.125.0-linux-x64.tar.gz";
-        sha256 = "0nc4wk5bqi7kcqxmhwqrzvpsk5cvmcws5apag8hqr1ja94jlvpgj";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-x64.tar.gz";
+        sha256 = "0icdrxg0n61npmwq9idzxrx9zncp3vnrw4q04b5y4h5w5b5sz9fv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-amd64.tar.gz";
@@ -29,12 +29,12 @@
         sha256 = "11kpczajnshx3ky6m8imsydxpw7a8k608bz3bhy9wd43x2gcg5qd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.0-linux-amd64.tar.gz";
-        sha256 = "0lcklijw6fa0c9ni2zaihwfwlfjjfmamx5kk68si1db5fcb6plci";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-amd64.tar.gz";
+        sha256 = "0fv5lqdak26dvka627j6ybr4mz1027pqgig0vabfifnrgbybk5ra";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.84.0-linux-amd64.tar.gz";
-        sha256 = "019pjxd36mkhcn4pywb4lxk9qnl0m14jisfz44d88q66lwjylhpy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-amd64.tar.gz";
+        sha256 = "0m652snqibs73bhb5rhi4f3a18jjs5s4mh8xj91w82ksljgs0ww3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz";
@@ -53,8 +53,8 @@
         sha256 = "1g6rzqsgak4801b2zzhq3ss6gkvkc8y7swpbm92sdbns71hxvw6w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.30.0-linux-amd64.tar.gz";
-        sha256 = "0z9nzlvgz6k0babja23kj7f01zdsml3qrxcx1yf0g4piij22w8zz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-amd64.tar.gz";
+        sha256 = "00px345df0gnirscmj57pvsk9z412z4r5la4y71daf2f2acl73q3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-amd64.tar.gz";
@@ -121,8 +121,8 @@
         sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-linux-amd64.tar.gz";
-        sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-linux-amd64.tar.gz";
+        sha256 = "0d05z7iym834vxlk7d1blxvjcbyqvi129pfbcl76qyf294sbgbsv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.125.0-darwin-x64.tar.gz";
-        sha256 = "1gsl8rvxd7bwmi5w2zp37yb2y0ic4f5fd9pcmfzip1p657bivai2";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-x64.tar.gz";
+        sha256 = "08zmjayipsv7j713dy4pk3s6ixx4sqw5n99n6jqm2zr97jz8jknh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-amd64.tar.gz";
@@ -187,12 +187,12 @@
         sha256 = "00p3b7m2rnp5w4nsh15w2s3hbhwv6wm2x30d8g939z07z6dxzq3s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.0-darwin-amd64.tar.gz";
-        sha256 = "0mh6938qcrhafgnigm76bwrf114jydmhvh2lz8rfysv3s36x2n70";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-amd64.tar.gz";
+        sha256 = "031x0yi2znc71drb13h1idn0x48z05ylygjlx7gcp3lci67p66lc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.84.0-darwin-amd64.tar.gz";
-        sha256 = "0ylqll4yw5nnsa02iim8j1z0jv3nxv3grdhf822m5q9vciqnnryr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-amd64.tar.gz";
+        sha256 = "1lki7piyk3dffd1cd5zs37dck002ir9mbaysx4cn92w1bbjvn2c2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz";
@@ -211,8 +211,8 @@
         sha256 = "1gcv6ri58a4k8g7dzh0xvpmv1x6ndlihkmd5n2gza303i9c8466n";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.30.0-darwin-amd64.tar.gz";
-        sha256 = "1g2dycrldsnpxdkl8ymympf0bq04r6384x99cgar75qbk4firxzq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-amd64.tar.gz";
+        sha256 = "0rvpv2igaq4xsw0z5fpd11zkkwxwbi3ymq08h2gvkv3zdb966bci";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-amd64.tar.gz";
@@ -279,8 +279,8 @@
         sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-darwin-amd64.tar.gz";
-        sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-darwin-amd64.tar.gz";
+        sha256 = "0pr5s2iaxid9jn290798ssbrcn00gkx3r72f3dvimdb9njrvr2pi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.125.0-linux-arm64.tar.gz";
-        sha256 = "0lz8pvvm114plsqd9d9a9vnaclafhjfx3z6s04slmxpyl89ifv19";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-arm64.tar.gz";
+        sha256 = "0h5fhiyqgs0zvmj72z5asmqyp1y3fmwd0vi3acx38ra65bnwd5yp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-arm64.tar.gz";
@@ -345,12 +345,12 @@
         sha256 = "0kabsgjxhg8dlj0qa33mfsm90vsd9lzizw1a5sfmf9py7flcvn0y";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.0-linux-arm64.tar.gz";
-        sha256 = "05160qmplnb97mcwr91hy5zlwvsdilk2qx3680anx97f6aj28hdb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-arm64.tar.gz";
+        sha256 = "1hvv63kmpn2277577i95wcdnzc4fy9dmp6jwmx8nv7ddh9fqw0ha";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.84.0-linux-arm64.tar.gz";
-        sha256 = "0wiy5qcyxgrayxxag9q0nv7wlkf35gdxf2m72hv7qyiwam3xgrxn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-arm64.tar.gz";
+        sha256 = "0y5avw0zf87sqsh50nb6dm45cpbf2glaxd9lwcnk3bkiwqlbxyis";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz";
@@ -369,8 +369,8 @@
         sha256 = "0rmn667z8s4pndck24h82qp5fyshixvji736x6barlpiamy4lkhj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.30.0-linux-arm64.tar.gz";
-        sha256 = "1g5jhcbjx6xk60akcvdgq681y77ds68c1pp5cdj4yimkhmrs40h3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-arm64.tar.gz";
+        sha256 = "1xfql6ggxd90vh4kb9c0iki1cs47j6v1qld9chcanm394kchavd5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-arm64.tar.gz";
@@ -437,8 +437,8 @@
         sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-linux-arm64.tar.gz";
-        sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-linux-arm64.tar.gz";
+        sha256 = "0g7hm3s6mm17y417il6pm78d6aq02bb13sq00cp4ard9sd3qvzwa";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.125.0-darwin-arm64.tar.gz";
-        sha256 = "18hklqyraizww4xq7sjz4qcf8ci9s1x6dq4p7wdh4rqlgryx0hg6";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-arm64.tar.gz";
+        sha256 = "07s197xz1mv3c3jj15q1hk31q4awf08m7q2s3kkhkqslq6c4ijyn";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-arm64.tar.gz";
@@ -503,12 +503,12 @@
         sha256 = "1mmrvn31njs2sr9h6cj7m1ph2gh465qqx0pigvbidjfhl9ag2hrx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.0-darwin-arm64.tar.gz";
-        sha256 = "0v4qs6gx75hgmff2nl9qrbj5qh03fla2iacm98r8ppa8s9xql658";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-arm64.tar.gz";
+        sha256 = "1x4768mr61mf4kf4rfyg8ifgin4jwxm7s1i3gi7nbfwr8qlkh643";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.84.0-darwin-arm64.tar.gz";
-        sha256 = "0nxcp9pdpdh657fdzl90dl597w6b9qrlcx84wdn8xhmzrvhpbyw0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-arm64.tar.gz";
+        sha256 = "0aml7p89i5dgynfxzzrp2p1acp9s222y6s65s6vxdy2llq8izccd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz";
@@ -527,8 +527,8 @@
         sha256 = "1wfiq9rzdzp8pa88g7dbgz644dih8f9f0apw6vfngjjsd2kj3k1c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.30.0-darwin-arm64.tar.gz";
-        sha256 = "11k3yh4v5fgyw4s6gaxxcwmxy0zq1vzl3yslxfzw1l54r314lyjg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-arm64.tar.gz";
+        sha256 = "0x9fvwwx4hd7a3n0nmjnri2r5pdf72chkczdjx3n04rf7lrzbhz4";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-arm64.tar.gz";
@@ -595,8 +595,8 @@
         sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-darwin-arm64.tar.gz";
-        sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-darwin-arm64.tar.gz";
+        sha256 = "0c4p9gv7a740432190mi6z1471irrfl51rmmbsrdf05dj7brn3zx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-darwin-arm64.tar.gz";

From c44014a401de83b26fb63bf461c5ee8a32326536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 09:07:31 +0000
Subject: [PATCH 59/79] fanbox-dl: 0.21.1 -> 0.22.1

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

diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix
index 9de1203a4897..102a9120b9da 100644
--- a/pkgs/by-name/fa/fanbox-dl/package.nix
+++ b/pkgs/by-name/fa/fanbox-dl/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fanbox-dl";
-  version = "0.21.1";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "hareku";
     repo = "fanbox-dl";
     rev = "v${version}";
-    hash = "sha256-ncxL0qTEsAgfA6jJoat1WnOylg91PaG/fhcy3NrFxhA=";
+    hash = "sha256-wMFxAi4ENFFdMwHpgfOp/FRF6h2p91NS94FAjH/C2ww=";
   };
 
   vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";

From a8c4a11589cfc21614971ab1ba26bde9a63d43de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 09:32:03 +0000
Subject: [PATCH 60/79] granted: 0.29.1 -> 0.30.0

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

diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix
index 6b2a558c9105..6e54e33a1a1d 100644
--- a/pkgs/tools/admin/granted/default.nix
+++ b/pkgs/tools/admin/granted/default.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "granted";
-  version = "0.29.1";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-GrmY7R37F9hc8jGHMqMRwyapFXupa3M76/q8pPVch/Q=";
+    sha256 = "sha256-MKnzhfA5hUaZRrvyxjkEXwoyr6uD4eVEPmhW7Hu7PS4=";
   };
 
-  vendorHash = "sha256-/X7kHaBZyDV4IqvKqyR7pAQLgYqIvcvSSh0NdrA5d3I=";
+  vendorHash = "sha256-EEyIeLlU+0Pd+B6atqLXTmmlGpYWkEuQlQNSsp1zbug=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 01ecaadaf3bc195dfddcfd1a004a8b10561e0ad2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 09:46:46 +0000
Subject: [PATCH 61/79] immich-go: 0.20 -> 0.20.1

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

diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index a133e498ca12..f275c700386a 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }:
 buildGoModule rec {
   pname = "immich-go";
-  version = "0.20";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "simulot";
     repo = "immich-go";
     rev = "${version}";
-    hash = "sha256-zQ3uH9i6doF343UGRnbRWxdiHNvEMyVrKOLpBQQhT8E=";
+    hash = "sha256-9pIQ3xRskPZtwjCJ7MG8IaVsVkqM6s3Jxy4qG842/h8=";
 
     # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
     # The intention here is to write the information into files in the `src`'s

From 3b5592819c9691a15011cdf4156f7aa1bb7d7f15 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Mon, 22 Jul 2024 22:09:06 +0200
Subject: [PATCH 62/79] tracker-miners: fix store permissions

Add patch: tracker-landlock-nix-store-permission.patch
See https://gitlab.gnome.org/GNOME/localsearch/-/issues/351
Fixes https://github.com/NixOS/nixpkgs/issues/319587
---
 pkgs/by-name/tr/tracker-miners/package.nix        |  4 ++++
 .../tracker-landlock-nix-store-permission.patch   | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch

diff --git a/pkgs/by-name/tr/tracker-miners/package.nix b/pkgs/by-name/tr/tracker-miners/package.nix
index caf2e36488b2..fb882da42b73 100644
--- a/pkgs/by-name/tr/tracker-miners/package.nix
+++ b/pkgs/by-name/tr/tracker-miners/package.nix
@@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-50OIFUtcGXtLfuQvDc6MX7vd1NNhCT74jU+zA+M9pf4=";
   };
 
+  patches = [
+    ./tracker-landlock-nix-store-permission.patch
+  ];
+
   nativeBuildInputs = [
     asciidoc
     docbook-xsl-nons
diff --git a/pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch b/pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch
new file mode 100644
index 000000000000..4715241ee628
--- /dev/null
+++ b/pkgs/by-name/tr/tracker-miners/tracker-landlock-nix-store-permission.patch
@@ -0,0 +1,15 @@
+diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c
+index 6d4510be1..1de5d5a90 100644
+--- a/src/libtracker-miners-common/tracker-landlock.c
++++ b/src/libtracker-miners-common/tracker-landlock.c
+@@ -184,6 +184,10 @@ gboolean
+ tracker_landlock_init (const gchar * const *indexed_folders)
+ {
+ 	TrackerLandlockRule stock_rules[] = {
++		{ "/nix/store",
++		 (LANDLOCK_ACCESS_FS_EXECUTE |
++		  LANDLOCK_ACCESS_FS_READ_FILE |
++		  LANDLOCK_ACCESS_FS_READ_DIR) },
+ 		/* Allow access to the executable itself */
+ 		{ LIBEXECDIR "/tracker-extract-3",
+ 		 LANDLOCK_ACCESS_FS_READ_FILE |

From fc23e7ef6c2b50119af97a38b9cc6b08c66c276b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 03:32:33 -0700
Subject: [PATCH 63/79] python312Packages.apptools: 5.2.1 -> 5.3.0

Diff: https://github.com/enthought/apptools/compare/refs/tags/5.2.1...5.3.0

Changelog: https://github.com/enthought/apptools/releases/tag/5.3.0
---
 .../python-modules/apptools/default.nix       | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 60360301a09b..8540a8f39c4b 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -2,11 +2,13 @@
   lib,
   buildPythonPackage,
   configobj,
-  fetchPypi,
-  importlib-resources,
+  fetchFromGitHub,
+  numpy,
   pandas,
+  pyface,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   tables,
   traits,
   traitsui,
@@ -14,27 +16,37 @@
 
 buildPythonPackage rec {
   pname = "apptools";
-  version = "5.2.1";
-  format = "setuptools";
+  version = "5.3.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM=";
+  src = fetchFromGitHub {
+    owner = "enthought";
+    repo = "apptools";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qNtDHmvl5HbtdbjnugVM7CKVCW+ysAwRB9e2Ounh808=";
   };
 
-  propagatedBuildInputs = [
-    configobj
-    traits
-    traitsui
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [
-    tables
-    pandas
-    pytestCheckHook
-  ];
+  dependencies = [ traits ];
+
+  optional-dependencies = {
+    gui = [
+      pyface
+      traitsui
+    ];
+    h5 = [
+      numpy
+      pandas
+      tables
+    ];
+    persistence = [ numpy ];
+    preferences = [ configobj ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$TMP

From 3c4ea54b4ecb30ac05b4717b61b262b0ba766c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 03:44:16 -0700
Subject: [PATCH 64/79] python312Packages.envisage: update dependencies

---
 .../python-modules/envisage/default.nix       | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix
index 94964c9a581a..30b450719b5f 100644
--- a/pkgs/development/python-modules/envisage/default.nix
+++ b/pkgs/development/python-modules/envisage/default.nix
@@ -4,47 +4,42 @@
   buildPythonPackage,
   fetchPypi,
   ipython,
+  pyface,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
   setuptools,
   traits,
+  traitsui,
 }:
 
 buildPythonPackage rec {
   pname = "envisage";
   version = "7.0.3";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-97GviL86j/8qmsbja7SN6pkp4/YSIEz+lK7WKwMWyeM=";
   };
 
-  # for the optional dependency ipykernel, only versions < 6 are
-  # supported, so it's not included in the tests, and not propagated
-  propagatedBuildInputs = [
-    traits
+  build-system = [ setuptools ];
+
+  dependencies = [
     apptools
+    pyface
     setuptools
-  ];
+    traits
+    traitsui
+  ] ++ apptools.optional-dependencies.preferences;
 
   preCheck = ''
     export HOME=$PWD/HOME
   '';
 
-  nativeCheckInputs = [
-    ipython
-    pytestCheckHook
-  ];
-
-  disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
-    # https://github.com/enthought/envisage/issues/455
-    "envisage/tests/test_egg_basket_plugin_manager.py"
-    "envisage/tests/test_egg_plugin_manager.py"
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "envisage" ];
 

From a1722951433ead808e078cc9f597b573163bb379 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 11:09:24 +0000
Subject: [PATCH 65/79] python312Packages.clarifai-grpc: 10.6.3 -> 10.6.6

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

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 57ab3af10d3f..f7922f5fa01b 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "10.6.3";
+  version = "10.6.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     rev = "refs/tags/${version}";
-    hash = "sha256-CeBTcIs+WjqpwKUAy4Ws+27jcO5pkopMXhPwrpzdWnA=";
+    hash = "sha256-UnMIl+fB5BA0LTurHN2XpMlhvOzvAgveLG+EuQE2WG4=";
   };
 
   build-system = [ setuptools ];

From 701bc1978f5e67da44e26768a5060b375fc89aba Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 24 Jul 2024 13:52:35 +0200
Subject: [PATCH 66/79] basedpyright: 1.14.0 -> 1.15.0

Diff:
https://github.com/DetachHead/basedpyright/compare/v1.14.0...v1.15.0

Changelog:
https://github.com/DetachHead/basedpyright/releases/tag/v1.15.0
---
 pkgs/by-name/ba/basedpyright/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index b33c55186674..e244266b32b3 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -11,13 +11,13 @@
 }:
 
 let
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WNXIlBdnubV8hbhLXNOpoO5llN0h3G820BkX5cgRU1A=";
+    hash = "sha256-SMF7BXPhoMyUqGY8WK5pIVAy+p/mS+Li+Lz0uLyhFjY=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -47,7 +47,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-68+HmPFsiC01c+B0zD/b8FTemzVrc6wnUvcjWj5uWNo=";
+    npmDepsHash = "sha256-GO6ozBtf9P6tKhqtgNJjNdziJ9rYImH0fdYi7KZ1NgI=";
     dontNpmBuild = true;
     # FIXME: Remove this flag when TypeScript 5.5 is released
     npmFlags = [ "--legacy-peer-deps" ];
@@ -94,7 +94,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-SN1x7D+HZHRmlixTzZFcuG929lEEWpd813EtgwHtdRM=";
+  npmDepsHash = "sha256-areRNvJXmnK/yNCwQ//SNVI6eDOqweYxTULvrANLwPo=";
 
   postPatch = ''
     chmod +w ../../

From a73f62ce8b13717767aab9af147553cbcd67ca46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 14:05:11 +0000
Subject: [PATCH 67/79] python312Packages.azure-mgmt-redhatopenshift: 1.4.0 ->
 1.5.0

---
 .../python-modules/azure-mgmt-redhatopenshift/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
index 6c678d4cad62..02208c826527 100644
--- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-redhatopenshift";
-  version = "1.4.0";
+  version = "1.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BL2a2L2AwJWvs0V+VpSGaS8//AWMy5m6rdAPDJPbrEo=";
+    hash = "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc=";
   };
 
   propagatedBuildInputs = [

From 9fc4af3e6ac0734cd577d5388c1571d15b0419b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 14:20:17 +0000
Subject: [PATCH 68/79] python312Packages.azure-mgmt-redis: 14.3.0 -> 14.4.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index b40de91c0ad6..18cf2fd0c10b 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-redis";
-  version = "14.3.0";
+  version = "14.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eoMbY4oNzYXkn3uFUhxecJQD+BxYkGTbWhAWSgAoLyA=";
+    hash = "sha256-CIRzJa/wexeuheb+Az0KBaz4z0HMmpzGBiOuLaxGZ+8=";
   };
 
   propagatedBuildInputs = [

From bc3df8de047d829b8a20e1589d2b881d692e585c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 15:36:54 +0000
Subject: [PATCH 69/79] python312Packages.hidapi: 0.14.0 -> 0.14.0.post2

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

diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index fe08c934ea61..ee69705614c9 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "hidapi";
-  version = "0.14.0";
+  version = "0.14.0.post2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be";
+    sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw=";
   };
 
   nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ];

From 38ae7bec50686a7b59956f13eec6e71d19ac02ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 15:46:50 +0000
Subject: [PATCH 70/79] python312Packages.pyfwup: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix
index 2956c34b4685..5203a2bcf98c 100644
--- a/pkgs/development/python-modules/pyfwup/default.nix
+++ b/pkgs/development/python-modules/pyfwup/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyfwup";
-  version = "0.4.0";
+  version = "0.5.0";
 
   pyproject = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "greatscottgadgets";
     repo = "pyfwup";
     rev = "refs/tags/${version}";
-    hash = "sha256-JSaAEGobdLqpSj9yvKrAsXfdkHpXSCcuGYRxz2QJqck=";
+    hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE=";
   };
 
   dependencies = [

From c24efe53ac3000f2ecf388e0027c4d143bc25cd4 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 9 Jul 2024 11:57:07 +0200
Subject: [PATCH 71/79] multipass: 1.13.1 -> 1.14.0

---
 .../multipass/cmake_no_fetch.patch            | 19 -----
 .../virtualization/multipass/default.nix      | 16 +++-
 .../multipass/test_unreachable_call.patch     | 12 +++
 .../multipass/vcpkg_no_install.patch          | 83 +++++++++++++++++++
 4 files changed, 109 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/tools/virtualization/multipass/test_unreachable_call.patch
 create mode 100644 pkgs/tools/virtualization/multipass/vcpkg_no_install.patch

diff --git a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch
index bde1792d4002..6981a0dd33f7 100644
--- a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch
+++ b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch
@@ -1,22 +1,3 @@
-diff --git a/3rd-party/CMakeLists.txt b/3rd-party/CMakeLists.txt
-index 188ebfc6..4a34a922 100644
---- a/3rd-party/CMakeLists.txt
-+++ b/3rd-party/CMakeLists.txt
-@@ -2,12 +2,8 @@ include(FetchContent)
- set(FETCHCONTENT_QUIET FALSE)
- 
- FetchContent_Declare(gRPC
--  GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git
--  GIT_TAG e3acf245
--  GIT_SHALLOW TRUE
--  GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib"
--  GIT_SUBMODULES_RECURSE false
--  GIT_PROGRESS TRUE
-+  DOWNLOAD_COMMAND true
-+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/grpc
- )
- set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")
- 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
 index 52bd407f..a1100112 100644
 --- a/tests/CMakeLists.txt
diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix
index 851ee7cfd69d..c756ff94b5da 100644
--- a/pkgs/tools/virtualization/multipass/default.nix
+++ b/pkgs/tools/virtualization/multipass/default.nix
@@ -15,6 +15,8 @@
   OVMF,
   pkg-config,
   qemu,
+  poco,
+  protobuf,
   qemu-utils,
   qtbase,
   qtwayland,
@@ -26,7 +28,7 @@
 
 let
   pname = "multipass";
-  version = "1.13.1";
+  version = "1.14.0";
 
   # This is done here because a CMakeLists.txt from one of it's submodules tries
   # to modify a file, so we grab the source for the submodule here, copy it into
@@ -46,7 +48,7 @@ stdenv.mkDerivation {
     owner = "canonical";
     repo = "multipass";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QttgWSuhxcuOyMNF9Ve1w0ftT41+hNz3WW5Vag/88X4=";
+    hash = "sha256-1g5Og4LkNujjT4KCXHmXaiTK58Bgb2KyYLKwTFFVEHE=";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''
@@ -60,6 +62,8 @@ stdenv.mkDerivation {
     ./lxd_socket_path.patch
     ./cmake_no_fetch.patch
     ./cmake_warning.patch
+    ./vcpkg_no_install.patch
+    ./test_unreachable_call.patch
   ];
 
   postPatch = ''
@@ -68,6 +72,9 @@ stdenv.mkDerivation {
       --replace-fail "determine_version(MULTIPASS_VERSION)" "" \
       --replace-fail 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'
 
+    # Don't build/use vcpkg
+    rm -rf 3rd-party/vcpkg
+
     # Patch the patch of the OVMF binaries to use paths from the nix store.
     substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
       --replace-fail "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
@@ -97,6 +104,9 @@ stdenv.mkDerivation {
     EOF
   '';
 
+  # We'll build the flutter application seperately using buildFlutterApplication
+  cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ];
+
   buildInputs = [
     gtest
     libapparmor
@@ -105,6 +115,8 @@ stdenv.mkDerivation {
     openssl
     qtbase
     qtwayland
+    poco.dev
+    protobuf
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/virtualization/multipass/test_unreachable_call.patch b/pkgs/tools/virtualization/multipass/test_unreachable_call.patch
new file mode 100644
index 000000000000..a692362df8ef
--- /dev/null
+++ b/pkgs/tools/virtualization/multipass/test_unreachable_call.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test_common_callbacks.cpp b/tests/test_common_callbacks.cpp
+index ccae78e0..f9ab4423 100644
+--- a/tests/test_common_callbacks.cpp
++++ b/tests/test_common_callbacks.cpp
+@@ -73,6 +73,7 @@ struct TestLoggingSpinnerCallbacks : public TestSpinnerCallbacks, public WithPar
+         default:
+             assert(false && "shouldn't be here");
+         }
++        __builtin_unreachable();
+     }
+ };
+ 
diff --git a/pkgs/tools/virtualization/multipass/vcpkg_no_install.patch b/pkgs/tools/virtualization/multipass/vcpkg_no_install.patch
new file mode 100644
index 000000000000..434cfbce31f3
--- /dev/null
+++ b/pkgs/tools/virtualization/multipass/vcpkg_no_install.patch
@@ -0,0 +1,83 @@
+diff --git a/3rd-party/CMakeLists.txt b/3rd-party/CMakeLists.txt
+index 73291f6c..c1a38198 100644
+--- a/3rd-party/CMakeLists.txt
++++ b/3rd-party/CMakeLists.txt
+@@ -4,6 +4,24 @@ if (MSVC)
+   add_compile_options(-wd5045) #Disable warning about Spectre mitigation
+ endif()
+ 
++include(FetchContent)
++set(FETCHCONTENT_QUIET FALSE)
++
++FetchContent_Declare(gRPC
++  DOWNLOAD_COMMAND true
++  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/grpc
++)
++
++set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")
++
++FetchContent_MakeAvailable(gRPC)
++
++# Workaround for zlib placing its generated zconf.h file in the build dir,
++# and protobuf not knowing so finding the system version instead
++include_directories(${grpc_SOURCE_DIR}/third_party/zlib)
++
++set_property(DIRECTORY ${grpc_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL YES)
++
+ # Generates gRPC and protobuf C++ sources and headers from the given .proto files
+ #
+ # generate_grpc_cpp (<SRCS> <DEST> [<ARGN>...])
+@@ -34,9 +52,9 @@ function(generate_grpc_cpp SRCS DEST)
+       "${DEST}/${FIL_WE}.grpc.pb.h"
+       "${DEST}/${FIL_WE}.pb.cc"
+       "${DEST}/${FIL_WE}.pb.h"
+-      COMMAND $<TARGET_FILE:protobuf::protoc>
+-      ARGS --grpc_out=${DEST} --cpp_out=${DEST} --proto_path=${FIL_DIR} --proto_path=${grpc_SOURCE_DIR}/third_party/protobuf/src --plugin=protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin> ${ABS_FIL}
+-      DEPENDS ${ABS_FIL}
++      COMMAND $<TARGET_FILE:protoc>
++      ARGS --grpc_out=${DEST} --cpp_out=${DEST} --proto_path=${FIL_DIR} --proto_path=${grpc_SOURCE_DIR}/third_party/protobuf/src --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> ${ABS_FIL}
++      DEPENDS ${ABS_FIL} protoc grpc_cpp_plugin
+       COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}"
+       VERBATIM)
+   endforeach ()
+@@ -47,9 +65,14 @@ endfunction()
+ 
+ add_library(gRPC INTERFACE)
+ 
++target_include_directories(gRPC INTERFACE
++  ${CMAKE_CURRENT_SOURCE_DIR}/grpc/include
++  ${CMAKE_CURRENT_SOURCE_DIR}/grpc/third_party/protobuf/src)
++
+ target_link_libraries(gRPC INTERFACE
+-  gRPC::grpc++
+-  protobuf::libprotobuf)
++  grpc++
++  libprotobuf
++  zlibstatic)
+ 
+ if (NOT MSVC)
+   target_compile_options(gRPC INTERFACE "-Wno-unused-parameter" "-Wno-non-virtual-dtor" "-Wno-pedantic")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18e47b74..d5bf5dea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,9 +49,6 @@ if(NOT DEFINED VCPKG_BUILD_DEFAULT)
+   set(VCPKG_TARGET_TRIPLET "${VCPKG_HOST_ARCH}-${VCPKG_HOST_OS}-release")
+ endif()
+ 
+-set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/vcpkg/scripts/buildsystems/vcpkg.cmake"
+-  CACHE STRING "Vcpkg toolchain file")
+-
+ project(Multipass)
+ 
+ option(MULTIPASS_ENABLE_TESTS "Build tests" ON)
+@@ -125,9 +122,6 @@ endif()
+ # OpenSSL config
+ find_package(OpenSSL REQUIRED)
+ 
+-# gRPC config
+-find_package(gRPC CONFIG REQUIRED)
+-
+ # Needs to be here before we set further compilation options
+ add_subdirectory(3rd-party)
+ 

From 3b3ed6c66909b4ee5eb7092a941025c1eafe9d12 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 24 Jul 2024 18:46:01 +0100
Subject: [PATCH 72/79] multipass: add comments to explain patches

---
 pkgs/tools/virtualization/multipass/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix
index c756ff94b5da..053aad4edba4 100644
--- a/pkgs/tools/virtualization/multipass/default.nix
+++ b/pkgs/tools/virtualization/multipass/default.nix
@@ -59,10 +59,24 @@ stdenv.mkDerivation {
   };
 
   patches = [
+    # Multipass is usually only delivered as a snap package on Linux, and it expects that
+    # the LXD backend will also be delivered via a snap - in which cases the LXD socket
+    # is available at '/var/snap/lxd/...'. Here we patch to ensure that Multipass uses the
+    # LXD socket location on NixOS in '/var/lib/...'
     ./lxd_socket_path.patch
+    # The upstream cmake file attempts to fetch googletest using FetchContent, which fails
+    # in the Nix build environment. This patch disables the fetch in favour of providing
+    # the googletest library from nixpkgs.
     ./cmake_no_fetch.patch
+    # Ensures '-Wno-ignored-attributes' is supported by the compiler before attempting to build.
     ./cmake_warning.patch
+    # As of Multipass 1.14.0, the upstream started using vcpkg for grabbing C++ dependencies,
+    # which doesn't work in the nix build environment. This patch reverts that change, in favour
+    # of providing those dependencies manually in this derivation.
     ./vcpkg_no_install.patch
+    # The compiler flags used in nixpkgs surface an error in the test suite where an
+    # unreachable path was not annotated as such - this patch adds the annotation to ensure
+    # that the test suite passes in the nix build process.
     ./test_unreachable_call.patch
   ];
 

From 3e051ceda2cbab6f4774387f32350eb0b47bd970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 08:14:12 -0700
Subject: [PATCH 73/79] python312Packages.inflect: 7.2.1 -> 7.3.1

Diff: https://github.com/jaraco/inflect/compare/refs/tags/v7.2.1...v7.3.1

Changelog: https://github.com/jaraco/inflect/blob/v7.3.1/CHANGES.rst
---
 .../python-modules/inflect/default.nix        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 8d0fe80336c6..36e0d96f9782 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -1,31 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  isPy27,
+  pythonOlder,
+  fetchFromGitHub,
   more-itertools,
   setuptools-scm,
-  pydantic,
   pytestCheckHook,
   typeguard,
 }:
 
 buildPythonPackage rec {
   pname = "inflect";
-  version = "7.2.1";
-  disabled = isPy27;
-  format = "pyproject";
+  version = "7.3.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-p85eI9Z5hzTyVsGtntUhhrjsJ28QsYzj0+yxnCHrbLY=";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "inflect";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     more-itertools
-    pydantic
     typeguard
   ];
 

From 6fd9741c85cd7751d3d0e5e06173510c2caed358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 10:51:39 -0700
Subject: [PATCH 74/79] snapcraft: don't override pydantic

---
 pkgs/by-name/sn/snapcraft/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 396d81826841..1af08c97fd1a 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,7 +13,6 @@
 let
   python = python3.override {
     packageOverrides = self: super: {
-      pydantic = self.pydantic_1;
       pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
         version = "0.11.2";
         src = fetchFromGitHub {
@@ -30,10 +29,6 @@ let
           types-deprecated
         ];
       });
-      versioningit = super.versioningit.overridePythonAttrs (old: rec {
-        # incompatible with pydantic_1
-        doCheck = false;
-      });
     };
   };
 in

From 491caca6862e826b480c7252040e0c3f9e9e6f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 18:13:29 +0000
Subject: [PATCH 75/79] python312Packages.timetagger: 24.4.1 -> 24.07.1

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

diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index 20d70ed0c3b8..de944d5b26b3 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "timetagger";
-  version = "24.4.1";
+  version = "24.07.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "almarklein";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4=";
+    hash = "sha256-zm+3vk2ZeaZjciANNVSVxDT5S2LhOAl3B4AE2RgA5Tw=";
   };
 
   propagatedBuildInputs = [

From f01323e0b3c7ee9cc422f27a55dc6da781489a4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 24 Jul 2024 20:55:48 +0200
Subject: [PATCH 76/79] python312Packages.tencentcloud-sdk-python: 3.0.1195 ->
 3.0.1196

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1195...3.0.1196

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1196/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 33abc5413792..a44560d0cabc 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.1195";
+  version = "3.0.1196";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-UOX4ptB2yMUxMRjiQEUYZqLVXVr1je5bSYplwH7yGQA=";
+    hash = "sha256-UwI3WzcNU3aZ4VYMyCJcnpYom7dw9QoUFgWaEY1iYrA=";
   };
 
   build-system = [ setuptools ];

From a0e4fc38b60a7b41045a4e6eb42920d7e23caaf5 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Wed, 24 Jul 2024 14:19:21 -0400
Subject: [PATCH 77/79] noseyparker: 0.12.0 -> 0.18.1

---
 pkgs/tools/security/noseyparker/default.nix | 34 ++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/noseyparker/default.nix b/pkgs/tools/security/noseyparker/default.nix
index 72a1d87f1112..b39666071fb6 100644
--- a/pkgs/tools/security/noseyparker/default.nix
+++ b/pkgs/tools/security/noseyparker/default.nix
@@ -1,38 +1,50 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, boost
 , cmake
-, pkg-config
-, openssl
+, git
 , hyperscan
+, openssl
+, pkg-config
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "noseyparker";
-  version = "0.12.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "noseyparker";
     rev = "v${version}";
-    hash = "sha256-qop6KjTFPQ5o1kPEVPP0AfDfr8w/JP3YmC+sb5OUbDY=";
+    hash = "sha256-IorJWXhS1ZUye1wKPnGb+zx/YgfXhwi3cb/V3zpYaKY=";
   };
 
-  cargoHash = "sha256-ZtoJO/R11qTFYAE6G7AVCpnYZ3JGrxtVSXvCm0W8DAA=";
+  cargoHash = "sha256-xf70RKPZY96oUuifBC0mg5lV0MjGpzR2qDQbNJMSYtM=";
 
-  postPatch = ''
-    # disabledTests (network, failing)
-    rm tests/test_noseyparker_github.rs
-    rm tests/test_noseyparker_scan.rs
-  '';
+  nativeCheckInputs = [
+    git
+  ];
+
+  checkFlags = [
+    # These tests expect access to network to clone and use GitHub API
+    "--skip=github::github_repos_list_multiple_user_dedupe_jsonl_format"
+    "--skip=github::github_repos_list_org_badtoken"
+    "--skip=github::github_repos_list_user_badtoken"
+    "--skip=github::github_repos_list_user_human_format"
+    "--skip=github::github_repos_list_user_json_format"
+    "--skip=github::github_repos_list_user_jsonl_format"
+    "--skip=scan::appmaker::scan_workflow_from_git_url"
+  ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
   buildInputs = [
-    openssl
+    boost
     hyperscan
+    openssl
   ];
 
   OPENSSL_NO_VENDOR = 1;

From d36c2dfd132a3ca26c17909850ef13711eac80c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 23:18:39 +0000
Subject: [PATCH 78/79] python312Packages.publicsuffixlist: 1.0.1.20240713 ->
 1.0.2.20240724

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 45ba4f5c769c..4edaaaed333f 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.1.20240713";
+  version = "1.0.2.20240724";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wmc31eIpCTOxhrBcqLL4+PG9zShRpTIc8sNMR/Q642o=";
+    hash = "sha256-7pxRDUkWC1Umu5Eq6JiUnRadbMmjC96uMJynYPhSfUI=";
   };
 
   build-system = [ setuptools ];

From 7342b2ae4d72ef1f75a1c20050f5aeafe484ca98 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 25 Jul 2024 00:31:11 +0100
Subject: [PATCH 79/79] python312Packages.aiosmtpd: add some key
 reverse-dependencies to passthru.tests

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

diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index dfecf0b966af..ff9cb38cd6ba 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -9,6 +9,10 @@
   pythonOlder,
   setuptools,
   typing-extensions,
+
+  # for passthru.tests
+  django,
+  aiosmtplib,
 }:
 
 buildPythonPackage rec {
@@ -49,6 +53,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiosmtpd" ];
 
+  passthru.tests = {
+    inherit django aiosmtplib;
+  };
+
   meta = with lib; {
     description = "Asyncio based SMTP server";
     mainProgram = "aiosmtpd";