From c714a76c0427262fdc99b2d0dfd0b1509178128f Mon Sep 17 00:00:00 2001
From: William Sengir <william@sengir.com>
Date: Wed, 15 Feb 2023 23:07:21 -0700
Subject: [PATCH 01/62] chromium: fix vulkan linking

libvulkan is dlopen'd but is missing from the linker search path.
We probably should be using the libvulkan (and libGLESv2) provided by
chromium, but using vulkan-loader's libvulkan.so.1 is a tried-and-true
workaround.

Fixes #150398.
---
 pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b79c69275adf..150567f80c02 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -38,6 +38,8 @@
 , libepoxy
 # postPatch:
 , glibc # gconv + locale
+# postFixup:
+, vulkan-loader
 
 # Package customization:
 , cupsSupport ? true, cups ? null
@@ -341,10 +343,10 @@ let
     in lib.concatStringsSep "\n" commands;
 
     postFixup = ''
-      # Make sure that libGLESv2 is found by dlopen (if using EGL).
+      # Make sure that libGLESv2 and libvulkan are found by dlopen.
       chromiumBinary="$libExecPath/$packageName"
       origRpath="$(patchelf --print-rpath "$chromiumBinary")"
-      patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
+      patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader ]}:$origRpath" "$chromiumBinary"
     '';
 
     passthru = {

From b6388ae3ee77d7fd38dbcba94414fd735a9292e6 Mon Sep 17 00:00:00 2001
From: Rose Hogenson <rhogenson@posteo.net>
Date: Sat, 4 Mar 2023 18:35:03 -0800
Subject: [PATCH 02/62] lutris: Include libnghttp2 in the FHS.

This library is needed for the lutris runtime version of curl.
---
 pkgs/applications/misc/lutris/fhsenv.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 075755bf217d..7a5333d22ba7 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -24,6 +24,9 @@ in buildFHSUserEnv {
     # Adventure Game Studio
     allegro dumb
 
+    # Curl
+    libnghttp2
+
     # Desmume
     lua agg soundtouch openal desktop-file-utils atk
 

From 2b168ba3f064beeb908031bb765a33b806d6c77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 19 Feb 2023 23:02:01 +0200
Subject: [PATCH 03/62] headscale: rename oidc.client_secret_file to
 oidc.client_secret_path

Headscale now supports passing the OIDC client secret via a file, as
added in [juanfont/headscale#1127][1127]. Lets use that.

The headscale option is `client_secret_path`; let's make it consistent
and rename the Nix option to this. Note that I wasn't able to do this:

    mkRenamedOptionModule [ ... "client_secret_file" ] [ ... "client_secret_path" ]

I get such error:

    error: evaluation aborted with the following error message: 'cannot find attribute `services.headscale.settings.oidc.client_secret_file''

[1127]: https://github.com/juanfont/headscale/pull/1127
---
 nixos/modules/services/networking/headscale.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index 390a448ab584..d2851e72a0dd 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -291,11 +291,11 @@ in {
                 '';
               };
 
-              client_secret_file = mkOption {
+              client_secret_path = mkOption {
                 type = types.nullOr types.path;
                 default = null;
                 description = lib.mdDoc ''
-                  Path to OpenID Connect client secret file.
+                  Path to OpenID Connect client secret file. Expands environment variables in format ''${VAR}.
                 '';
               };
 
@@ -425,7 +425,7 @@ in {
     (mkRenamedOptionModule ["services" "headscale" "dns" "baseDomain"] ["services" "headscale" "settings" "dns_config" "base_domain"])
     (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "issuer"] ["services" "headscale" "settings" "oidc" "issuer"])
     (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientId"] ["services" "headscale" "settings" "oidc" "client_id"])
-    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientSecretFile"] ["services" "headscale" "settings" "oidc" "client_secret_file"])
+    (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientSecretFile"] ["services" "headscale" "settings" "oidc" "client_secret_path"])
     (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "hostname"] ["services" "headscale" "settings" "tls_letsencrypt_hostname"])
     (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "challengeType"] ["services" "headscale" "settings" "tls_letsencrypt_challenge_type"])
     (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "httpListen"] ["services" "headscale" "settings" "tls_letsencrypt_listen"])
@@ -478,9 +478,6 @@ in {
           export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.settings.db_password_file})"
         ''}
 
-        ${optionalString (cfg.settings.oidc.client_secret_file != null) ''
-          export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.settings.oidc.client_secret_file})"
-        ''}
         exec ${cfg.package}/bin/headscale serve
       '';
 

From ad33f1800f2b2352d74ead11af39a0297875071e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 17 Mar 2023 04:20:00 +0000
Subject: [PATCH 04/62] rake: 12.3.2 -> 13.0.6

---
 pkgs/development/tools/build-managers/rake/Gemfile.lock | 4 ++--
 pkgs/development/tools/build-managers/rake/gemset.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock
index f89ceae93442..a8c82c508bd9 100644
--- a/pkgs/development/tools/build-managers/rake/Gemfile.lock
+++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (12.3.2)
+    rake (13.0.6)
 
 PLATFORMS
   ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.1.4
+   2.4.6
diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix
index 534c5efcfb13..b389469840d0 100644
--- a/pkgs/development/tools/build-managers/rake/gemset.nix
+++ b/pkgs/development/tools/build-managers/rake/gemset.nix
@@ -4,9 +4,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
       type = "gem";
     };
-    version = "12.3.2";
+    version = "13.0.6";
   };
 }

From 6077061bb563603bdecc389462980cf5fdb77e5b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 20 Mar 2023 04:20:00 +0000
Subject: [PATCH 05/62] python310Packages.rst2pdf: 0.99 -> 0.100

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

diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix
index ecf06468f7c8..7bb8ac8545a0 100644
--- a/pkgs/development/python-modules/rst2pdf/default.nix
+++ b/pkgs/development/python-modules/rst2pdf/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "rst2pdf";
-  version = "0.99";
+  version = "0.100";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8fa23fa93bddd1f52d058ceaeab6582c145546d80f2f8a95974f3703bd6c8152";
+    sha256 = "sha256-Zkw8FubT3qJ06ECkNurE26bLUKtq8xYvydVxa+PLe0I=";
   };
 
   outputs = [ "out" "man" ];

From 2ae0a53efc7d01d8b98d16adecae94b3691edd60 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 20 Mar 2023 04:20:00 +0000
Subject: [PATCH 06/62] rst2pdf: add top level alias

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9076a08fd744..7fcac314fdea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11626,6 +11626,8 @@ with pkgs;
 
   rst2html5 = callPackage ../tools/text/rst2html5 { };
 
+  rst2pdf = with python3Packages; toPythonApplication rst2pdf;
+
   rstcheck = with python3Packages; toPythonApplication rstcheck;
 
   rt = callPackage ../servers/rt { };

From a70114f1b7b9410aa20abca49708d94825a7415f Mon Sep 17 00:00:00 2001
From: Anurag <contact.anurag7@gmail.com>
Date: Mon, 20 Mar 2023 18:25:38 +0530
Subject: [PATCH 07/62] maintainers: add kranuarg7

Signed-off-by: Anurag <contact.anurag7@gmail.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d45dd9ccbd20..19474bd4bbd8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8186,6 +8186,12 @@
     githubId = 735008;
     name = "Louis Taylor";
   };
+  kranurag7 = {
+    email = "contact.anurag7@gmail.com";
+    github = "kranurag7";
+    githubId = "81210977";
+    name = "Anurag";
+  };
   kranzes = {
     email = "personal@ilanjoselevich.com";
     github = "Kranzes";

From 94c11d33343df7772a83388bc0c4f5fb7da8559f Mon Sep 17 00:00:00 2001
From: Anurag <contact.anurag7@gmail.com>
Date: Mon, 20 Mar 2023 15:32:25 +0530
Subject: [PATCH 08/62] kubectl-gadget: init at 0.14.0

Signed-off-by: Anurag <contact.anurag7@gmail.com>
---
 maintainers/maintainer-list.nix               |  2 +-
 .../cluster/kubectl-gadget/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/cluster/kubectl-gadget/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 19474bd4bbd8..0635961375ef 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8189,7 +8189,7 @@
   kranurag7 = {
     email = "contact.anurag7@gmail.com";
     github = "kranurag7";
-    githubId = "81210977";
+    githubId = 81210977;
     name = "Anurag";
   };
   kranzes = {
diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
new file mode 100644
index 000000000000..f6642588a939
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "kubectl-gadget";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "inspektor-gadget";
+    repo = "inspektor-gadget";
+    rev = "v${version}";
+    hash = "sha256:16i9biyvzkpgxyfb41afaarnlm59vy02nspln5zq69prg6mp8rwa";
+  };
+
+  vendorHash = "sha256-Kj8gP5393++nPeX38TX6duB9OO/ql7hpRA5gTTtTl+M=";
+
+  CGO_ENABLED = 0;
+
+  ldflags = [
+    "-X main.version=v${version}"
+  ];
+
+  subPackages = [ "cmd/kubectl-gadget" ];
+
+  meta = with lib; {
+    description = "A collection of gadgets for troubleshooting Kubernetes applications using eBPF";
+    homepage = "https://inspektor-gadget.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kranurag7 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 298703f74cd2..43a4ce86ea59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31218,6 +31218,8 @@ with pkgs;
 
   kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
 
+  kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { };
+
   kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { };
 
   kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { };

From 0c64c8d545af02ccfefe574a3e637346422ae8e1 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 21 Mar 2023 09:51:34 +0800
Subject: [PATCH 09/62] libkrunfw: 3.9.0 -> 3.10.0

Diff: https://github.com/containers/libkrunfw/compare/v3.9.0...v3.10.0
---
 pkgs/development/libraries/libkrunfw/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix
index 13090776405a..83f62cdb381d 100644
--- a/pkgs/development/libraries/libkrunfw/default.nix
+++ b/pkgs/development/libraries/libkrunfw/default.nix
@@ -13,28 +13,26 @@
 assert sevVariant -> stdenv.isx86_64;
 stdenv.mkDerivation rec {
   pname = "libkrunfw";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = if stdenv.isLinux then fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg=";
+    hash = "sha256-yL5D8oOGucLWi4kFPxan5Gq+jIkVSDOW/v1+zKg3G+o=";
   } else fetchurl {
     url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
-    hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q=";
+    hash = "sha256-Q7n+Og+eAnHSQm7kLUN0uV+CKcdtLBYAgt7Q0+CxEfA=";
   };
 
   kernelSrc = fetchurl {
-    url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz";
-    hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM=";
+    url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.xz";
+    hash = "sha256-L8wH4ckOpM4Uj1D5vusNygtuSzeado3oq8ekom8lJTQ=";
   };
 
   preBuild = ''
     substituteInPlace Makefile \
       --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \
-      --replace 'tar xf $(KERNEL_TARBALL)' \
-                'tar xf $(KERNEL_TARBALL); sed -i "s|/usr/bin/env bash|$(SHELL)|" $(KERNEL_SOURCES)/scripts/check-local-export' \
       --replace 'gcc' '$(CC)'
   '';
 

From 5e00adf7f8c76ce674003e134dcbf28ddcd75016 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 21 Mar 2023 09:57:34 +0800
Subject: [PATCH 10/62] libkrun: 1.5.0 -> 1.5.1

Diff: https://github.com/containers/libkrun/compare/v1.5.0...v1.5.1
---
 pkgs/development/libraries/libkrun/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix
index c931489057e7..e2d804050689 100644
--- a/pkgs/development/libraries/libkrun/default.nix
+++ b/pkgs/development/libraries/libkrun/default.nix
@@ -15,21 +15,21 @@
 
 stdenv.mkDerivation rec {
   pname = "libkrun";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = if stdenv.isLinux then fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0=";
+    hash = "sha256-N9AkG+zkjQHNaaCVrEpMfWUN9bQNHjMA2xi5NUulF5A=";
   } else fetchurl {
     url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
-    hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI=";
+    hash = "sha256-8hPbnZtDbiVdwBrtxt4nZ/QA2OFtui2VsQlaoOmWybo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU=";
+    hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From d1156e3ca9f05f1733d7dc3f650512727b0a1571 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 21 Mar 2023 10:05:59 +0800
Subject: [PATCH 11/62] v2ray-domain-list-community: 20230311145412 ->
 20230320093818

---
 pkgs/data/misc/v2ray-domain-list-community/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index adbbbb201e3e..3ecc56cec5d4 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,14 +3,14 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20230311145412";
+    version = "20230320093818";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-dHXfj1f/wnv7W8e1jTclt7qaag5OzP4zCZflN8p0v3M=";
+      hash = "sha256-KEA3hsrlDs+GpxBrc6CeNwoyXvu1OBJJ8UaB6iwFyyg=";
     };
-    vendorHash = "sha256-wqOpZ5MSWN3L+rVKdA2E/Zbwqb/KHwMKoGlSIPBKgv0=";
+    vendorHash = "sha256-zkf2neI1HiPkCrcw+cYoZ2L/OGkM8HPIv5gUqc05Wak=";
     meta = with lib; {
       description = "community managed domain list";
       homepage = "https://github.com/v2fly/domain-list-community";

From 3ecd7073e6f3afd880408ec72b49e3ba72c62053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Tue, 21 Mar 2023 14:50:28 +1100
Subject: [PATCH 12/62] stabber: fix darwin build

---
 pkgs/misc/stabber/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index 478cbda3dc00..ff89241a2469 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat
-, libmicrohttpd
+, libmicrohttpd, darwin
 }:
 
 with lib;
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ glib expat libmicrohttpd ];
+  buildInputs = [ glib expat libmicrohttpd ] ++
+    lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   meta = {
     description = "Stubbed XMPP Server";

From 8a449b274a372d72d8689c3ab45f7778b7070b37 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Mar 2023 04:20:00 +0000
Subject: [PATCH 13/62] postgresqlPackages.pgvector: 0.4.0 -> 0.4.1

---
 pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 8eb0cb7f42f8..e2e49f528fc4 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgvector";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector";
     rev = "v${version}";
-    hash = "sha256-bOckX7zvHhgJDDhoAm+VZVIeVIf2hG/3oWZWuTtnZPo=";
+    hash = "sha256-1mFHjHGB9KVZfPvuaC3sZzyzJvX49PjADVVJn1fSjgs=";
   };
 
   buildInputs = [ postgresql ];

From 13076d8e3c19f59086faa9fb3cb1e3e60918dd06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 05:30:40 +0000
Subject: [PATCH 14/62] python310Packages.clintermission: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index b5df005978c4..a577e0b23c9c 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonPackage rec {
   pname = "clintermission";
-  version = "0.2.0";
+  version = "0.3.0";
   format = "setuptools";
 
   disabled = !isPy3k;
@@ -14,8 +14,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sebageek";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-HPeO9K91a0MacSUN0SR0lPEWRTQgP/cF1FZaNvZLxAg=";
   };
 
   propagatedBuildInputs = [

From 0981f73014e4dc54d5a9ab08c3639ecac4f72f7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 06:03:58 +0000
Subject: [PATCH 15/62] java-service-wrapper: 3.5.51 -> 3.5.53

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

diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
index e17271d50ef2..9d380129faf5 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "java-service-wrapper";
-  version = "3.5.51";
+  version = "3.5.53";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    hash = "sha256-XkgzggtFLYCt3gP0F4wq38TFHCoo/x+bDzzz/TqmvB0=";
+    hash = "sha256-mDXlsH+iu9CcqlMwtbrMicAwuRClK1WmPY2SYIF8USw=";
   };
 
   buildInputs = [ jdk ];

From b3bdfcb44b0fe40302d71bc10c20563a888c7650 Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Tue, 21 Mar 2023 02:57:03 -0300
Subject: [PATCH 16/62] irpf: 2022-1.7 -> 2023-1.1

---
 pkgs/applications/finance/irpf/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix
index e24b2d5400af..8b5ca39154cc 100644
--- a/pkgs/applications/finance/irpf/default.nix
+++ b/pkgs/applications/finance/irpf/default.nix
@@ -11,13 +11,15 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "irpf";
-  version = "2022-1.7";
+  version = "2023-1.1";
 
+  # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
+  # Para outros sistemas operacionais -> Multi
   src = let
     year = lib.head (lib.splitVersion version);
   in fetchzip {
     url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
-    sha256 = "sha256-EHuka0HzWoqjvT/DcuJ9LWSrWl0PW5FyS+7/PdCgrNQ=";
+    sha256 = "sha256-UOo9LBeOA6H/A7dM6wIa0wXyAaq9xGnX9EUBzK4Y0ng=";
   };
 
   nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];

