From ec6f63dae7982f3d83b792afa0d8a88ac754a0ac Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 30 Mar 2023 22:41:16 +0200
Subject: [PATCH 01/40] libsForQt5.qtpositioning: init at 5.15.2

---
 pkgs/development/libraries/qt-5/5.15/default.nix   |  1 +
 pkgs/development/libraries/qt-5/5.15/srcs.nix      | 11 +++++++++++
 .../libraries/qt-5/modules/qtpositioning.nix       | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/modules/qtpositioning.nix

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 46a60f5403f4..d28f9209a271 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -157,6 +157,7 @@ let
         inherit gstreamer gst-plugins-base;
       };
       qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
+      qtpositioning = callPackage ../modules/qtpositioning.nix {};
       qtquick1 = null;
       qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
       qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 0603ae077e47..dc17f2d72bbb 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -22,6 +22,17 @@ let
 in
 lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
 // {
+  # Has no kde/5.15 branch
+  qtpositioning = rec {
+    version = "5.15.2";
+    src = fetchFromGitHub {
+      owner = "qt";
+      repo = "qtpositioning";
+      rev = "v${version}";
+      hash = "sha256-L/P+yAQItm3taPpCNoOOm7PNdOFZiIwJJYflk6JDWvU=";
+    };
+  };
+
   # qtwebkit does not have an official release tarball on the qt mirror and is
   # mostly maintained by the community.
   qtwebkit = rec {
diff --git a/pkgs/development/libraries/qt-5/modules/qtpositioning.nix b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix
new file mode 100644
index 000000000000..99b06bbf2536
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix
@@ -0,0 +1,14 @@
+{ qtModule
+, qtbase
+, qtdeclarative
+, qtserialport
+, pkg-config
+, openssl
+}:
+
+qtModule {
+  pname = "qtpositioning";
+  qtInputs = [ qtbase qtdeclarative qtserialport ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+}

From d92633226f5c4aa8f5c8e875e664cef54b2849f9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 11 Apr 2023 22:07:58 +0200
Subject: [PATCH 02/40] alice-tools,alice-tools-qt5,alice-tools-qt6: 0.12.1 ->
 0.13.0

And reflect Qt version in pname.
---
 pkgs/tools/games/alice-tools/default.nix | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index 0aed7016feac..d5493dc63aa1 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -2,7 +2,6 @@
 , lib
 , gitUpdater
 , fetchFromGitHub
-, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -21,33 +20,17 @@
 assert withGUI -> qtbase != null && wrapQtAppsHook != null;
 
 stdenv.mkDerivation rec {
-  pname = "alice-tools";
-  version = "0.12.1";
+  pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "nunuhara";
     repo = "alice-tools";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-uXiNNneAOTDupgc+ZvaeRNbEQFJBv4ppdEc3kZeUsg8=";
+    hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
   };
 
-  patches = [
-    # These two patches (one to alice-tools, one to a subproject) improve DCF & PCF parsing
-    # Remove them when version > 0.12.1
-    (fetchpatch {
-      url = "https://github.com/nunuhara/alice-tools/commit/c800e85b37998d7a47060f5da4b1782d7201a042.patch";
-      excludes = [ "subprojects/libsys4" ];
-      hash = "sha256-R5ckFHqUWHdAPkFa53UbVeLgxJg/8qGLTQWwj5YRJc4=";
-    })
-    (fetchpatch {
-      url = "https://github.com/nunuhara/libsys4/commit/cff2b826d1618fb17616cdd288ab0c50f35e8032.patch";
-      stripLen = 1;
-      extraPrefix = "subprojects/libsys4/";
-      hash = "sha256-CmetiVP2kGL+MwuE9OoEDrDFxzwWvv1TtZuq1li1uIw=";
-    })
-  ];
-
   postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") ''
     substituteInPlace src/meson.build \
       --replace qt5 qt6

From 82c8852b6f60e838d50dcd1b1add6d6aa61e8a6e Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 11 Apr 2023 22:27:05 +0200
Subject: [PATCH 03/40] alice-tools,alice-tools-qt5,alice-tools-qt6: Add
 version test

---
 pkgs/tools/games/alice-tools/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index d5493dc63aa1..d10ce8e65ab6 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , gitUpdater
+, testers
 , fetchFromGitHub
 , meson
 , ninja
@@ -19,14 +20,14 @@
 
 assert withGUI -> qtbase != null && wrapQtAppsHook != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}";
   version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "nunuhara";
     repo = "alice-tools";
-    rev = version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
   };
@@ -76,7 +77,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { };
+  passthru = {
+    updateScript = gitUpdater { };
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = lib.optionalString withGUI "env QT_QPA_PLATFORM=minimal " + "${lib.getExe finalAttrs.finalPackage} --version";
+    };
+  };
 
   meta = with lib; {
     description = "Tools for extracting/editing files from AliceSoft games";
@@ -86,4 +93,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ OPNA2608 ];
     mainProgram = if withGUI then "galice" else "alice";
   };
-}
+})

From 664d9fd9a252569075f21f2b7d13463466d9ae8c Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 12 Apr 2023 12:29:07 +0200
Subject: [PATCH 04/40] alice-tools-qt6: Fix Qt tool detection on Darwin

Meson seems to default to QMake there, which gives search paths into qtbase.out instead of qtbase.dev
---
 pkgs/tools/games/alice-tools/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index d10ce8e65ab6..07d96cbd03fa 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -33,8 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") ''
+    # Use Meson's Qt6 module
     substituteInPlace src/meson.build \
       --replace qt5 qt6
