From 9cb1ca6d71c2e3a04660509349556cbc78bfcd93 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Tue, 7 Feb 2023 22:33:25 -0600
Subject: [PATCH 01/49] rocfft: fix propagatedBuildInputs typo

propagatedBuildInputs has been incorrectly spelled for a while now.
---
 pkgs/development/libraries/rocfft/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix
index 6e5795cd304..cff991fe8aa 100644
--- a/pkgs/development/libraries/rocfft/default.nix
+++ b/pkgs/development/libraries/rocfft/default.nix
@@ -58,7 +58,7 @@ let
       openmp
     ];
 
-    propogatedBuildInputs = lib.optionals buildTests [
+    propagatedBuildInputs = lib.optionals buildTests [
       fftw
       fftwFloat
     ];

From 4af7dad6255d8a61eb31bc60702df467e91a65ee Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Tue, 7 Feb 2023 22:40:47 -0600
Subject: [PATCH 02/49] rocfft: split base outputs for hydra

Split the base derivation's outputs to hopefully avoid hydra failing the base due to the output limit and not continuing with the rest.
This and all hydra commits for rocfft and composable_kernel will be reverted if this does not work.
---
 pkgs/development/libraries/rocfft/default.nix | 54 ++++++++++++++-----
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix
index cff991fe8aa..20c855d23aa 100644
--- a/pkgs/development/libraries/rocfft/default.nix
+++ b/pkgs/development/libraries/rocfft/default.nix
@@ -19,6 +19,11 @@
 }:
 
 let
