From 712adfbb27f3369b18adee28a6e0939833d8ec31 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloom@riseup.net>
Date: Thu, 30 Mar 2023 22:59:47 +0300
Subject: [PATCH 01/92] obs-studio-plugins.obs-teleport: init at 0.6.5

Closes #223775.
---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../plugins/obs-teleport/default.nix          | 54 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 049636dd59d3..0f6b9ef878ca 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -32,6 +32,8 @@
 
   obs-source-record = callPackage ./obs-source-record.nix { };
 
+  obs-teleport = callPackage ./obs-teleport { };
+
   obs-vaapi = callPackage ./obs-vaapi { };
 
   obs-vkcapture = callPackage ./obs-vkcapture.nix {
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
new file mode 100644
index 000000000000..7aa0739a938b
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
@@ -0,0 +1,54 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, libjpeg
+, nix-update-script
+, obs-studio
+}:
+
+buildGoModule rec {
+  pname = "obs-teleport";
+  version = "0.6.5";
+
+  src = fetchFromGitHub {
+    owner = "fzwoch";
+    repo = "obs-teleport";
+    rev = version;
+    sha256 = "sha256-J3Q0AQV21jh+Pth5wXbGbryrx7Mg65rAQVapyGBls7Y=";
+  };
+
+  vendorHash = "sha256-2rlEMkdcD+46EpQhUpLIGMzqvlyMFYK/XQYV9DJZxao=";
+
+  buildInputs = [
+    libjpeg
+    obs-studio
+  ];
+
+  ldflags = [ "-s" "-w" ];
+
+  CGO_CFLAGS = "-I${obs-studio}/include/obs";
+  CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api";
+
+  buildPhase = ''
+    runHook preBuild
+
+    go build -buildmode=c-shared -o obs-teleport.so .
+
+    runHook postBuild
+  '';
+
+  postInstall = ''
+    mkdir -p $out/lib/obs-plugins
+    mv obs-teleport.so $out/lib/obs-plugins
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "An OBS Studio plugin for an open NDI-like replacement";
+    homepage = "https://github.com/fzwoch/obs-teleport";
+    maintainers = [ lib.maintainers.paveloom ];
+    license = lib.licenses.gpl2Plus;
+    platforms = obs-studio.meta.platforms;
+  };
+}

From ae08ff7b7172d3d99c95fb94b79489c39b3db78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Sat, 3 Dec 2022 13:29:16 +0100
Subject: [PATCH 02/92] xcodeenv: allow versions higher than specified
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add `allowHigher` option to let higher versions of Xcode.
This is useful when xcodeenv is used for `nix-shell` for developers
and their xcode version might be a bit newer than required one.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 .../mobile/xcodeenv/compose-xcodewrapper.nix  | 19 ++++++++++++++-----
 pkgs/development/mobile/xcodeenv/default.nix  | 14 ++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
index 0a469da418a1..fa9e89337615 100644
--- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
@@ -1,10 +1,13 @@
-{stdenv}:
-{version ? "11.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{ stdenv, lib }:
+{ version ? "11.1"
+, allowHigher ? false
+, xcodeBaseDir ? "/Applications/Xcode.app" }:
 
 assert stdenv.isDarwin;
 
 stdenv.mkDerivation {
-  name = "xcode-wrapper-"+version;
+  pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}";
+  inherit version;
   buildCommand = ''
     mkdir -p $out/bin
     cd $out/bin
@@ -24,9 +27,15 @@ stdenv.mkDerivation {
     ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
 
     # Check if we have the xcodebuild version that we want
-    if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
+    currVer=$($out/bin/xcodebuild -version | head -n1)
+    ${if allowHigher then ''
+    if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
+    '' else ''
+    if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
+    ''}
     then
-        echo "We require xcodebuild version: ${version}"
+        echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
+        echo "Instead what was found: $currVer"
         exit 1
     fi
   '';
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index 90642ca7d9ac..f63ed63c0479 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,15 +1,9 @@
-{ stdenv, lib }:
+{ callPackage }:
 
 rec {
-  composeXcodeWrapper = import ./compose-xcodewrapper.nix {
-    inherit stdenv;
-  };
+  composeXcodeWrapper = callPackage ./compose-xcodewrapper.nix { };
 
-  buildApp = import ./build-app.nix {
-    inherit stdenv lib composeXcodeWrapper;
-  };
+  buildApp = callPackage ./build-app.nix { inherit composeXcodeWrapper; };
 
-  simulateApp = import ./simulate-app.nix {
-    inherit stdenv lib composeXcodeWrapper;
-  };
+  simulateApp = callPackage ./simulate-app.nix { inherit composeXcodeWrapper; };
 }

From 56344717c0d339678e929681acd4f45e712b4858 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 08:47:24 +0000
Subject: [PATCH 03/92] python310Packages.mkdocs-swagger-ui-tag: 0.5.2 -> 0.6.1

---
 .../python-modules/mkdocs-swagger-ui-tag/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index cb2f6979db5c..5b94eb230cc4 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-swagger-ui-tag";
-  version = "0.5.2";
+  version = "0.6.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qurnqgpsppO4LPg8fN6HobUoNHQTDI6OmEDjVtObA78=";
+    hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw=";
   };
 
   propagatedBuildInputs = [ mkdocs beautifulsoup4 ];

From 71728de8148073bf37c9eb918618457cfe493644 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 13:03:45 +0200
Subject: [PATCH 04/92] python310Packages.mkdocs-swagger-ui-tag: update meta

---
 .../python-modules/mkdocs-swagger-ui-tag/default.nix           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 5b94eb230cc4..31168c5370cf 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -23,8 +23,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ];
 
   meta = with lib; {
-    description = "A MkDocs plugin supports for add Swagger UI in page.";
+    description = "A MkDocs plugin supports for add Swagger UI in page";
     homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag";
+    changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v${version}/CHANGELOG";
     license = licenses.mit;
     maintainers = with maintainers; [ snpschaaf ];
   };

From c176f0a52de467eabf0e2382d4b14d3f80d75486 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 13:06:02 +0200
Subject: [PATCH 05/92] python310Packages.mkdocs-swagger-ui-tag: update
 disabled

- add format
---
 .../mkdocs-swagger-ui-tag/default.nix          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 31168c5370cf..d4c3690b4765 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -1,8 +1,8 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , drawio-headless
 , fetchPypi
-, isPy3k
-, lib
+, pythonOlder
 , mkdocs
 , beautifulsoup4
 }:
@@ -10,17 +10,23 @@
 buildPythonPackage rec {
   pname = "mkdocs-swagger-ui-tag";
   version = "0.6.1";
+  format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw=";
   };
 
-  propagatedBuildInputs = [ mkdocs beautifulsoup4 ];
+  propagatedBuildInputs = [
+    mkdocs
+    beautifulsoup4
+  ];
 
-  pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ];
+  pythonImportsCheck = [
+    "mkdocs_swagger_ui_tag"
+  ];
 
   meta = with lib; {
     description = "A MkDocs plugin supports for add Swagger UI in page";

From a1377d938451ac320ccd8f3e56037c02a0caa7ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 14:17:09 +0000
Subject: [PATCH 06/92] fatsort: 1.6.4.625 -> 1.6.5.640

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

diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 2ca135704e0c..ef7111dd72ff 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.4.625";
+  version = "1.6.5.640";
   pname = "fatsort";
 
   src = fetchurl {
     url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
-    sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0=";
+    sha256 = "sha256-Yw7OVtnrOlVSSvCuw6reeFQ2DrqUkXKmz7R2jLj75C4=";
   };
 
   buildInputs = [ help2man libiconv ];

From c1321cf04e361cb07acc7e8cda3f8a9c650aeb73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 15:15:58 +0000
Subject: [PATCH 07/92] python310Packages.zigpy-zigate: 0.10.3 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 16228f53861a..77ac66638b78 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.10.3";
+  version = "0.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-eGN2QvPHZ8gfPPFdUbAP9cs43jzUHDBS/w1tni1shB0=";
   };
 
   propagatedBuildInputs = [

From 7bbf9bfc3867a619e342df8608b81c07ac80b1dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 15:42:02 +0000
Subject: [PATCH 08/92] python310Packages.azure-mgmt-imagebuilder: 1.1.0 ->
 1.2.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index 8b92d97dd2dc..c8aadd1f4d6a 100644
--- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.0";
+  version = "1.2.0";
   pname = "azure-mgmt-imagebuilder";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss=";
+    hash = "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI=";
     extension = "zip";
   };
 

From b15a98560a0aaf59b9988c85954398783f0ca436 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 17:34:16 +0000
Subject: [PATCH 09/92] python310Packages.returns: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix
index 5a5ce355feed..c9fcac37f932 100644
--- a/pkgs/development/python-modules/returns/default.nix
+++ b/pkgs/development/python-modules/returns/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "returns";
-  version = "0.19.0";
+  version = "0.20.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dry-python";
     repo = "returns";
     rev = "refs/tags/${version}";
-    hash = "sha256-yKlW5M7LlK9xF4GiCKtUVrZwwSmFVjCnDhnzaNFcAsU=";
+    hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ=";
   };
 
   nativeBuildInputs = [

From 2a088c0c0261d4a4dc026bc5ed01f4acc84cc5fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 20:22:26 +0200
Subject: [PATCH 10/92] python310Packages.zigpy-zigate: add changelog to meta

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

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 77ac66638b78..4b11d35b6b7d 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -52,6 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library which communicates with ZiGate radios for zigpy";
     homepage = "https://github.com/zigpy/zigpy-zigate";
+    changelog = "https://github.com/zigpy/zigpy-zigate/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ mvnetbiz ];
     platforms = platforms.linux;

From 665bc71e23ba826ad46b9686162269dc8dd38410 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 18:48:48 +0000
Subject: [PATCH 11/92] obs-studio-plugins.droidcam-obs: 2.0.1 -> 2.0.2

---
 .../video/obs-studio/plugins/droidcam-obs/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
index 131817a2589f..a1cf5f2e7eef 100644
--- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "droidcam-obs";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "dev47apps";
     repo = "droidcam-obs-plugin";
     rev = version;
-    sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50=";
+    sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU=";
   };
 
   postPatch = ''

From 973ced0339d0c9b03cca7bd2e75415325bb2f118 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 18:49:49 +0000
Subject: [PATCH 12/92] snac2: 2.25 -> 2.28

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

diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix
index 7f2d6c774d07..e1a37f6c9aec 100644
--- a/pkgs/servers/snac2/default.nix
+++ b/pkgs/servers/snac2/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "snac2";
-  version = "2.25";
+  version = "2.28";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = pname;
     rev = version;
-    hash = "sha256-xWRsJ1b2Ddf4H9KLIyc4GpRc6xUNFRQpIdgfrdPg/0c=";
+    hash = "sha256-VeywijUgLcSxaqlkFkZMqZQn2u2ZmCL1CcJ7eW+C9k4=";
   };
 
   buildInputs = [ curl openssl ];

From 1b3c6848081aec70b21a08b644099421756bb0d9 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 26 Apr 2023 21:20:06 +0200
Subject: [PATCH 13/92] linux-wifi-hotspot: Fix desktop file path

---
 pkgs/os-specific/linux/linux-wifi-hotspot/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