+
+    # For some reason Meson uses QMake instead of pkg-config detection method for Qt6 on Darwin, which gives wrong search paths for tools
+    export PATH=${qtbase.dev}/libexec:$PATH
   '';
 
   mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [

From a56b0af5ff980f795b223bac9a03dcf8460ca5aa Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Fri, 31 Mar 2023 08:04:22 +0200
Subject: [PATCH 05/40] maintainers: add ne9z

Signed-off-by: Maurice Zhou <yuchen@apvc.uk>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4eefe3bea0f5..c940532cf3ff 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10678,6 +10678,12 @@
     githubId = 137805;
     name = "Alexander Tsvyashchenko";
   };
+  ne9z = {
+    email = "yuchen@apvc.uk";
+    github = "ne9z";
+    githubId = 77314501;
+    name = "Maurice Zhou";
+  };
   nebulka = {
     email = "arapun@proton.me";
     github = "nebulka1";

From 5ae47dfec6679ffacafa5e97975aa2127d7b33d8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Apr 2023 04:20:00 +0000
Subject: [PATCH 06/40] esbuild: 0.17.17 -> 0.17.18

https://github.com/evanw/esbuild/releases/tag/v0.17.18
---
 pkgs/development/tools/esbuild/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 6edf64e695fa..18ade20a4fe8 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.17.17";
+  version = "0.17.18";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-UPY/edmriacHqQ030nvYsuRj6OwdazFbsCs1oHAahaU=";
+    hash = "sha256-RiVyPqQzww5Iw24XI6Dmeh2RqTRQOkmalPjKvl3Nyg4=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

From a3a582ab8cdf700a2f9ae6b558a9cd6fc5a84d0b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Apr 2023 04:20:00 +0000
Subject: [PATCH 07/40] tflint: 0.46.0 -> 0.46.1

https://github.com/terraform-linters/tflint/releases/tag/v0.46.1
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 7c09718fd951..146d10b2438b 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.46.0";
+  version = "0.46.1";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ne/i8LLNCo5Kg0xAL/ZexR5uRmZLXcgZ6yZNT5vSYb0=";
+    hash = "sha256-oMf1uUD+7z42Z6bfMxNCWNFu/WwdEqBocVbbfe2OPbo=";
   };
 
-  vendorHash = "sha256-K+/xJ9ei+LyWodubRw5mFzi4U1V1MB5h4nUuPrTASBY=";
+  vendorHash = "sha256-1S3my0/77LiiGZDemVrYzN1jMcZdTyd404y67euraeI=";
 
   doCheck = false;
 

From 501deb05fa0b5b7cd01571d272d8f47deb2bd8d6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Apr 2023 04:20:00 +0000
Subject: [PATCH 08/40] dot-language-server: 1.1.26 -> 1.1.27

---
 .../tools/language-servers/dot-language-server/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/language-servers/dot-language-server/default.nix b/pkgs/development/tools/language-servers/dot-language-server/default.nix
index efaca2119b50..ef42edeec9d9 100644
--- a/pkgs/development/tools/language-servers/dot-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/dot-language-server/default.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "dot-language-server";
-  version = "1.1.26";
+  version = "1.1.27";
 
   src = fetchFromGitHub {
     owner = "nikeee";
     repo = "dot-language-server";
     rev = "v${version}";
-    hash = "sha256-Wv+Bw+mcc4vn1CfjIy5vAg5Kw7TUf+flcqLguvQVaCQ=";
+    hash = "sha256-Dha6S+qc9rwPvxUkBXYUomyKckEcqp/ESU/24GkrmpA=";
   };
 
-  npmDepsHash = "sha256-w7c6f+VlBx2kvLyEWgbT9S0hA7mu5gCNuQzGThkXAGY=";
+  npmDepsHash = "sha256-nI8xPCTZNqeGW4I99cDTxtVLicF1MEIMTPRp7O0bFE4=";
 
   npmBuildScript = "compile";
 

From 7432b75233b05597124dc5d04e5d787bdd1711f9 Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Fri, 31 Mar 2023 08:03:58 +0200
Subject: [PATCH 09/40] pyrosimple: init at 2.7.0

Signed-off-by: Maurice Zhou <yuchen@apvc.uk>
---
 .../networking/p2p/pyrosimple/default.nix     | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/pyrosimple/default.nix

diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix
new file mode 100644
index 000000000000..15a9ce266e00
--- /dev/null
+++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, python3Packages
+, nix-update-script
+, pyrosimple
+, testers
+, fetchPypi
+, buildPythonPackage
+, bencode-py
+, apscheduler
+, jinja2
+, python-daemon
+, importlib-resources
+, parsimonious
+, prometheus-client
+, prompt-toolkit
+, requests
+, shtab
+, inotify
+, withInotify ? stdenv.isLinux
+, python-box
+, tomli
+, tomli-w
+}:
+
+let
+  pname = "pyrosimple";
+  version = "2.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU=";
+  };
+
+  propagatedBuildInputs = [
+    bencode-py
+    apscheduler
+    jinja2
+    python-daemon
+    importlib-resources
+    parsimonious
+    prometheus-client
+    prompt-toolkit
+    requests
+    shtab
+    python-box
+    tomli
+    tomli-w
+  ] ++ lib.optional withInotify inotify;
+
+in buildPythonPackage {
+  inherit pname version src propagatedBuildInputs;
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = testers.testVersion {
+      package = pyrosimple;
+      command = "pyroadmin --version";
+    };
+  };
+
+  meta = let inherit (lib) licenses platforms maintainers;
+  in {
+    homepage = "https://kannibalox.github.io/pyrosimple/";
+    description = "A rTorrent client and Python 3 fork of the pyrocore tools";
+    license = licenses.gpl3Plus;
+    changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
+    platforms = platforms.all;
+    maintainers = builtins.attrValues { inherit (maintainers) ne9z; };
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496faefd0c91..035c84f73013 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32898,6 +32898,8 @@ with pkgs;
 
   pwdsafety = callPackage ../tools/security/pwdsafety { };
 
+  pyrosimple = python3Packages.callPackage ../applications/networking/p2p/pyrosimple { };
+
   qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
   qbittorrent-nox = qbittorrent.override {
     guiSupport = false;

From 80cf91af2080d0db5e157187a53e500ac8e7da88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Apr 2023 11:32:44 +0000
Subject: [PATCH 10/40] php81Extensions.pdlib: 1.0.2 -> 1.1.0

---
 pkgs/development/php-packages/pdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index 5a1e431d52d8..19312ef985c0 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -1,7 +1,7 @@
 { buildPecl, fetchFromGitHub, lib, pkg-config, dlib }:
 let
   pname = "pdlib";
-  version = "1.0.2";
+  version = "1.1.0";
 in
 buildPecl {
   inherit pname version;
@@ -10,7 +10,7 @@ buildPecl {
     owner = "goodspb";
     repo = "pdlib";
     rev = "v${version}";
-    sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
+    sha256 = "sha256-AKZ3F2XzEQCeZkacSXBinxeGQrHBmqjP7mDGQ3RBAiE=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From a4d304a664ededf9ca2873fe5d38147b09ead8da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Apr 2023 19:05:17 +0000
Subject: [PATCH 11/40] intel-media-sdk: 23.1.2 -> 23.2.0

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

diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index a6349d4f138c..1a24deeddb16 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-sdk";
-  version = "23.1.2";
+  version = "23.2.0";
 
   src = fetchFromGitHub {
     owner = "Intel-Media-SDK";
     repo = "MediaSDK";
     rev = "intel-mediasdk-${version}";
-    hash = "sha256-vtzcKPOxmfEl8IF7/hNGfeZmX+AdrHydeYsyYuB1B4o=";
+    hash = "sha256-XxwB5C1NBjq6cjlfzYmvudH6dlItFYSU9dd5DwH7tH0=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From de85369ecdeff51f2213c6203ee7bd67ccf62108 Mon Sep 17 00:00:00 2001
From: Alexandre Pereira <programming.hubmaking@slmail.me>
Date: Sun, 23 Apr 2023 02:47:17 +0100
Subject: [PATCH 12/40] elixir-ls: 0.13.0 -> 0.14.5

first pull request !
---
 pkgs/development/beam-modules/elixir-ls/pin.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json
index 79909f98b7de..e2eb21a57096 100644
--- a/pkgs/development/beam-modules/elixir-ls/pin.json
+++ b/pkgs/development/beam-modules/elixir-ls/pin.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.13.0",
-  "sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=",
-  "depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM="
+  "version": "0.14.5",
+  "sha256": "sha256-F0c1vyeie8sf11SHfDKb8v1DZ5No3Rr3PPj3jMg0veg=",
+  "depsSha256": "sha256-/lKZ9Ns32A/elJTez72mH2tZ7ujwEX9p4FIKHpfGq78="
 }

From 6537121e53c76c73f8e1aaa65954e998731f2b86 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 23 Apr 2023 02:06:57 +0000
Subject: [PATCH 13/40] xfce.xfce4-dict: 0.8.4 -> 0.8.5

https://gitlab.xfce.org/apps/xfce4-dict/-/compare/xfce4-dict-0.8.4...xfce4-dict-0.8.5
---
 .../xfce/applications/xfce4-dict/default.nix  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
index 989d07a44f65..65431b3917d9 100644
--- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
@@ -1,11 +1,19 @@
-{ lib, mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
+{ lib
+, mkXfceDerivation
+, automakeAddFlags
+, glib
+, gtk3
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+}:
 
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-dict";
-  version = "0.8.4";
+  version = "0.8.5";
 
-  sha256 = "sha256-UEkHB+i6hkTTjX62GCnr4uiCdZANuffSx2Nb2DF/pT4=";
+  sha256 = "sha256-sU9V2cQUFG5571c7xrVSDCxanAbbnCUg2YLZ2uzoPJ0=";
 
   patches = [ ./configure-gio.patch ];
 
@@ -15,7 +23,13 @@ mkXfceDerivation {
     automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS
   '';
 
-  buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
+  buildInputs = [
+    glib
+    gtk3
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+  ];
 
   meta = with lib; {
     description = "A Dictionary Client for the Xfce desktop environment";

From 0bbec286d7935a79f51c2b66869935b64689c241 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 23 Apr 2023 02:08:47 +0000
Subject: [PATCH 14/40] xfce.xfce4-time-out-plugin: 1.1.2 -> 1.1.3

https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/compare/xfce4-time-out-plugin-1.1.2...xfce4-time-out-plugin-1.1.3
---
 .../xfce4-time-out-plugin/default.nix         | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
index 6939dc42b31c..a5b656650170 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
@@ -1,15 +1,28 @@
-{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ lib
+, mkXfceDerivation
+, glib
+, gtk3
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+}:
 
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-time-out-plugin";
-  version = "1.1.2";
+  version = "1.1.3";
   rev-prefix = "xfce4-time-out-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-xfkQjlUfvm0YXs3bRJD4W/71VkaPq3Y+cDFVNiL/bjc=";
+  sha256 = "sha256-sm6y3t4nngZDg4Q8S3SVkNR++XkCKysQePN6Qei1OY8=";
 
   buildInputs = [
-    gtk3 libxfce4ui libxfce4util xfce4-panel xfconf
+    glib
+    gtk3
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
   ];
 
   meta = with lib; {

From e9b044f247d64a62013acee8fb4460e172139f60 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 23 Apr 2023 02:09:12 +0000
Subject: [PATCH 15/40] xfce.xfce4-weather-plugin: 0.11.0 -> 0.11.1

https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/compare/xfce4-weather-plugin-0.11.0...xfce4-weather-plugin-0.11.1
---
 .../xfce4-weather-plugin/default.nix          | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
index cd30b79650e3..162160e4e813 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
@@ -1,17 +1,32 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower,
-  libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, gitUpdater }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, intltool
+, glib
+, gtk3
+, libxml2
+, libsoup
+, upower
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+, hicolor-icon-theme
+, gitUpdater
+}:
 
 let
   category = "panel-plugins";
 in
 
 stdenv.mkDerivation rec {
-  pname  = "xfce4-weather-plugin";
-  version = "0.11.0";
+  pname = "xfce4-weather-plugin";
+  version = "0.11.1";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-4yQuqVHVG8D97R0CpPH2Yr7Bah+xDIVfcb2mVBoRU/w=";
+    sha256 = "sha256-pFFG+aDc3JXRkcCcZK0nmuKJz4+BHEQz4I4xplaEUjk=";
   };
 
   nativeBuildInputs = [
@@ -20,10 +35,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    glib
+    gtk3
     libxml2
     libsoup
     upower
     libxfce4ui
+    libxfce4util
     xfce4-panel
     xfconf
     hicolor-icon-theme

From 24dd72f6eceb7353e8d058ed8152665198028db3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 04:24:50 +0000
Subject: [PATCH 16/40] vhs: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix
index 2c594636c0df..54fe65589243 100644
--- a/pkgs/applications/misc/vhs/default.nix
+++ b/pkgs/applications/misc/vhs/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "vhs";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-62FS/FBhQNpj3dAfKfIUKY+IJeeaONzqRu7mG49li+o";
+    hash = "sha256-qtewd4sm3urFwoDkqdUHfr2SvJRR1nVLLE5d28BocYg=";
   };
 
-  vendorHash = "sha256-+BLZ+Ni2dqboqlOEjFNF6oB/vNDlNRCb6AiDH1uSsLw";
+  vendorHash = "sha256-s1ISU7VEH9o7SBF3Vy+2kVZNxOFUYLmh/le5vU8rOqg=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 

From 910fc742dbdc4264e7c426f2aeed6532e772e88d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 04:35:50 +0000
Subject: [PATCH 17/40] fluent-bit: 2.0.11 -> 2.1.1

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

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 7df58d84b819..d045dc1f67a8 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "2.0.11";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "sha256-/LkQnS3NMvZf0yP6X32sayXvUDd0et5VkCWvJe4GboI=";
+    sha256 = "sha256-l0kl+4ISrfT9rQlvCs3GSJfQAqGwxhYmcqn3USl9Ewo=";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From d2797ded5f1d25ed6fcb230c5b3ed43a606bd34b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 04:56:40 +0000
Subject: [PATCH 18/40] codeql: 2.12.6 -> 2.13.0

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

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index ac9f0727edc3..8c739172c191 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.12.6";
+  version = "2.13.0";
 
   dontConfigure = true;
   dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "sha256-0AOrjM7wUMgyKLmeoAPMY7O/YWXmqb5OBJGlGV5JFR0=";
+    sha256 = "sha256-K74o/qEC3DeR8lclJpkIXp6cAP6GLkK5QWJ6HzLxE8M=";
   };
 
   nativeBuildInputs = [

From a009dbc329a48050a11cedab19ec326e6e33a099 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 07:35:30 +0000
Subject: [PATCH 19/40] kubecfg: 0.29.1 -> 0.29.2

---
 pkgs/applications/networking/cluster/kubecfg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 46747974dd2f..9fd3fc41ce51 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubecfg";
-  version = "0.29.1";
+  version = "0.29.2";
 
   src = fetchFromGitHub {
     owner = "kubecfg";
     repo = "kubecfg";
     rev = "v${version}";
-    hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA=";
+    hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8=";
   };
 
-  vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw=";
+  vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg=";
 
   ldflags = [
     "-s"

From 6e7bb7594d4c6393e80f1d0e95d0e2ef9290dbc3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 10:38:14 +0200
Subject: [PATCH 20/40] python311Packages.titlecase: 2.3 -> 2.4

Diff: https://github.com/ppannuto/python-titlecase/compare/refs/tags/v2.3...v2.4
---
 pkgs/development/python-modules/titlecase/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix
index 0614f375a3a9..6cd8e7faa1e1 100644
--- a/pkgs/development/python-modules/titlecase/default.nix
+++ b/pkgs/development/python-modules/titlecase/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "titlecase";
-  version = "2.3";
+  version = "2.4";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ppannuto";
     repo = "python-titlecase";
-    rev = "v${version}";
-    sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 4f3a8eabd79fbc64625ed0140371359205b94e4b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 11:06:34 +0200
Subject: [PATCH 21/40] python311Packages.stripe: 5.2.0 -> 5.4.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 7085f0fe703b..3a51416cadc2 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "5.2.0";
+  version = "5.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pDcrna+DEtgjaaqmSZcpem8Ea8B8oJ91159ayAkztBQ=";
+    hash = "sha256-cr2nv5vnUo4bl6W7rLBxbN9qDJWXsT/b+jZM7DwTBxM=";
   };
 
   propagatedBuildInputs = [

From 73af36514aa95a2cc57dfec5ba23f9dfbda65404 Mon Sep 17 00:00:00 2001
From: 0xMRTT <0xMRTT@proton.me>
Date: Sun, 23 Apr 2023 11:08:06 +0200
Subject: [PATCH 22/40] schemes: init at 0.2.0

---
 pkgs/applications/misc/schemes/default.nix | 54 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/misc/schemes/default.nix

diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix
new file mode 100644
index 000000000000..41ec97f8b176
--- /dev/null
+++ b/pkgs/applications/misc/schemes/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, appstream-glib
+, desktop-file-utils
+, glib
+, gtk4
+, gtksourceview5
+, libadwaita
+, libgee
+, libpanel
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation rec {
+  pname = "schemes";
+  version = "0.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "chergert";
+    repo = "schemes";
+    rev = version;
+    hash = "sha256-XUC24KzZSU4+F2JZMsydukvAwEGdMxCnkPG6QHnCw6w=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    gtksourceview5
+    libpanel
+  ];
+
+  meta = with lib; {
+    description = "Edit GtkSourceView style-schemes for an application or platform";
+    homepage = "https://gitlab.gnome.org/chergert/schemes";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0xMRTT ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e296abe63928..8e389826fa25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11978,6 +11978,8 @@ with pkgs;
 
   sasview = libsForQt5.callPackage ../applications/science/misc/sasview { };
 
+  schemes = callPackage ../applications/misc/schemes { };
+
   scanbd = callPackage ../tools/graphics/scanbd { };
 
   scdl = callPackage ../tools/misc/scdl { };

From b65f68fdcdd3194191bdc922ce23c382fe4fb361 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 09:21:57 +0000
Subject: [PATCH 23/40] lima: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 189105ab5452..7924d7f70f6f 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "lima";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-jmVgrrbxkvzDkUYpNivz3jOOEEkr90iS5W4aY3L7Cug=";
+    sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ=";
   };
 
-  vendorHash = "sha256-8YmApeijOmWFfLu4UJTa1Ufn0RbaO4TKe7QHvjluMRg=";
+  vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU=";
 
   nativeBuildInputs = [ makeWrapper installShellFiles ]
     ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];

From 230c99e505f207bcb8a312c29e87ccd6373d4b2d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 23 Apr 2023 17:52:35 +0800
Subject: [PATCH 24/40] clair: fix src hash

---
 pkgs/tools/admin/clair/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index a12049e6fea7..d3944f63871c 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "quay";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yh617C99WSi//3YBIim5QLJTh8KgVcMkgG6AqRJYVvA=";
+    hash = "sha256-Nd73GQJUYkFMyvMLAUgu/LQuDEW74s9+YKwqnftPoPM=";
   };
 
   vendorHash = "sha256-V9Y+dZv3RKiyzGJB1o4+M4QQeRpBkCtJOr2zyjTCKTY=";

From f563bd3ba46f90006b25707b0b60e7747a76fd37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 10:05:26 +0000
Subject: [PATCH 25/40] jd-diff-patch: 1.6.1 -> 1.7.1

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

diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix
index ad7f7fad3cc6..a322ad52ddf4 100644
--- a/pkgs/development/tools/jd-diff-patch/default.nix
+++ b/pkgs/development/tools/jd-diff-patch/default.nix
@@ -2,19 +2,19 @@
 
 buildGoModule rec {
   pname = "jd-diff-patch";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner  = "josephburnett";
     repo   = "jd";
     rev    = "v${version}";
-    sha256 = "sha256-Ti7eElLplnYGP7v1VuGpyeZ3ZIau6Ffx4ACMBDIBROw=";
+    sha256 = "sha256-fi+vj1vHhgw2OPQqQ0827P6Axy/cio0UVFLeD/nhFvw=";
   };
 
   # not including web ui
   excludedPackages = [ "gae" "pack" ];
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   meta = with lib; {
     description = "Commandline utility and Go library for diffing and patching JSON values";

From 4388afbd9bef812fc22419154139409ffea4a8b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 10:21:44 +0000
Subject: [PATCH 26/40] usql: 0.14.0 -> 0.14.4

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

diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix
index 2c9ce250ee58..b695286085d1 100644
--- a/pkgs/applications/misc/usql/default.nix
+++ b/pkgs/applications/misc/usql/default.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.14.0";
+  version = "0.14.4";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-AYo1sRzsOuyv0p3X8/TmsWdCBq3Gcqo0J6+B2aI7UIo=";
+    hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0=";
   };
 
   buildInputs = [ unixODBC icu ];
 
-  vendorHash = "sha256-ro/m9t8vHxyAS+a42/OkaqhrUs0FPGu0Ns9tn5HyKXg=";
+  vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A=";
   proxyVendor = true;
 
   # Exclude broken impala & hive driver

From 9e16658e3039efed7373bbdcd95dc5c3e1598977 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 12:52:21 +0200
Subject: [PATCH 27/40] python310Packages.ssdp: update build requirements

---
 .../python-modules/ssdp/default.nix           | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index d2db80dbd383..9a68f24a0440 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -1,17 +1,18 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pbr
+, flit-core
+, flit-scm
 , pytestCheckHook
 , pythonOlder
-, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "ssdp";
   version = "1.1.1";
+  format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "codingjoe";
@@ -22,29 +23,28 @@ buildPythonPackage rec {
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  nativeBuildInputs = [
-    setuptools-scm
-  ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "--cov" ""
+  '';
 
-  buildInputs = [
-    pbr
+  nativeBuildInputs = [
+    flit-core
+    flit-scm
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "pytest-runner" "" \
-      --replace "--cov=ssdp" ""
-  '';
-
-  pythonImportsCheck = [ "ssdp" ];
+  pythonImportsCheck = [
+    "ssdp"
+  ];
 
   meta = with lib; {
     description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)";
     homepage = "https://github.com/codingjoe/ssdp";
+    changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From a5165e99c8000bb088be07971f3ac4723ab145c4 Mon Sep 17 00:00:00 2001
From: oluceps <i@oluceps.uk>
Date: Wed, 5 Apr 2023 16:49:22 +0800
Subject: [PATCH 28/40] phantomsocks: init at unstable-2023-04-05

---
 .../tools/networking/phantomsocks/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/networking/phantomsocks/default.nix

diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/tools/networking/phantomsocks/default.nix
new file mode 100644
index 000000000000..fc8fef3a14b8
--- /dev/null
+++ b/pkgs/tools/networking/phantomsocks/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "phantomsocks";
+  version = "unstable-2023-04-05";
+
+  src = fetchFromGitHub {
+    owner = "macronut";
+    repo = pname;
+    rev = "a54ae9f3611e8623f89e69273f2ded7f7c0a7abf";
+    hash = "sha256-ytTLwKlwbaiSWDRZBkOV7Hrl5ywWzLbv/fJ7nVlD++E=";
+  };
+
+  vendorHash = "sha256-c0NQfZuMMWz1ASwFBcpMNjxZwXLo++gMYBiNgvT8ZLQ=";
+
+  meta = with lib;{
+    homepage = "https://github.com/macronut/phantomsocks";
+    description = "A cross-platform proxy client/server for Linux/Windows/macOS";
+    longDescription = ''
+      A cross-platform proxy tool that could be used to modify TCP packets
+      to implement TCB desync to bypass detection and censoring.
+    '';
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ oluceps ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbc9d709ada4..d3dce4839d48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32838,6 +32838,8 @@ with pkgs;
 
   pfsshell = callPackage ../tools/misc/pfsshell { };
 
+  phantomsocks = callPackage ../tools/networking/phantomsocks { };
+
   photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
 
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };

From 84be28f36ac4ce0632df8ff2cd91822b234360db Mon Sep 17 00:00:00 2001
From: John Rinehart <johnrichardrinehart@gmail.com>
Date: Sun, 23 Apr 2023 12:17:31 +0100
Subject: [PATCH 29/40] headscale: change 'sha256'-style attributes
 'hash'-style attributes

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

diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index a116c7a4ddc8..fc6fb3156176 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -12,10 +12,10 @@ buildGoModule rec {
     owner = "juanfont";
     repo = "headscale";
     rev = "v${version}";
-    sha256 = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
+    hash = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
   };
 
-  vendorSha256 = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
+  vendorHash = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
 
   ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
 

From c8f2f13fdaef8021db6ca1c834caba6ef141fc0f Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 23 Apr 2023 12:52:55 +0100
Subject: [PATCH 30/40] cargo-geiger: 0.11.5 -> 0.11.6

Diff: https://github.com/rust-secure-code/cargo-geiger/compare/cargo-geiger-0.11.5...cargo-geiger-0.11.6

Changelog: https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-0.11.6/CHANGELOG.md
---
 .../tools/rust/cargo-geiger/default.nix          | 16 +++++++---------
 pkgs/top-level/all-packages.nix                  |  4 +---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index 03fbd4dd31e2..6d35e4d3ab8a 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -5,26 +5,25 @@
 , pkg-config
 , openssl
   # darwin dependencies
-, Security
-, CoreFoundation
+, darwin
 , libiconv
 , curl
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-geiger";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "rust-secure-code";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "sha256-PrrhxY+Hk1XfdV0u4GgIsbo8oNOFnqbCeivY2Ix6g+k=";
+    sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE=";
   };
-  cargoHash = "sha256-D3upXhKFkuZfEVOPJ9mCwoZkbkX9s2MltyTkKcBvb6I=";
+  cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA=";
 
   buildInputs = [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ];
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]);
   nativeBuildInputs = [ pkg-config ]
     # curl-sys wants to run curl-config on darwin
     ++ lib.optionals stdenv.isDarwin [ curl.dev ];
@@ -37,9 +36,8 @@ rustPlatform.buildRustPackage rec {
     "--skip serialize_test2_report"
     "--skip serialize_test3_report"
     "--skip serialize_test6_report"
-    "--skip test_package::case_2"
-    "--skip test_package::case_3"
-    "--skip test_package::case_6"
+    # multiple test cases that time-out or cause memory leaks
+    "--skip test_package"
     "--skip test_package_update_readme::case_2"
     "--skip test_package_update_readme::case_3"
     "--skip test_package_update_readme::case_5"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e296abe63928..714021489365 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16148,9 +16148,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
-  cargo-geiger = callPackage ../development/tools/rust/cargo-geiger {
-    inherit (darwin.apple_sdk.frameworks) Security CoreFoundation;
-  };
+  cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { };
 
   cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
     inherit (darwin.apple_sdk.frameworks) AppKit;

From 394bf4e5be27cbbd4c425cd8881cc775efaeb0e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 13:56:08 +0200
Subject: [PATCH 31/40] python311Packages.tablib: 3.3.0 -> 3.4.0

Changelog: https://github.com/jazzband/tablib/raw/v3.4.0/HISTORY.md
---
 pkgs/development/python-modules/tablib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 56af48f6403e..2b9076ae6043 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "tablib";
-  version = "3.3.0";
-  format = "setuptools";
+  version = "3.4.0";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA=";
+    hash = "sha256-d+qX+vb5Kn4ZjAW9DGkPPLpXuD6kWmNrcvlny2/m8WA=";
   };
 
   postPatch = ''

From 24d6aa1a9003225dfdbed496704f6d363e272a09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Apr 2023 15:02:47 +0200
Subject: [PATCH 32/40] python310Packages.qdrant-client: adjust inputs

- enable tests
- add pythonImportsCheck
---
 .../python-modules/qdrant-client/default.nix  | 69 ++++++++++++++-----
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix
index 98bde376e042..57e5ab8ee019 100644
--- a/pkgs/development/python-modules/qdrant-client/default.nix
+++ b/pkgs/development/python-modules/qdrant-client/default.nix
@@ -1,34 +1,71 @@
-{ lib, buildPythonPackage, fetchPypi, python3Packages, numpy, httpx, grpcio, typing-extensions, grpcio-tools, pydantic, urllib3, h2 }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, grpcio
+, grpcio-tools
+, h2
+, httpx
+, numpy
+, pytestCheckHook
+, poetry-core
+, pydantic
+, pythonOlder
+, typing-extensions
+, urllib3
+}:
 
 buildPythonPackage rec {
   pname = "qdrant-client";
   version = "1.1.0";
-
-  src = fetchPypi {
-    pname = "qdrant_client";
-    inherit version;
-    hash = "sha256-tiWPQXjYkUM77rgKYbQG4jdi9c/I2WTMq5y+9zLax/0=";
-  };
-
   format = "pyproject";
 
-  nativeBuildInputs = with python3Packages; [
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "qdrant";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rpNTV3VBTND39iW/kve0aG1KJzAIl1whmhH+e6RbOhw=";
+  };
+
+  nativeBuildInputs = [
     poetry-core
   ];
 
+  propagatedBuildInputs = [
+    numpy
+    httpx
+    grpcio
+    typing-extensions
+    grpcio-tools
+    pydantic
+    urllib3
+    h2
+  ];
 
-  # postPatch = ''
-  #   substituteInPlace setup.cfg \
-  #     --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2,<0.21.0"
-  # '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
-  propagatedBuildInputs = [ numpy httpx grpcio typing-extensions grpcio-tools pydantic urllib3 h2 ];
+  pythonImportsCheck = [
+    "qdrant_client"
+  ];
 
-  doCheck = false;
+  disabledTests = [
+    # Tests require network access
+    "test_conditional_payload_update"
+    "test_locks"
+    "test_multiple_vectors"
+    "test_points_crud"
+    "test_qdrant_client_integration"
+    "test_quantization_config"
+    "test_record_upload"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/qdrant/qdrant-client";
     description = "Python client for Qdrant vector search engine";
+    homepage = "https://github.com/qdrant/qdrant-client";
+    changelog = "https://github.com/qdrant/qdrant-client/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ happysalada ];
   };

From b4dea3ca4c58f276b834f4c42c8a8203bd2ef1f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 14:05:02 +0000
Subject: [PATCH 33/40] numix-icon-theme-circle: 23.04.05 -> 23.04.20

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 8d6fbe4ff4b5..3f48f5b22a82 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "23.04.05";
+  version = "23.04.20";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU=";
+    sha256 = "sha256-pc5GwxU4KP6PktPvuCYVzJORVmMvC8GdBPr7QSN2cM0=";
   };
 
   nativeBuildInputs = [ gtk3 ];

From a683a04ebe4c3123eb8530aaee9eda28350c4e26 Mon Sep 17 00:00:00 2001
From: Quentin JOLY <82603435+QJoly@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:26:33 +0000
Subject: [PATCH 34/40] kubexit: Init at 0.3.2

Update pkgs/applications/networking/cluster/kubexit/default.nix

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>

Good description (previous one was wrong)

Update pkgs/applications/networking/cluster/kubexit/default.nix

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
---
 .../networking/cluster/kubexit/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubexit/default.nix

diff --git a/pkgs/applications/networking/cluster/kubexit/default.nix b/pkgs/applications/networking/cluster/kubexit/default.nix
new file mode 100644
index 000000000000..bf086de6d78b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubexit/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "kubexit";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "karlkfi";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Kzom+/Xad6SI9czw4xvmTbJ+bNB9mF2oSq37IFn384U=";
+  };
+
+  vendorHash = "sha256-RA3+S5Pad+4mNUgcZ2Z0K0FKA3Za5o1ko049GM4yQQ8=";
+  ldflags = [ "-s" "-w" ];
+  meta = with lib; {
+    description = "Command supervisor for coordinated Kubernetes pod container termination.";
+    homepage = "https://github.com/karlkfi/kubexit/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ qjoly ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d0a2fae172..25f7f2f75297 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31602,6 +31602,8 @@ with pkgs;
 
   kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
 
+  kubexit = callPackage ../applications/networking/cluster/kubexit { } ;
+
   kup = libsForQt5.callPackage ../applications/misc/kup { };
 
   kupfer = callPackage ../applications/misc/kupfer { };

From a5340ba9ff3484008c7b7633f9c4cb231ebcce42 Mon Sep 17 00:00:00 2001
From: Benjamin Lee <benjamin@computer.surgery>
Date: Wed, 12 Apr 2023 15:26:11 -0700
Subject: [PATCH 35/40] tree-sitter-grammars: add nu

---
 .../tools/parsing/tree-sitter/grammars/default.nix    |  1 +
 .../parsing/tree-sitter/grammars/tree-sitter-nu.json  | 11 +++++++++++
 pkgs/development/tools/parsing/tree-sitter/update.nix |  4 ++++
 3 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 441734f5edc1..386d90ca5c15 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -57,6 +57,7 @@
   tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json;
   tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
   tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
+  tree-sitter-nu = lib.importJSON ./tree-sitter-nu.json;
   tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
   tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json;
   tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
new file mode 100644
index 000000000000..7e8b2d5d9315
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/LhKipp/tree-sitter-nu",
+  "rev": "3133b2f391be10698c4fd6bc3d16f94cf2cb39b2",
+  "date": "2023-02-18T19:56:18+01:00",
+  "path": "/nix/store/x4yfa2dvs7gzi62qqs084jx38mhla0ym-tree-sitter-nu",
+  "sha256": "096jz9bb0dihi1civ8x1milyhdmx5chzwyrg84wj1jv94fkfmjk0",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 92a3f1698f0e..49c0d2866612 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -362,6 +362,10 @@ let
       orga = "JoranHonig";
       repo = "tree-sitter-solidity";
     };
+    "tree-sitter-nu" = {
+      orga = "LhKipp";
+      repo = "tree-sitter-nu";
+    };
   };
 
   allGrammars =

From 36034fbc517692ee203cac218b1dc0658ebfd7cc Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 23 Apr 2023 18:57:44 +0300
Subject: [PATCH 36/40] jellyfin-web: 10.8.9 -> 10.8.10

---
 pkgs/servers/jellyfin/node-deps.nix | 4 ++--
 pkgs/servers/jellyfin/web.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/jellyfin/node-deps.nix b/pkgs/servers/jellyfin/node-deps.nix
index ceb53197182e..3fd20cd256fb 100644
--- a/pkgs/servers/jellyfin/node-deps.nix
+++ b/pkgs/servers/jellyfin/node-deps.nix
@@ -11817,8 +11817,8 @@ let
   args = {
     name = "jellyfin-web";
     packageName = "jellyfin-web";
-    version = "10.8.9";
-    src = ../../../../../../../nix/store/yvn7h8hrydjxiw23fhqj5ya6yilj0d57-source;
+    version = "10.8.10";
+    src = ../../../../../../../nix/store/l77pzlsdcdhb2lyan89wpw111nvf348l-source;
     dependencies = [
       sources."@ampproject/remapping-2.1.2"
       (sources."@apideck/better-ajv-errors-0.3.3" // {
diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix
index 7dbab6683f3e..92b12c8643a2 100644
--- a/pkgs/servers/jellyfin/web.nix
+++ b/pkgs/servers/jellyfin/web.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jellyfin-web";
-  version = "10.8.9";
+  version = "10.8.10";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-web";
     rev = "v${version}";
-    sha256 = "hHZ8HVf8fidd5VPs06kB3/BHBHFxoV3fVObBesqfRJo=";
+    sha256 = "fJmGiHLwhgd3Ac7ggCbkMu6llob3qN87EpHpCO4K29I=";
   };
 
   nativeBuildInputs = [

From a5cbcee70b0a1e3711f41ffcb6b6ab64a22e080a Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 23 Apr 2023 18:58:05 +0300
Subject: [PATCH 37/40] jellyfin: 10.8.9 -> 10.8.10

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

diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index b7973a8e1d41..9ac59bf72cf7 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -14,13 +14,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.8.9"; # ensure that jellyfin-web has matching version
+  version = "10.8.10"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    sha256 = "kvtC9qtVuewR9W6sq963/tNgZbWSpygpBqcXnHuvX0Q=";
+    sha256 = "uX56TSyi0V0Rs6R3A8QHZrjTIHUZobLYIgG+nZDE3Hg=";
   };
 
   patches = [

From 5d91a896449650d13fbba8c8abc65d1615c2b654 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sun, 23 Apr 2023 14:05:30 +0100
Subject: [PATCH 38/40] kalendar: Remove unused fetchFromGitLab

Hasn't been needed since it moved into pkgs/applications/kde
---
 pkgs/applications/kde/kalendar.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix
index 1bf6f3d1e139..30303cc497b2 100644
--- a/pkgs/applications/kde/kalendar.nix
+++ b/pkgs/applications/kde/kalendar.nix
@@ -1,6 +1,5 @@
 { lib
 , mkDerivation
-, fetchFromGitLab
 , cmake
 , extra-cmake-modules
 , makeWrapper

From 60c3435ab9241dad3124a80ba8c8888ec8712b93 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 23 Apr 2023 19:20:12 +0300
Subject: [PATCH 39/40] angelfish: fix build

Fixes #227824. Sorry!
---
 pkgs/applications/kde/angelfish.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix
index 6de8e703bd70..45cfcad67d8e 100644
--- a/pkgs/applications/kde/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@@ -20,8 +20,8 @@
 , srcs
 
 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "23.03.80"
-, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
+, cargoShaForVersion ? "23.04.0"
+, cargoSha256 ? "sha256-96Qe8zdLZdOrU/t6J+JJ6V0PXyFOnJF18qDrk4PZGsA="
 }:
 
 # Guard against incomplete updates.

From 75e62acf2e6f7e998ea913ac646d4596e9ca95d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Apr 2023 10:40:26 +0000
Subject: [PATCH 40/40] jfrog-cli: 2.36.0 -> 2.36.1

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

diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix
index a3dea2a9a60d..2575482b34e9 100644
--- a/pkgs/tools/misc/jfrog-cli/default.nix
+++ b/pkgs/tools/misc/jfrog-cli/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "jfrog-cli";
-  version = "2.36.0";
-  vendorHash = "sha256-oAekCcPoaruEq7oENhrpRj2K5l+y2/b6IzqtpQSAzk8=";
+  version = "2.36.1";
+  vendorHash = "sha256-i0iZhYcVRxkcCWd9+liX5vvwXCyem3v1sRZYqmsNbgY=";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     rev = "v${version}";
-    sha256 = "sha256-dyhJuKIUgWalpyM2DASjPsj3tpV9W3Z7AeMlHtWoQrk=";
+    sha256 = "sha256-C3XoBtJyTQQDC5QKmNAyvdYt4ZyBhHs33bW4DDlv9lU=";
   };
 
   postInstall = ''