From 57c69fcbea58a733b5c09c53e6973e1f69bc6220 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 21 Mar 2023 07:44:24 +0100
Subject: [PATCH 17/62] wasmtime: 6.0.1 -> 7.0.0

https://github.com/bytecodealliance/wasmtime/blob/b5a2d536acb2a8a8a505116302b36173bb713748/RELEASES.md
---
 pkgs/development/interpreters/wasmtime/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index f07ddfb0e606..7a3297ba7f07 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "6.0.1";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vVdvj3Q3weK+yohSaEDaagqWWZkA+KV4gRRbcE3UiPQ=";
+    hash = "sha256-vbsjUJH6wHmSTwUV5tXrTUljPJNLTms8K6EyWi0mipA=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-7FYXKEN17I7sLQid2JGTxFHMhGPka2coEMS6y4HvwPU=";
+  cargoHash = "sha256-eTm0FfWiNpEwj2egLrQGPA1lZ0K5GfVOeULsbNyf18Q=";
 
   cargoBuildFlags = [
     "--package wasmtime-cli"

From 0ffa7103858d41d801d0cd5b0c17deb9f11ed034 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Mar 2023 08:41:05 +0100
Subject: [PATCH 18/62] python310Packages.clintermission: add changelog to meta

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

diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index a577e0b23c9c..8f6fea89d3e9 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -32,6 +32,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Non-fullscreen command-line selection menu";
     homepage = "https://github.com/sebageek/clintermission";
+    changelog = "https://github.com/sebageek/clintermission/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };

From e1e99e710ef2163cb00235c7e8366d9f00e6d3dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Mar 2023 08:44:29 +0100
Subject: [PATCH 19/62] python310Packages.clintermission: update disabled

---
 .../python-modules/clintermission/default.nix            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index 8f6fea89d3e9..c4bf46135aa8 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -1,21 +1,22 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
-, prompt-toolkit }:
+, pythonOlder
+, prompt-toolkit
+}:
 
 buildPythonPackage rec {
   pname = "clintermission";
   version = "0.3.0";
   format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sebageek";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-HPeO9K91a0MacSUN0SR0lPEWRTQgP/cF1FZaNvZLxAg=";
+    hash = "sha256-HPeO9K91a0MacSUN0SR0lPEWRTQgP/cF1FZaNvZLxAg=";
   };
 
   propagatedBuildInputs = [

From e727287d69759f55029e2642eaf46d33edcdb628 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 21 Mar 2023 11:40:49 +0200
Subject: [PATCH 20/62] rigsofrods-bin: init at 2022.12

---
 pkgs/games/rigsofrods-bin/default.nix | 69 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/games/rigsofrods-bin/default.nix

diff --git a/pkgs/games/rigsofrods-bin/default.nix b/pkgs/games/rigsofrods-bin/default.nix
new file mode 100644
index 000000000000..fa9edfe72f45
--- /dev/null
+++ b/pkgs/games/rigsofrods-bin/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, makeWrapper
+, unzip
+, libGL
+, libICE
+, libSM
+, libX11
+, libXrandr
+, zlib
+, alsa-lib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rigsofrods-bin";
+  version = "2022.12";
+
+  src = fetchurl {
+    url = "https://update.rigsofrods.org/rigs-of-rods-linux-2022-12.zip";
+    hash = "sha256-jj152fd4YHlU6YCVCnN6DKRfmi5+ORpMQVDacy/TPeE=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+    unzip
+  ];
+
+  buildInputs = [
+    libGL
+    libICE
+    libSM
+    libX11
+    libXrandr
+    stdenv.cc.cc
+    zlib
+  ];
+
+  runtimeDependencies = [
+    alsa-lib
+  ];
+
+  noDumpEnvVars = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/rigsofrods
+    cp -a . $out/share/rigsofrods
+    for f in RoR RunRoR; do
+      makeWrapper $out/share/rigsofrods/$f $out/bin/$f \
+        --chdir $out/share/rigsofrods
+    done
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A free/libre soft-body physics simulator mainly targeted at simulating vehicle physics";
+    homepage = "https://www.rigsofrods.org";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ raskin wegank ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7afeef86bd2c..52c351633880 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36068,6 +36068,8 @@ with pkgs;
     };
   };
 
+  rigsofrods-bin = callPackage ../games/rigsofrods-bin { };
+
   riko4 = callPackage ../games/riko4 { };
 
   rili = callPackage ../games/rili { };

From a6f33bd62fcda1c18089d4898191d9e534033b3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 10:45:22 +0000
Subject: [PATCH 21/62] seqkit: 2.3.1 -> 2.4.0

---
 pkgs/applications/science/biology/seqkit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix
index 27ba07481f0e..598c8248bfb4 100644
--- a/pkgs/applications/science/biology/seqkit/default.nix
+++ b/pkgs/applications/science/biology/seqkit/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "seqkit";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "seqkit";
     rev = "v${version}";
-    sha256 = "sha256-2DWb6PIYT9VfJeqbZ9+E1jk/xJ2+h0GARKF6XWdMhkI=";
+    sha256 = "sha256-v2Z94UDuXnT7eVFX+uLSxXR34eIBzRm1bHwD7gO9SVA=";
   };
 