index e5e4e1dca87a..ca466d37634d 100644
--- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
+++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
       --replace "etc" "$out/etc"
     substituteInPlace ./src/scripts/wihotspot \
       --replace "/usr" "$out"
+    substituteInPlace ./src/desktop/wifihotspot.desktop \
+      --replace "/usr" "$out"
   '';
 
   makeFlags = [

From 8436c5fac4e2fd1d7ab8166cd8d17b82e57a3085 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 26 Apr 2023 21:30:35 +0200
Subject: [PATCH 14/92] linux-wifi-hotspot: Fix file paths in polkit rule

---
 pkgs/os-specific/linux/linux-wifi-hotspot/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
index ca466d37634d..7e45943aba4f 100644
--- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
+++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
       --replace "/usr" "$out"
     substituteInPlace ./src/desktop/wifihotspot.desktop \
       --replace "/usr" "$out"
+    substituteInPlace ./src/scripts/policies/polkit.policy \
+      --replace "/usr" "$out"
   '';
 
   makeFlags = [

From 6199e72b49d9499a346c55a3b63120a846d402e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 20:10:37 +0000
Subject: [PATCH 15/92] ballerina: 2201.4.0 -> 2201.5.0

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

diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix
index 20c13c9f25dd..80c272a08588 100644
--- a/pkgs/development/compilers/ballerina/default.nix
+++ b/pkgs/development/compilers/ballerina/default.nix
@@ -1,6 +1,6 @@
 { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
 let
-  version = "2201.4.0";
+  version = "2201.5.0";
   codeName = "swan-lake";
 in stdenv.mkDerivation {
   pname = "ballerina";
@@ -8,7 +8,7 @@ in stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
-    sha256 = "sha256-720QKGOerRzXsnbUghk+HGOMl4lQxHDYya3+FHtU/Ys=";
+    sha256 = "sha256-6UpUKoUHkYW9aPo2AbpP5uC1rCv578ultG9II1jZPRE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c158c5bc151aa666e6938dae4bae8043239d2b0f Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Wed, 19 Apr 2023 21:15:00 +0200
Subject: [PATCH 16/92] freenet: Reduce closure size

Reduce the closure size from 1.0G to 174.7M.
---
 .../applications/networking/p2p/freenet/default.nix |  4 ++--
 .../networking/p2p/freenet/freenetWrapper           |  2 +-
 pkgs/top-level/all-packages.nix                     | 13 +++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index c7a1a02fc241..8a46b5a476c1 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, gradle, bash, coreutils
+{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils
 , substituteAll, nixosTests, perl, fetchpatch, writeText }:
 
 let
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
 
   wrapper = substituteAll {
     src = ./freenetWrapper;
-    inherit bash coreutils jdk seednodes;
+    inherit bash coreutils jre seednodes;
   };
 
   # https://github.com/freenet/fred/blob/next/build-offline.sh
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index f8292615de7a..74ff2c62961f 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -15,4 +15,4 @@ cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
 chmod u+rw -- $FREENET_HOME/seednodes.fref
 
 cd -- $FREENET_HOME
-exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
+exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dac8b735a293..2daf308d0642 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30495,6 +30495,19 @@ with pkgs;
 
   freenet = callPackage ../applications/networking/p2p/freenet {
     gradle = gradle_7;
+    jdk = jdk_headless;
+    # Reduce closure size
+    jre = pkgs.jre_minimal.override {
+      modules = [
+        "java.base"
+        "java.logging"
+        "java.naming"
+        "java.sql"
+        "java.desktop"
+        "java.management"
+      ];
+      jdk = jdk_headless;
+    };
   };
 
   freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };

From 828f60c5febd77adf6bbc5da81e6e701d9949e2f Mon Sep 17 00:00:00 2001
From: Vinny Meller <vinnymeller@gmail.com>
Date: Wed, 26 Apr 2023 15:15:30 -0500
Subject: [PATCH 17/92] twm: 0.4.0 -> 0.6.0

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

diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix
index 524f74f33182..5ad3deea1954 100644
--- a/pkgs/tools/misc/twm/default.nix
+++ b/pkgs/tools/misc/twm/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "twm";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "vinnymeller";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-CC3FlEX86mrRi+TFOoswHEaxKbvFm5fHSqbikgZdPA8=";
+    sha256 = "sha256-OUaT/JMh4JgFbzIYlU34EN7gxEydNKBXSLJfYKOeck4=";
   };
 
-  cargoHash = "sha256-TCqXoFkxwqYuztaPdtfcSVL6psYkVaafOrUT6bUd8ig=";
+  cargoHash = "sha256-VGbY3QRkO4znEGs2daUhpDeNntONwvGeUg1ryFyWmjE=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];

From c8a41009da9e948faee31599388f158ef582f269 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Apr 2023 20:25:24 +0000
Subject: [PATCH 18/92] libvgm: unstable-2023-01-18 -> unstable-2023-04-22

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

diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix
index 733a75e5fc90..e6f985225ef5 100644
--- a/pkgs/development/libraries/libvgm/default.nix
+++ b/pkgs/development/libraries/libvgm/default.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libvgm";
-  version = "unstable-2023-01-18";
+  version = "unstable-2023-04-22";
 
   src = fetchFromGitHub {
     owner = "ValleyBell";
     repo = "libvgm";
-    rev = "c250212538dd48d3965826ad7fe669bb0f348cbd";
-    sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc=";
+    rev = "669a7566a356393d4e5b1030a9f9cdd3486bb41b";
+    sha256 = "U/PO/YtS8bOb2yKk57UQKH4eRNysYC/hrmUR5YZyYlw=";
   };
 
   outputs = [

From d0ea6c4ecdb5ccd50662023e9355df5869b78218 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Apr 2023 23:02:00 +0200
Subject: [PATCH 19/92] python310Packages.python-gvm: 23.4.1 -> 23.4.2

Diff: https://github.com/greenbone/python-gvm/compare/refs/tags/v23.4.1...v23.4.2

Changelog: https://github.com/greenbone/python-gvm/releases/tag/v23.4.2
---
 pkgs/development/python-modules/python-gvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index 3ea1d0d89a8c..2311240a7896 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-gvm";
-  version = "23.4.1";
+  version = "23.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RuyOhFerWSJ/JEQTruv1gh/ieO2X99E33VW28assflY=";
+    hash = "sha256-ONCPC05NYyymTKiJZaDTdcShLLy4+K+JwROVVXBkz+o=";
   };
 
   nativeBuildInputs = [

From baabb309a88fd7c1e7457bb7bfb145e9bce2b190 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 00:34:15 +0200
Subject: [PATCH 20/92] trufflehog: 3.32.2 -> 3.33.0

Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.32.2...v3.33.0

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.33.0
---
 pkgs/tools/security/trufflehog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index dc955510de00..b7614d74145c 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.32.2";
+  version = "3.33.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+iGk3pmmpiljnmX0yCL3/X+icWvukxVA5n32npVBGOM=";
+    hash = "sha256-ZbsWPyLPN6qTMyEuisLA589B5JgYV9LixuRV91G/6oY=";
   };
 
   vendorHash = "sha256-sSpRu6zLIvllrDYdtrj3oD3pCVs9ucSXbu3IYTqjT+k=";

From 24cea5a7f9224d76b82bdba51b9be851d2442828 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 01:03:20 +0200
Subject: [PATCH 21/92] python310Packages.syrupy: 4.0.1 -> 4.0.2

Diff: https://github.com/tophat/syrupy/compare/refs/tags/v4.0.1...v4.0.2

Changelog: https://github.com/tophat/syrupy/releases/tag/v4.0.2
---
 pkgs/development/python-modules/syrupy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 8b22b098a8ce..4043cb637c2f 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "syrupy";
-  version = "4.0.1";
+  version = "4.0.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8.1";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tophat";
     repo = "syrupy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE=";
+    hash = "sha256-luYYh6L7UxW8wkp1zxR0EOmyTj0mIZ6Miy6HcVHebo4=";
   };
 
   nativeBuildInputs = [

From cb84557817e7a90f1c87758899f54493d908be7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 01:00:15 +0000
Subject: [PATCH 22/92] vmagent: 1.85.3 -> 1.90.0

---
 pkgs/servers/monitoring/vmagent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix
index c19be7871707..bd7df1ee30db 100644
--- a/pkgs/servers/monitoring/vmagent/default.nix
+++ b/pkgs/servers/monitoring/vmagent/default.nix
@@ -1,18 +1,18 @@
 { lib, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "vmagent";
-  version = "1.85.3";
+  version = "1.90.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     rev = "v${version}";
-    sha256 = "sha256-/p5oHxp1fVyUMjZ3vim9YKNhFqIACGa3KTYIv/k4MXg=";
+    sha256 = "sha256-XENouirZ8d92h+4KNI3K7k7e2kF3sah5DAZjlC2pVds=";
   };
 
   ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   subPackages = [ "app/vmagent" ];
 

From c6113676c21a2bbf3fede99d6afa2c3340b06feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 03:52:43 +0000
Subject: [PATCH 23/92] p4c: 1.2.3.7 -> 1.2.3.8

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

diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix
index c26aa44170f1..e4d896f96be8 100644
--- a/pkgs/development/compilers/p4c/default.nix
+++ b/pkgs/development/compilers/p4c/default.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "p4c";
-  version = "1.2.3.7";
+  version = "1.2.3.8";
 
   src = fetchFromGitHub {
     owner = "p4lang";
     repo = "p4c";
     rev = "v${version}";
-    sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc=";
+    sha256 = "sha256-EvMoooB6kAV0fJ3XBFJKpams87ImybTXw0C5P9YAa9Q=";
     fetchSubmodules = true;
   };
 

From 002add16d703513456b6153e6340c06246460936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 03:53:02 +0000
Subject: [PATCH 24/92] ecs-agent: 1.70.1 -> 1.70.2

---
 pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 928eb53c2715..494d33ec8716 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.70.1";
+  version = "1.70.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = pname;
-    hash = "sha256-CAoMXWxtsGJOEOxZ8ZLwLYAWW0kY/4jryrIAFDbOeXA=";
+    hash = "sha256-52Ty7g8SnhYAgYsE9mpmRmg4T6QifjWDIwNnJZBSPMk=";
   };
 
   vendorHash = null;

From 44b84c3d5b73399db429da91da83e86cff3dbba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 04:08:51 +0000
Subject: [PATCH 25/92] patchelfUnstable: unstable-2023-04-23 ->
 unstable-2023-04-25

---
 pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index c4d9807e0b39..7d340cf547b0 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "patchelf";
-  version = "unstable-2023-04-23";
+  version = "unstable-2023-04-25";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "patchelf";
-    rev = "99c24238981b7b1084313aca8f5c493bb46f302c";
-    sha256 = "sha256-v8hMcFVtTknn1LMfRCDQa/bYgP/bpsPhSYp01TiCtew=";
+    rev = "008a582741617e2d7d5aa4aab1e8ddfdec0067d9";
+    sha256 = "sha256-SC9zZbHN1p5BD6YHr+/ZNelmmZDozEO/vDwuCdJJCcs=";
   };
 
   # Drop test that fails on musl (?)