+  name-zero = "librocfft-device-0.so.0.1";
+  name-one = "librocfft-device-1.so.0.1";
+  name-two = "librocfft-device-2.so.0.1";
+  name-three = "librocfft-device-3.so.0.1";
+
   # This is over 3GB, to allow hydra caching we separate it
   rf = stdenv.mkDerivation (finalAttrs: {
     pname = "rocfft";
@@ -26,6 +31,10 @@ let
 
     outputs = [
       "out"
+      "libzero"
+      "libone"
+      "libtwo"
+      "libthree"
     ] ++ lib.optionals buildTests [
       "test"
     ] ++ lib.optionals buildBenchmarks [
@@ -80,7 +89,16 @@ let
       "-DBUILD_CLIENTS_SAMPLES=ON"
     ];
 
-    postInstall = lib.optionalString buildTests ''
+    postInstall = ''
+      mv $out/lib/${name-zero} $libzero
+      mv $out/lib/${name-one} $libone
+      mv $out/lib/${name-two} $libtwo
+      mv $out/lib/${name-three} $libthree
+      ln -s $libzero $out/lib/${name-zero}
+      ln -s $libone $out/lib/${name-one}
+      ln -s $libtwo $out/lib/${name-two}
+      ln -s $libthree $out/lib/${name-three}
+    '' + lib.optionalString buildTests ''
       mkdir -p $test/{bin,lib/fftw}
       cp -a $out/bin/* $test/bin
       ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw
@@ -113,23 +131,31 @@ let
     };
   });
 
-  rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } ''
-    cp -a ${rf}/lib/$name $out
+  rf-zero = runCommand name-zero { preferLocalBuild = true; } ''
+    cp -a ${rf.libzero} $out
   '';
 
-  rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } ''
-    cp -a ${rf}/lib/$name $out
+  rf-one = runCommand name-one { preferLocalBuild = true; } ''
+    cp -a ${rf.libone} $out
   '';
 
-  rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } ''
-    cp -a ${rf}/lib/$name $out
+  rf-two = runCommand name-two { preferLocalBuild = true; } ''
+    cp -a ${rf.libtwo} $out
   '';
 
-  rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } ''
-    cp -a ${rf}/lib/$name $out
+  rf-three = runCommand name-three { preferLocalBuild = true; } ''
+    cp -a ${rf.libthree} $out
   '';
 in stdenv.mkDerivation {
-  inherit (rf) pname version outputs src passthru meta;
+  inherit (rf) pname version src passthru meta;
+
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   dontUnpack = true;
   dontPatch = true;
@@ -140,10 +166,10 @@ in stdenv.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/lib
-    cp -as ${rf-zero} $out/lib/${rf-zero.name}
-    cp -as ${rf-one} $out/lib/${rf-one.name}
-    cp -as ${rf-two} $out/lib/${rf-two.name}
-    cp -as ${rf-three} $out/lib/${rf-three.name}
+    ln -sf ${rf-zero} $out/lib/${name-zero}
+    ln -sf ${rf-one} $out/lib/${name-one}
+    ln -sf ${rf-two} $out/lib/${name-two}
+    ln -sf ${rf-three} $out/lib/${name-three}
     cp -an ${rf}/* $out
   '' + lib.optionalString buildTests ''
     cp -a ${rf.test} $test

From 93482590c103c06625b26bd5dd315b5b3d0df014 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 18 Mar 2023 12:51:12 +0000
Subject: [PATCH 03/49] clash: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 74156366730..5c95206dfd9 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clash";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "Dreamacro";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-f/iSnSaRr1dqMRKb7GDZdc2WuykO42XMSNKwMOwuagc=";
+    hash = "sha256-w/Iz1PZekeKVGFHPteMEbjLP3V9qMmLLAz27qW0VtPk=";
   };
 
-  vendorHash = "sha256-fDn6UlijI2TJPF4FS50u1MMDxnd8eDTbqHLnGso/FoU=";
+  vendorHash = "sha256-raNFt+Ymh7m+p1wXy1ofMO1UJ2EouwaY7Ysngfw3X8U=";
 
   # Do not build testing suit
   excludedPackages = [ "./test" ];

From b5f7d9c3ae2600cd689964ebf8488815d80a80e7 Mon Sep 17 00:00:00 2001
From: Mika Naylor <mail@autophagy.io>
Date: Thu, 23 Mar 2023 17:23:26 +0100
Subject: [PATCH 04/49] flink: 1.14.4 -> 1.17.0

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

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 131cee6af03..203af72a7b3 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flink";
-  version = "1.14.4";
+  version = "1.17.0";
 
   src = fetchurl {
-    url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
-    sha256 = "sha256-qvWUh+EQT/MljN5LCX2JLMEapIEGAbAljrCMTYsFqtw=";
+    url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
+    sha256 = "sha256-x60Lk/xXf+Isg1J6z5qAIZ2/dbDiztPIKWrdPITp3Tg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     downloadPage = "https://flink.apache.org/downloads.html";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ mbode ];
+    maintainers = with maintainers; [ mbode autophagy ];
   };
 }

From 4f7f469c8257e136f24bbd2f079e8507790eca57 Mon Sep 17 00:00:00 2001
From: "Christoph Engelbert (noctarius)" <me@noctarius.com>
Date: Mon, 6 Mar 2023 13:05:31 +0100
Subject: [PATCH 05/49] timescaledb: Fixed the licensing for the timescaledb
 package to be split into TSL (Timescale Community License) and Apache 2.0
 components.

TimescaleDB provides two types of licenses, Apache 2.0 and Timescale Community License (TSL), with different feature sets. While all the code is in the same repository, the build
system can build both versions depending on the build parameters set in.

Co-authored-by: Emily Lange <git@indeednotjames.com>
---
 lib/licenses.nix                                | 7 +++++++
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 7 ++++---
 pkgs/servers/sql/postgresql/packages.nix        | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 2bca8d36b56..873056d2fa5 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -909,6 +909,13 @@ in mkLicense lset) ({
     url = "https://github.com/thestk/stk/blob/master/LICENSE";
   };
 
+  tsl = {
+    shortName = "TSL";
+    fullName = "Timescale License Agreegment";
+    url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
+    unfree = true;
+  };
+
   tcltk = {
     spdxId = "TCL";
     fullName = "TCL/TK License";
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index a476d3e21d3..35c91efbe42 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }:
+{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, enableUnfree ? true }:
 
 # # To enable on NixOS:
 # config.services.postgresql = let
@@ -12,7 +12,7 @@
 # }
 
 stdenv.mkDerivation rec {
-  pname = "timescaledb";
+  pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
   version = "2.10.1";
 
   nativeBuildInputs = [ cmake ];
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
+    ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ]
     ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
 
   # Fix the install phase which tries to install into the pgsql extension dir,
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/timescale/timescaledb/raw/${version}/CHANGELOG.md";
     maintainers = with maintainers; [ marsam ];
     platforms = postgresql.meta.platforms;
-    license = licenses.asl20;
+    license = with licenses; if enableUnfree then tsl else asl20;
     broken = versionOlder postgresql.version "12";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index b6fc6480aec..211a54bb552 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -55,6 +55,7 @@ self: super: {
     temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
 
     timescaledb = super.callPackage ./ext/timescaledb.nix { };
+    timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
 
     timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { };
 

From 9a1bef21ef0e782595862ba39c25dcd82ff2b54b Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 25 Mar 2023 06:25:38 -0400
Subject: [PATCH 06/49] trino-cli: 403 -> 410

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

diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix
index 42064b38916..8d9e8ac4c7f 100644
--- a/pkgs/development/tools/database/trino-cli/default.nix
+++ b/pkgs/development/tools/database/trino-cli/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "trino-cli";
-  version = "403";
+  version = "410";
 
   jarfilename = "${pname}-${version}-executable.jar";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
-    sha256 = "sha256-Yo7WQoY99gbXflcms0v3r9w+GXSNOP+CdKDnUZXEs8Q=";
+    sha256 = "sha256-8ywle5z8OOFejAsBKSrh8RvaKyO1zht1My4QjKe/Lps=";
   };
 
   dontUnpack = true;
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "The Trino CLI provides a terminal-based, interactive shell for running queries";
     homepage = "https://github.com/trinodb/trino";
     license = licenses.asl20;
-    maintainers = [ maintainers.regadas ];
+    maintainers = with maintainers; [ regadas cpcloud ];
   };
 }

From 8a619cd583a1d259d4814469d4418bdbb161c1f3 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloom@riseup.net>
Date: Sun, 26 Mar 2023 18:53:26 +0300
Subject: [PATCH 07/49] subtitleedit: 3.6.11 -> 3.6.12

---
 pkgs/applications/video/subtitleedit/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix
index a7bdf2e110f..9898f0a6ffa 100644
--- a/pkgs/applications/video/subtitleedit/default.nix
+++ b/pkgs/applications/video/subtitleedit/default.nix
@@ -11,15 +11,16 @@
 , mono
 , mpv
 , tesseract4
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
   pname = "subtitleedit";
-  version = "3.6.11";
+  version = "3.6.12";
 
   src = fetchzip {
     url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
-    sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26";
+    sha256 = "08p67krgcignjisbq7nmnb3nga2sad4vl739ak4a5rp3b49l1dmb";
     stripRoot = false;
   };
 
@@ -79,6 +80,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "A subtitle editor";
     homepage = "https://nikse.dk/subtitleedit/";

From e81d3ea1b86b16b190d2e784c226916129af4ad0 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Date: Mon, 27 Mar 2023 11:09:36 -0300
Subject: [PATCH 08/49] goreleaser: install completions and manpages

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
---
 pkgs/tools/misc/goreleaser/default.nix | 38 ++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 378e2e060b3..5fa4b236981 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv
+, lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, buildPackages
+}:
 
 buildGoModule rec {
   pname = "goreleaser";
@@ -13,20 +19,36 @@ buildGoModule rec {
 
   vendorHash = "sha256-eVuEyQCO2/gufMJp8eUpC82wdJbbJsMKR1ZGv96C9mI=";
 
-  ldflags = [
-    "-s"
-    "-w"
-    "-X main.version=${version}"
-    "-X main.builtBy=nixpkgs"
-  ];
+  ldflags =
+    [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ];
 
   # tests expect the source files to be a build repo
   doCheck = false;
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall =
+    let emulator = stdenv.hostPlatform.emulator buildPackages;
+    in ''
+      ${emulator} $out/bin/goreleaser man > goreleaser.1
+      installManPage ./goreleaser.1
+      installShellCompletion --cmd goreleaser \
+        --bash <(${emulator} $out/bin/goreleaser completion bash) \
+        --fish <(${emulator} $out/bin/goreleaser completion fish) \
+        --zsh  <(${emulator} $out/bin/goreleaser completion zsh)
+    '';
+
   meta = with lib; {
     description = "Deliver Go binaries as fast and easily as possible";
     homepage = "https://goreleaser.com";
-    maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin techknowlogick developer-guy caarlos0 ];
+    maintainers = with maintainers; [
+      c0deaddict
+      endocrimes
+      sarcasticadmin
+      techknowlogick
+      developer-guy
+      caarlos0
+    ];
     license = licenses.mit;
   };
 }

From 9f75cd079cf280ac6e374c4f72360a19331a0c93 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 28 Mar 2023 04:20:00 +0000
Subject: [PATCH 09/49] grpc: 1.52.1 -> 1.53.0

https://github.com/grpc/grpc/releases/tag/v1.53.0
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 0d0a66973dc..2d591109f27 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "grpc";
-  version = "1.52.1"; # N.B: if you change this, please update:
+  version = "1.53.0"; # N.B: if you change this, please update:
     # pythonPackages.grpcio-tools
     # pythonPackages.grpcio-status
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk=";
+    hash = "sha256-YRVWR1woMDoq8TWFrL2nqQvAbtqBnUd3QlfbFTJm8dc=";
     fetchSubmodules = true;
   };
 

From 7b007a320753a3fe316170b84b95c9ff82df2dd4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 28 Mar 2023 04:20:00 +0000
Subject: [PATCH 10/49] python310Packages.grpcio-tools: 1.52.0 -> 1.53.0

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

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 28af8e6af2c..0b6418a4797 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.52.0";
+  version = "1.53.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wD6X5M1kMnavIQDL3Mn2sTBLHbeeWflXWMMCOj7kvVQ=";
+    hash = "sha256-kl7/8tY8oyZvk8kk/+ul1JbxaozL4SX6DRis9HzF+og=";
   };
 
   postPatch = ''

From ac7d68bc8a63cef1a56f14de96c3db3fe2065f86 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 28 Mar 2023 04:20:00 +0000
Subject: [PATCH 11/49] python310Packages.grpcio-status: 1.52.0 -> 1.53.0

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

diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 4eb45eca6cc..c4748193303 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.52.0";
+  version = "1.53.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YCo4CNSFobaeEdFQoHXj6Sf2R/Oos4fuPD8BYzRFsvw=";
+    hash = "sha256-WkaCDcfZS6xIquXdl8lMreoJ2AoFVTrKdKkqKVQDBCA=";
   };
 
   postPatch = ''

From 433152d665e9e87e42f0a7369707f2fdcdd2b463 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 29 Mar 2023 05:10:32 +0000
Subject: [PATCH 12/49] prisma-engines: 4.11.0 -> 4.12.0

---
 .../tools/database/prisma-engines/Cargo.lock  | 294 ++++++++++++------
 .../tools/database/prisma-engines/default.nix |   5 +-
 2 files changed, 200 insertions(+), 99 deletions(-)

diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock
index fe87c3dea8a..4e62430f3c5 100644
--- a/pkgs/development/tools/database/prisma-engines/Cargo.lock
+++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock
@@ -299,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "byteorder"
@@ -440,6 +440,27 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "codspeed"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2042d58652a59f53ee0d7f61435b6760b63a9c09a598c7044a8c8b1a0a352afe"
+dependencies = [
+ "colored",
+ "libc",
+]
+
+[[package]]
+name = "codspeed-criterion-compat"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93201017af114a2ef3df75212aa456aa1a981673d84aa18555014bb89c2a7262"
+dependencies = [
+ "codspeed",
+ "colored",
+ "criterion",
+]
+
 [[package]]
 name = "colored"
 version = "2.0.0"
@@ -529,6 +550,7 @@ dependencies = [
  "schema",
  "schema-builder",
  "serde_json",
+ "user-facing-errors",
 ]
 
 [[package]]
@@ -565,6 +587,8 @@ dependencies = [
  "lazy_static",
  "num-traits",
  "oorandom",
+ "plotters",
+ "rayon",
  "regex",
  "serde",
  "serde_derive",
@@ -807,14 +831,9 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "cuid",
- "either",
- "enumflags2",
- "indoc",
  "nanoid",
  "prisma-value",
  "psl-core",
- "serde",
- "serde_json",
  "uuid 1.1.2",
 ]
 
@@ -837,9 +856,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "encode_unicode"
@@ -962,6 +981,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "expect-test"
 version = "1.4.0"
@@ -1517,27 +1557,6 @@ dependencies = [
  "user-facing-errors",
 ]
 
-[[package]]
-name = "introspection-core"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "introspection-connector",
- "json-rpc-stdio",
- "jsonrpc-core",
- "jsonrpc-derive",
- "mongodb-introspection-connector",
- "psl",
- "serde",
- "serde_json",
- "sql-introspection-connector",
- "tokio",
- "tracing",
- "tracing-futures",
- "tracing-subscriber",
- "user-facing-errors",
-]
-
 [[package]]
 name = "introspection-engine-tests"
 version = "0.1.0"
@@ -1548,7 +1567,6 @@ dependencies = [
  "expect-test",
  "indoc",
  "introspection-connector",
- "introspection-core",
  "migration-connector",
  "pretty_assertions",
  "psl",
@@ -1566,6 +1584,16 @@ dependencies = [
  "user-facing-errors",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "ipconfig"
 version = "0.3.0"
@@ -1644,18 +1672,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "jsonrpc-derive"
-version = "17.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f6326966ebac440db89eba788f5a0e5ac2614b4b4bfbdc049a971e71040f32"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1743,9 +1759,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
 [[package]]
 name = "libloading"
@@ -1785,6 +1801,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "lock_api"
 version = "0.4.8"
@@ -2110,7 +2132,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -2541,9 +2563,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.41"
+version = "0.10.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -2573,18 +2595,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "111.22.0+1.1.1q"
+version = "111.25.0+1.1.1t"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.79"
+version = "0.9.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
+checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
 dependencies = [
  "autocfg",
  "cc",
@@ -2733,7 +2755,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -2909,6 +2931,34 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
+[[package]]
+name = "plotters"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "postgres-native-tls"
 version = "0.5.0"
@@ -3019,13 +3069,10 @@ name = "prisma-models"
 version = "0.0.0"
 dependencies = [
  "bigdecimal",
- "chrono",
  "dml",
  "itertools",
  "prisma-value",
  "psl",
- "serde",
- "serde_json",
  "thiserror",
 ]
 
@@ -3043,15 +3090,6 @@ dependencies = [
  "uuid 1.1.2",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -3148,9 +3186,10 @@ dependencies = [
 name = "psl"
 version = "0.1.0"
 dependencies = [
+ "base64 0.13.1",
  "builtin-psl-connectors",
  "dissimilar",
- "dml",
+ "either",
  "expect-test",
  "indoc",
  "psl-core",
@@ -3186,6 +3225,7 @@ dependencies = [
  "migration-core",
  "mongodb",
  "mongodb-client",
+ "once_cell",
  "parking_lot 0.12.1",
  "psl",
  "quaint",
@@ -3584,6 +3624,28 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -3619,15 +3681,6 @@ version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "request-handlers"
 version = "0.1.0"
@@ -3735,6 +3788,20 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.36.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -3808,7 +3875,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -3833,7 +3900,7 @@ dependencies = [
 name = "schema-builder"
 version = "0.1.0"
 dependencies = [
- "criterion",
+ "codspeed-criterion-compat",
  "once_cell",
  "prisma-models",
  "psl",
@@ -4151,6 +4218,8 @@ dependencies = [
  "serde",
  "serde_json",
  "sql-schema-describer",
+ "sqlformat",
+ "sqlparser",
  "thiserror",
  "tracing",
  "tracing-futures",
@@ -4241,15 +4310,24 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a"
+checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
 dependencies = [
  "itertools",
  "nom",
  "unicode_categories",
 ]
 
+[[package]]
+name = "sqlparser"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0366f270dbabb5cc2e4c88427dc4c08bba144f81e32fbd459a013f26a4d16aa0"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -4352,16 +4430,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
 dependencies = [
  "cfg-if",
  "fastrand",
- "libc",
  "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "rustix",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -4381,9 +4458,9 @@ dependencies = [
  "anyhow",
  "async-trait",
  "colored",
+ "dmmf",
  "enumflags2",
  "introspection-connector",
- "introspection-core",
  "migration-connector",
  "migration-core",
  "psl",
@@ -4566,7 +4643,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -5049,6 +5126,7 @@ version = "0.1.0"
 dependencies = [
  "backtrace",
  "indoc",
+ "itertools",
  "quaint",
  "serde",
  "serde_json",
@@ -5179,9 +5257,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5189,9 +5267,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
 dependencies = [
  "bumpalo",
  "log",
@@ -5204,9 +5282,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5214,9 +5292,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5227,9 +5305,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasm-logger"
@@ -5357,6 +5435,30 @@ dependencies = [
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.1"
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index abef32f2ff6..b088aa0dc07 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -14,13 +14,13 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "4.11.0";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    sha256 = "sha256-VAVrXSz75rPdBOz9Jg75rpA3VBvw4WO+hFvk+A4f6Mc=";
+    sha256 = "sha256-bSyAWJ4ukiXVyKI1iGvCs2cMgW1jdYRs5cgTdOCXvrQ=";
   };
 
   # Use system openssl.
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec {
     "-p" "query-engine"
     "-p" "query-engine-node-api"
     "-p" "migration-engine-cli"
-    "-p" "introspection-core"
     "-p" "prisma-fmt"
   ];
 

From 83a0976fd427e507bdebe88affbb088033073eec Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 29 Mar 2023 05:10:58 +0000
Subject: [PATCH 13/49] prisma-engines: add myself to maintainers

---
 pkgs/development/tools/database/prisma-engines/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index b088aa0dc07..dcafb119be3 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://www.prisma.io/";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ pamplemousse pimeys tomhoule ];
+    maintainers = with maintainers; [ pamplemousse pimeys tomhoule ivan ];
   };
 }
 

From 5c4ad62a84a611e8972f51c4eb21a544877fb627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Mar 2023 15:56:21 -0700
Subject: [PATCH 14/49] bzip3: 1.2.2 -> 1.2.3

Diff: https://github.com/kspalaiologos/bzip3/compare/1.2.2...1.2.3

Changelog: https://github.com/kspalaiologos/bzip3/blob/1.2.3/NEWS
---
 pkgs/tools/compression/bzip3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index 37a4519c945..c1c88584fb2 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bzip3";
-  version = "1.2.2";
+  version = "1.2.3";
 
   outputs = [ "bin" "dev" "out" ];
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "kspalaiologos";
     repo = "bzip3";
     rev = finalAttrs.version;
-    hash = "sha256-B59Z7+5SFjt/UgppNtdUtzw96y+EVglHoKzq9Il9ud8=";
+    hash = "sha256-sBGY/tZz5qe1YF+MouwE1qpMKxeiHnXRL4gQx7EtuEc=";
   };
 
   postPatch = ''

From 4d4c170cb4d4f343d94ad87336e8e438c1a74920 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 29 Mar 2023 18:15:08 -0700
Subject: [PATCH 15/49] openexr_3: 3.1.6 -> 3.1.7

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

diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index b1800aa69dd..4cf535cb2f9 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "3.1.6";
+  version = "3.1.7";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    sha256 = "sha256-rXiltW7PHvye6bIyhDyo8aaVvssfGOwr9TguaYlLuUc=";
+    sha256 = "sha256-Kl+aOA797aZvrvW4ZQNHdSU7YFPieZEzX3aYeaoH6eU=";
   };
 
   outputs = [ "bin" "dev" "out" "doc" ];

From e5ff1da80c2f85e36a08d16474b489db8415aff2 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 30 Mar 2023 08:59:08 +0000
Subject: [PATCH 16/49] nodePackages.prisma: 4.11.0 -> 4.12.0

---
 pkgs/development/node-packages/overrides.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 375d73aef9d..afc9c3a0e38 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -412,14 +412,13 @@ final: prev: {
 
     src = fetchurl {
       url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
-      sha512 = "sha512-4zZmBXssPUEiX+GeL0MUq/Yyie4ltiKmGu7jCJFnYMamNrrulTBc+D+QwAQSJ01tyzeGHlD13kOnqPwRipnlNw==";
+      hash = "sha512-xqVper4mbwl32BWzLpdznHAYvYDWQQWK2tBfXjdUD397XaveRyAP7SkBZ6kFlIg8kKayF4hvuaVtYwXd9BodAg==";
     };
     postInstall = with pkgs; ''
       wrapProgram "$out/bin/prisma" \
         --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \
         --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
         --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
-        --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \
         --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt
     '';
 

From d8cde8d6ba4bb64ddca9c84d91ee10ba885ca742 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 30 Mar 2023 20:15:40 +0800
Subject: [PATCH 17/49] appstream: fix cross compilation, set strictDeps

---
 pkgs/development/libraries/appstream/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 3d10053d645..745cba31110 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -3,6 +3,7 @@
 , substituteAll
 , fetchFromGitHub
 , meson
+, mesonEmulatorHook
 , ninja
 , pkg-config
 , gettext
@@ -49,6 +50,12 @@ stdenv.mkDerivation rec {
     ./installed-tests-path.patch
   ];
 
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
@@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
     gobject-introspection
     itstool
     vala
+    gperf
+  ] ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    mesonEmulatorHook
   ];
 
   buildInputs = [
@@ -71,7 +81,6 @@ stdenv.mkDerivation rec {
     libxml2
     libxmlb
     libyaml
-    gperf
     curl
   ];
 

From 3a9aec90fc1b46ff3e2206e103b50ace4d21f1b7 Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Fri, 31 Mar 2023 07:29:02 -0500
Subject: [PATCH 18/49] xorg-server: 21.1.7 -> 21.1.8 fixes CVE-2023-1393

---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f03e5205553..953d4a3de80 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3324,11 +3324,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile }: stdenv.mkDerivation {
     pname = "xorg-server";
-    version = "21.1.7";
+    version = "21.1.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/xserver/xorg-server-21.1.7.tar.xz";
-      sha256 = "1fvpb1wr4bjksr1ag77mcvsz87qb947dn85blrn34lpcs0nhpinr";
+      url = "mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz";
+      sha256 = "0lmimvaw9x0ymdhjfqsrbx689bcapy8c24ajw9705j2harrxpaiq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3ddb7665cb1..05de84ed586 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz
 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-21.1.7.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz

From 81419809dfe36a8d9f72d22095c6b1364d51174a Mon Sep 17 00:00:00 2001
From: IndeedNotJames <git@indeednotjames.com>
Date: Fri, 31 Mar 2023 19:56:56 +0200
Subject: [PATCH 19/49] gops: 0.3.25 -> 0.3.27

https://github.com/google/gops/releases/tag/v0.3.27
https://github.com/google/gops/releases/tag/v0.3.26
diff: https://github.com/google/gops/compare/v0.3.25...v0.3.27
---
 pkgs/development/tools/gops/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix
index 3804368d20f..a74d0a9d08c 100644
--- a/pkgs/development/tools/gops/default.nix
+++ b/pkgs/development/tools/gops/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gops";
-  version = "0.3.25";
+  version = "0.3.27";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gops";
     rev = "v${version}";
-    sha256 = "sha256-y2T+v4EafiVuyRiuQdNDECc06e5eHtquvGA9ugW55Bs=";
+    sha256 = "sha256-F1/1wMO2lQ4v2+r3FPzaxCkL2lW+COgxy4fjv6+p7AY=";
   };
 
-  vendorSha256 = null;
+  vendorHash = "sha256-ea+1AV0WzaQiDHyAUsm0rd/bznehG9UtmB1ubgHrOGM=";
 
   preCheck = "export HOME=$(mktemp -d)";
 

From 7f14501e42c9f6314f85738cb9378b9d1e5c8675 Mon Sep 17 00:00:00 2001
From: Matt Bryant <github@programsareproofs.com>
Date: Tue, 28 Mar 2023 20:43:28 -0700
Subject: [PATCH 20/49] functiontrace-server: init at 0.5.2

Added initial version of the server-piece of https://functiontrace.com.
This is most useful with a functiontrace client, which depends on this
and will therefore be added afterwards.
---
 .../tools/functiontrace-server/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/functiontrace-server/default.nix

diff --git a/pkgs/development/tools/functiontrace-server/default.nix b/pkgs/development/tools/functiontrace-server/default.nix
new file mode 100644
index 00000000000..abacb1d9f9d
--- /dev/null
+++ b/pkgs/development/tools/functiontrace-server/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchCrate, stdenv, darwin }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "functiontrace-server";
+  version = "0.5.2";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js=";
+  };
+
+  cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8=";
+
+  buildInputs = lib.optionals stdenv.isDarwin
+    [ darwin.apple_sdk.frameworks.CoreFoundation ];
+
+  meta = with lib; {
+    description = "Server for FunctionTrace, a graphical Python profiler";
+    homepage = "https://functiontrace.com";
+    license = with licenses; [ prosperity30 ];
+    maintainers = with maintainers; [ tehmatt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d3c480437..b8e1332d442 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -542,6 +542,8 @@ with pkgs;
 
   frugal = callPackage ../development/tools/frugal { };
 
+  functiontrace-server = callPackage ../development/tools/functiontrace-server { };
+
   glade = callPackage ../development/tools/glade { };
 
   goda = callPackage ../development/tools/goda { };

From 147c3c0f28aa12ffd6d9373e6924bb34c459c573 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 04:40:37 +0000
Subject: [PATCH 21/49] jackett: 0.20.3689 -> 0.20.3723

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 440c9c67519..1d57127b8dd 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.20.3689";
+  version = "0.20.3723";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-nsbzTR748vyojwju8ydXTNqgXaMPC2jLCLWPh0kVxzi2M0mG5hk6z1GSWIkfUPk6CogAWlfyFmyY/iMONgXQdw==";
+    hash = "sha512-Uh/lOBYzE7r4qCTIZbiegWOuqoxvq8W9EWxeh2enWEfkWke7APgAxC6myDNWpmduaPIBSIRJNvhwxaHVykVXvA==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From 05bca77904475cbd0d651964a5e80b756f60451a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 06:49:36 +0000
Subject: [PATCH 22/49] dnscontrol: 3.29.1 -> 3.30.0

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

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index 23d07bf8cfe..e3775db084e 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "3.29.1";
+  version = "3.30.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sfmdOwwB3X3GFTg7NNAh7mi+fu4YZy9+c5Co3qaVo1o=";
+    sha256 = "sha256-/ULO0ev1ybENaSrzAgblUdnyGp6QfFxO8XSHpH2wGpU=";
   };
 
-  vendorHash = "sha256-nOgb8UNDhumMyYu1v55qflYrU9HE8cWSGdfLqIAm/w4=";
+  vendorHash = "sha256-BtwSn3MLeMkjKBRXhln7hCB3wBVkKASe0zzfqbALQMQ=";
 
   ldflags = [ "-s" "-w" ];
 

From 47bcfe51627771f93580c419aa9a6d492c00cb5b Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 31 Mar 2023 19:17:24 +0200
Subject: [PATCH 23/49] foomatic-db{,-nonfree,-engine}: add meta.changelog

---
 pkgs/misc/cups/drivers/foomatic-db-engine/default.nix  | 3 ++-
 pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix | 3 ++-
 pkgs/misc/cups/drivers/foomatic-db/default.nix         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix
index b5e107ebf37..7c1bc55d333 100644
--- a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix
+++ b/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix
@@ -15,7 +15,7 @@
 , makeWrapper
 }:
 
-perlPackages.buildPerlPackage {
+perlPackages.buildPerlPackage rec {
   pname = "foomatic-db-engine";
   version = "unstable-2022-05-03";
 
@@ -79,6 +79,7 @@ perlPackages.buildPerlPackage {
   doCheck = false;  # no tests, would fail
 
   meta = {
+    changelog = "https://github.com/OpenPrinting/foomatic-db-engine/blob/${src.rev}/ChangeLog";
     description = "OpenPrinting printer support database engine";
     downloadPage = "https://www.openprinting.org/download/foomatic/";
     homepage = "https://openprinting.github.io/projects/02-foomatic/";
diff --git a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix b/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix
index 1c38ae38b98..a9ce7228f45 100644
--- a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix
+++ b/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix
@@ -6,7 +6,7 @@
 , perl
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "foomatic-db-nonfree";
   version = "unstable-2015-06-05";
 
@@ -60,6 +60,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    changelog = "https://github.com/OpenPrinting/foomatic-db-nonfree/blob/${src.rev}/ChangeLog";
     description = "OpenPrinting printer support database (unfree content)";
     downloadPage = "https://www.openprinting.org/download/foomatic/";
     homepage = "https://openprinting.github.io/projects/02-foomatic/";
diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix
index dd76fb1ee05..3b9d18d04d4 100644
--- a/pkgs/misc/cups/drivers/foomatic-db/default.nix
+++ b/pkgs/misc/cups/drivers/foomatic-db/default.nix
@@ -11,7 +11,7 @@
 , patchPpdFilesHook
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "foomatic-db";
   version = "unstable-2022-10-03";
 
@@ -79,6 +79,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    changelog = "https://github.com/OpenPrinting/foomatic-db/blob/${src.rev}/ChangeLog";
     description = "OpenPrinting printer support database (free content)";
     downloadPage = "https://www.openprinting.org/download/foomatic/";
     homepage = "https://openprinting.github.io/projects/02-foomatic/";

From f81afb13d4a8b87a7db6db3929643342a6ee17c0 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 31 Mar 2023 19:17:53 +0200
Subject: [PATCH 24/49] foomatic-db: unstable-2022-10-03 -> unstable-2023-03-30

introduces a couple of ppd files for Ricoh printers
---
 pkgs/misc/cups/drivers/foomatic-db/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix
index 3b9d18d04d4..ede978f7313 100644
--- a/pkgs/misc/cups/drivers/foomatic-db/default.nix
+++ b/pkgs/misc/cups/drivers/foomatic-db/default.nix
@@ -13,15 +13,15 @@
 
 stdenv.mkDerivation rec {
   pname = "foomatic-db";
-  version = "unstable-2022-10-03";
+  version = "unstable-2023-03-30";
 
   src = fetchFromGitHub {
     # there is also a daily snapshot at the `downloadPage`,
     # but it gets deleted quickly and would provoke 404 errors
     owner = "OpenPrinting";
     repo = "foomatic-db";
-    rev = "2a3c4d1bf7eadc42f936ce8989c1dd2973ea9669";
-    hash = "sha256-in0/j1nAQvM0NowBIBx3jj5WVMPIfZAeAk1SkuA3tjA=";
+    rev = "d883a215dc062e478c64d4e2eee9b0e39e6c629d";
+    hash = "sha256-eFgHTbj4pNfLG2ftU29FQ8rgRMbX+44UytfoZ4vdgZ4=";
   };
 
   buildInputs = [ cups cups-filters ghostscript gnused perl ];
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
       PPD files generated from the XML files in this package
       are contained in the package 'foomatic-db-ppds'.
       Besides the XML files, this package contains
-      about 6,600 PPD files, for printers from
+      about 6,700 PPD files, for printers from
       Brother, Canon, Epson, Gestetner, HP, InfoPrint,
       Infotec, KONICA_MINOLTA, Kyocera, Lanier, Lexmark, NRG,
       Oce, Oki, Ricoh, Samsung, Savin, Sharp, Toshiba and Utax.

From 1dbd6da1d65ade4bc7d7afb66e2f9b69f23e9104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 07:09:12 +0000
Subject: [PATCH 25/49] devbox: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 9de9f393d31..11115162ccf 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.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-mowrp08L74IgOoyA30cmt4QWDsHo1HPKm7bxiYp+YVI=";
+    hash = "sha256-n+kQMKys7yHJW9PX8RuU18TIQ8CBI3c1ibwMh4zTayA=";
   };
 
   ldflags = [

From c05d64a2c8cf3a7e5c033c82bb2b526f28bfbcbd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Apr 2023 07:10:00 +0000
Subject: [PATCH 26/49] devbox: 0.4.5 -> 0.4.6

https://github.com/jetpack-io/devbox/releases/tag/0.4.6
---
 pkgs/development/tools/devbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 11115162ccf..a2444607730 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.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-n+kQMKys7yHJW9PX8RuU18TIQ8CBI3c1ibwMh4zTayA=";
+    hash = "sha256-vAfpx4cGN7NxhQbkrhSRxlD+QNfzaiBRtTgyO3e8brU=";
   };
 
   ldflags = [

From 5465b6d14122613e1b8da1da5cbaeae77bbb0f12 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 1 Apr 2023 03:13:25 -0400
Subject: [PATCH 27/49] megasync: pin to ffmpeg_4

fix #224176
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8239fa321e8..7df435141e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5267,7 +5267,7 @@ with pkgs;
   medusa = callPackage ../tools/security/medusa { };
 
   megasync = libsForQt5.callPackage ../applications/misc/megasync {
-    ffmpeg = ffmpeg-full;
+    ffmpeg = ffmpeg_4;
   };
 
   megacmd = callPackage ../applications/misc/megacmd { };

From f8744b3f80ffe69f300cc675e09595185cec46ed Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sat, 1 Apr 2023 19:03:45 +1100
Subject: [PATCH 28/49] bundix: fixup ruby_3_0 support

---
 .../ruby-modules/bundix/default.nix           | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index d4cfe217b83..94c47f4e566 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,5 +1,12 @@
-{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
-  nix-prefetch-git }:
+{ buildRubyGem
+, fetchFromGitHub
+, fetchpatch
+, makeWrapper
+, lib
+, bundler
+, nix
+, nix-prefetch-git
+}:
 
 buildRubyGem rec {
   inherit (bundler) ruby;
@@ -15,6 +22,14 @@ buildRubyGem rec {
     sha256 = "sha256-iMp6Yj7TSWDqge3Lw855/igOWdTIuFH1LGeIN/cpq7U=";
   };
 
+  patches = [
+    # https://github.com/nix-community/bundix/pull/80
+    (fetchpatch {
+      url = "https://github.com/nix-community/bundix/commit/3d7820efdd77281234182a9b813c2895ef49ae1f.patch";
+      hash = "sha256-ShluCWfRQxR+vkXqa7Fh7+WHKf6vAsa9/DVeXjpAXLk=";
+    })
+  ];
+
   buildInputs = [ ruby bundler ];
   nativeBuildInputs = [ makeWrapper ];
 

From 2d999989eb90433da7bea9c9c8a5a505fe38d664 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 11:24:56 +0000
Subject: [PATCH 29/49] fastly: 8.1.2 -> 8.2.1

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

diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix
index 38b7ee476d2..9a94849082c 100644
--- a/pkgs/misc/fastly/default.nix
+++ b/pkgs/misc/fastly/default.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "8.1.2";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-M/2ShE1lmT7DLUSANt+JVGUPhXoXkIyachtfXpbu5MU=";
+    hash = "sha256-QJNXmSM8xIw8gN3rB1mGT7GRf1nx0Y0Z+8yf0gjddBo=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -33,7 +33,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-XND6sSjbZCTraKOapAvsVOZGf27YcyFnkC1vl8wO0ug=";
+  vendorHash = "sha256-lNb/RPL+MM2NeAVzGWfkrYJz+z8Lb9jPRmQP9Ht5Meo=";
 
   nativeBuildInputs = [
     installShellFiles

From 1b911d1fe29dcc63efa0afce053c05d4e8f7e0d8 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Thu, 30 Mar 2023 19:46:01 +0200
Subject: [PATCH 30/49] linuxPackages.nvidia_x11_production: 525.89.02 ->
 525.105.17

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 15a3c9e6c18..76a78cfbaf3 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -25,11 +25,11 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "525.89.02";
-    sha256_64bit = "sha256-DkEsiMW9mPhCqDmm9kYU8g5MCVDvfP+xKxWKcWM1k+k=";
-    openSha256 = "sha256-MP9ir0Fuodar239r3PbqVxIHd0vHvpDj8Rw55TeFtZM=";
-    settingsSha256 = "sha256-7rHaJWm0XHJXsKL8VnU9XT15t/DU8jdsCXQwQT+KaV0=";
-    persistencedSha256 = "sha256-4AmOL6b3GKCjGs6bRDpQAkEG4n41X395znyQF1x9VEs=";
+    version = "525.105.17";
+    sha256_64bit = "sha256-xjWiGigsm1NIXxnrtkoPS1NqlouU1Nl2KeC8VHpYFCo=";
+    openSha256 = "sha256-O3XB8tNLmNkzrYoVyJVEE0IcE772lOdr8qn4rQHIupE=";
+    settingsSha256 = "sha256-KUw31Am9Zfwk5QTs6th8+J3C4oUBacNgb7ZUNeV68W4=";
+    persistencedSha256 = "sha256-jhBtsf9MXrkU/SsBndR1ESGUHhgUWiSH7R75swk3m40=";
   };
 
   latest = selectHighestVersion production (generic {

From 5ac95120d54849d372d51e9171d53ca87148c766 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 1 Apr 2023 20:41:01 +0900
Subject: [PATCH 31/49] pymol: remove broken mark for darwin

The bug has been resolved by changing the backend to Qt
in this commit, ab3f0771a42aef7e691815209119bb49d1c63f93.
---
 pkgs/applications/science/chemistry/pymol/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 15a1e315823..155d521549e 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -70,7 +70,6 @@ python3Packages.buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     inherit description;
     homepage = "https://www.pymol.org/";
     license = licenses.mit;

From 3e81474faf6e40fcd6f17c1df220fef739277992 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 28 Nov 2022 23:34:06 +0100
Subject: [PATCH 32/49] qxmledit: 0.9.15  -> 0.9.17

Changelog: https://github.com/lbellonda/qxmledit/blob/0.9.17/NEWS
---
 .../applications/editors/qxmledit/default.nix | 35 ++++++++++++-------
 .../editors/qxmledit/qxmledit.json            |  6 ----
 2 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/editors/qxmledit/qxmledit.json

diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix
index c13b6a4d53e..4b59da01ba2 100644
--- a/pkgs/applications/editors/qxmledit/default.nix
+++ b/pkgs/applications/editors/qxmledit/default.nix
@@ -1,14 +1,24 @@
-{ lib, stdenv, fetchFromGitHub,
-  qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml
+, qtquick1, libGLU }:
 
 stdenv.mkDerivation rec {
-  pname = "qxmledit" ;
-  version = "0.9.15" ;
-  src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ;
-  nativeBuildInputs = [ qmake ] ;
-  buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ;
-  qmakeFlags = [ "CONFIG+=release" ] ;
-  outputs = [ "out" "doc" ] ;
+  pname = "qxmledit";
+  version = "0.9.17";
+
+  outputs = [ "out" "doc" ];
+
+  src = fetchFromGitHub {
+    owner = "lbellonda";
+    repo = pname;
+    rev = version;
+    hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
+  };
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ];
+
+  qmakeFlags = [ "CONFIG+=release" ];
 
   preConfigure = ''
     export QXMLEDIT_INST_DATA_DIR="$out/share/data"
@@ -23,9 +33,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     broken = stdenv.isDarwin;
-    description = "Simple XML editor based on qt libraries" ;
+    description = "Simple XML editor based on qt libraries";
     homepage = "https://sourceforge.net/projects/qxmledit";
     license = licenses.lgpl2;
-    platforms = platforms.all;
-  } ;
+    platforms = platforms.unix;
+    changelog = "https://github.com/lbellonda/qxmledit/blob/${version}/NEWS";
+  };
 }
diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json
deleted file mode 100644
index 88d2e3c4c2b..00000000000
--- a/pkgs/applications/editors/qxmledit/qxmledit.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "owner": "lbellonda",
-    "repo": "qxmledit",
-    "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1",
-    "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834"
-}

From dd7c4292753db02ce803dd2d3f1ea20970fb519b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 12:06:52 +0000
Subject: [PATCH 33/49] aliyun-cli: 3.0.152 -> 3.0.160

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

diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix
index d998abed7fc..278a1cef0d2 100644
--- a/pkgs/tools/admin/aliyun-cli/default.nix
+++ b/pkgs/tools/admin/aliyun-cli/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.152";
+  version = "3.0.160";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aliyun";
     repo = pname;
     fetchSubmodules = true;
-    sha256 = "sha256-n6S9ul9yD63l8Ge9Cs6QonRvvNxdke3u3P8TQOx5Z98=";
+    sha256 = "sha256-gMAYtvmP8dKiLITPx5sWkj3vRJNT468kEA2obCIDER4=";
   };
 
-  vendorHash = "sha256-Z8MDLUMgehoDEEBB2A5QWHGPqX5xt/16afa9T4v6kkQ=";
+  vendorHash = "sha256-H1qeJ37FaQY/EQtg3467gG8tA1PLyXaF8Sb5qKLf4wU=";
 
   subPackages = [ "main" ];
 

From 49c6c7c8e60da681abfb0bd6efa92aaef8563bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Apr 2023 12:25:44 +0000
Subject: [PATCH 34/49] dasel: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 3f613041ff9..48852268549 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
     rev = "v${version}";
-    sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI=";
+    sha256 = "sha256-3zYBgDtptEmuAhLFnPt0eDvgTYltHDdQGX1JCem/UxE=";
   };
 
   vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";

From ea126529eb23f39f5a6bf3341103044a151657a0 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Sat, 1 Apr 2023 13:52:36 +0200
Subject: [PATCH 35/49] nixos/nvidia: allow package to override IBT support

---
 nixos/modules/hardware/video/nvidia.nix       | 4 +++-
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 ++
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 79a3ab6baaa..6bbbcc58e98 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -26,6 +26,8 @@ let
   nvidiaPersistencedEnabled =  cfg.nvidiaPersistenced;
   nvidiaSettings = cfg.nvidiaSettings;
   busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?";
+
+  ibtSupport = cfg.open || (nvidia.ibtSupport or false);
 in
 
 {
@@ -462,7 +464,7 @@ in
     boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
       ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
       ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
-      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off";
+      ++ optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
 
     services.udev.extraRules =
       ''
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 76a78cfbaf3..98d1fceecaf 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -30,6 +30,8 @@ rec {
     openSha256 = "sha256-O3XB8tNLmNkzrYoVyJVEE0IcE772lOdr8qn4rQHIupE=";
     settingsSha256 = "sha256-KUw31Am9Zfwk5QTs6th8+J3C4oUBacNgb7ZUNeV68W4=";
     persistencedSha256 = "sha256-jhBtsf9MXrkU/SsBndR1ESGUHhgUWiSH7R75swk3m40=";
+
+    ibtSupport = true;
   };
 
   latest = selectHighestVersion production (generic {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index b76e64232b7..f8e896c75b9 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -11,6 +11,7 @@
 , useProfiles ? true
 , preferGtk2 ? false
 , settings32Bit ? false
+, ibtSupport ? false
 
 , prePatch ? ""
 , postPatch ? null
@@ -116,6 +117,7 @@ let
       persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
       inherit persistencedVersion settingsVersion;
       compressFirmware = false;
+      ibtSupport = ibtSupport || (lib.versionAtLeast version "530");
     } // optionalAttrs (!i686bundled) {
       inherit lib32;
     };

From 9dbd73118f058724fdeba1d222370b87cf7103cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 14:51:11 +0200
Subject: [PATCH 36/49] python310Packages.types-colorama: 0.4.15.9 -> 0.4.15.11

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

diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix
index 7710cdc152c..1b2789dd8eb 100644
--- a/pkgs/development/python-modules/types-colorama/default.nix
+++ b/pkgs/development/python-modules/types-colorama/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-colorama";
-  version = "0.4.15.9";
+  version = "0.4.15.11";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+25tIa07AbGHj8an0/Jm0fhFiwE9cUWTO9kI6x5mj7I=";
+    hash = "sha256-qUIesk2c/FhIgNwdM7f9QGoUInwfmfUMWrkmXgTQdjg=";
   };
 
   # Module has no tests

From a8b444d9dcf726acb026ceffc733dce79690429c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 14:55:30 +0200
Subject: [PATCH 37/49] python310Packages.reolink-aio: 0.5.8 -> 0.5.9

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.8...0.5.9

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

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 1c63cb4e636..c6127bbadbc 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.5.8";
+  version = "0.5.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-ELAytOxi2wAqt2hbVKFs4+HvJr3V+faWw2leO5bfv9A=";
+    hash = "sha256-CsXpvHwTNMSpgLr4bjwzKnW/R3k9DLlBxLlZ8aZaQG0=";
   };
 
   postPatch = ''

From 77817c434eded60b7e1c452c405aad7bd72fcb73 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 14:57:39 +0200
Subject: [PATCH 38/49] python310Packages.securetar: 2022.02.0 -> 2023.3.0

Diff: https://github.com/pvizeli/securetar/compare/2022.02.0...2023.3.0
---
 pkgs/development/python-modules/securetar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix
index c6010b8eef3..a7f90371f2b 100644
--- a/pkgs/development/python-modules/securetar/default.nix
+++ b/pkgs/development/python-modules/securetar/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "securetar";
-  version = "2022.02.0";
+  version = "2023.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "pvizeli";
     repo = pname;
     rev = version;
-    hash = "sha256-FwQp08jwcGh07zpHqRNoUUmeLZJh78wI8wCXySi3Tdc=";
+    hash = "sha256-3bDboggvKbpWyjpUOrUmtJx3Nj/6Uvut2nEQLYJubDA=";
   };
 
   propagatedBuildInputs = [

From c9e571d6772534796d4e8d47f3736aeee41acf09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 14:59:06 +0200
Subject: [PATCH 39/49] python310Packages.python-bsblan: 0.5.10 -> 0.5.11

Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.5.10...v0.5.11

Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.5.11
---
 pkgs/development/python-modules/python-bsblan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index dcfed60a8c1..7a3cc86a220 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-bsblan";
-  version = "0.5.10";
+  version = "0.5.11";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "liudger";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-VOi3v5SPHHx+qgqQmbIcC+APAks9CPklFAlCmHRM1iQ=";
+    hash = "sha256-fTjeJZhKPFi0cxZStegVdq7a48rQ236DnnCGngwZ5GU=";
   };
 
   nativeBuildInputs = [

From acb03ec4db2d947e7bdebbbae52880571ef0bd3c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:01:03 +0200
Subject: [PATCH 40/49] python310Packages.securetar: add changelog to meta

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

diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix
index a7f90371f2b..8b28d3ef815 100644
--- a/pkgs/development/python-modules/securetar/default.nix
+++ b/pkgs/development/python-modules/securetar/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-3bDboggvKbpWyjpUOrUmtJx3Nj/6Uvut2nEQLYJubDA=";
   };
 
@@ -35,6 +35,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to handle tarfile backups";
     homepage = "https://github.com/pvizeli/securetar";
+    changelog = "https://github.com/pvizeli/securetar/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From c7abb7924daaa05fe02bf3f2052bc167a0b118fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:03:09 +0200
Subject: [PATCH 41/49] python310Packages.sentry-sdk: 1.16.0 -> 1.17.0

Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.16.0...1.17.0

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

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 45834b88b8b..b351a77ea6e 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "1.16.0";
+  version = "1.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "sentry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-hJ6OikRro9YUEX8rqMs/JkTvM9aTabEj4E8iNQ71gEc=";
+    hash = "sha256-BcoCYyCz4tkb75P/z+eGQolRB0qxrdvTH+wV90zN884=";
   };
 
   propagatedBuildInputs = [

From 82d940255c9b78c612c16d8c1501f4be51f9992f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:07:20 +0200
Subject: [PATCH 42/49] python310Packages.pyvesync: 2.1.1 -> 2.1.6

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

diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index 27203dfdf4f..f984ba00e2f 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "2.1.1";
+  version = "2.1.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ=";
+    hash = "sha256-u31yiTAINjQagDzZZ+6+XCmCSwjGkoGSyFxTosHJ9i0=";
   };
 
   propagatedBuildInputs = [

From a54e46b4cb5943037396df5a872874514e2fcff3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:10:33 +0200
Subject: [PATCH 43/49] python310Packages.losant-rest: 1.17.2 -> 1.17.3

Diff: https://github.com/Losant/losant-rest-python/compare/v1.17.2...v1.17.3
---
 pkgs/development/python-modules/losant-rest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix
index 7c84d19a9dd..b36221f1581 100644
--- a/pkgs/development/python-modules/losant-rest/default.nix
+++ b/pkgs/development/python-modules/losant-rest/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "losant-rest";
-  version = "1.17.2";
+  version = "1.17.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Losant";
     repo = "losant-rest-python";
     rev = "v${version}";
-    hash = "sha256-R17pMVK0T2LLQPNX7mwIlkmuRyNs8rx0sJZa8F60mvs=";
+    hash = "sha256-S4ypZ4yTncoyKi4INpXg0UtcD+CmKRwr3c/FuSoXVKs=";
   };
 
   propagatedBuildInputs = [

From 809de9e24550b3156b9d2d3d1653a4fc944e824f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:15:34 +0200
Subject: [PATCH 44/49] python310Packages.lightwave2: 0.8.22 -> 0.8.23

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

diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix
index 3fa6b9b6732..4d1b01fd68a 100644
--- a/pkgs/development/python-modules/lightwave2/default.nix
+++ b/pkgs/development/python-modules/lightwave2/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "lightwave2";
-  version = "0.8.22";
+  version = "0.8.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YrvRlSogw9YSuOvm4PfjrKGvgiBqdXAO9CKqGcBBH0g=";
+    hash = "sha256-umhFqeX16c6o006MU9/9h4EnqcX7v8C5q3XjxYgi+xk=";
   };
 
   propagatedBuildInputs = [

From 5020bc802b0d3c715d5c6d302c3c217237216781 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:49:18 +0200
Subject: [PATCH 45/49] qovery-cli: 0.55.2 -> 0.56.0

Diff: https://github.com/Qovery/qovery-cli/compare/v0.55.2...v0.56.0

Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.56.0
---
 pkgs/tools/admin/qovery-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix
index e1ee37c3283..786a540f6f1 100644
--- a/pkgs/tools/admin/qovery-cli/default.nix
+++ b/pkgs/tools/admin/qovery-cli/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "qovery-cli";
-  version = "0.55.2";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-/KWkU9IpUWhVOyiNkYg98PSltS97XNWXaz9haN11Dac=";
+    hash = "sha256-hbFE2gj4fLA8N8Gh5QvwxfOlPfWTpLlia1lsfQ+RkaU=";
   };
 
   vendorHash = "sha256-1krHpwjs4kGhPMBF5j3iqUBo8TGKs1h+nDCmDmviPu4=";

From 3866c5d93690ed094547b395ee02555186a87a1c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Apr 2023 15:51:38 +0200
Subject: [PATCH 46/49] amass: 3.22.2 -> 3.23.1

Diff: https://github.com/OWASP/Amass/compare/v3.22.2...v3.23.1

Changelog: https://github.com/OWASP/Amass/releases/tag/v3.23.1
---
 pkgs/tools/networking/amass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 9311451a525..15a3ec98b56 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.22.2";
+  version = "3.23.1";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    hash = "sha256-q6neBDk/kcvAoih4urRTFmhH6N7Fh/hEJQtL//kqJiI=";
+    hash = "sha256-cU4PFuVzmHPZDboZXyPUA+MMra+rUhTxjaIrx91qzes=";
   };
 
-  vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y=";
+  vendorHash = "sha256-om7tiYZn8nAOZ3jjAmF0Ncs1OPjiY8v7QW0RSY1Tv6o=";
 
   outputs = [
     "out"

From 809b0fa27933b6bc7d2b08a1cebc760b3bc6f83b Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Tue, 28 Mar 2023 14:14:02 +0200
Subject: [PATCH 47/49] imhex: 1.26.2 -> 1.27.1

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

diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix
index 50693018f08..810bd12cd20 100644
--- a/pkgs/applications/editors/imhex/default.nix
+++ b/pkgs/applications/editors/imhex/default.nix
@@ -22,13 +22,13 @@
 
 let
   # when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs
-  version = "1.26.2";
+  version = "1.27.1";
 
   patterns_src = fetchFromGitHub {
     owner = "WerWolv";
     repo = "ImHex-Patterns";
     rev = "ImHex-v${version}";
-    hash = "sha256-2+7bJzgwHfXcINM5oxwi3vEbUtq9gGJc/uxFOwT4RnM=";
+    hash = "sha256-7Aaj+W+zXjHO8A2gmWtp5Pa/i5Uk8lXzX2WHjPIPRZI=";
   };
 
 in
@@ -41,7 +41,7 @@ gcc12Stdenv.mkDerivation rec {
     owner = "WerWolv";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-H2bnRByCUAltngmVWgPW4vW8k5AWecOAzwtBKsjbpTw=";
+    hash = "sha256-meOx8SkufXbXuBIVefr/mO9fsUi3zeQmqmf86+aDMaI=";
   };
 
   nativeBuildInputs = [ cmake llvm python3 perl pkg-config ];

From 3227f0b14b702d2a2c5f3db3d14dc6c3e23d04f1 Mon Sep 17 00:00:00 2001
From: Joshua Trees <me@jtrees.io>
Date: Tue, 28 Mar 2023 21:43:52 +0200
Subject: [PATCH 48/49] slack: make desktop icon themable

---
 .../networking/instant-messengers/slack/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index f524dec3ef1..57892ba31d4 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -177,7 +177,7 @@ let
       # Fix the desktop link
       substituteInPlace $out/share/applications/slack.desktop \
         --replace /usr/bin/ $out/bin/ \
-        --replace /usr/share/ $out/share/ \
+        --replace /usr/share/pixmaps/slack.png slack \
         --replace bin/slack "bin/slack -s"
 
       runHook postInstall

From c78a121316abfea8164196a9abd5e570090a20b7 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 1 Apr 2023 17:49:26 +0300
Subject: [PATCH 49/49] please: 0.5.3 -> 0.5.4

---
 pkgs/tools/security/please/default.nix         |  9 ++++++---
 .../tools/security/please/nixos-specific.patch | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/security/please/default.nix b/pkgs/tools/security/please/default.nix
index 40640ba4ed8..2ecbc9ab303 100644
--- a/pkgs/tools/security/please/default.nix
+++ b/pkgs/tools/security/please/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "please";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitLab {
     owner = "edneville";
     repo = "please";
     rev = "v${version}";
-    hash = "sha256-YL0yKIDoFD6Q5gVXOjHiqH2ub7jlhlE/uDKLK1FlE74=";
+    hash = "sha256-GW2t3pTX06mqEwFTpiLe3mlzFTmb5Fep5R0yHooRmig=";
   };
 
-  cargoHash = "sha256-noZsnFL6G1KcxGY0sn0PvY5nIdx5aOAMErMViIY/7bE=";
+  cargoHash = "sha256-bd3Pc8QPyPjE+xVcwASDILTXvMCioId/n6dXSr/KDOQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec {
     installManPage man/*
   '';
 
+  # Unit tests are broken on NixOS.
+  doCheck = false;
+
   passthru.tests = { inherit (nixosTests) please; };
 
   meta = with lib; {
diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/tools/security/please/nixos-specific.patch
index 926f815cbfb..890434532a5 100644
--- a/pkgs/tools/security/please/nixos-specific.patch
+++ b/pkgs/tools/security/please/nixos-specific.patch
@@ -1,13 +1,13 @@
 diff --git i/src/lib.rs w/src/lib.rs
-index fdd69f2..07c794e 100644
+index 5e98cfa..539434f 100644
 --- i/src/lib.rs
 +++ w/src/lib.rs
-@@ -1667,7 +1667,7 @@ pub fn search_path(binary: &str) -> Option<String> {
-         }
-     }
- 
--    for dir in "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') {
-+    for dir in "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') {
-         let path_name = format!("{}/{}", &dir, &binary);
-         let p = Path::new(&path_name);
+@@ -1755,7 +1755,7 @@ pub fn search_path(ro: &mut RunOptions, item: &EnvOptions) -> Option<String> {
+     let dirs = if item.search_path.is_some() {
+         item.search_path.as_ref().unwrap()
+     } else {
+-        "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
++        "/run/wrappers/bin:/run/current-system/sw/sbin:/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+     };
  
+     for dir in dirs.split(':') {