-  vendorSha256 = "sha256-RQNthtPYuOSCenA0hs5EhybimrftjEJlQNkfnKGXTiM=";
+  vendorHash = "sha256-dDMSwZnTWC60zvPDvUT+9T/mUUrhW0Itn87XO/+Ef2Q=";
 
   meta = with lib; {
     description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";

From afd961fa809d8fce6cee21f65ae96d9eebcd95e2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:42 +0100
Subject: [PATCH 22/62] ocamlPackages.higlo: use Dune 3

---
 pkgs/development/ocaml-modules/higlo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index 87a4186a68c3..da843fe15112 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -3,7 +3,7 @@
 buildDunePackage rec {
   pname = "higlo";
   version = "0.8";
-  useDune2 = true;
+  duneVersion = "3";
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";

From 4263071ee06a020e950ad0023f6c5ba74c898835 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:46 +0100
Subject: [PATCH 23/62] ocamlPackages.xtmpl: use Dune 3

---
 pkgs/development/ocaml-modules/xtmpl/default.nix | 2 +-
 pkgs/development/ocaml-modules/xtmpl/ppx.nix     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 6b4771fe1ff4..47e153e53c2d 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -3,7 +3,7 @@
 buildDunePackage rec {
   pname = "xtmpl";
   version = "0.19.0";
-  useDune2 = true;
+  duneVersion = "3";
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/xtmpl/ppx.nix b/pkgs/development/ocaml-modules/xtmpl/ppx.nix
index b6f5bd65000f..0e23cdc48f70 100644
--- a/pkgs/development/ocaml-modules/xtmpl/ppx.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/ppx.nix
@@ -3,8 +3,9 @@
 buildDunePackage {
   pname = "xtmpl_ppx";
   minimalOCamlVersion = "4.11";
+  duneVersion = "3";
 
-  inherit (xtmpl) src version useDune2;
+  inherit (xtmpl) src version;
 
   buildInputs = [ ppxlib xtmpl ];
 

From 48549020fca766a9330c88e70e8627e0efccb599 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:50 +0100
Subject: [PATCH 24/62] ocamlPackages.iri: use Dune 3

---
 pkgs/development/ocaml-modules/iri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix
index 22f106975868..0ea05cb7b9ba 100644
--- a/pkgs/development/ocaml-modules/iri/default.nix
+++ b/pkgs/development/ocaml-modules/iri/default.nix
@@ -5,7 +5,7 @@
 buildDunePackage rec {
   pname = "iri";
   version = "0.6.0";
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchFromGitLab {
     domain = "framagit.org";

From 48774c43cd70ceb5b64b60bb783e8b39cdee5142 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:53 +0100
Subject: [PATCH 25/62] acgtk: use Dune 3

---
 pkgs/applications/science/logic/acgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index c627b8a3c8f5..693bc306f21e 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }:
+{ lib, stdenv, fetchFromGitLab, dune_3, ocamlPackages }:
 
 stdenv.mkDerivation {
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ];
+  nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ];
 
   buildInputs = with ocamlPackages; [
     ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson

From 942e6fd471968470b5ca0fabc95681033e4552b6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:56 +0100
Subject: [PATCH 26/62] ocamlPackages.sedlex: use Dune 3

---
 pkgs/development/ocaml-modules/sedlex/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 27756fdcd26e..0ce962417ed7 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -47,6 +47,7 @@ buildDunePackage rec {
   inherit (param) version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "ocaml-community";

From 5350e7282db35f6ece665906b36bce84277a550f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2023 13:05:59 +0100
Subject: [PATCH 27/62] =?UTF-8?q?ocamlPackages.gen:=201.0=20=E2=86=92=201.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index ee932bffd5e6..86dbc61f6faf 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -1,22 +1,21 @@
 { lib, buildDunePackage, fetchFromGitHub, ocaml
-, dune-configurator
 , seq
 , qcheck, ounit2
 }:
 
 buildDunePackage rec {
-  version = "1.0";
+  version = "1.1";
   pname = "gen";
   minimalOCamlVersion = "4.03";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
     rev = "v${version}";
-    hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw=";
+    hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk=";
   };
 
-  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ seq ];
   checkInputs = [ qcheck ounit2 ];
 

From a8639cffe98915e361198f05afdcbd1dab14f637 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 21 Mar 2023 13:19:03 +0100
Subject: [PATCH 28/62] pgadmin4: 6.20 -> 6.21

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/tools/admin/pgadmin/default.nix  | 8 ++++----
 pkgs/tools/admin/pgadmin/package.json | 1 -
 pkgs/tools/admin/pgadmin/yarn.lock    | 7 -------
 pkgs/tools/admin/pgadmin/yarn.nix     | 8 --------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index f016207de0b0..f488c5dcee5a 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -12,11 +12,11 @@
 
 let
   pname = "pgadmin";
-  version = "6.20";
+  version = "6.21";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    hash = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU=";
+    hash = "sha256-9ErMhxzixyiwcwcduLP63JfM3rNy0W/3w0b+BbQAjUA=";
   };
 
   yarnDeps = mkYarnModules {
@@ -53,7 +53,7 @@ let
       };
       propagatedBuildInputs = [ prev.pytz ];
     });
-    # pgadmin 6.20 is incompatible with flask 2.2
+    # pgadmin 6.21 is incompatible with flask 2.2
     # https://redmine.postgresql.org/issues/7651
     flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
       version = "2.1.3";
@@ -87,7 +87,7 @@ let
         hash = "sha256-NP5cb+4PabUOMPgaO36haqFJKncf6a0JdNFkYQwJpsk=";
       };
     });
-    # pgadmin 6.20 is incompatible with the major flask-security-too update to 5.0.x
+    # pgadmin 6.21 is incompatible with the major flask-security-too update to 5.0.x
     flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
       version = "4.1.5";
       src = oldAttrs.src.override {
diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json
index f43473b081cd..17060850a0bc 100644
--- a/pkgs/tools/admin/pgadmin/package.json
+++ b/pkgs/tools/admin/pgadmin/package.json
@@ -124,7 +124,6 @@
     "jquery": "^3.6.0",
     "json-bignumber": "^1.0.1",
     "jsoneditor": "^9.5.4",
-    "jsoneditor-react": "^3.1.1",
     "karma-coverage": "^2.0.3",
     "leaflet": "^1.5.1",
     "lodash": "4.*",
diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock
index f506196c2040..e1f422834088 100644
--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
@@ -6235,13 +6235,6 @@ json5@^2.1.2, json5@^2.2.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
 
-jsoneditor-react@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz#bc36356ac5ecb0d8f88d49a5ccbeecdd7f996164"
-  integrity sha512-XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA==
-  dependencies:
-    prop-types "^15.7.2"
-
 jsoneditor@^9.5.4:
   version "9.9.2"
   resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.9.2.tgz#176112f71acbf37e977aae8656a17bc33a7a4269"
diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix
index 0dc8367c7ca2..7f4b07621457 100644
--- a/pkgs/tools/admin/pgadmin/yarn.nix
+++ b/pkgs/tools/admin/pgadmin/yarn.nix
@@ -6529,14 +6529,6 @@
         sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
       };
     }