From a990678a54e65a41bdaf57c204ca6cbf0b26cc80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 04:29:49 +0000
Subject: [PATCH 26/92] opera: 97.0.4719.43 -> 98.0.4759.6

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

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index be8a180b326f..6eb2b6f1b5aa 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "97.0.4719.43";
+  version = "98.0.4759.6";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-VZVR7oE2GJwVo1M2oHFWuzzyTphJARpeJX/tbAPvwEg=";
+    hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ=";
   };
 
   unpackPhase = "dpkg-deb -x $src .";

From 2991a24965dc91b2ec6771476f0bc2bea7ddab72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 04:53:16 +0000
Subject: [PATCH 27/92] eksctl: 0.137.0 -> 0.138.0

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 85d72b1b56f1..4639fe4df326 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.137.0";
+  version = "0.138.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    hash = "sha256-OTTEJugF/yur3n6LZ1ESJV03DzFEvQ4HXCFUDLrTbYg=";
+    hash = "sha256-hZnNb6tsgllJUo3lz+qF/d3MQJJ6IauqVl5nG5J3aok=";
   };
 
-  vendorHash = "sha256-q+xLO1oppamR34TMFEajY/D+3nPcXDW0oeA/pzS8hI0=";
+  vendorHash = "sha256-ZjA89x+B0pT5jShr1Iv/geBYtH/bYnk/TIQZWLObAck=";
 
   doCheck = false;
 

From 7e151a0527c2754859f8ca1be43994f158ce733c Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 27 Apr 2023 03:46:46 +0000
Subject: [PATCH 28/92] skeema: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix
index 043285497e91..927b50173de5 100644
--- a/pkgs/tools/system/skeema/default.nix
+++ b/pkgs/tools/system/skeema/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "skeema";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "skeema";
     repo = "skeema";
     rev = "v${version}";
-    hash = "sha256-mzxoA5oWX94EdiapSCgyC62RCffuutWzC1YKkGfJSEU=";
+    hash = "sha256-JhOQKfJCaZc5PlDWPuYe1Ag9AHkw9RjEQ4N9MSda4rY=";
   };
 
   vendorHash = null;

From 2b8f96c360abde583fe8da37c9b82f8ffbd9ded0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 05:44:21 +0000
Subject: [PATCH 29/92] tilt: 0.31.2 -> 0.32.2

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

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index ebb28798f55e..d9900e07cbb8 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,15 +5,15 @@ buildGoModule rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
     running in development environment and try to serve assets from the
     source tree, which is not there once build completes.  */
-  version = "0.31.2";
+  version = "0.32.2";
 
   src = fetchFromGitHub {
     owner  = "tilt-dev";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8=";
+    sha256 = "sha256-YB/stG+7gxIaB+vMx8PwmUm4W32fCNeRnVrOvOXba5k=";
   };
-  vendorSha256 = null;
+  vendorHash = null;
 
   subPackages = [ "cmd/tilt" ];
 

From de8e0a71c67f2c693de0d2fbc88b1167af0555b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 05:53:18 +0000
Subject: [PATCH 30/92] devbox: 0.4.6 -> 0.4.8

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

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index a2444607730f..2c48d3ba81fe 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "devbox";
-  version = "0.4.6";
+  version = "0.4.8";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-vAfpx4cGN7NxhQbkrhSRxlD+QNfzaiBRtTgyO3e8brU=";
+    hash = "sha256-Xs7xd2U00AnYlXZv1PYHaSIYhDg+GpCHAtT2xis61vM=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
   # integration tests want file system access
   doCheck = false;
 
-  vendorHash = "sha256-62cJVlrGdrBSK+yzOA4WiHvplEMuKo09qp95+aX3WY0=";
+  vendorHash = "sha256-Ct1hftgMYAF8DPdnYTB1QQYD0HGC4wifIbMX+TrgDdk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From af9916744930248f32abc4294f35509a5d30e274 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 06:40:58 +0000
Subject: [PATCH 31/92] mediainfo: 22.12 -> 23.03

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

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 8adfb7453ef5..1f2c6dee6fa4 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "22.12";
+  version = "23.03";
   pname = "mediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w=";
+    sha256 = "sha256-8GGkJXVlZ2ojS2O91tSX4xcMjkojQaQgu6OcTqi6pJg=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From 7278814d722a58ee5b78b06d58671273e5c69b49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 06:42:16 +0000
Subject: [PATCH 32/92] ibus-engines.table: 1.16.13 -> 1.17.0

---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 97beeadc4853..620ea55e2e55 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.16.13";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "sha256-hkSUmxBC7n2VTEVfI7rLgdo//xh0iZHxnAmjOayrJu0=";
+    sha256 = "sha256-6zuSb/oNUAozzUmrIdSR6FH8xXds07MTpRVU4A19chc=";
   };
 
   postPatch = ''

From df4b2cb3db2588179b4aeb20b133f1e2908cb499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 06:53:42 +0000
Subject: [PATCH 33/92] altair: 5.0.22 -> 5.0.23

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

diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix
index 6bd435750066..af29e7e590b3 100644
--- a/pkgs/development/tools/altair-graphql-client/default.nix
+++ b/pkgs/development/tools/altair-graphql-client/default.nix
@@ -2,11 +2,11 @@
 
 let
   pname = "altair";
-  version = "5.0.22";
+  version = "5.0.23";
 
   src = fetchurl {
     url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-zbsKj70ESotf4rW3zf60gaZWoXRgPRi4sPv7eIXC/Zg=";
+    sha256 = "sha256-sjM5KztkFqsZT153b181OLrus5YS09Dp/w4LD6Q6Ros=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 0fb99734cf3c2e08eb9ebac1347f181e194a7936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 07:07:26 +0000
Subject: [PATCH 34/92] parallel: 20230322 -> 20230422

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index dc1971b465cd..e2da0ba1fd52 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "parallel";
-  version = "20230322";
+  version = "20230422";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-5cexum0MvJ1NxYqj4hyJcMWuSbD9D69Or4vb1gAre8o=";
+    sha256 = "sha256-kQZZPQncTeDglLexQ5CjCdj8sdJxBKU4FNFpN9y648I=";
   };
 
   outputs = [ "out" "man" "doc" ];

From b94c7f3acc71784ee952061c5117b9ee8a97d71e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 07:14:15 +0000
Subject: [PATCH 35/92] jetty: 11.0.13 -> 11.0.14

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

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 9082dceb5021..876189343f23 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "jetty";
-  version = "11.0.13";
+  version = "11.0.14";
   src = fetchurl {
     url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
-    sha256 = "sha256-RZryj2AJKKv13iwRBVwushOpPFLUj7wd4JIgJ6JVIz4=";
+    sha256 = "sha256-lmS9B5dXJAc9j/RVs2sqMRaj1C5CN2trTszUXfPfHI4=";
   };
 
   dontBuild = true;

From fc1133dc0ddbbf0927abd51903cc7ea391d25794 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 07:25:52 +0000
Subject: [PATCH 36/92] saga: 9.0.0 -> 9.0.1

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

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 734cdccbf45a..2bdd5b75ddb6 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -31,11 +31,11 @@
 
 mkDerivation rec {
   pname = "saga";
-  version = "9.0.0";
+  version = "9.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
-    sha256 = "sha256-Yi0zYV6RnUy9mx7/jVBXa0POyTqisPqFEFH+BATn2YY=";
+    sha256 = "sha256-8S8Au+aLwl8X0GbqPPv2Q6EL98KSoT665aILc5vcbpA=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";

From cb22816835b9ff45c3140b194a7dfcfcfc27ec23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 07:52:22 +0000
Subject: [PATCH 37/92] reaper: 6.77 -> 6.79

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

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 60f7cf657fdb..68393ad87ad5 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "6.77";
+  version = "6.79";
 
   src = fetchurl {
     url = url_for_platform version stdenv.hostPlatform.qemuArch;
     hash = {
-      x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";
-      aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";
+      x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0=";
+      aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU=";
     }.${stdenv.hostPlatform.system};
   };
 

From 1830443d0ce703fd6c46312bb7dd326fdd3f1e5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 08:02:07 +0000
Subject: [PATCH 38/92] plantuml: 1.2023.5 -> 1.2023.6

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 17f6d5ac777f..680bd302bb5a 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2023.5";
+  version = "1.2023.6";
   pname = "plantuml";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
-    sha256 = "sha256-C4ui/YdUIeLADugDuTmyY/5L4Nz+0iGcK3JgWPkU8UM=";
+    sha256 = "sha256-Ce9e0B+Sb8o7a5rO5RC7f1TzeEjXSC25FdZ3aPLKlu4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b719ba7b67d059793a3312c12dc9b34184d6f85b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 08:18:43 +0000
Subject: [PATCH 39/92] chezmoi: 2.33.1 -> 2.33.3

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

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index dc7498506f05..f969a7a37566 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "2.33.1";
+  version = "2.33.3";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    hash = "sha256-arZqLkb+J9tSBrZGlqc7KXSABVznRbGoKrMOG3CQeg8=";
+    hash = "sha256-FHp4sBNuTi0cHECAE2u1DcNUmbo/6plAnPUMs3+OlIE=";
   };
 
-  vendorHash = "sha256-NU7NmWMUR9jNR8tmEg97o7QMs01aCoYBktj8kUEdBLU=";
+  vendorHash = "sha256-D1LxpTWqe40/49obXchF1udDQMeDLAk1RVPFiEqYwMg=";
 
   doCheck = false;
 

From 1a7a3206713d84e0da3bdd536d855b03822b57b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 08:29:26 +0000
Subject: [PATCH 40/92] cudatext: 1.191.5 -> 1.192.0

---
 pkgs/applications/editors/cudatext/default.nix |  4 ++--
 pkgs/applications/editors/cudatext/deps.json   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 5547bb8aeb30..55c5aabaa36d 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.191.5";
+  version = "1.192.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ=";
+    hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 97d37f8db2ac..43400ed2c2f9 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -11,18 +11,18 @@
   },
   "ATFlatControls": {
     "owner": "Alexey-T",
-    "rev": "2023.03.22",
-    "hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs="
+    "rev": "2023.04.26",
+    "hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0="
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2023.04.22",
-    "hash": "sha256-12W0p18s15KFFIopgit8l/Bf1KjMZkP2kCAaeaoqfyQ="
+    "rev": "2023.04.26",
+    "hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
-    "rev": "2023.04.08",
-    "hash": "sha256-xm2fMAm0DF0hILxBQ2m+OSodQQgl5a4rkW0pgTDjuoo="
+    "rev": "2023.04.26",
+    "hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk="
   },
   "EControl": {
     "owner": "Alexey-T",

From 45081f74a527702c81961cab6dca39bba67a4476 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 08:29:48 +0000
Subject: [PATCH 41/92] mark: 8.9 -> 9.1.4

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

diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix
index cc743cec8b82..33d6072c8c81 100644
--- a/pkgs/tools/text/mark/default.nix
+++ b/pkgs/tools/text/mark/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mark";
-  version = "8.9";
+  version = "9.1.4";
 
   src = fetchFromGitHub {
     owner  = "kovetskiy";
     repo   = "mark";
     rev    = version;
-    sha256 = "sha256-mtATdRUNTBXy/r7VoxHi1SNTv8fGz7svil6dOkqq5Bk=";
+    sha256 = "sha256-nAgEegtRT4c2wJzVOY41JgM/JVW5xQjRnhXUzjwqxLY=";
   };
 
-  vendorHash = "sha256-V14i+8h0HxxHVDNfgaHUxdzEnB+mKL5iGjBwMjPDZ9s=";
+  vendorHash = "sha256-2rEwZffM+RK0baz8m+fXN2NGYskv4zO67cWC4rx+hfI=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 

From 9d9fa0066443d94fddd9db53737f1af53fa7245c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 27 Apr 2023 11:05:03 +0200
Subject: [PATCH 42/92] mattermost: 7.8.1 -> 7.8.3

Fixes CVE-2023-1831 / MMSA-2023-00146, MMSA-2023-00160 and MMSA-2023-00162.

Changelogs:
https://docs.mattermost.com/install/self-managed-changelog.html#release-v7-8-extended-support-release
---
 pkgs/servers/mattermost/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 7439396969f4..e18bff1d3f78 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -7,21 +7,21 @@
 
 buildGoModule rec {
   pname = "mattermost";
-  version = "7.8.1";
+  version = "7.8.3";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "mattermost-server";
     rev = "v${version}";
-    sha256 = "sha256-6aJkJCJmQHvSn5SHIPXj0nNLBuEez9BCYYMMlv3iZqQ=";
+    hash = "sha256-MJAYKBMQEf82YkDOpLHnL7Jxlz6i0K0B8E99pRxGHgc=";
   };
 
   webapp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    sha256 = "sha256-KmzjhAkv1TpOlHtZnN/ifkQnzDqk1rN+fl4JStZRbXQ=";
+    hash = "sha256-4VOEDrCKZI5HR5U2m49Dfbs5Mc+i8l4N41jIy8+5D1k=";
   };
 
-  vendorSha256 = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk=";
+  vendorHash = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk=";
 
   subPackages = [ "cmd/mattermost" ];
 

From 646d91b53401b19e095214a4bbd312f0e3f09101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 09:18:18 +0000
Subject: [PATCH 43/92] jotta-cli: 0.15.75988 -> 0.15.80533

---
 pkgs/applications/misc/jotta-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
index 28451b3c2e4f..d128c8cc6925 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jotta-cli";
-  version = "0.15.75988";
+  version = "0.15.80533";
   src = fetchzip {
       url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
-      sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc=";
+      sha256 = "sha256-4Knenhuezc+hKqVVY/l5d7SNfiAHyxspwGEgJj++GQM=";
       stripRoot = false;
     };
 

From b4dff837563acd7589e1713742216b58142002d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 09:25:01 +0000
Subject: [PATCH 44/92] sfeed: 1.7 -> 1.8

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

diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
index 80ff75736227..02813960ea6c 100644
--- a/pkgs/tools/misc/sfeed/default.nix
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sfeed";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
     rev = version;
-    sha256 = "sha256-W9AQc3Y3do1M2GM7LQVM5SN07LoWaZL7GTQD+SmQRwQ=";
+    sha256 = "sha256-oosBwLCVZDy29RNxLXie0IPRUxAmT6qJlQGHypWScuk=";
   };
 
   buildInputs = [ ncurses ];

From 376eadb5eb655540a7ed9f20945f7b40bb964017 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 27 Apr 2023 09:54:20 +0000
Subject: [PATCH 45/92] =?UTF-8?q?gnome.ghex:=2044.0=20=E2=86=92=2044.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/ghex/-/compare/44.0...44.1
---
 pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix
index 96c1633b8da5..36aad3edaac3 100644
--- a/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome/apps/ghex/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ghex";
-  version = "44.0";
+  version = "44.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "WKpHz9vtEoCjwTGVHBokWWEpQEoLDTR6Pb//tv9oOXY=";
+    sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI=";
   };
 
   nativeBuildInputs = [

From 5810bab503be88e17fe3f82f15bdf9e135ca5249 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 09:55:48 +0000
Subject: [PATCH 46/92] kdiff3: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index b5100570648f..7877d7d8d3d2 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -14,11 +14,11 @@
 
 mkDerivation rec {
   pname = "kdiff3";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-s/l+Gz6BF1VKeljVj48PaT/wMKQrvLcwj7RPhZWM1Ss=";
+    sha256 = "sha256-IFQ0kw9nU2wgUZFir33fQ1hG4qGhJdegmG9M4n+bM8g=";
   };
 
   buildInputs = [ boost ];

From 831478b07458301f1cf3544318d6708126eebdbe Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Thu, 27 Apr 2023 12:41:07 +0100
Subject: [PATCH 47/92] chatblade: 0.2.1 -> 0.2.3

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

diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix
index aee760a31fa9..a96f68c57137 100644
--- a/pkgs/applications/misc/chatblade/default.nix
+++ b/pkgs/applications/misc/chatblade/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "chatblade";
-  version = "0.2.1";
+  version = "0.2.3";
   format = "setuptools";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1syZyqdv+0iyAOWDychv3bGnkHs9SCxsEotxQ+G1UPo=";
+    sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk=";
   };
 
   doCheck = false; # there are no tests

From f13c8704bc25835b49019e87bba0b52393f3f920 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 12:01:46 +0000
Subject: [PATCH 48/92] python310Packages.pylsqpack: 0.3.16 -> 0.3.17

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

diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix
index 73e54377e66c..3c2eba13d2b9 100644
--- a/pkgs/development/python-modules/pylsqpack/default.nix
+++ b/pkgs/development/python-modules/pylsqpack/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pylsqpack";
-  version = "0.3.16";
+  version = "0.3.17";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s=";
+    hash = "sha256-LyB3jblW3H5LGop5ci1XpGUMRZl/tlwTUsv4XreqPOI=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 0d11b477754a4fa27f4723026e80413b8843c9ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 12:51:21 +0000
Subject: [PATCH 49/92] vgmtools: unstable-2023-01-27 -> unstable-2023-04-17

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

diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix
index e0a14a82124c..1233974bf841 100644
--- a/pkgs/tools/audio/vgmtools/default.nix
+++ b/pkgs/tools/audio/vgmtools/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vgmtools";
-  version = "unstable-2023-01-27";
+  version = "unstable-2023-04-17";
 
   src = fetchFromGitHub {
     owner = "vgmrips";
     repo = "vgmtools";
-    rev = "fc55484b5902191e5467e6044bb90c1c74a0c938";
-    sha256 = "Ho0yYoe1TIlVxMauz/harP1xSw42wdcklj/O6fA+VEk=";
+    rev = "894fb43d584e31efe0c7070ba9b6b85938012745";
+    sha256 = "BGL7Lm6U1QdYZgEnn9tGgY+z8Fhjj+Sd2Cesn1sxWhY=";
   };
 
   nativeBuildInputs = [

From fd2c8bfaa356ca0b7001cd49d7a1578eaeaf5dce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 12:57:02 +0000
Subject: [PATCH 50/92] imgproxy: 3.15.0 -> 3.16.0

---
 pkgs/servers/imgproxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index adc4459bd7a8..8cca579af7c8 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "imgproxy";
-  version = "3.15.0";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    sha256 = "sha256-Y0QxjIY8ac/6MAdqKDEv3/et1+ysCMkV522jxDP72Js=";
+    sha256 = "sha256-TdJRoburmJl2Ez0wzJnqm2jpJpFOSOmaBx0O9Z/8DXQ=";
     rev = "v${version}";
   };
 
-  vendorHash = "sha256-6rEGuuw3UJyWeaIm9v5P8/V0Nxd9ySe0PCf0rWRDB9s=";
+  vendorHash = "sha256-EtNFSAx8YcRhzgV3IdrZaCM6fOd284iuTperCFECsL8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 9d136b7467bd2bde6338ab98cff8056499c7e83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 27 Apr 2023 14:58:40 +0200
Subject: [PATCH 51/92] ldtk: 1.2.5 -> 1.3.0

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

diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix
index 3e6346f57e41..8d6ec620e5c4 100644
--- a/pkgs/applications/editors/ldtk/default.nix
+++ b/pkgs/applications/editors/ldtk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ldtk";
-  version = "1.2.5";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
-    sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A=";
+    hash = "sha256-2gGxl6l7J/L0CfMJk6PVmc1ABQISzAnjKDJgnMyx2PM=";
   };
 
   nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

From d92e42073fc2297482ed57f314392b1911c506fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 13:02:52 +0000
Subject: [PATCH 52/92] xurls: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 4da65d9af027..dc0825b88d4f 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "xurls";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
     rev = "v${version}";
-    sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw=";
+    sha256 = "sha256-9hPXZ/t15+LG9fji1gyeWhUrYOr6eGyKYg3a1SmHJpQ=";
   };
 
-  vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo=";
+  vendorHash = "sha256-eVK7qU+NWsarBsEpg6aGow/urmhIpU3Z9RwoTvSymXo=";
 
   ldflags = [ "-s" "-w" ];
 

From ebb1fb926ae4db2c07cd3329e8715affa39411b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 27 Apr 2023 15:03:22 +0200
Subject: [PATCH 53/92] ldtk: add meta.changelog

---
 pkgs/applications/editors/ldtk/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix
index 8d6ec620e5c4..ef21add4b32e 100644
--- a/pkgs/applications/editors/ldtk/default.nix
+++ b/pkgs/applications/editors/ldtk/default.nix
@@ -48,8 +48,9 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "https://ldtk.io/";
     description = "Modern, lightweight and efficient 2D level editor";
+    homepage = "https://ldtk.io/";
+    changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ felschr ];

From 8c513b21713b90593d1a9e64f16c8ab1b3f53e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 13:17:53 +0000
Subject: [PATCH 54/92] thedesk: 24.0.10 -> 24.1.2

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

diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix
index 8e4a671c4a64..bfb20c5ccbdd 100644
--- a/pkgs/applications/misc/thedesk/default.nix
+++ b/pkgs/applications/misc/thedesk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "thedesk";
-  version = "24.0.10";
+  version = "24.1.2";
 
   src = fetchurl {
     url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
-    sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0=";
+    sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU=";
   };
 
   nativeBuildInputs = [

From 4f855640e1e8b93e1a9da3d9748d4e2e8e2b274a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 13:29:38 +0000
Subject: [PATCH 55/92] cloud-init: 23.1.1 -> 23.1.2

---
 pkgs/tools/virtualization/cloud-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 53e6a3a612fe..44b47a2ac6d0 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cloud-init";
-  version = "23.1.1";
+  version = "23.1.2";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "cloud-init";
     rev = "refs/tags/${version}";
-    hash = "sha256-w1UP7JIt/+6UlASB8kv2Lil+1sMTDIrADoYOT/WtaeE=";
+    hash = "sha256-tn4flcrf04hVWhqkmK4qDenXcnV93pP+C+8J63b6FXQ=";
   };
 
   patches = [ ./0001-add-nixos-support.patch ./0002-Add-Udhcpc-support.patch ];

From 074b1277b9d530d56d0e52223810a5a7e262817e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 13:59:58 +0000
Subject: [PATCH 56/92] loksh: 7.2 -> 7.3

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

diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix
index 469271ecf1ad..d646e91e286b 100644
--- a/pkgs/shells/loksh/default.nix
+++ b/pkgs/shells/loksh/default.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loksh";
-  version = "7.2";
+  version = "7.3";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = finalAttrs.pname;
     rev = finalAttrs.version;
     fetchSubmodules = true;
-    sha256 = "sha256-Dnt1xo/5URs5yiNtj75a5K/qGJ+0lirPExnG+0xLuq8=";
+    sha256 = "sha256-djjJH+mknmOfleVJhSkCLqCIaELh2gjZZE/xdNZuPtY=";
   };
 
   nativeBuildInputs = [

From 772b06df7c4f9c42a2b3b0bf2eb77159b93ad3c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 14:08:23 +0000
Subject: [PATCH 57/92] libwmf: 0.2.12 -> 0.2.13

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

diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index e6d598b54bac..b42e09894db8 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libwmf";
-  version = "0.2.12";
+  version = "0.2.13";
 
   outputs = [ "out" "dev" ];
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "caolanm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6";
+    sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From b436e6312656acae8cf0f1dd8ddef72c87240941 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 14:48:33 +0000
Subject: [PATCH 58/92] jadx: 1.4.6 -> 1.4.7

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

diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix
index 34fe78aabb00..2911c369b0b7 100644
--- a/pkgs/tools/security/jadx/default.nix
+++ b/pkgs/tools/security/jadx/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "jadx";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "skylot";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-nxEK2K6id1Rnqo85ls6YEHXrhc9ykJU17+olGqg+aGA=";
+    hash = "sha256-3t2e3WfH/ohkdGWlfV3t9oHJ1Q6YM6nSLOgmzgJEkls=";
   };
 
   deps = stdenv.mkDerivation {

From 2a172875f7059cd9c41aae3b7eb99f5f00f1fe69 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 17:11:36 +0200
Subject: [PATCH 59/92] checkov: 2.3.199 -> 2.3.202

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.199...2.3.202

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

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 8917ff369d00..3f35f17181d8 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,14 +22,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.3.199";
+  version = "2.3.202";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-JwEI+i6xvO8wsCCAliljXxddL3T6MWzHvzMmewNlbsk=";
+    hash = "sha256-cJGHby6g4ndz031vxLFmQ9yUAB6lsyGff3eM8vjxUbc=";
   };
 
   patches = [
@@ -116,7 +116,7 @@ buildPythonApplication rec {
     # Tests are comparing console output
     "cli"
     "console"
-    # Starting to fail after 2.3.199
+    # Starting to fail after 2.3.202
     "test_non_multiline_pair"
   ];
 

From 7cd0043499a62b961036f583749ca3f9c3780447 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 17:14:05 +0200
Subject: [PATCH 60/92] python310Packages.fakeredis: 2.11.0 -> 2.11.1

Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.11.0...v2.11.1

Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.11.1
---
 pkgs/development/python-modules/fakeredis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 3c2a6671ea2c..71b9e4d915ec 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.11.0";
+  version = "2.11.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg=";
+    hash = "sha256-nV/YZFgy4IagdJRLeg1rLTe7f2NsVnvizyMQrJhlrik=";
   };
 
   nativeBuildInputs = [

From c37d673e4280ac26fde2b371b4fdda6cedd9c076 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 27 Apr 2023 09:26:28 -0600
Subject: [PATCH 61/92] tidal-hifi: 5.0.0 -> 5.1.0

- Remove icon generation as upstream includes them now
---
 pkgs/applications/audio/tidal-hifi/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix
index cecfbaca8120..f3a16e89df82 100644
--- a/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/pkgs/applications/audio/tidal-hifi/default.nix
@@ -18,7 +18,6 @@
 , gdk-pixbuf
 , glib
 , gtk3
-, imagemagick
 , libappindicator-gtk3
 , libdbusmenu
 , libdrm
@@ -37,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tidal-hifi";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchurl {
     url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
-    sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE=";
+    sha256 = "sha256-IaSgul2L0L343TVT3ujgBoMt6tITwjJaBNOVJPCBDtI=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     gtk3
-    imagemagick
     pango
     systemd
     mesa # for libgbm
@@ -110,12 +108,6 @@ stdenv.mkDerivation rec {
       "''${gappsWrapperArgs[@]}"
     substituteInPlace $out/share/applications/tidal-hifi.desktop \
       --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
-
-    for size in 48 64 128 256 512; do
-      mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
-      convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \
-        -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png
-    done
   '';
 
   meta = with lib; {

From bd466f9ac0ee18776cd5b8181b564fc6b63aae46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 27 Apr 2023 17:20:28 +0200
Subject: [PATCH 62/92] taskjuggler: remove old/unused 3.x files

Somehow we have an old and unused taskjuggler-3.5.0 expr. Remove it.
---
 .../applications/misc/taskjuggler/3.x/Gemfile |  2 -
 .../misc/taskjuggler/3.x/Gemfile.lock         | 21 ---------
 .../misc/taskjuggler/3.x/default.nix          | 15 ------
 .../misc/taskjuggler/3.x/gemset.nix           | 47 -------------------
 4 files changed, 85 deletions(-)
 delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile
 delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
 delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/default.nix
 delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/gemset.nix

diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/3.x/Gemfile
deleted file mode 100644
index 77cbaeeed793..000000000000
--- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'http://rubygems.org'
-gem 'taskjuggler'
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
deleted file mode 100644
index 8831993117d2..000000000000
--- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    taskjuggler (3.5.0)
-      mail (>= 2.4.3)
-      term-ansicolor (>= 1.0.7)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    tins (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  taskjuggler
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix
deleted file mode 100644
index d3a8e26a4d82..000000000000
--- a/pkgs/applications/misc/taskjuggler/3.x/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, bundlerEnv, ruby }:
-
-bundlerEnv {
-  name = "taskjuggler-3.5.0";
-
-  inherit ruby;
-  gemdir = ./.;
-
-  meta = {
-    description = "A modern and powerful project management tool";
-    homepage    = "https://taskjuggler.org/";
-    license     = lib.licenses.gpl2;
-    platforms   = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
deleted file mode 100644
index deeeac106943..000000000000
--- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  mail = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  mime-types = {
-    version = "2.6.1";
-    source = {
-      type = "gem";
-      sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
-    };
-  };
-  taskjuggler = {
-    version = "3.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
-    };
-    dependencies = [
-      "mail"
-      "term-ansicolor"
-    ];
-  };
-  term-ansicolor = {
-    version = "1.3.2";
-    source = {
-      type = "gem";
-      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  tins = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
-    };
-  };
-}

From 7b13b02405a3ca9fd710489883e7b740983175f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Apr 2023 17:35:14 +0000
Subject: [PATCH 63/92] open-stage-control: 1.23.0 -> 1.24.2

---
 pkgs/applications/audio/open-stage-control/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix
index caab41a11436..1377598f807e 100644
--- a/pkgs/applications/audio/open-stage-control/default.nix
+++ b/pkgs/applications/audio/open-stage-control/default.nix
@@ -2,13 +2,13 @@
 
 buildNpmPackage rec {
   pname = "open-stage-control";
-  version = "1.23.0";
+  version = "1.24.2";
 
   src = fetchFromGitHub {
     owner = "jean-emmanuel";
     repo = "open-stage-control";
     rev = "v${version}";
-    hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI=";
+    hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE=";
   };
 
   # Remove some Electron stuff from package.json

From ca0c89900851906da9029019e2badde583c853ac Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Thu, 27 Apr 2023 11:59:05 -0600
Subject: [PATCH 64/92] nixos(steam): fix when gamescope isn't enabled

---
 nixos/modules/programs/steam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 28985b8db17c..78001116764e 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -84,6 +84,7 @@ in {
 
     gamescopeSession = mkOption {
       description = mdDoc "Run a GameScope driven Steam session from your display-manager";
+      default = {};
       type = types.submodule {
         options = {
           enable = mkEnableOption (mdDoc "GameScope Session");

From b866d85d5cd2d3f518a00a154513f520180cc3d5 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Thu, 27 Apr 2023 11:59:25 -0600
Subject: [PATCH 65/92] nixos(steam): install steam-gamescope

Allows to launch from a tty, in addition to display-manager.
---
 nixos/modules/programs/steam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 78001116764e..c63b31bde11f 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -136,7 +136,7 @@ in {
     environment.systemPackages = [
       cfg.package
       cfg.package.run
-    ];
+    ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope;
 
     networking.firewall = lib.mkMerge [
       (mkIf cfg.remotePlay.openFirewall {

From 4cdc34959b66e7613bc246c1557ac4eb91b2ee1c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 27 Apr 2023 21:11:16 +0300
Subject: [PATCH 66/92] openscenegraph: fix build on darwin

---
 pkgs/development/libraries/openscenegraph/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 891c5121b0e7..8fc4539c6687 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
   libX11, libXinerama, libXrandr, libGLU, libGL,
   glib, ilmbase, libxml2, pcre, zlib,
-  AGL, Carbon, Cocoa, Foundation,
+  AGL, Accelerate, Carbon, Cocoa, Foundation,
   boost,
   jpegSupport ? true, libjpeg,
   exrSupport ? false, openexr,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional sdlSupport SDL2
     ++ lib.optional restSupport asio
     ++ lib.optionals withExamples [ fltk ]
-    ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
+    ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ]
     ++ lib.optional (restSupport || colladaSupport) boost
   ;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82e27448e190..f122e99aed67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23064,7 +23064,7 @@ with pkgs;
   opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation;
+    inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation;
   };
 
   openslide = callPackage ../development/libraries/openslide { };

From 3b172df71c982b9e914837a7d056fa785dae8782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 27 Apr 2023 17:06:36 +0200
Subject: [PATCH 67/92] nodePackages.node2nix: add wrongly removed patch back

Thanks for catching lilyinstarlight!
---
 pkgs/development/node-packages/overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 73ccd8112863..a7e827fb163f 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -347,6 +347,12 @@ final: prev: {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = let
       patches = [
+        # Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
+        (fetchpatch {
+          name = "convert-crlf-for-script-bin-files.patch";
+          url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
+          hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
+        })
         # fix nodejs attr names
         (fetchpatch {
           url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch";

From 288edda34e2de148c6cfb5b46993deda570ec161 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 27 Apr 2023 20:19:55 +0200
Subject: [PATCH 68/92] python3Packages.latex2mathml: 3.75.2 -> 3.75.3

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

diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index 8737f0ef31da..572038eb3149 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -11,15 +11,15 @@
 
 buildPythonPackage rec {
   pname = "latex2mathml";
-  version = "3.75.2";
+  version = "3.75.3";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = pname;
     rev = version;
-    hash = "sha256-i/F1B/Rndg66tiKok1PDMK/rT5c2e8upnQrMSCTUzpU=";
+    hash = "sha256-i1OJ6hmF04cdDOG1gfyseCJu+e0LEr1I3UwLXbdQJqQ=";
   };
 
   format = "pyproject";

From dd05a95591047375f005de308380fc0af875fabc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 7 Jan 2022 18:29:59 +0800
Subject: [PATCH 69/92] alephone: fix cross compilation by setting AR in
 makeFlags

---
 pkgs/games/alephone/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix
index 98b21865d7ca..0a88c91e8a84 100644
--- a/pkgs/games/alephone/default.nix
+++ b/pkgs/games/alephone/default.nix
@@ -39,6 +39,7 @@ let
     ];
 
     configureFlags = [ "--with-boost=${boost}" ];
+    makeFlags = [ "AR:=$(AR)" ];
 
     enableParallelBuilding = true;
 

From dfcc29fe27efff078d2a05a1d579583c0ef2a4e4 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Thu, 27 Apr 2023 21:15:41 +0200
Subject: [PATCH 70/92] pkgsMusl.gtk4: fix build (#228560)

---
 pkgs/development/libraries/gtk/4.x.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index fe3549eee572..f801f83c9895 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -48,6 +48,7 @@
 , cups
 , AppKit
 , Cocoa
+, libexecinfo
 , broadwaySupport ? true
 }:
 
@@ -138,6 +139,8 @@ stdenv.mkDerivation rec {
     cups
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+    libexecinfo
   ];
   #TODO: colord?
 
@@ -180,7 +183,11 @@ stdenv.mkDerivation rec {
 
   # These are the defines that'd you'd get with --enable-debug=minimum (default).
   # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
-  env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
+  env = {
+    NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
+  } // lib.optionalAttrs stdenv.hostPlatform.isMusl {
+    NIX_LDFLAGS = "-lexecinfo";
+  };
 
   postPatch = ''
     files=(

From 1e07e5480d8fceac95be7eaaced4885d1859ed85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 26 Apr 2023 15:36:41 -0600
Subject: [PATCH 71/92] =?UTF-8?q?digikam:=207.9.0=20=E2=86=92=207.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 9f68964f424e..263bfe490ba7 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -56,11 +56,11 @@
 
 mkDerivation rec {
   pname   = "digikam";
-  version = "7.9.0";
+  version = "7.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
-    sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ=";
+    sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE=";
   };
 
   nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

From d5904d7e6b57d82212be4db9745633fd93925f37 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 27 Apr 2023 22:59:28 +0300
Subject: [PATCH 72/92] squashfsTools: fix build on darwin

---
 pkgs/tools/filesystems/squashfs/darwin.patch | 357 -------------------
 pkgs/tools/filesystems/squashfs/default.nix  |   2 +-
 2 files changed, 1 insertion(+), 358 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/squashfs/darwin.patch

diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch
deleted file mode 100644
index 657971c5b0ab..000000000000
--- a/pkgs/tools/filesystems/squashfs/darwin.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-Patch based on commits by Dave Vasilevsky <dave@vasilevsky.ca> and
-Blake Riley <blake.riley@gmail.com>, squashed into a single patch,
-with BSD-specific changes omitted.
-
-See also https://github.com/plougher/squashfs-tools/pull/69.
-
-diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
-index ea2f604..9c979f8 100644
---- a/squashfs-tools/action.c
-+++ b/squashfs-tools/action.c
-@@ -39,6 +39,10 @@
- #include <errno.h>
- #include <ctype.h>
- 
-+#ifndef FNM_EXTMATCH /* glibc extension */
-+	#define FNM_EXTMATCH 0
-+#endif
-+
- #include "squashfs_fs.h"
- #include "mksquashfs.h"
- #include "action.h"
-@@ -2415,9 +2419,12 @@ static char *get_start(char *s, int n)
- 
- static int subpathname_fn(struct atom *atom, struct action_data *action_data)
- {
--	return fnmatch(atom->argv[0], get_start(strdupa(action_data->subpath),
-+	char *path = strdup(action_data->subpath);
-+	int is_match = fnmatch(atom->argv[0], get_start(path,
- 		count_components(atom->argv[0])),
- 		FNM_PATHNAME|FNM_EXTMATCH) == 0;
-+	free(path);
-+	return is_match;
- }
- 
- /*
-diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
-index 216b979..eea2ec9 100644
---- a/squashfs-tools/info.c
-+++ b/squashfs-tools/info.c
-@@ -144,31 +144,22 @@ void dump_state()
- void *info_thrd(void *arg)
- {
- 	sigset_t sigmask;
--	struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 };
--	int sig, waiting = 0;
-+	int sig, err, waiting = 0;
- 
- 	sigemptyset(&sigmask);
- 	sigaddset(&sigmask, SIGQUIT);
- 	sigaddset(&sigmask, SIGHUP);
-+	sigaddset(&sigmask, SIGALRM);
- 
- 	while(1) {
--		if(waiting)
--			sig = sigtimedwait(&sigmask, NULL, &timespec);
--		else
--			sig = sigwaitinfo(&sigmask, NULL);
-+		err = sigwait(&sigmask, &sig);
- 
--		if(sig == -1) {
-+		if(err == -1) {
- 			switch(errno) {
--			case EAGAIN:
--				/* interval timed out */
--				waiting = 0;
--				/* FALLTHROUGH */
- 			case EINTR:
--				/* if waiting, the wait will be longer, but
--				   that's OK */
- 				continue;
- 			default:
--				BAD_ERROR("sigtimedwait/sigwaitinfo failed "
-+				BAD_ERROR("sigwait failed "
- 					"because %s\n", strerror(errno));
- 			}
- 		}
-@@ -179,8 +170,12 @@ void *info_thrd(void *arg)
- 			/* set one second interval period, if ^\ received
- 			   within then, dump queue and cache status */
- 			waiting = 1;
--		} else
-+			alarm(1);
-+		} else if (sig == SIGQUIT) {
- 			dump_state();
-+		} else if (sig == SIGALRM) {
-+			waiting = 0;
-+		}
- 	}
- }
- 
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
-index 843f9f4..ed2c3a6 100644
---- a/squashfs-tools/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -35,7 +35,12 @@
- #include <stddef.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef linux
-+#include <sys/sysctl.h>
-+#else
-+#include <sys/sysinfo.h>
- #include <sys/sysmacros.h>
-+#endif
- #include <fcntl.h>
- #include <errno.h>
- #include <dirent.h>
-@@ -50,7 +55,10 @@
- #include <sys/wait.h>
- #include <limits.h>
- #include <ctype.h>
--#include <sys/sysinfo.h>
-+
-+#ifndef FNM_EXTMATCH /* glibc extension */
-+	#define FNM_EXTMATCH 0
-+#endif
- 
- #ifndef linux
- #include <sys/sysctl.h>
-@@ -5064,6 +5072,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
- 	sigemptyset(&sigmask);
- 	sigaddset(&sigmask, SIGQUIT);
- 	sigaddset(&sigmask, SIGHUP);
-+	sigaddset(&sigmask, SIGALRM);
- 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
- 		BAD_ERROR("Failed to set signal mask in intialise_threads\n");
- 
-@@ -5802,6 +5811,35 @@ static int get_physical_memory()
- 	long long page_size = sysconf(_SC_PAGESIZE);
- 	int phys_mem;
- 
-+#ifndef linux
-+	#ifdef HW_MEMSIZE
-+		#define SYSCTL_PHYSMEM HW_MEMSIZE
-+	#elif defined(HW_PHYSMEM64)
-+		#define SYSCTL_PHYSMEM HW_PHYSMEM64
-+	#else
-+		#define SYSCTL_PHYSMEM HW_PHYSMEM
-+	#endif
-+
-+	int mib[2];
-+	uint64_t sysctl_physmem = 0;
-+	size_t sysctl_len = sizeof(sysctl_physmem);
-+
-+	mib[0] = CTL_HW;
-+	mib[1] = SYSCTL_PHYSMEM;
-+
-+	if(sysctl(mib, 2, &sysctl_physmem, &sysctl_len, NULL, 0) == 0) {
-+		/* some systems use 32-bit values, work with what we're given */
-+		if (sysctl_len == 4)
-+			sysctl_physmem = *(uint32_t*)&sysctl_physmem;
-+		phys_mem = sysctl_physmem >> 20;
-+	} else {
-+		ERROR_START("Failed to get amount of available "
-+			"memory.");
-+		ERROR_EXIT("  Defaulting to least viable amount\n");
-+		phys_mem = SQUASHFS_LOWMEM;
-+	}
-+  #undef SYSCTL_PHYSMEM
-+#else
- 	if(num_pages == -1 || page_size == -1) {
- 		struct sysinfo sys;
- 		int res = sysinfo(&sys);
-@@ -5814,6 +5852,7 @@ static int get_physical_memory()
- 	}
- 
- 	phys_mem = num_pages * page_size >> 20;
-+#endif
- 
- 	if(phys_mem < SQUASHFS_LOWMEM)
- 		BAD_ERROR("Mksquashfs requires more physical memory than is "
-diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c
-index 2067f80..ca8b7f4 100644
---- a/squashfs-tools/read_xattrs.c
-+++ b/squashfs-tools/read_xattrs.c
-@@ -31,13 +31,13 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#include <stdlib.h>
-+
- #include "squashfs_fs.h"
- #include "squashfs_swap.h"
- #include "xattr.h"
- #include "error.h"
- 
--#include <stdlib.h>
--
- extern int read_fs_bytes(int, long long, long long, void *);
- extern int read_block(int, long long, long long *, int, void *);
- 
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index d434b42..1208e45 100644
---- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -32,8 +32,12 @@
- #include "stdarg.h"
- #include "fnmatch_compat.h"
- 
-+#ifndef linux
-+#include <sys/sysctl.h>
-+#else
- #include <sys/sysinfo.h>
- #include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -1182,7 +1186,7 @@ int create_inode(char *pathname, struct inode *i)
- 			break;
- 		case SQUASHFS_SYMLINK_TYPE:
- 		case SQUASHFS_LSYMLINK_TYPE: {
--			struct timespec times[2] = {
-+			struct timeval times[2] = {
- 				{ i->time, 0 },
- 				{ i->time, 0 }
- 			};
-@@ -1201,8 +1205,7 @@ int create_inode(char *pathname, struct inode *i)
- 				goto failed;
- 			}
- 
--			res = utimensat(AT_FDCWD, pathname, times,
--					AT_SYMLINK_NOFOLLOW);
-+			res = lutimes(pathname, times);
- 			if(res == -1) {
- 				EXIT_UNSQUASH_STRICT("create_inode: failed to"
- 					" set time on %s, because %s\n",
-@@ -2687,6 +2690,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_
- 		sigemptyset(&sigmask);
- 		sigaddset(&sigmask, SIGQUIT);
- 		sigaddset(&sigmask, SIGHUP);
-+		sigaddset(&sigmask, SIGALRM);
- 		if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
- 			EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n");
- 
-diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
-index 1099678..5b6a038 100644
---- a/squashfs-tools/unsquashfs.h
-+++ b/squashfs-tools/unsquashfs.h
-@@ -46,6 +46,10 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- 
-+#ifndef FNM_EXTMATCH /* glibc extension */
-+	#define FNM_EXTMATCH 0
-+#endif
-+
- #include "endian_compat.h"
- #include "squashfs_fs.h"
- #include "unsquashfs_error.h"
-diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c
-index e906eaf..f1e68c2 100644
---- a/squashfs-tools/unsquashfs_info.c
-+++ b/squashfs-tools/unsquashfs_info.c
-@@ -96,31 +96,22 @@ void dump_state()
- void *info_thrd(void *arg)
- {
- 	sigset_t sigmask;
--	struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 };
--	int sig, waiting = 0;
-+	int sig, err, waiting = 0;
- 
- 	sigemptyset(&sigmask);
- 	sigaddset(&sigmask, SIGQUIT);
- 	sigaddset(&sigmask, SIGHUP);
-+	sigaddset(&sigmask, SIGALRM);
- 
- 	while(1) {
--		if(waiting)
--			sig = sigtimedwait(&sigmask, NULL, &timespec);
--		else
--			sig = sigwaitinfo(&sigmask, NULL);
-+		err = sigwait(&sigmask, &sig);
- 
--		if(sig == -1) {
-+		if(err == -1) {
- 			switch(errno) {
--			case EAGAIN:
--				/* interval timed out */
--				waiting = 0;
--				/* FALLTHROUGH */
- 			case EINTR:
--				/* if waiting, the wait will be longer, but
--				   that's OK */
- 				continue;
- 			default:
--				BAD_ERROR("sigtimedwait/sigwaitinfo failed "
-+				BAD_ERROR("sigwait failed "
- 					"because %s\n", strerror(errno));
- 			}
- 		}
-@@ -132,8 +123,12 @@ void *info_thrd(void *arg)
- 			/* set one second interval period, if ^\ received
- 			   within then, dump queue and cache status */
- 			waiting = 1;
--		} else
-+			alarm(1);
-+		} else if (sig == SIGQUIT) {
- 			dump_state();
-+		} else if (sig == SIGALRM) {
-+			waiting = 0;
-+		}
- 	}
- }
- 
-diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c
-index 61910e1..73e0090 100644
---- a/squashfs-tools/unsquashfs_xattr.c
-+++ b/squashfs-tools/unsquashfs_xattr.c
-@@ -27,6 +27,11 @@
- 
- #include <sys/xattr.h>
- 
-+#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
-+	#define lsetxattr(path_, name_, val_, sz_, flags_) \
-+		setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW)
-+#endif
-+
- #define NOSPACE_MAX 10
- 
- extern int root_process;
-diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c
-index b1c0089..6d7ed98 100644
---- a/squashfs-tools/xattr.c
-+++ b/squashfs-tools/xattr.c
-@@ -22,6 +22,14 @@
-  * xattr.c
-  */
- 
-+#ifndef linux
-+#define __BYTE_ORDER BYTE_ORDER
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#else
-+#include <endian.h>
-+#endif
-+
- #define TRUE 1
- #define FALSE 0
- 
-@@ -36,6 +44,13 @@
- #include <stdlib.h>
- #include <sys/xattr.h>
- 
-+#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
-+	#define llistxattr(path_, buf_, sz_) \
-+		listxattr(path_, buf_, sz_, XATTR_NOFOLLOW)
-+	#define lgetxattr(path_, name_, val_, sz_) \
-+		getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW)
-+#endif
-+
- #include "squashfs_fs.h"
- #include "squashfs_swap.h"
- #include "mksquashfs.h"
--- 
-2.35.1
-
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index b1b6efc6993b..02b380a230f9 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     # This patch adds an option to pad filesystems (increasing size) in
     # exchange for better chunking / binary diff calculation.
     ./4k-align.patch
-  ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
+  ];
 
   strictDeps = true;
   nativeBuildInputs = [ which ]

From 6bda19fb912049d6801b3402225a3ee6fdce6cef Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 16:19:05 +0000
Subject: [PATCH 73/92] hello-wayland: add update script

---
 pkgs/applications/graphics/hello-wayland/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix
index 7ecc43c44907..d3934fb8b8d4 100644
--- a/pkgs/applications/graphics/hello-wayland/default.nix
+++ b/pkgs/applications/graphics/hello-wayland/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchFromGitHub
 , imagemagick, pkg-config, wayland, wayland-protocols
+, unstableGitUpdater
 }:
 
 stdenv.mkDerivation {
@@ -23,6 +24,8 @@ stdenv.mkDerivation {
     runHook postBuild
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "Hello world Wayland client";
     homepage = "https://github.com/emersion/hello-wayland";

From 36233d967522af6e072cc1c45d1b9f9c8f531310 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 16:19:17 +0000
Subject: [PATCH 74/92] hello-wayland: unstable-2023-03-16 ->
 unstable-2023-04-23

---
 pkgs/applications/graphics/hello-wayland/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix
index d3934fb8b8d4..afc8e76405aa 100644
--- a/pkgs/applications/graphics/hello-wayland/default.nix
+++ b/pkgs/applications/graphics/hello-wayland/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation {
   pname = "hello-wayland";
-  version = "unstable-2023-03-16";
+  version = "unstable-2023-04-23";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "hello-wayland";
-    rev = "f6a8203309977af03cda94765dd61367c189bea6";
-    sha256 = "FNtc6OApW/epAFortvujNVWJJVI44IY+Pa0qU0QdecA=";
+    rev = "77e270c19672f3ad863e466093f429cde8eb1f16";
+    sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
   };
 
   nativeBuildInputs = [ imagemagick pkg-config ];

From dbed54656c61498e30530bb00a098b9b272d9c90 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 24 Apr 2023 20:28:51 +0000
Subject: [PATCH 75/92] river-tag-overlay: fix cross

---
 .../misc/river-tag-overlay/default.nix             | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix
index 4aa2a3c59a97..0cec751a199c 100644
--- a/pkgs/applications/misc/river-tag-overlay/default.nix
+++ b/pkgs/applications/misc/river-tag-overlay/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }:
+{ lib, stdenv, fetchFromSourcehut, fetchpatch
+, wayland, pixman, pkg-config, wayland-scanner
+}:
 
 stdenv.mkDerivation rec {
   pname = "river-tag-overlay";
@@ -11,8 +13,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E=";
   };
 
+  patches = [
+    # Backport cross fix.
+    (fetchpatch {
+      url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch";
+      sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE=";
+    })
+  ];
+
   buildInputs = [ pixman wayland ];
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config wayland-scanner ];
 
   makeFlags = [
     "DESTDIR=${placeholder "out"}"

From 2e2d5d6f1136dbce0a8b558a35b2bc4ddf3d9831 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 24 Apr 2023 20:28:59 +0000
Subject: [PATCH 76/92] river-tag-overlay: unmark broken on aarch64

This package didn't build on aarch64 when it was added, but now it
does.  In the meantime we bumped the default GCC on aarch64, so
presumably that fixed it.
---
 pkgs/applications/misc/river-tag-overlay/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix
index 0cec751a199c..902f6e816148 100644
--- a/pkgs/applications/misc/river-tag-overlay/default.nix
+++ b/pkgs/applications/misc/river-tag-overlay/default.nix
@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ edrex ];
     platforms = platforms.linux;
-    broken = stdenv.isAarch64;
   };
 }

From 3d409345416cda845407e3075f5eaf7a590d9db5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 13:39:45 +0000
Subject: [PATCH 77/92] rofi-wayland: fix cross

---
 pkgs/applications/misc/rofi/wayland.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index d6e6946af547..dfb096d654d6 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchFromGitHub
 , rofi-unwrapped
+, wayland-scanner
 , wayland-protocols
 , wayland
 }:
@@ -18,8 +19,8 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
     sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
   };
 
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
-  buildInputs = oldAttrs.buildInputs ++ [ wayland ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
+  buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
 
   meta = with lib; {
     description = "Window switcher, run dialog and dmenu replacement for Wayland";

From 26dd4a84edb018d06936ebbe48b6af029138e796 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 24 Apr 2023 23:07:03 +0200
Subject: [PATCH 78/92] buildLuarocksPackage: fixes attributes being ignored

follow up of https://github.com/NixOS/nixpkgs/pull/224553 where
some arguments got ignored whil they were before taken into account.
---
 .../interpreters/lua-5/build-lua-package.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index adba03873aa6..eeca9b11ad05 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -83,11 +83,10 @@ let
   __structuredAttrs = true;
   env = {
     LUAROCKS_CONFIG="$PWD/${luarocks_config}";
-  };
+  } // attrs.env or {};
 
   generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
 
-
   nativeBuildInputs = [
     wrapLua
     lua.pkgs.luarocks
@@ -99,6 +98,7 @@ let
     # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
     externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
     in [ lua.pkgs.luarocks ]
+      ++ buildInputs
       ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
       ++ (map (d: d.dep) externalDeps')
     ;
@@ -200,15 +200,15 @@ let
   '';
 
   passthru = {
-    inherit lua; # The lua interpreter
-  };
+    inherit lua;
+  } // attrs.passthru or { };
 
   meta = {
     platforms = lua.meta.platforms;
     # add extra maintainer(s) to every package
     maintainers = (attrs.meta.maintainers or []) ++ [ ];
     broken = disabled;
-  } // attrs.meta;
+  } // attrs.meta or {};
 }));
 in
   luarocksDrv

From 36302a3056631dc66d73c7a6343950fdb1750e77 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:22:33 +0300
Subject: [PATCH 79/92] root: fix build on aarch64-darwin

---
 pkgs/applications/science/misc/root/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 2ebfd4a1a87a..c98c50273f47 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -208,6 +208,9 @@ stdenv.mkDerivation rec {
     # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
     # fatal error: could not build module '_Builtin_intrinsics'
     "-Druntime_cxxmodules=OFF"
+
+    # At least C++17 standard required with root7
+    "-DCMAKE_CXX_STANDARD=17"
   ];
 
   # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.

From 13e9ef736a8f4458172d324de0a784d4c6167e9a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 22:30:32 +0200
Subject: [PATCH 80/92] python310Packages.adlfs: 2023.1.0 -> 2023.4.0

Diff: https://github.com/fsspec/adlfs/compare/refs/tags/2023.1.0...2023.4.0

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

diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix
index 53c09cfa019f..9d73c93cef55 100644
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "adlfs";
-  version = "2023.1.0";
+  version = "2023.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fsspec";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY=";
+    hash = "sha256-olXOMmUBfamOrwtS0SEFGW3Z7g+ExWHxON9SKKSxnbc=";
   };
 
   propagatedBuildInputs = [

From 28211c5c65c83de8f327e5f61e5dd4e73facb705 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:33:06 +0300
Subject: [PATCH 81/92] python310Packages.uamqp: fix build on aarch64-darwin

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

diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 24d2b7b34630..2ae0d32a5679 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -40,6 +40,9 @@ buildPythonPackage rec {
     sed -i \
       -e '/#define EVP_PKEY_id/d' \
       src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
+    sed -z -i \
+      -e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \
+      src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
   '';
 
   nativeBuildInputs = [

From 337a4cc448551f1f47e973a484b3e5dab23f29a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 22:35:06 +0200
Subject: [PATCH 82/92] python310Packages.pytibber: 0.27.1 -> 0.27.2

Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.27.1...0.27.2

Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.27.2
---
 pkgs/development/python-modules/pytibber/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 8c25f17bb8b3..33a61c2582ee 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pytibber";
-  version = "0.27.1";
+  version = "0.27.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pyTibber";
     rev = "refs/tags/${version}";
-    hash = "sha256-KmUzXlINRbtyzZCoG4d2Xc57g07d+x7bdoq/DtMmtqM=";
+    hash = "sha256-8JeQvvCxKAmFy8kiXVD+l1EBv5mO1rWYoAg+iLjapRw=";
   };
 
   propagatedBuildInputs = [

From 53264e7daa7952967d1a7bd3ee194e93f336bacb Mon Sep 17 00:00:00 2001
From: Quentin JOLY <82603435+QJoly@users.noreply.github.com>
Date: Mon, 24 Apr 2023 07:41:45 +0000
Subject: [PATCH 83/92] kubecm: init at 0.22.1

fix lint
---
 .../networking/cluster/kubecm/default.nix     | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubecm/default.nix

diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix
new file mode 100644
index 000000000000..279ac3f0329d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubecm/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "kubecm";
+  version = "0.22.1";
+
+  src = fetchFromGitHub {
+    owner = "sunny0826";
+    repo = "kubecm";
+    rev = "v${version}";
+    hash = "sha256-0oQOuBYCDNnOODM2ZSqTgOI+jHWuHTtsk2NfGIPMy5A=";
+  };
+
+  vendorHash = "sha256-fVPiEDB6WFu2x5EY7NjmJEEq297QxP10593cXxxv8iI=";
+  ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Manage your kubeconfig more easily";
+    homepage = "https://github.com/sunny0826/kubecm/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ qjoly ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a8afdff022f..58f9b8f9a687 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31620,6 +31620,8 @@ with pkgs;
 
   k9s = callPackage ../applications/networking/cluster/k9s { };
 
+  kubecm = callPackage ../applications/networking/cluster/kubecm { };
+
   ktunnel = callPackage ../applications/networking/cluster/ktunnel { };
 
   ktop = callPackage ../applications/networking/cluster/ktop { };

From ea88f8313ea31b0e76cac6a396dab416dc93b014 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:55:28 +0300
Subject: [PATCH 84/92] qscintilla: remove from libsForQt5

---
 pkgs/top-level/qt5-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index ce2d13ed52e9..6de840951521 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -192,8 +192,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   qoauth = callPackage ../development/libraries/qoauth { };
 
-  qscintilla = callPackage ../development/libraries/qscintilla { };
-
   qt5ct = callPackage ../tools/misc/qt5ct { };
 
   qtdbusextended = callPackage ../development/libraries/qtdbusextended { };

From 53e5cca730d5c8ad562328e166fe10526e647b48 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 27 Apr 2023 00:28:50 +0200
Subject: [PATCH 85/92] vimPlugins.vim-solarized8: init at 2023-02-25

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9a3100d33369..f2a7de9cbb1e 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13209,6 +13209,18 @@ final: prev:
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
 
+  vim-solarized8 = buildVimPluginFrom2Nix {
+    pname = "vim-solarized8";
+    version = "2023-02-25";
+    src = fetchFromGitHub {
+      owner = "lifepillar";
+      repo = "vim-solarized8";
+      rev = "bcd4e74e9850fd59ee0294a5c3ae958ed535cc52";
+      sha256 = "00qhqy511wdcmlsglwhqsd6gffagjmdz0wl5627a3nwmxs8p45sa";
+    };
+    meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
+  };
+
   vim-solidity = buildVimPluginFrom2Nix {
     pname = "vim-solidity";
     version = "2018-04-17";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index f8f72b955770..1c3312d3b92b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1110,6 +1110,7 @@ https://github.com/justinmk/vim-sneak/,,
 https://github.com/garbas/vim-snipmate/,,
 https://github.com/honza/vim-snippets/,,
 https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
+https://github.com/lifepillar/vim-solarized8/,HEAD,
 https://github.com/tomlion/vim-solidity/,,
 https://github.com/christoomey/vim-sort-motion/,,
 https://github.com/tpope/vim-speeddating/,,

From 8634641676c76bc7245ce1dd18d34b42035aea74 Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Thu, 30 Mar 2023 16:34:55 +0800
Subject: [PATCH 86/92] trash-cli: add shell completions

---
 pkgs/tools/misc/trash-cli/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index f607da9099a0..fdc99fcfaa00 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -43,6 +43,16 @@ python3Packages.buildPythonApplication rec {
 
     runHook postInstallCheck
   '';
+  postInstall = ''
+    for bin in trash{,-{empty,list,put,restore}}; do
+      $out/bin/$bin --print-completion bash > $bin
+      install -Dm644 $bin -t $out/share/bash-completion/completions
+      $out/bin/$bin --print-completion zsh > _$bin
+      install -Dm644 _$bin -t $out/share/zsh/site-functions
+      $out/bin/$bin --print-completion tcsh > $bin.csh
+      install -Dm644 $bin.csh -t $out/etc/profile.d
+    done
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/andreafrancia/trash-cli";

From f7cb50b3cfd4c6c4be75f5e33172021be562a49b Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Tue, 4 Apr 2023 04:15:12 +0800
Subject: [PATCH 87/92] trash-cli: use installShellCompletion

---
 pkgs/tools/misc/trash-cli/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index fdc99fcfaa00..48bb79467cd8 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, installShellFiles, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "trash-cli";
@@ -13,6 +13,11 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [ psutil six ];
 
+  nativeBuildInputs = with python3Packages; [
+    installShellFiles
+    shtab
+  ];
+
   nativeCheckInputs = with python3Packages; [
     mock
     pytestCheckHook
@@ -44,13 +49,10 @@ python3Packages.buildPythonApplication rec {
     runHook postInstallCheck
   '';
   postInstall = ''
-    for bin in trash{,-{empty,list,put,restore}}; do
-      $out/bin/$bin --print-completion bash > $bin
-      install -Dm644 $bin -t $out/share/bash-completion/completions
-      $out/bin/$bin --print-completion zsh > _$bin
-      install -Dm644 _$bin -t $out/share/zsh/site-functions
-      $out/bin/$bin --print-completion tcsh > $bin.csh
-      install -Dm644 $bin.csh -t $out/etc/profile.d
+    for bin in trash-empty trash-list trash-restore trash-put trash; do
+      installShellCompletion --cmd "$bin" \
+        --bash <("$out/bin/$bin" --print-completion bash) \
+        --zsh  <("$out/bin/$bin" --print-completion zsh)
     done
   '';
 

From a7333e6b435e6ae8ca28af8cd6de863215d43846 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 11:19:01 +0000
Subject: [PATCH 88/92] tofi: unmark broken on aarch64

When the tofi package was added, it didn't build on aarch64, but now
it does, presumably due to the GCC upgrade.
---
 pkgs/applications/misc/tofi/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix
index ba2c2827b7da..9cd651cfcae3 100644
--- a/pkgs/applications/misc/tofi/default.nix
+++ b/pkgs/applications/misc/tofi/default.nix
@@ -34,6 +34,5 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ fbergroth ];
     platforms = platforms.linux;
-    broken = stdenv.isAarch64;
   };
 }

From d7d3821ab83260e5b9d376b39fa139989c61c978 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 11:19:42 +0000
Subject: [PATCH 89/92] tofi: fix cross

---
 pkgs/applications/misc/tofi/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix
index 9cd651cfcae3..76c5b2047e30 100644
--- a/pkgs/applications/misc/tofi/default.nix
+++ b/pkgs/applications/misc/tofi/default.nix
@@ -6,6 +6,7 @@
 , meson
 , scdoc
 , wayland-protocols
+, wayland-scanner
 , freetype
 , harfbuzz
 , cairo
@@ -25,7 +26,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90=";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
+  depsBuildBuild = [ pkg-config ];
+  nativeBuildInputs = [
+    meson ninja pkg-config scdoc wayland-protocols wayland-scanner
+  ];
   buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ];
 
   meta = with lib; {

From c10a195ab1b577918fdfa1f4a08b7b634f137be9 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sat, 8 Apr 2023 12:55:40 -0600
Subject: [PATCH 90/92] gcc: tighten platform flags special-case for
 aarch64-darwin

The 4aa95e33121c316c5b34031bb08106d2dc113e38 commit added support for
aarch64-darwin but also ignored platform flags if the build platform
is aarch64-darwin. This leads to confusing errors such as
`pkgsCross.raspberryPi` packages compiled with soft-float even though
the platform supports hard-float (and is built as such on other
platforms).

The correct way to ignore platform flags is to check `targetPlatform`,
not the build platform. This change fixes that.

While we're here, tigthen the special-case to cover only the problematic
flags: `-with-cpu` and `-with-arch`.
---
 pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +--
 pkgs/development/compilers/gcc/common/platform-flags.nix  | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 771c16d84b7b..aa8ecc62e55a 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -217,8 +217,7 @@ let
     ++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
     ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
 
-    # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc
-    ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv)  targetPlatform; inherit lib; })
+    ++ import ../common/platform-flags.nix { inherit (stdenv)  targetPlatform; inherit lib; }
     ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
     ++ lib.optional disableBootstrap' "--disable-bootstrap"
 
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index c0593cd781ed..57d7438fcd3a 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,12 +1,15 @@
 { lib, targetPlatform }:
 
 let
+  isAarch64Darwin = targetPlatform.isDarwin && targetPlatform.isAarch64;
   gcc = targetPlatform.gcc or {};
   p =  gcc
     // targetPlatform.parsed.abi;
 in lib.concatLists [
-  (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
-  (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
+  # --with-arch= is unknown flag on x86_64 and aarch64-darwin.
+  (lib.optional (!targetPlatform.isx86_64 && !isAarch64Darwin && p ? arch) "--with-arch=${p.arch}")
+  # --with-cpu on aarch64-darwin fails with "Unknown cpu used in --with-cpu=apple-a13".
+  (lib.optional (!isAarch64Darwin && p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
   (lib.optional (p ? float) "--with-float=${p.float}")

From fbd71c4856cff61fe3fb1c82f13f1590f9069781 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Fri, 28 Apr 2023 08:13:15 +1000
Subject: [PATCH 91/92] dtrx: 8.5.0 -> 8.5.1

---
 pkgs/tools/compression/dtrx/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 5a32db7c050e..074da03956dc 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -21,20 +21,15 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dtrx";
-  version = "8.5.0";
+  version = "8.5.1";
 
   src = fetchFromGitHub {
     owner = "dtrx-py";
     repo = "dtrx";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-jx2IHa7Ztg8Dbwgm8mSJQKtNpg0sg5axGssBMTAMDI0=";
+    sha256 = "sha256-KOHafmvl17IABlcBuE7isHVCIYRbA68Dna6rgiiWlkQ=";
   };
 
-  # https://github.com/dtrx-py/dtrx/issues/45
-  postPatch = ''
-    sed -i "s/platform==unsupported/# platform==unsupported/" setup.cfg
-  '';
-
   postInstall =
     let
       archivers = lib.makeBinPath (

From af661f3be7e995a3f7ae17e29938ceea80263c88 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Apr 2023 18:36:02 -0400
Subject: [PATCH 92/92] Revert "root: fix build on aarch64-darwin"

---
 pkgs/applications/science/misc/root/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index c98c50273f47..2ebfd4a1a87a 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -208,9 +208,6 @@ stdenv.mkDerivation rec {
     # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
     # fatal error: could not build module '_Builtin_intrinsics'
     "-Druntime_cxxmodules=OFF"
-
-    # At least C++17 standard required with root7
-    "-DCMAKE_CXX_STANDARD=17"
   ];
 
   # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.