-    {
-      name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz";
-      path = fetchurl {
-        name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz";
-        sha512 = "XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA==";
-      };
-    }
     {
       name = "jsoneditor___jsoneditor_9.9.2.tgz";
       path = fetchurl {

From 8ade2218efcb5077bc730012929b9e6eb835a1e9 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 08:39:50 -0400
Subject: [PATCH 29/62] httplz: 1.12.5 -> 1.12.6

---
 pkgs/tools/networking/httplz/default.nix | 22 +++++-----------------
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index d32792149974..db2663bc54c9 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -1,37 +1,26 @@
 { lib
 , rustPlatform
 , fetchCrate
-, fetchpatch
 , installShellFiles
 , makeWrapper
 , pkg-config
 , ronn
 , openssl
 , stdenv
-, libiconv
-, Security
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "httplz";
-  version = "1.12.5";
+  version = "1.12.6";
 
   src = fetchCrate {
     inherit version;
     pname = "https";
-    sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts=";
+    sha256 = "sha256-qkhou4Rmv31zwyL8aM7U0YUZwOb3KQMHdOQsOrRI1TA=";
   };
 
-  patches = [
-    # https://github.com/thecoshman/http/pull/151
-    (fetchpatch {
-      name = "fix-rust-1.65-compile.patch";
-      url = "https://github.com/thecoshman/http/commit/6e4c8e97cce09d0d18d4936f90aa643659d813fc.patch";
-      hash = "sha256-mXclXfp2Nzq6Pr9VFmxiOzECGZEQRNOAcXoKhiOyuFs=";
-    })
-  ];
-
-  cargoSha256 = "sha256-odiVIfNJPpagoASnYvdOosHXa37gbQM8Zmvtnao0pAs=";
+  cargoSha256 = "sha256-BuNCKtK9ePV0d9o/DlW098Y4DWTIl0YKyryXMv09Woc=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -41,8 +30,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
-    libiconv
-    Security
+    darwin.apple_sdk.frameworks.Security
   ];
 
   cargoBuildFlags = [ "--bin" "httplz" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db2f3cb8a31a..4ebb957f2052 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8454,9 +8454,7 @@ with pkgs;
 
   httping = callPackage ../tools/networking/httping { };
 
-  httplz = callPackage ../tools/networking/httplz {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  httplz = callPackage ../tools/networking/httplz { };
 
   httpfs2 = callPackage ../tools/filesystems/httpfs { };
 

From 3c1516ab310f670217c2725dae77c2083aaf7c69 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:17:05 +0200
Subject: [PATCH 30/62] lutris: remove wxGTK30

---
 pkgs/applications/misc/lutris/fhsenv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 075755bf217d..807162ac51c5 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -30,7 +30,7 @@ in buildFHSUserEnv {
     # DGen // TODO: libarchive is broken
 
     # Dolphin
-    bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm
+    bluez ffmpeg gettext portaudio miniupnpc mbedtls_2 lzo sfml gsm
     wavpack orc nettle gmp pcre vulkan-loader
 
     # DOSBox

From 72e009faf1fad2b2ecc3574edb4dc4e867ae1866 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Wed, 22 Mar 2023 01:15:55 +0800
Subject: [PATCH 31/62] helix: fix icon path

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

diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index 5c450e21748c..3b77d441e1c9 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec {
     mkdir -p $out/lib
     cp -r runtime $out/lib
     installShellCompletion contrib/completion/hx.{bash,fish,zsh}
-    mkdir -p $out/share/{applications,icons}
+    mkdir -p $out/share/{applications,icons/hicolor/256x256/apps}
     cp contrib/Helix.desktop $out/share/applications
-    cp contrib/helix.png $out/share/icons
+    cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
   '';
   postFixup = ''
     wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime

From a2fc959c03017006c04d6b45c3d79be0f3683d85 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 13:12:04 -0400
Subject: [PATCH 32/62] whitebox-tools: 2.0.0 -> 2.2.0

Diff: https://github.com/jblindsay/whitebox-tools/compare/7551aa70e8d9cbd8b3744fde48e82aa40393ebf8...v2.2.0
---
 .../gis/whitebox-tools/default.nix            |  12 +-
 .../whitebox-tools/update-cargo-lock.patch    | 578 ------------------
 2 files changed, 4 insertions(+), 586 deletions(-)
 delete mode 100644 pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch

diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index fc4648eb9dce..b8ccd554f771 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -7,20 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "whitebox_tools";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
-    rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8";
-    hash = "sha256-MJQJcU91rAF7sz16Dlvg64cfWK8x3uEFcAsYqVLiz1Y=";
+    rev = "v${version}";
+    hash = "sha256-DQ7BPRd90GNQVfD5NoVcxoyd2L3WZvIkecmRJVUY1R4=";
   };
 
-  cargoSha256 = "sha256-+IFLv/mIgqyDKNC5aZgQeW6Ymu6+desOD8dDvEdwsSM=";
-
-  cargoPatches = [
-    ./update-cargo-lock.patch
-  ];
+  cargoHash = "sha256-BounjGGhbU5dxNV8WjVDQtV7YONNVRldc/t+wet1Gh8=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch b/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch
deleted file mode 100644
index 8c9f1eeff11b..000000000000
--- a/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch
+++ /dev/null
@@ -1,578 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a0bcf0b7..c6c65322 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4,9 +4,9 @@ version = 3
- 
- [[package]]
- name = "adler"
--version = "0.2.3"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
-+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
- 
- [[package]]
- name = "adler32"
-@@ -27,9 +27,9 @@ dependencies = [
- 
- [[package]]
- name = "alloc-no-stdlib"
--version = "2.0.1"
-+version = "2.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5192ec435945d87bc2f70992b4d818154b5feede43c09fb7592146374eac90a6"
-+checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
- 
- [[package]]
- name = "alloc-stdlib"
-@@ -63,15 +63,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
- 
- [[package]]
- name = "bitflags"
--version = "1.2.1"
-+version = "1.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
- name = "brotli"
--version = "3.3.0"
-+version = "3.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f29919120f08613aadcd4383764e00526fc9f18b6c0895814faeed0dd78613e"
-+checksum = "71cb90ade945043d3d53597b2fc359bb063db8ade2bcffe7997351d0756e9d50"
- dependencies = [
-  "alloc-no-stdlib",
-  "alloc-stdlib",
-@@ -80,9 +80,9 @@ dependencies = [
- 
- [[package]]
- name = "brotli-decompressor"
--version = "2.3.1"
-+version = "2.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1052e1c3b8d4d80eb84a8b94f0a1498797b5fb96314c001156a1c761940ef4ec"
-+checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
- dependencies = [
-  "alloc-no-stdlib",
-  "alloc-stdlib",
-@@ -90,9 +90,9 @@ dependencies = [
- 
- [[package]]
- name = "byteorder"
--version = "1.4.2"
-+version = "1.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
-+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
- 
- [[package]]
- name = "bzip2"
-@@ -106,9 +106,9 @@ dependencies = [
- 
- [[package]]
- name = "bzip2-sys"
--version = "0.1.10+1.0.8"
-+version = "0.1.11+1.0.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c"
-+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
- dependencies = [
-  "cc",
-  "libc",
-@@ -117,9 +117,9 @@ dependencies = [
- 
- [[package]]
- name = "cc"
--version = "1.0.66"
-+version = "1.0.72"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
-+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
- 
- [[package]]
- name = "cfg-if"
-@@ -149,26 +149,20 @@ dependencies = [
-  "bitflags",
- ]
- 
--[[package]]
--name = "const_fn"
--version = "0.4.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
--
- [[package]]
- name = "crc32fast"
--version = "1.2.1"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
-+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
- dependencies = [
-  "cfg-if",
- ]
- 
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.0"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
-+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
- dependencies = [
-  "cfg-if",
-  "crossbeam-utils",
-@@ -176,9 +170,9 @@ dependencies = [
- 
- [[package]]
- name = "crossbeam-deque"
--version = "0.8.0"
-+version = "0.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
-+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
- dependencies = [
-  "cfg-if",
-  "crossbeam-epoch",
-@@ -187,12 +181,11 @@ dependencies = [
- 
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.1"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
-+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
- dependencies = [
-  "cfg-if",
-- "const_fn",
-  "crossbeam-utils",
-  "lazy_static",
-  "memoffset",
-@@ -201,11 +194,10 @@ dependencies = [
- 
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.1"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
-- "autocfg 1.0.1",
-  "cfg-if",
-  "lazy_static",
- ]
-@@ -216,16 +208,22 @@ version = "1.6.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
- 
-+[[package]]
-+name = "fasteval"
-+version = "0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4f4cdac9e4065d7c48e30770f8665b8cef9a3a73a63a4056a33a5f395bc7cf75"
-+
- [[package]]
- name = "flate2"
--version = "1.0.20"
-+version = "1.0.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
-+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
- dependencies = [
-  "cfg-if",
-  "crc32fast",
-  "libc",
-- "miniz_oxide 0.4.3",
-+ "miniz_oxide 0.4.4",
- ]
- 
- [[package]]
-@@ -236,9 +234,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
- 
- [[package]]
- name = "generic-array"
--version = "0.12.3"
-+version = "0.12.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
- dependencies = [
-  "typenum",
- ]
-@@ -256,18 +254,18 @@ dependencies = [
- 
- [[package]]
- name = "hermit-abi"
--version = "0.1.18"
-+version = "0.1.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
-+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
- dependencies = [
-  "libc",
- ]
- 
- [[package]]
- name = "itoa"
--version = "0.4.7"
-+version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
-+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
- 
- [[package]]
- name = "kdtree"
-@@ -280,9 +278,9 @@ dependencies = [
- 
- [[package]]
- name = "las"
--version = "0.7.4"
-+version = "0.7.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1c0c61a3595a942582db0ae4ac8367bba6cad29afc6387db9d7315c05890d14c"
-+checksum = "80dd11fe6e333400f08bd3a17c20146bfe4f719bb92545b388be9d21e69644b1"
- dependencies = [
-  "byteorder",
-  "chrono",
-@@ -295,9 +293,9 @@ dependencies = [
- 
- [[package]]
- name = "laz"
--version = "0.5.2"
-+version = "0.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "01192c65789af53929798b55be28a65379028e2f822939e2fe887e8a694f5562"
-+checksum = "4d7a69934a6239f0b4ebb431afe9554df2ec63ef8325a9696b0e94735f554960"
- dependencies = [
-  "byteorder",
-  "num-traits",
-@@ -311,9 +309,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
- 
- [[package]]
- name = "libc"
--version = "0.2.86"
-+version = "0.2.110"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
-+checksum = "b58a4469763e4e3a906c4ed786e1c70512d16aa88f84dded826da42640fc6a1c"
- 
- [[package]]
- name = "libm"
-@@ -347,9 +345,9 @@ dependencies = [
- 
- [[package]]
- name = "memoffset"
--version = "0.6.1"
-+version = "0.6.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
-+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
- dependencies = [
-  "autocfg 1.0.1",
- ]
-@@ -365,9 +363,9 @@ dependencies = [
- 
- [[package]]
- name = "miniz_oxide"
--version = "0.4.3"
-+version = "0.4.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
-+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
- dependencies = [
-  "adler",
-  "autocfg 1.0.1",
-@@ -402,23 +400,23 @@ dependencies = [
- 
- [[package]]
- name = "num"
--version = "0.3.1"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
-+checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
- dependencies = [
-  "num-bigint",
-- "num-complex 0.3.1",
-+ "num-complex 0.4.0",
-  "num-integer",
-  "num-iter",
-- "num-rational 0.3.2",
-+ "num-rational 0.4.0",
-  "num-traits",
- ]
- 
- [[package]]
- name = "num-bigint"
--version = "0.3.2"
-+version = "0.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
-+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
- dependencies = [
-  "autocfg 1.0.1",
-  "num-integer",
-@@ -437,9 +435,9 @@ dependencies = [
- 
- [[package]]
- name = "num-complex"
--version = "0.3.1"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
-+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
- dependencies = [
-  "num-traits",
- ]
-@@ -478,9 +476,9 @@ dependencies = [
- 
- [[package]]
- name = "num-rational"
--version = "0.3.2"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
- dependencies = [
-  "autocfg 1.0.1",
-  "num-bigint",
-@@ -510,9 +508,9 @@ dependencies = [
- 
- [[package]]
- name = "pdqselect"
--version = "0.1.0"
-+version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27"
-+checksum = "7778906d9321dd56cde1d1ffa69a73e59dcf5fda6d366f62727adf2bd4193aee"
- 
- [[package]]
- name = "pest"
-@@ -525,9 +523,9 @@ dependencies = [
- 
- [[package]]
- name = "pkg-config"
--version = "0.3.19"
-+version = "0.3.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-+checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e"
- 
- [[package]]
- name = "podio"
-@@ -537,24 +535,24 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19"
- 
- [[package]]
- name = "ppv-lite86"
--version = "0.2.10"
-+version = "0.2.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
- 
- [[package]]
- name = "proc-macro2"
--version = "1.0.24"
-+version = "1.0.33"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-+checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
- dependencies = [
-  "unicode-xid",
- ]
- 
- [[package]]
- name = "quote"
--version = "1.0.8"
-+version = "1.0.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
-+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
- dependencies = [
-  "proc-macro2",
- ]
-@@ -756,9 +754,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
- 
- [[package]]
- name = "rayon"
--version = "1.5.0"
-+version = "1.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
-+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
- dependencies = [
-  "autocfg 1.0.1",
-  "crossbeam-deque",
-@@ -768,9 +766,9 @@ dependencies = [
- 
- [[package]]
- name = "rayon-core"
--version = "1.9.0"
-+version = "1.9.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
-+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
- dependencies = [
-  "crossbeam-channel",
-  "crossbeam-deque",
-@@ -809,9 +807,9 @@ dependencies = [
- 
- [[package]]
- name = "ryu"
--version = "1.0.5"
-+version = "1.0.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-+checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
- 
- [[package]]
- name = "scopeguard"
-@@ -839,18 +837,18 @@ dependencies = [
- 
- [[package]]
- name = "serde"
--version = "1.0.123"
-+version = "1.0.131"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
-+checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1"
- dependencies = [
-  "serde_derive",
- ]
- 
- [[package]]
- name = "serde_derive"
--version = "1.0.123"
-+version = "1.0.131"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
-+checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -859,9 +857,9 @@ dependencies = [
- 
- [[package]]
- name = "serde_json"
--version = "1.0.64"
-+version = "1.0.72"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
-+checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
- dependencies = [
-  "itoa",
-  "ryu",
-@@ -879,9 +877,9 @@ dependencies = [
- 
- [[package]]
- name = "syn"
--version = "1.0.60"
-+version = "1.0.82"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
-+checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -890,18 +888,18 @@ dependencies = [
- 
- [[package]]
- name = "thiserror"
--version = "1.0.26"
-+version = "1.0.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
-+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
- dependencies = [
-  "thiserror-impl",
- ]
- 
- [[package]]
- name = "thiserror-impl"
--version = "1.0.26"
-+version = "1.0.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
-+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -921,9 +919,9 @@ dependencies = [
- 
- [[package]]
- name = "typenum"
--version = "1.12.0"
-+version = "1.14.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
-+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
- 
- [[package]]
- name = "ucd-trie"
-@@ -933,9 +931,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
- 
- [[package]]
- name = "unicode-xid"
--version = "0.2.1"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
- 
- [[package]]
- name = "uuid"
-@@ -957,10 +955,11 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
- 
- [[package]]
- name = "whitebox_common"
--version = "1.5.0"
-+version = "2.0.0"
- dependencies = [
-  "byteorder",
-  "nalgebra",
-+ "num-traits",
-  "rand 0.7.3",
-  "rstar",
-  "rustc_version",
-@@ -970,7 +969,7 @@ dependencies = [
- 
- [[package]]
- name = "whitebox_lidar"
--version = "1.5.0"
-+version = "2.0.0"
- dependencies = [
-  "brotli",
-  "byteorder",
-@@ -986,7 +985,9 @@ dependencies = [
- name = "whitebox_plugins"
- version = "1.5.0"
- dependencies = [
-+ "fasteval",
-  "num_cpus",
-+ "rand 0.7.3",
-  "whitebox_common",
-  "whitebox_raster",
-  "whitebox_vector",
-@@ -994,7 +995,7 @@ dependencies = [
- 
- [[package]]
- name = "whitebox_raster"
--version = "1.5.0"
-+version = "2.0.0"
- dependencies = [
-  "byteorder",
-  "chrono",
-@@ -1006,7 +1007,7 @@ dependencies = [
- 
- [[package]]
- name = "whitebox_tools"
--version = "1.5.0"
-+version = "2.0.0"
- dependencies = [
-  "byteorder",
-  "chrono",

From b5bf60dfab7186974f327ce3061cc895f48a3027 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 13:24:45 -0400
Subject: [PATCH 33/62] tuckr: 0.7.0 -> 0.7.1

Diff: https://github.com/RaphGL/Tuckr/compare/0.7.0...0.7.1

Changelog: https://github.com/RaphGL/Tuckr/releases/tag/0.7.1
---
 pkgs/applications/misc/tuckr/default.nix      | 12 +++--
 .../misc/tuckr/update-cargo-lock.diff         | 49 -------------------
 2 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/misc/tuckr/update-cargo-lock.diff

diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix
index e3daca956c44..4223d6d9b44d 100644
--- a/pkgs/applications/misc/tuckr/default.nix
+++ b/pkgs/applications/misc/tuckr/default.nix
@@ -2,24 +2,28 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tuckr";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
     rev = version;
-    sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0=";
+    sha256 = "sha256-47qnBGCiPWJGF4QcqjzmDIZWlCO3xE3QyIF6nSPGWAc=";
   };
 
-  cargoPatches = [ ./update-cargo-lock.diff ];
+  cargoHash = "sha256-IX7ZX4fKBK0wS7nlSdf/bVGzXl2GU7qwwmtPMoOe/m8=";
 
-  cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM=";
+  # Cargo.lock is outdated
+  preConfigure = ''
+    cargo update --offline
+  '';
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 
   meta = with lib; {
     description = "A super powered replacement for GNU Stow";
     homepage = "https://github.com/RaphGL/Tuckr";
+    changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ mimame ];
   };
diff --git a/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/pkgs/applications/misc/tuckr/update-cargo-lock.diff
deleted file mode 100644
index 45fe445042fb..000000000000
--- a/pkgs/applications/misc/tuckr/update-cargo-lock.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index 5f5dd43..d7c8370 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -107,9 +107,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.1.4"
-+version = "4.1.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
- dependencies = [
-  "bitflags",
-  "clap_derive",
-@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
- 
- [[package]]
- name = "hermit-abi"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01"
-+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
- 
- [[package]]
- name = "inout"
-@@ -319,9 +319,9 @@ dependencies = [
- 
- [[package]]
- name = "once_cell"
--version = "1.17.0"
-+version = "1.17.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
- 
- [[package]]
- name = "opaque-debug"
-@@ -597,7 +597,7 @@ dependencies = [
- 
- [[package]]
- name = "tuckr"
--version = "0.6.1"
-+version = "0.7.0"
- dependencies = [
-  "chacha20poly1305",
-  "clap",

From 52b2d5f42262a47310cd77544cd4611f70d25951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 <gdamjan@gmail.com>
Date: Tue, 21 Mar 2023 22:10:04 +0100
Subject: [PATCH 34/62] go2tv: 1.13.0 -> 1.14.0

https://github.com/alexballas/go2tv/releases/tag/v1.14.0
---
 pkgs/applications/video/go2tv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix
index 1137193ef41c..7a163040f9ee 100644
--- a/pkgs/applications/video/go2tv/default.nix
+++ b/pkgs/applications/video/go2tv/default.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "go2tv" + lib.optionalString (!withGui) "-lite";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "alexballas";
     repo = "go2tv";
     rev = "v${version}";
-    sha256 = "sha256-ZHKfBKOX3/kVR6Nc+jSmLgfmpihc6QMb6NvTFlsBr5E=";
+    sha256 = "sha256-jzQLQCD5kAl7G8S8ihW52JuQ/d5Ma+LQwznBGLI3+Ac=";
   };
 
-  vendorSha256 = "sha256-msXfXFWXyZeT6zrRPZkBV7PEyPqYkx+JlpTWUwgFavI=";
+  vendorHash = null;
 
   nativeBuildInputs = [ pkg-config ];
 

From 695a3c582ed86e15aba60bdd6d1f64aac4aa6493 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Tue, 21 Mar 2023 14:56:54 -0400
Subject: [PATCH 35/62] aws-workspaces: 4.1.0 -> 4.5.0

---
 .../remote/aws-workspaces/default.nix          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix
index 71a3080a4951..984dd3e90958 100644
--- a/pkgs/applications/networking/remote/aws-workspaces/default.nix
+++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix
@@ -1,19 +1,19 @@
 { stdenv, lib
 , makeWrapper, dpkg, fetchurl, autoPatchelfHook
-, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16
+, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb, hiredis
 }:
 
 stdenv.mkDerivation rec {
   pname = "aws-workspaces";
-  version = "4.1.0.1523";
+  version = "4.5.0.2006";
 
   src = fetchurl {
-    # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages
+    # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages
     urls = [
-      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
-      "https://web.archive.org/web/20220709124028/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
+      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb"
+      "https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb"
     ];
-    sha256 = "sha256-nOrIOPZ0yOBGOQgNQxnm1cVR9NJ+BTEC12UB7Ux1yuk=";
+    sha256 = "sha256-1ysj020fYOmIRvZR27+7ZNqdzqkA2QbrCwDU18ouxaI=";
   };
 
   nativeBuildInputs = [
@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
     libsoup
     glib-networking
     graphicsmagick_q16
+    hiredis
+    libusb
+    libva
   ];
 
   unpackPhase = ''
@@ -49,6 +52,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
     patchelf --replace-needed libGraphicsMagick++-Q16.so.12 libGraphicsMagick++.so.12 $out/usr/lib/x86_64-linux-gnu/pcoip-client/vchan_plugins/libvchan-plugin-clipboard.so
+    patchelf --replace-needed libhiredis.so.0.14 libhiredis.so $out/lib/libpcoip_core.so
   '';
 
   installPhase = ''
@@ -70,6 +74,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ]; # TODO Mac support
-    maintainers = [ maintainers.mausch ];
+    maintainers = with maintainers; [ mausch dylanmtaylor ];
   };
 }

From 0768a2e9279c425b72c8ae1e02bd3ae2efc6b60c Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:06:06 -0300
Subject: [PATCH 36/62] erlang_21: remove

---
 pkgs/development/interpreters/erlang/21.nix |  7 -------
 pkgs/top-level/aliases.nix                  |  4 +++-
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/beam-packages.nix            | 16 +---------------
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/21.nix

diff --git a/pkgs/development/interpreters/erlang/21.nix b/pkgs/development/interpreters/erlang/21.nix
deleted file mode 100644
index 3af1198bdd54..000000000000
--- a/pkgs/development/interpreters/erlang/21.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "21.3.8.24";
-  sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g=";
-  meta.knownVulnerabilities = [ "CVE-2022-37026" ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 55f59aa8c8b1..81cbe3f85f4b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -439,7 +439,9 @@ mapAliases ({
   enyo-doom = enyo-launcher; # Added 2022-09-09
   epoxy = libepoxy; # Added 2021-11-11
   epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
-  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22 erlangR21; # added 2023-03-21
+  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22; # added 2023-03-21
+  erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
+  erlangR21 = erlang_21;
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
   etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
   eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b31acb068c1..0336f895e825 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16578,7 +16578,7 @@ with pkgs;
   };
 
   inherit (beam.interpreters)
-    erlang erlang_25 erlang_24 erlang_23 erlang_22 erlang_21
+    erlang erlang_25 erlang_24 erlang_23 erlang_22
     erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
     elixir-ls;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 079b3c51f440..ae7fd07d0838 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -14,7 +14,7 @@ let
   self = beam;
 
   # Aliases added 2023-03-21
-  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" "21" ];
+  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" ];
 
   interpretersAliases = versionLoop (version: {
     "erlangR${version}" = self.interpreters."erlang_${version}";
@@ -99,19 +99,6 @@ in
       odbcSupport = true;
     };
 
-    erlang_21 = self.beamLib.callErlang ../development/interpreters/erlang/21.nix {
-      openssl = openssl_1_1;
-      wxGTK = wxGTK32;
-      autoconf = buildPackages.autoconf269;
-      inherit wxSupport systemdSupport;
-    };
-    erlang_21_odbc = self.interpreters.erlang_21.override { odbcSupport = true; };
-    erlang_21_javac = self.interpreters.erlang_21.override { javacSupport = true; };
-    erlang_21_odbc_javac = self.interpreters.erlang_21.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };
-
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlang_24.elixir`.
@@ -132,6 +119,5 @@ in
     erlang_24 = self.packagesWith self.interpreters.erlang_24;
     erlang_23 = self.packagesWith self.interpreters.erlang_23;
     erlang_22 = self.packagesWith self.interpreters.erlang_22;
-    erlang_21 = self.packagesWith self.interpreters.erlang_21;
   } // packagesAliases;
 }

From 0219fa5fbfc39019c00c0241431e63f51d9c270c Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 18:38:37 -0400
Subject: [PATCH 37/62] pomsky: 0.9 -> 0.10

Diff: https://github.com/pomsky-lang/pomsky/compare/v0.9...v0.10

Changelog: https://github.com/pomsky-lang/pomsky/blob/v0.10/CHANGELOG.md
---
 pkgs/tools/text/pomsky/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/tools/text/pomsky/default.nix
index d1cda76b169c..0e34a2650a9b 100644
--- a/pkgs/tools/text/pomsky/default.nix
+++ b/pkgs/tools/text/pomsky/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pomsky";
-  version = "0.9";
+  version = "0.10";
 
   src = fetchFromGitHub {
-    owner = "rulex-rs";
+    owner = "pomsky-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-SR+cXCPcEejX3AauN3mS6zWU46m4nomMs1UVk+si1NY=";
+    hash = "sha256-V4WztquClcBQF74c8WalWITT+SRymEawLXmvTflNEGk=";
   };
 
-  cargoSha256 = "sha256-5ASB2zPL+0DAPWoB/Ez+DUbEjhDvVk00yyN75w6jzYk=";
+  cargoHash = "sha256-34lI4zI1JMYek3sCXOWw08EqhaI1bqTGFPxeEYmEbXQ=";
 
   # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads''
   doCheck = false;
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A portable, modern regular expression language";
     homepage = "https://pomsky-lang.org";
-    changelog = "https://github.com/rulex-rs/pomsky/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pomsky-lang/pomsky/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit /* or */ asl20 ];
     maintainers = with maintainers; [ figsoda ];
   };

From 3b24ddfc6b9d5201d3ad05fda0f9cc7d34942ae3 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:11:16 -0300
Subject: [PATCH 38/62] erlang_22: remove

---
 pkgs/development/interpreters/erlang/22.nix |  7 -------
 pkgs/top-level/aliases.nix                  |  4 +++-
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/beam-packages.nix            | 18 +-----------------
 4 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/22.nix

diff --git a/pkgs/development/interpreters/erlang/22.nix b/pkgs/development/interpreters/erlang/22.nix
deleted file mode 100644
index c42af71eacc8..000000000000
--- a/pkgs/development/interpreters/erlang/22.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "22.3.4.24";
-  sha256 = "0c9713xa8sjw7nr55hysgcnbvj7gzbrpzdl94y1nqn7vw4ni8is3";
-  meta.knownVulnerabilities = [ "CVE-2022-37026" ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 81cbe3f85f4b..5e39f204a999 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -439,9 +439,11 @@ mapAliases ({
   enyo-doom = enyo-launcher; # Added 2022-09-09
   epoxy = libepoxy; # Added 2021-11-11
   epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
-  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22; # added 2023-03-21
+  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23; # added 2023-03-21
   erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
   erlangR21 = erlang_21;
+  erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21
+  erlangR22 = erlang_22;
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
   etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
   eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0336f895e825..c8ae15c5119b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16578,7 +16578,7 @@ with pkgs;
   };
 
   inherit (beam.interpreters)
-    erlang erlang_25 erlang_24 erlang_23 erlang_22
+    erlang erlang_25 erlang_24 erlang_23
     erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
     elixir-ls;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index ae7fd07d0838..9402bd668e79 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -14,7 +14,7 @@ let
   self = beam;
 
   # Aliases added 2023-03-21
-  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" ];
+  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" ];
 
   interpretersAliases = versionLoop (version: {
     "erlangR${version}" = self.interpreters."erlang_${version}";
@@ -84,21 +84,6 @@ in
       odbcSupport = true;
     };
 
-    erlang_22 = self.beamLib.callErlang ../development/interpreters/erlang/22.nix {
-      openssl = openssl_1_1;
-      wxGTK = wxGTK32;
-      # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
-      parallelBuild = true;
-      autoconf = buildPackages.autoconf269;
-      inherit wxSupport systemdSupport;
-    };
-    erlang_22_odbc = self.interpreters.erlang_22.override { odbcSupport = true; };
-    erlang_22_javac = self.interpreters.erlang_22.override { javacSupport = true; };
-    erlang_22_odbc_javac = self.interpreters.erlang_22.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };
-
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlang_24.elixir`.
@@ -118,6 +103,5 @@ in
     erlang_25 = self.packagesWith self.interpreters.erlang_25;
     erlang_24 = self.packagesWith self.interpreters.erlang_24;
     erlang_23 = self.packagesWith self.interpreters.erlang_23;
-    erlang_22 = self.packagesWith self.interpreters.erlang_22;
   } // packagesAliases;
 }

From 80a7ce3920062a602c205ae9b599d7b0f6793196 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 21:04:45 -0400
Subject: [PATCH 39/62] nix-init: 0.2.0 -> 0.2.1

Diff: https://github.com/nix-community/nix-init/compare/v0.2.0...v0.2.1

Changelog: https://github.com/nix-community/nix-init/blob/v0.2.1/CHANGELOG.md
---
 pkgs/tools/nix/nix-init/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix
index 3453a1b74c66..2b207ce03cb6 100644
--- a/pkgs/tools/nix/nix-init/default.nix
+++ b/pkgs/tools/nix/nix-init/default.nix
@@ -26,16 +26,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-init";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-init";
     rev = "v${version}";
-    hash = "sha256-/lH8zO6ah7/HVZ7jOxTgs2iKND1UlGP5EQLtx6JsFxo=";
+    hash = "sha256-SvoKw0Ep8NGknu+6qd6xW6hfH261kFD6DjZhPXQpzs0=";
   };
 
-  cargoHash = "sha256-jI/hysUq3JGe0hdZTQQw49BfcTWMx6jg+QAkd1QeBv4=";
+  cargoHash = "sha256-lm4Y/ZTRMiBp3ECKnHZBvwM8Qso+rilT3BDxzfcnpHQ=";
 
   nativeBuildInputs = [
     curl
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildNoDefaultFeatures = true;
-  buildFeatures = [ "reqwest/rustls-tls" ];
 
   checkFlags = [
     # requires internet access

From 00bf4e5a9b234bcecfc79a7fbbdd34ba026f3010 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 02:07:56 +0000
Subject: [PATCH 40/62] fst: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix
index fbd81fbbdbd9..d08d29376b74 100644
--- a/pkgs/tools/text/fst/default.nix
+++ b/pkgs/tools/text/fst/default.nix
@@ -7,15 +7,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fst";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchCrate {
     inherit version;
     crateName = "fst-bin";
-    sha256 = "sha256-m9JDVHy+o4RYLGkYnhOpTuLyJjXtOwwl2SQpzRuz1m0=";
+    sha256 = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g=";
   };
 
-  cargoSha256 = "sha256-RMjNk8tE7AYBYgys4IjCCfgPdDgwbYVmrWpWNBOf70E=";
+  cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 

From 0899cf5fde0d5c839ed5b3000ddaaa73d9064557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 02:35:00 +0000
Subject: [PATCH 41/62] qradiolink: 0.8.8-1 -> 0.8.9-1

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

diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index a0b7dd8c7821..b5aaa390a7b4 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -24,13 +24,13 @@
 
 gnuradio3_8.pkgs.mkDerivation rec {
   pname = "qradiolink";
-  version = "0.8.8-1";
+  version = "0.8.9-1";
 
   src = fetchFromGitHub {
     owner = "qradiolink";
     repo = "qradiolink";
     rev = version;
-    sha256 = "sha256-2M5TSTNbbH188GiKqjP+IfBqks379Fw0fiGLBNiaxEg=";
+    sha256 = "sha256-yY9sdLFaG0fX/4obImxVAyJk13RklYjX99Ch9hgzTe8=";
   };
 
   preBuild = ''

From 3d8f70a7566582d2a21a91da803cb30e653460b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 03:08:31 +0000
Subject: [PATCH 42/62] werf: 1.2.212 -> 1.2.214

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

diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index e8e2beb8e497..be34a925ab6b 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.212";
+  version = "1.2.214";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-P1cmimlSOHtBXOYW3uYbAQ6Jfh7huk121Jdz/5zp8PY=";
+    hash = "sha256-ITSOzn1+5pIlSSpXi7I5JxtZ0mXUXxIONgvngrYrHEU=";
   };
 
-  vendorHash = "sha256-YGC6+pJyohwiM8Bg+C5GrhaqsZeKE+gHOI21ot3xj14=";
+  vendorHash = "sha256-u9/ZtNNSO/NGXgxyOjjGDjSe9ZyesREhg+E9HjaFhBk=";
 
   proxyVendor = true;
 

From d3eb164901e542dd9d9d98e98231d3398ffbbfe7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 03:52:52 +0000
Subject: [PATCH 43/62] v2ray: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index b8f358a53ead..ffccea276ea6 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "v2ray-core";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
     rev = "v${version}";
-    hash = "sha256-dgWpfpJiPYQmVg7CHRE8f9hX5vgC2TuLpTfMAksDurs=";
+    hash = "sha256-LrsLkuLoiZb3Y5BUkg9lB+qd0HHbgRNrixm5BdQMKck=";
   };
 
   # `nix-update` doesn't support `vendorHash` yet.
   # https://github.com/Mic92/nix-update/pull/95
-  vendorSha256 = "sha256-BEMdh1zQdjVEu0GJt6KJyWN5P9cUHfs04iNZWxzZ0Yo=";
+  vendorSha256 = "sha256-0uc+oncdOdIhIygr2ktT7f1qHIeyoVEnjyhzsUMjMBY=";
 
   ldflags = [ "-s" "-w" "-buildid=" ];
 

From f518c0c099921465d40a4ceb1aac392663d6cc23 Mon Sep 17 00:00:00 2001
From: apfelkuchen06 <apfelkuchen@hrnz.li>
Date: Wed, 22 Mar 2023 05:38:45 +0100
Subject: [PATCH 44/62] mpdevil: 1.10.1 -> 1.10.2

also add self to maintainers
---
 pkgs/applications/audio/mpdevil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix
index 394812a586b8..35fe314958c7 100644
--- a/pkgs/applications/audio/mpdevil/default.nix
+++ b/pkgs/applications/audio/mpdevil/default.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mpdevil";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-w31e8cJvdep/ZzmDBCfdCZotrPunQBl1cTTWjs3sE1w=";
+    sha256 = "sha256-zLCL64yX7i/mtUf8CkgrSwb6zZ7vhR1Dw8eUH/vgFT4=";
   };
 
   format = "other";
@@ -50,6 +50,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/SoongNoonien/mpdevil";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ apfelkuchen6 ];
   };
 }

From b34716334fd4def65a7394890938cce201cdc166 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 06:11:54 +0100
Subject: [PATCH 45/62] ocamlPackages.uecc: use Dune 3

---
 pkgs/development/ocaml-modules/uecc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix
index efb86d862476..1185977132dd 100644
--- a/pkgs/development/ocaml-modules/uecc/default.nix
+++ b/pkgs/development/ocaml-modules/uecc/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "uecc";
   version = "0.4";
 
+  duneVersion = "3";
+
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-uecc";

From 9e37176f06195a9d2480b95496ce7262dbb44efb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 06:12:00 +0100
Subject: [PATCH 46/62] =?UTF-8?q?ocamlPackages.hidapi:=201.1.1=20=E2=86=92?=
 =?UTF-8?q?=201.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/ocaml-modules/hidapi/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index 68fc506222de..b47c153a4974 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -1,19 +1,21 @@
-{ pkgs, lib, fetchurl, buildDunePackage, pkg-config, dune-configurator
+{ pkgs, lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator
 , bigstring,
 }:
 
 buildDunePackage rec {
   pname = "hidapi";
-  version = "1.1.1";
+  version = "1.1.2";
 
-  useDune2 = true;
+  duneVersion = "3";
 
-  src = fetchurl {
-    url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2";
+  src = fetchFromGitHub {
+    owner = "vbmithr";
+    repo = "ocaml-hidapi";
+    rev = version;
+    hash = "sha256-SNQ1/i5wJJgcslIUBe+z5QgHns/waHnILyMUJ46cUwg=";
   };
 
-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.03";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pkgs.hidapi dune-configurator ];

From 213349f3ad345ed5893717e5d9c60dddda79e4fc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 06:12:05 +0100
Subject: [PATCH 47/62] =?UTF-8?q?ocamlPackages.secp256k1-internal:=200.3?=
 =?UTF-8?q?=20=E2=86=92=200.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/secp256k1-internal/default.nix           | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
index 4a9a761ab30c..b403b997027b 100644
--- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
@@ -11,15 +11,16 @@
 
 buildDunePackage rec {
   pname = "secp256k1-internal";
-  version = "0.3";
+  version = "0.4";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-secp256k1-internal";
-    rev = version;
-    sha256 = "sha256-1wvQ4RW7avcGsIc0qgDzhGrwOBY0KHrtNVHCj2cgNzo=";
+    rev = "v${version}";
+    hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00=";
   };
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     gmp

From 8ede16564f5479675b60cd3a82a2a59edb0c2184 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 06:12:11 +0100
Subject: [PATCH 48/62] ocamlPackages.bigstring: use Dune 3 & fix for OCaml 5

---
 pkgs/development/ocaml-modules/bigstring/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix
index f966e0b90b1b..650522363d31 100644
--- a/pkgs/development/ocaml-modules/bigstring/default.nix
+++ b/pkgs/development/ocaml-modules/bigstring/default.nix
@@ -1,12 +1,16 @@
-{ lib, fetchFromGitHub, buildDunePackage }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
 
 buildDunePackage rec {
   pname = "bigstring";
   version = "0.3";
 
-  useDune2 = true;
+  duneVersion = "3";
+  minimalOCamlVersion = "4.03";
 
-  minimumOCamlVersion = "4.03";
+  # Ensure compatibility with OCaml ≥ 5.0
+  preConfigure = lib.optional (lib.versionAtLeast ocaml.version "4.08") ''
+    substituteInPlace src/dune --replace '(libraries bytes bigarray)' ""
+  '';
 
   src = fetchFromGitHub {
     owner = "c-cube";

From 8d4f793fe98715d88a66d92726ce3153a499fd27 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 06:15:09 +0100
Subject: [PATCH 49/62] python310Packages.easyenergy: 0.2.1 -> 0.2.2

---
 .../python-modules/easyenergy/default.nix      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix
index 99a6a72d499b..a77cd77b05ca 100644
--- a/pkgs/development/python-modules/easyenergy/default.nix
+++ b/pkgs/development/python-modules/easyenergy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "easyenergy";
-  version = "0.2.1";
+  version = "0.2.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-easyenergy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FjqkePMD55LWLwL6ZWzKwCI0tcYACPdRuci5fy6n02s=";
+    hash = "sha256-jo9Gn5ZPm9jSTB4m1yy779hqzby9abFFDSnKLxYqccg=";
   };
 
   postPatch = ''
@@ -51,6 +51,20 @@ buildPythonPackage rec {
     "easyenergy"
   ];
 
+  disabledTests = [
+    # Tests require network access
+    "test_json_request"
+    "test_internal_session"
+    "test_electricity_model_usage"
+    "test_electricity_model_return"
+    "test_electricity_none_data"
+    "test_no_electricity_data"
+    "test_gas_morning_model"
+    "test_gas_model"
+    "test_gas_none_data"
+    "test_no_gas_data"
+  ];
+
   meta = with lib; {
     description = "Module for getting energy/gas prices from easyEnergy";
     homepage = "https://github.com/klaasnicolaas/python-easyenergy";

From b47362f3a49219e520775620d3aca1fa55a60d27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 05:47:30 +0000
Subject: [PATCH 50/62] yamlfmt: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix
index 0d05ef2577d6..662fc5cb3d7a 100644
--- a/pkgs/development/tools/yamlfmt/default.nix
+++ b/pkgs/development/tools/yamlfmt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "yamlfmt";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oTdBFWISOfaz4ZDbJmyxtaKrjo9DVNJ5N7Qxnu7SwZA=";
+    sha256 = "sha256-2gcB44tpYXRES0nqLfXt3Srj2NCuQ/iBdv4yxjfmrnk=";
   };
 
-  vendorSha256 = "sha256-QRY6mYtrMvjUqXJOOvHL0b0OQ28320UwV8HL4fXpcNQ=";
+  vendorHash = "sha256-7Ip6dgpO3sPGXcwymYcaoFydTPIt+BmJC7UqyfltJx0=";
 
   doCheck = false;
 

From c88a6b8c48de0f5d599e0da782c45f4490b22bfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 06:06:04 +0000
Subject: [PATCH 51/62] asnmap: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix
index 72420b7c7456..cafc5d4f8d02 100644
--- a/pkgs/tools/security/asnmap/default.nix
+++ b/pkgs/tools/security/asnmap/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "asnmap";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-auVdBt8XT0qvEC9TfuROBbV/D6uQXBODZs/vrkJolwI=";
+    hash = "sha256-7yKOeKSsexqLZ+ep7+mft6GlHrZiwv6OOCeERZu7gAE=";
   };
 
-  vendorHash = "sha256-6z40pIj6cgC7lXS2qDhkYec5zIrmjHzh2W0U5BDmSzU=";
+  vendorHash = "sha256-VmbmRkJB5jme8j/ONMkbsITJxg5inxYnb5AoKUR3Uzg=";
 
   # Tests require network access
   doCheck = false;

From d477a191acc32c34bed0edecdfb176c0f0b2b71a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 22 Mar 2023 08:12:51 +0200
Subject: [PATCH 52/62] rigsofrods: alias to rigsofrods-bin

---
 .../interpreters/angelscript/2.22.nix         | 35 -----------
 .../libraries/mysocketw/default.nix           | 59 -------------------
 .../development/libraries/mysocketw/gcc.patch | 13 ----
 .../libraries/ogrepaged/default.nix           | 42 -------------
 pkgs/games/rigsofrods/default.nix             | 42 -------------
 pkgs/games/rigsofrods/gtk3.patch              | 29 ---------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 19 ------
 8 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 pkgs/development/interpreters/angelscript/2.22.nix
 delete mode 100644 pkgs/development/libraries/mysocketw/default.nix
 delete mode 100644 pkgs/development/libraries/mysocketw/gcc.patch
 delete mode 100644 pkgs/development/libraries/ogrepaged/default.nix
 delete mode 100644 pkgs/games/rigsofrods/default.nix
 delete mode 100644 pkgs/games/rigsofrods/gtk3.patch

diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
deleted file mode 100644
index 26625f612366..000000000000
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  pname = "angelscript";
-  version = "2.22.2";
-  nativeBuildInputs = [ unzip ];
-
-  src = fetchurl {
-    url = "http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "sha256-gzR96GSZJNV+bei3OPqlx7aw+WBv8XRpHGh8u+go6N4=";
-  };
-  preConfigure = ''
-    cd angelscript/projects/gnuc
-    sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    export SHARED=1
-    export VERSION="${version}"
-    mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
-  '';
-  postBuild = ''
-    rm ../../lib/*
-  '';
-  postInstall = ''
-    mkdir -p "$out/share/docs/angelscript"
-    cp -r ../../../docs/* "$out/share/docs/angelscript"
-  '';
-  meta = with lib; {
-    description = "Light-weight scripting library";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    badPlatforms = [ "aarch64-linux" ];
-    downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
-    homepage = "http://www.angelcode.com/angelscript/";
-  };
-}
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
deleted file mode 100644
index 880f5d50a042..000000000000
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, fetchurl
-, openssl
-, cmake
-}:
-
-let
-
-  joinpaths-src = fetchurl {
-    url = "https://github.com/AnotherFoxGuy/CMakeCM/raw/afe41f4536ae21f6f11f83e8c0b8b8c450ef1332/modules/JoinPaths.cmake";
-    hash = "sha256-eUsNj6YqO3mMffEtUBFFgNGkeiNL+2tNgwkutkam7MQ=";
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "mysocketw";
-  version = "3.11.0";
-
-  src = fetchFromGitHub {
-    owner = "RigsOfRods";
-    repo = "socketw";
-    rev = version;
-    hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo=";
-  };
-
-  patches = [
-    # in master post 3.11.0, see https://github.com/RigsOfRods/socketw/issues/16
-    (fetchpatch {
-      name = "fix-pkg-config.patch";
-      url = "https://github.com/RigsOfRods/socketw/commit/17cad062c3673bd0da74a2fecadb01dbf9813a07.patch";
-      sha256 = "01b019gfm01g0r1548cizrf7mqigsda8jnrzhg8dhi9c49nfw1bp";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [
-    openssl
-  ];
-
-  postUnpack = ''(
-    mkdir -p source/build/_cmcm-modules/resolved && cd $_
-    cp ${joinpaths-src} JoinPaths.cmake
-    printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence
-  )'';
-
-  meta = with lib; {
-    description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
-    homepage = "https://github.com/RigsOfRods/socketw";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/development/libraries/mysocketw/gcc.patch
deleted file mode 100644
index 7779a18fa528..000000000000
--- a/pkgs/development/libraries/mysocketw/gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-I picked it up from:
-http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
-
---- a/src/sw_base.cxx.old	2009-12-19 21:19:31.057051328 -0800
-+++ b/src/sw_base.cxx	2009-12-19 21:19:44.939551918 -0800
-@@ -19,6 +19,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #ifndef __WIN32__
-   #include <netdb.h>
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
deleted file mode 100644
index 8209d32f759a..000000000000
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
-
-stdenv.mkDerivation rec {
-  pname = "ogre-paged";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "RigsOfRods";
-    repo = "ogre-pagedgeometry";
-    rev = "v${version}";
-    sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U=";
-  };
-
-  patches = [
-    # These patches come from https://github.com/RigsOfRods/ogre-pagedgeometry/pull/6
-    # and make ogre-paged build with ogre-1.10.
-    (fetchpatch {
-      url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/2d4df577decba37ec3cdafc965deae0f6d31fe45.patch";
-      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
-    })
-    (fetchpatch {
-      url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/4d81789ec6f55e294a5ad040ea7abe2b415cbc92.patch";
-      sha256 = "17q8djdz2y3g46azxc3idhyvi6vf0sqkxld4bbyp3l9zn7dq76rp";
-    })
-    (fetchpatch {
-      url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/10f7c5ce5b422e9cbac59d466f3567a24c8831a4.patch";
-      sha256 = "1kk0dbadzg73ai99l3w04q51sil36vzbkaqc79mdwy0vjrn4ardb";
-    })
-  ];
-
-  buildInputs = [ ois ogre libX11 boost ];
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ];
-
-  meta = {
-    description = "Paged Geometry for Ogre3D";
-    homepage = "https://github.com/RigsOfRods/ogre-paged";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
deleted file mode 100644
index 580f0ef2b1dd..000000000000
--- a/pkgs/games/rigsofrods/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost,
-  pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
-  angelscript, ogrepaged, mysocketw, libxcb
-  }:
-
-stdenv.mkDerivation rec {
-  version = "0.4.7.0";
-  pname = "rigsofrods";
-
-  src = fetchFromGitHub {
-    owner = "RigsOfRods";
-    repo = "rigs-of-rods";
-    rev = version;
-    sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4";
-  };
-
-  patches = [
-    ./gtk3.patch
-  ];
-
-  installPhase = ''
-    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
-    mkdir -p $out/share/rigsofrods
-    cp -r bin/* $out/share/rigsofrods
-    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
-    mkdir -p $out/bin
-    ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
-  '';
-
-  nativeBuildInputs = [ cmake pkg-config unzip ];
-  buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
-    libuuid openal ogre ois curl gtk3 mygui angelscript
-    ogrepaged mysocketw libxcb ];
-
-  meta = with lib; {
-    description = "3D simulator game where you can drive, fly and sail various vehicles";
-    homepage = "https://rigsofrods.sourceforge.net/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/games/rigsofrods/gtk3.patch b/pkgs/games/rigsofrods/gtk3.patch
deleted file mode 100644
index e873cfedbaed..000000000000
--- a/pkgs/games/rigsofrods/gtk3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake
-index 1bdf93c..4773fca 100644
---- a/cmake/DependenciesConfig.cmake
-+++ b/cmake/DependenciesConfig.cmake
-@@ -187,10 +187,8 @@ endmacro(importLib)
- 
- ELSEIF(UNIX)
-    find_package(PkgConfig)
--   PKG_CHECK_MODULES  (GTK gtk+-2.0 REQUIRED)
--   PKG_CHECK_MODULES  (GTK_PIXBUF gdk-pixbuf-2.0 REQUIRED)
-+   PKG_CHECK_MODULES  (GTK gtk+-3.0 REQUIRED)
-    include_directories(${GTK_INCLUDE_DIRS})
--   include_directories(${GTK_PIXBUF_INCLUDE_DIRS})
- 
-    # Ogre basics
-    PKG_CHECK_MODULES  (Ogre OGRE REQUIRED)
-diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
-index 51cc350..7f723b6 100644
---- a/source/configurator/CMakeLists.txt
-+++ b/source/configurator/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(WIN32)
-    endif(ROR_USE_OPENCL)
- ELSEIF(UNIX)
-    find_package(PkgConfig)
--   PKG_CHECK_MODULES  (GTK gtk+-2.0 REQUIRED)
-+   PKG_CHECK_MODULES  (GTK gtk+-3.0 REQUIRED)
-    INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
- 
-    PKG_CHECK_MODULES  (Ogre OGRE REQUIRED)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 64530695ba9b..59bdf8e70dd8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1373,6 +1373,7 @@ mapAliases ({
   rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23
   riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22
   riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14
+  rigsofrods = rigsofrods-bin; # Added 2023-03-22
   rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15
   ring-daemon = jami-daemon; # Added 2021-10-26
   rkt = throw "rkt was archived by upstream"; # Added 2020-05-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26badeb71b9f..ac6ce8336bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16429,8 +16429,6 @@ with pkgs;
 
   angelscript = callPackage ../development/interpreters/angelscript { };
 
-  angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix { };
-
   babashka = callPackage ../development/interpreters/clojure/babashka.nix { };
 
   # BQN interpreters and compilers
@@ -22616,8 +22614,6 @@ with pkgs;
     ogre = ogre1_9;
   };
 
-  mysocketw = callPackage ../development/libraries/mysocketw { };
-
   mythes = callPackage ../development/libraries/mythes { };
 
   nanodbc = callPackage ../development/libraries/nanodbc { };
@@ -22772,10 +22768,6 @@ with pkgs;
   ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix { };
   ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { };
 
-  ogrepaged = callPackage ../development/libraries/ogrepaged {
-    ogre = ogre1_9;
-  };
-
   olm = callPackage ../development/libraries/olm { };
 
   one_gadget = callPackage ../development/tools/misc/one_gadget { };
@@ -36056,17 +36048,6 @@ with pkgs;
 
   rftg = callPackage ../games/rftg { };
 
-  rigsofrods = callPackage ../games/rigsofrods {
-    angelscript = angelscript_2_22;
-    ogre = ogre1_9;
-    ogrepaged = ogrepaged.override {
-      ogre = ogre1_9;
-    };
-    mygui = mygui.override {
-      withOgre = true;
-    };
-  };
-
   rigsofrods-bin = callPackage ../games/rigsofrods-bin { };
 
   riko4 = callPackage ../games/riko4 { };

From 86a91b3bbbb735625753ede5b9218e5ff54020e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 06:27:59 +0000
Subject: [PATCH 53/62] syft: 0.74.0 -> 0.75.0

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

diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix
index c17eb73f960e..eb3d1029e02d 100644
--- a/pkgs/tools/admin/syft/default.nix
+++ b/pkgs/tools/admin/syft/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "0.74.0";
+  version = "0.75.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-AJAm+sgB3fyKYfyVTJsZVx5n7cnWVX5bFm27b1q+6sQ=";
+    hash = "sha256-/PQza+pSIww3CzYcqEB7Ep8yHns62xh52EoqZodBPPI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
   };
   # hash mismatch with darwin
   proxyVendor = true;
-  vendorHash = "sha256-iKcz+HFcek07GuK7xTeAKS/QRBt56oDMHy/mzlR8xDo=";
+  vendorHash = "sha256-le660nqfrqW1a79tlY4/UKqN06zHkUpAVPQhYPqNJLU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4f5d96b92b672caac4e979d63a94c5b8d1c5185e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 06:36:58 +0000
Subject: [PATCH 54/62] azure-static-sites-client: 1.0.022291 -> 1.0.022651

---
 .../azure-static-sites-client/versions.json   | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json
index 82df086db3bd..af7423939eb1 100644
--- a/pkgs/development/tools/azure-static-sites-client/versions.json
+++ b/pkgs/development/tools/azure-static-sites-client/versions.json
@@ -1,6 +1,44 @@
 [
   {
     "version": "latest",
+    "buildId": "1.0.022651",
+    "publishDate": "2023-03-15T19:45:57.9352112Z",
+    "files": {
+      "linux-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/linux/StaticSitesClient",
+        "sha": "89816326d56d4653cf8431b73d742d69222e87d2df9e7f87dca4c3819faed289"
+      },
+      "win-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/windows/StaticSitesClient.exe",
+        "sha": "d6f66a390e20634e320f7abfae5463705ba56d1f81e43015b78d6613a27881a3"
+      },
+      "osx-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/macOS/StaticSitesClient",
+        "sha": "2a8a9d9d47d9c4f1bc4d8a87508f9f2d95bfb4568803d8fe2ce1feb6a032ef1f"
+      }
+    }
+  },
+  {
+    "version": "stable",
+    "buildId": "1.0.022651",
+    "publishDate": "2023-03-15T19:45:57.9352112Z",
+    "files": {
+      "linux-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/linux/StaticSitesClient",
+        "sha": "89816326d56d4653cf8431b73d742d69222e87d2df9e7f87dca4c3819faed289"
+      },
+      "win-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/windows/StaticSitesClient.exe",
+        "sha": "d6f66a390e20634e320f7abfae5463705ba56d1f81e43015b78d6613a27881a3"
+      },
+      "osx-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/macOS/StaticSitesClient",
+        "sha": "2a8a9d9d47d9c4f1bc4d8a87508f9f2d95bfb4568803d8fe2ce1feb6a032ef1f"
+      }
+    }
+  },
+  {
+    "version": "backup",
     "buildId": "1.0.022431",
     "publishDate": "2023-02-21T18:46:09.9616432Z",
     "files": {
@@ -17,43 +55,5 @@
         "sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755"
       }
     }
-  },
-  {
-    "version": "stable",
-    "buildId": "1.0.022291",
-    "publishDate": "2023-02-07T21:07:28.1304112Z",
-    "files": {
-      "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/linux/StaticSitesClient",
-        "sha": "65ca5599a37cd41ab6d88557b0e33179ffc0f86cb81fe1c72db30b021d8e63c0"
-      },
-      "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/windows/StaticSitesClient.exe",
-        "sha": "b94f11e62441339882bfd9f0e8fc496d7c77f9b6d9c2fe305b64d53e87e9814c"
-      },
-      "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/macOS/StaticSitesClient",
-        "sha": "3f5808e91fe24a3afee25297fce42cff4b1ab4fbbfaaf0c510662b14277485c6"
-      }
-    }
-  },
-  {
-    "version": "backup",
-    "buildId": "1.0.022152",
-    "publishDate": "2023-01-24T18:38:40.5584174Z",
-    "files": {
-      "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/linux/StaticSitesClient",
-        "sha": "40e1639efc239151b3021a262ee85a747403fbf1c9ffce3de1aa0cbf273a3069"
-      },
-      "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/windows/StaticSitesClient.exe",
-        "sha": "e3287b8b63b00faa501573cd205ce8f7bb9743f7107f3e4f01639d0b297f21fc"
-      },
-      "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/macOS/StaticSitesClient",
-        "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a"
-      }
-    }
   }
 ]

From 3f80a80e4c5d06d157198619276ecabfb61904db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 06:59:06 +0000
Subject: [PATCH 55/62] idasen: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix
index 544ecba1c40d..56523d538d5d 100644
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "idasen";
-  version = "0.9.5";
+  version = "0.9.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "newAM";
     repo = "idasen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tjjoKUaX1v06I43TkkvKRHmd1rDuXqjEIHSTatbzyQk=";
+    hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk=";
   };
 
   nativeBuildInputs = [

From cb4b7e205f3ccef188006c40c0aa85a1230d9b9f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 22 Mar 2023 11:07:40 +1000
Subject: [PATCH 56/62] crun: 1.8.1 -> 1.8.2

Diff: https://github.com/containers/crun/compare/1.8.1...1.8.2

Changelog: https://github.com/containers/crun/releases/tag/1.8.2
---
 pkgs/applications/virtualization/crun/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 1c2dce886536..a335e058b9f1 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    hash = "sha256-Pm96fOfbBqf7mc9llv3sFi00Ioa3f9WNoDmLBPhB2eI=";
+    hash = "sha256-3L+rhDfvxu9MhU/VvyJTIkDV+1h4Y56PbZRLS2a5rjY=";
     fetchSubmodules = true;
   };
 
@@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
   passthru.tests = { inherit (nixosTests) podman; };
 
   meta = with lib; {
+    changelog = "https://github.com/containers/crun/releases/tag/${version}";
     description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
     homepage = "https://github.com/containers/crun";
     license = licenses.gpl2Plus;

From 585f616810304e4f402608d51c4ecef045d834d3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:21:50 +0200
Subject: [PATCH 57/62] openscenegraph: drop wxGTK30

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

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 3a6a7b57c40f..891c5121b0e7 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -23,7 +23,7 @@
   sdlSupport ? false, SDL2,
   restSupport ? false, asio,
   withApps ? false,
-  withExamples ? false, fltk, wxGTK30,
+  withExamples ? false, fltk,
 }:
 
 stdenv.mkDerivation rec {
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional luaSupport lua
     ++ lib.optional sdlSupport SDL2
     ++ lib.optional restSupport asio
-    ++ lib.optionals withExamples [ fltk wxGTK30 ]
+    ++ lib.optionals withExamples [ fltk ]
     ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
     ++ lib.optional (restSupport || colladaSupport) boost
   ;

From 4170777d706b0c6c5da8e4177fac8381e4928739 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 07:53:04 +0000
Subject: [PATCH 58/62] mold: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 3514e9c24d13..04ed7db71147 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mold";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "rui314";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5zE5a+BYzQjgVb0Ti7bSQrGzTyysOTTR0NMOO5IKG68=";
+    hash = "sha256-dfdrXp05eJALTQnx2F3GxRWKMA+Icj0mRPcb72z7qMw=";
   };
 
   nativeBuildInputs = [

From af287b1a592385d5035332ab8e2de852166d85d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 07:58:57 +0000
Subject: [PATCH 59/62] psi-plus: 1.5.1644 -> 1.5.1646

---
 .../networking/instant-messengers/psi-plus/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 22638a4c2083..6f3b7cfb022f 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
 
 mkDerivation rec {
   pname = "psi-plus";
-  version = "1.5.1644";
+  version = "1.5.1646";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = version;
-    sha256 = "sha256-wSfgV0moBar27xa91ywky7Apr5QHISZ27lQlp02J1Mg=";
+    sha256 = "sha256-FeZlJAJHmNGd7hbpjmthe2/yGxh0zIl3zXnA+vRjNCM=";
   };
 
   cmakeFlags = [

From 8f1c68db169b6754a70ba05e03bedb8ece2dd94a Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Wed, 15 Mar 2023 17:57:55 +0100
Subject: [PATCH 60/62] ucx: 1.13.1 -> 1.14.0 and optional ROCm support

---
 pkgs/development/libraries/ucx/default.nix | 35 +++++++++++-----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix
index b7c76434392f..aa3b59faef63 100644
--- a/pkgs/development/libraries/ucx/default.nix
+++ b/pkgs/development/libraries/ucx/default.nix
@@ -1,7 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, doxygen
-, numactl, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl
+, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config
 , enableCuda ? false
 , cudatoolkit
+, enableRocm ? false
+, rocm-core, rocm-runtime, rocm-device-libs, hip
 }:
 
 let
@@ -10,29 +12,24 @@ let
     inherit (cudatoolkit) name meta;
     paths = [ cudatoolkit cudatoolkit.lib ];
   };
+  rocm = symlinkJoin {
+    name = "rocm";
+    paths = [ rocm-core rocm-runtime rocm-device-libs hip ];
+  };
 
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "ucx";
-  version = "1.13.1";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "openucx";
     repo = "ucx";
     rev = "v${version}";
-    sha256 = "sha256-NhtN8xrHc6UnUrMbq9LHpb25JO+/LDGcLLGebCfGnv4=";
+    sha256 = "sha256-OSYeJfMi57KABt8l3Yj0glqx54C5cwM2FqlijszJIk4=";
   };
 
-  patches = [
-    # Pull upstream fix for binutils-2.39:
-    #   https://github.com/openucx/ucx/pull/8450
-    (fetchpatch {
-      name = "binutils-2.39.patch";
-      url = "https://github.com/openucx/ucx/commit/6b6128efd416831cec3a1820f7d1c8e648b79448.patch";
-      sha256 = "sha256-ci00nZG8iOUEFXbmgr/5XkIfiw4eAAdG1wcEYjQSiT8=";
-    })
-  ];
-
-  nativeBuildInputs = [ autoreconfHook doxygen ];
+  nativeBuildInputs = [ autoreconfHook doxygen pkg-config ];
 
   buildInputs = [
     libbfd
@@ -41,7 +38,8 @@ in stdenv.mkDerivation rec {
     perl
     rdma-core
     zlib
-  ] ++ lib.optional enableCuda cudatoolkit;
+  ] ++ lib.optional enableCuda cudatoolkit
+  ++ lib.optional enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];
 
   configureFlags = [
     "--with-rdmacm=${rdma-core}"
@@ -49,7 +47,8 @@ in stdenv.mkDerivation rec {
     "--with-rc"
     "--with-dm"
     "--with-verbs=${rdma-core}"
-  ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}";
+  ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"
+  ++ lib.optional enableRocm "--with-rocm=${rocm}";
 
   enableParallelBuilding = true;
 

From 6477d7f0eae45ca9dffb04127616ec26b9ebaeb2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 21 Mar 2023 23:16:39 -0300
Subject: [PATCH 61/62] elvish: rewrite

---
 pkgs/shells/elvish/default.nix | 48 ++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 38ab7cb8dcce..1bd0c138c9c0 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,30 +1,42 @@
-{ lib, buildGoModule, fetchFromGitHub, runCommand }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, runCommand
+}:
 
-buildGoModule rec {
+let
   pname = "elvish";
   version = "0.19.2";
-
-  subPackages = [ "cmd/elvish" ];
-
-  ldflags = [ "-s" "-w" "-X src.elv.sh/pkg/buildinfo.Version==${version}" ];
+  shellPath = "/bin/elvish";
+in
+buildGoModule {
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "elves";
-    repo = pname;
+    repo = "elvish";
     rev = "v${version}";
-    sha256 = "sha256-eCPJXCgmMvrJ2yVqYgXHXJWb6Ec0sutc91LNs4yRBYk=";
+    hash = "sha256-eCPJXCgmMvrJ2yVqYgXHXJWb6Ec0sutc91LNs4yRBYk=";
   };
 
-  vendorSha256 = "sha256-VMI20IP1jVkUK3rJm35szaFDfZGEEingUEL/xfVJ1cc=";
+  vendorHash = "sha256-VMI20IP1jVkUK3rJm35szaFDfZGEEingUEL/xfVJ1cc=";
+
+  subPackages = [ "cmd/elvish" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X src.elv.sh/pkg/buildinfo.Version==${version}"
+  ];
 
   strictDeps = true;
-  doCheck = false;
 
+  doCheck = false;
   doInstallCheck = true;
   installCheckPhase = ''
     runHook preInstallCheck
 
-    $out${passthru.shellPath} -c "
+    $out${shellPath} -c "
       fn expect {|key expected|
         var actual = \$buildinfo[\$key]
         if (not-eq \$actual \$expected) {
@@ -38,17 +50,19 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  passthru = {
+    inherit shellPath;
+  };
+
+  meta = {
+    homepage = "https://elv.sh/";
     description = "A friendly and expressive command shell";
     longDescription = ''
       Elvish is a friendly interactive shell and an expressive programming
       language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0
       status, it is already suitable for most daily interactive use.
     '';
-    homepage = "https://elv.sh/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ vrthra AndersonTorres ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
   };
-
-  passthru.shellPath = "/bin/elvish";
 }

From e4e91c61b21c3bc0d3dc83f9dec0cea8eef14ceb Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 21 Mar 2023 23:18:17 -0300
Subject: [PATCH 62/62] moe: 1.12 -> 1.13

---
 pkgs/applications/editors/moe/default.nix | 34 +++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 79595a00c262..197cccd43c3f 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
-, ncurses
 , lzip
+, ncurses
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
   pname = "moe";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchurl {
-    url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
-    sha256 = "sha256-iohfK+Qm+OBK05yWASvYYJVAhaI3RPJFFmMWiCbXoeg=";
+    url = "mirror://gnu/moe/moe-${self.version}.tar.lz";
+    hash = "sha256-Q6VXvFEvidbHGOX0ECnP46BVaCYg642+zmMC80omFGs=";
   };
 
   prePatch = ''
@@ -19,10 +20,16 @@ stdenv.mkDerivation rec {
       "insert( 0U, 1U,"
   '';
 
-  nativeBuildInputs = [ lzip ];
-  buildInputs = [ ncurses ];
+  nativeBuildInputs = [
+    lzip
+  ];
 
-  meta = with lib; {
+  buildInputs = [
+    ncurses
+  ];
+
+  meta = {
+    homepage = "https://www.gnu.org/software/moe/";
     description = "A small, 8-bit clean editor";
     longDescription = ''
       GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and
@@ -33,10 +40,9 @@ stdenv.mkDerivation rec {
       completion, directory browser, duplicate removal from prompt histories,
       delimiter matching, text conversion from/to UTF-8, romanization, etc.
     '';
-    homepage = "https://www.gnu.org/software/moe/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
   };
-}
+})
 # TODO: a configurable, global moerc file