From f8e08ed20e65e1a20032b937158d6022c0f35300 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Mar 2022 22:28:40 +0000
Subject: [PATCH 01/35] liquibase: 4.8.0 -> 4.9.0

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

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 06f4c947b20..87a66f9bdab 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "4.8.0";
+  version = "4.9.0";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM=";
+    sha256 = "sha256-1InRJzHqikm6Jd7z54TW6JFn3FO0LtStehWNaC+rdw8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d1009de69837eddf285f89c68c89a26375d0e76a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Mar 2022 22:38:23 +0000
Subject: [PATCH 02/35] mackerel-agent: 0.72.8 -> 0.72.9

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

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index d11add105f6..54307fb98b4 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.72.8";
+  version = "0.72.9";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-IejLCi1TJ2Q0lpA2ZK3hea18YX483FV4IisYRRVD1Vg=";
+    sha256 = "sha256-+3a0FyVf5AB85gGGBI8/ssLBqj9Kp3w9DUNbSaAtXvA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0c4017153957120c0953a355ee5eb39d5bf8acec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Apr 2022 15:54:26 +0200
Subject: [PATCH 03/35] python3Packages.rns: init at 0.3.4

---
 .../python-modules/rns/default.nix            | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/rns/default.nix

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
new file mode 100644
index 00000000000..39496de24c0
--- /dev/null
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, netifaces
+, pyserial
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "rns";
+  version = "0.3.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "markqvist";
+    repo = "Reticulum";
+    rev = version;
+    hash = "sha256-fpXbp0Tj22flco9Rg4JTWZes6oxY7FhvYD76jA3yVuE=";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    netifaces
+    pyserial
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "RNS"
+  ];
+
+  meta = with lib; {
+    description = "Cryptography-based networking stack for wide-area networks";
+    homepage = "https://github.com/markqvist/Reticulum";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad2f9173123..b4a718f5603 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8869,6 +8869,8 @@ in {
 
   rnginline = callPackage ../development/python-modules/rnginline { };
 
+  rns = callPackage ../development/python-modules/rns { };
+
   robomachine = callPackage ../development/python-modules/robomachine { };
 
   robot-detection = callPackage ../development/python-modules/robot-detection { };

From bed3a732cb086389793d959633b6df2dbd641abe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Apr 2022 15:56:24 +0200
Subject: [PATCH 04/35] python3Packages.lxmf: init at 0.1.4

---
 .../python-modules/lxmf/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/lxmf/default.nix

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
new file mode 100644
index 00000000000..9650c5d8957
--- /dev/null
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, rns
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "lxmf";
+  version = "0.1.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "markqvist";
+    repo = "lxmf";
+    rev = version;
+    hash = "sha256-kWawKlEAnn/uNjM2TT2aVW2V4M0+S/1Ysrw/muJhC0s=";
+  };
+
+  propagatedBuildInputs = [
+    rns
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "LXMF"
+  ];
+
+  meta = with lib; {
+    description = "Lightweight Extensible Message Format for Reticulum";
+    homepage = "https://github.com/markqvist/lxmf";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4a718f5603..712a85b2f7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4894,6 +4894,8 @@ in {
 
   lupupy = callPackage ../development/python-modules/lupupy { };
 
+  lxmf= callPackage ../development/python-modules/lxmf { };
+
   lxml = callPackage ../development/python-modules/lxml {
     inherit (pkgs) libxml2 libxslt zlib;
   };

From 5d89f265661a113235d30bd16bb8e87e0126d108 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Apr 2022 16:03:34 +0200
Subject: [PATCH 05/35] python3Packages.nomadnet: init at 0.1.7

---
 .../python-modules/nomadnet/default.nix       | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/nomadnet/default.nix

diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
new file mode 100644
index 00000000000..4505c33a696
--- /dev/null
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, rns
+, fetchFromGitHub
+, lxmf
+, urwid
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "nomadnet";
+  version = "0.1.7";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "markqvist";
+    repo = "NomadNet";
+    rev = version;
+    hash = "sha256-WJpcV6+cnK1525lbYvkWqrGasioph72nuoNV4oWxVK0=";
+  };
+
+  propagatedBuildInputs = [
+    rns
+    lxmf
+    urwid
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "nomadnet"
+  ];
+
+  meta = with lib; {
+    description = "Off-grid, resilient mesh communication";
+    homepage = "https://github.com/markqvist/NomadNet";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 712a85b2f7d..95448b8a2a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5413,6 +5413,8 @@ in {
 
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };
 
+  nomadnet = callPackage ../development/python-modules/nomadnet { };
+
   nanomsg-python = callPackage ../development/python-modules/nanomsg-python {
     inherit (pkgs) nanomsg;
   };

From a0257674da77e84bb33d655e3be0f92cbd4fe217 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Apr 2022 21:33:06 +0000
Subject: [PATCH 06/35] python310Packages.vertica-python: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
index cd6186e574f..0fdd4ed6d96 100644
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "vertica-python";
-  version = "1.0.4";
+  version = "1.0.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA=";
+    hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo=";
   };
 
   propagatedBuildInputs = [

From fc88850f1077142a7abe70b5ffd390e453ea4095 Mon Sep 17 00:00:00 2001
From: papojari <papojari-git.ovoid@aleeas.com>
Date: Wed, 13 Apr 2022 21:34:06 +0200
Subject: [PATCH 07/35] dabet: init at 3.0.0

---
 pkgs/tools/misc/dabet/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/dabet/default.nix

diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/tools/misc/dabet/default.nix
new file mode 100644
index 00000000000..13a63b392c1
--- /dev/null
+++ b/pkgs/tools/misc/dabet/default.nix
@@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchFromGitea }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "dabet";
+  version = "3.0.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "papojari";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-B5z2RUkvztnGCKeVsjp/yzrI8m/6mjBB0DS1yhFZhM4=";
+  };
+
+  cargoSha256 = "sha256-v1lc2quqxuNUbBQHaTtIDUPPTMyz8nj+TNCdSjrfrOA=";
+
+  meta = with lib; {
+    description = "Print the duration between two times";
+    homepage = "https://codeberg.org/papojari/dabet";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ papojari ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27e83d8d1e7..d4e7be0b6bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2854,6 +2854,8 @@ with pkgs;
 
   cucumber = callPackage ../development/tools/cucumber {};
 
+  dabet = callPackage ../tools/misc/dabet { };
+
   dabtools = callPackage ../applications/radio/dabtools { };
 
   daemontools = callPackage ../tools/admin/daemontools { };

From 942f536c766f883694eccb50a9f1660e90a0da62 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 17 Mar 2022 16:31:47 +0000
Subject: [PATCH 08/35] wasilibc: unstable-2021-09-23 -> unstable-2022-04-12

Done in response to a few PRs which I made to wasi-libc to make things
better for downstream packagers like us.
---
 .../libraries/wasilibc/default.nix            | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix
index e8436f9e956..9448041c5e7 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation {
   pname = "wasilibc";
-  version = "unstable-2021-09-23";
+  version = "unstable-2022-04-12";
 
   src = buildPackages.fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wasi-libc";
-    rev = "ad5133410f66b93a2381db5b542aad5e0964db96";
-    hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA=";
+    rev = "a279514a6ef30cd8ee1469345b33172fcbc8d52d";
+    sha256 = "0a9ldas8p7jg7jlkhb9wdiw141z7vfz6p18mnmxnnnna7bp1y3fz";
     fetchSubmodules = true;
   };
 
+  outputs = [ "out" "dev" "share" ];
+
   # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument]
   postPatch = ''
     substituteInPlace Makefile \
@@ -19,21 +21,24 @@ stdenv.mkDerivation {
   '';
 
   preBuild = ''
-    export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE"
+    export SYSROOT_LIB=${builtins.placeholder "out"}/lib
+    export SYSROOT_INC=${builtins.placeholder "dev"}/include
+    export SYSROOT_SHARE=${builtins.placeholder "share"}/share
+    mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE"
+    makeFlagsArray+=(
+      "SYSROOT_LIB:=$SYSROOT_LIB"
+      "SYSROOT_INC:=$SYSROOT_INC"
+      "SYSROOT_SHARE:=$SYSROOT_SHARE"
+    )
   '';
 
-  makeFlags = [
-    "WASM_CC=${stdenv.cc.targetPrefix}cc"
-    "WASM_NM=${stdenv.cc.targetPrefix}nm"
-    "WASM_AR=${stdenv.cc.targetPrefix}ar"
-    "INSTALL_DIR=${placeholder "out"}"
-  ];
-
   enableParallelBuilding = true;
 
-  postInstall = ''
-    mv $out/lib/*/* $out/lib
-    ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
+  # We just build right into the install paths, per the `preBuild`.
+  dontInstall = true;
+
+  preFixup = ''
+    ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports
   '';
 
   meta = with lib; {

From 539887622b9bc33186fc0aed6f1eaccdb9e19833 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 15 Apr 2022 04:20:00 +0000
Subject: [PATCH 09/35] starship: 2022-04-12 -> 1.6.2

https://github.com/starship/starship/releases/tag/v1.6.2
---
 pkgs/tools/misc/starship/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index bbb4efef940..f3277477481 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -14,15 +14,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  # unstable was used for a quick fix for darwin
-  # revert to stable for the release after 1.5.4
-  version = "unstable-2022-04-12";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
-    rev = "a02e87833d6a0e0da3c239d0bbbf3b485356a655";
-    sha256 = "sha256-oe/dKFgM8h+ur8E9/dw4byBl9vD6foUXyKX19HDozYU=";
+    rev = "v${version}";
+    sha256 = "sha256-Swxc2gl3YP+0Kf+trp37rGhr5G8NT4L3Bb3lHwLm50Q=";
   };
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
@@ -40,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  cargoSha256 = "sha256-lku+K1Y5HIt4gDHqudhDMVs7XGoKw8HcMjXMGDu1vkg=";
+  cargoSha256 = "sha256-UvIectx6qWkXg/yVQe11NXhh2UD0D/dMCtK1kj3ln6M=";
 
   preCheck = ''
     HOME=$TMPDIR

From b56bba188bb4a3deab64f00a89c646a748db4fdf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 15 Apr 2022 12:18:17 +0200
Subject: [PATCH 10/35] eva: 0.2.7 -> 0.3.0

Changes: https://github.com/nerdypepper/eva/compare/v0.2.7...v0.3.0

I ha to go back to using `fetchFromGitHub` because `0.3.0` is not
published on crates.io (cc @NerdyPepper).
---
 pkgs/tools/misc/eva/default.nix | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index f589d39f35e..038ecc7bf22 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -1,29 +1,17 @@
-{ lib, rustPlatform, fetchCrate, fetchpatch }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "eva";
-  version = "0.2.7";
+  version = "0.3.0";
 
-  src = fetchCrate {
-    inherit pname version;
-    sha256 = "sha256-4rmFvu6G4h8Pl592NlldSCkqZBbnTcXrs98ljIJmTXo=";
+  src = fetchFromGitHub {
+    owner = "nerdypepper";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-INXKjjHW9HZ1NWx1CQOerTBUy0rYFLNJMuRgKQfQwdc=";
   };
 
-  cargoSha256 = "sha256-BG/W8lG/47kyA7assS6efEO+DRkpSFcZQhlSIozlonA=";
-
-  patches = [
-    # to fix the test suite (can be removed as soon as #33 is merged).
-    (fetchpatch {
-      url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch";
-      sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv";
-    })
-
-    # to fix `cargo test -- --test-threads $NIX_BUILD_CORES`
-    (fetchpatch {
-      url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch";
-      sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj";
-    })
-  ];
+  cargoSha256 = "sha256-4l9y2qmS7G1PvxF8/51F7fx/sDuYHWDkcyOin2sYHdk=";
 
   meta = with lib; {
     description = "A calculator REPL, similar to bc";

From 782d03bca71ecfe225a6d71a9ca2d5055d8af327 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 15 Apr 2022 19:33:52 +0100
Subject: [PATCH 11/35] graalvmXX-ee: remove

This package was last updated in 2020. It is out-of-date compared to
upstream and we have the graalvmXX-ce already, that is much better
maintained nowadays.
---
 .../compilers/graalvm/enterprise-edition.nix  | 183 ------------------
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   4 -
 3 files changed, 2 insertions(+), 187 deletions(-)
 delete mode 100644 pkgs/development/compilers/graalvm/enterprise-edition.nix

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
deleted file mode 100644
index f3ca8a4f5bb..00000000000
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsa-lib, setJavaClassPath }:
-
-let
-  common = javaVersion:
-    let
-      graalvmXXX-ee = stdenv.mkDerivation rec {
-        pname = "graalvm${javaVersion}-ee";
-        version = "20.2.1";
-        srcs = [
-          (requireFile {
-             name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
-             sha256 = {  "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002";
-                        "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d";
-                        "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a";
-                        "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf";
-                        "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09";
-                        "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067";
-                        "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-        ];
-        nativeBuildInputs = [ unzip perl ];
-        unpackPhase = ''
-          unpack_jar() {
-            jar=$1
-            unzip -o $jar -d $out
-            perl -ne 'use File::Path qw(make_path);
-                      use File::Basename qw(dirname);
-                      if (/^(.+) = (.+)$/) {
-                        make_path dirname("$ENV{out}/$1");
-                        system "ln -s $2 $ENV{out}/$1";
-                      }' $out/META-INF/symlinks
-            perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) {
-                        my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4  eq 'x' ? 0100 : 0) +
-                                   ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7  eq 'x' ? 0010 : 0) +
-                                   ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0);
-                        chmod $mode, "$ENV{out}/$1";
-                      }' $out/META-INF/permissions
-            rm -rf $out/META-INF
-          }
-
-          mkdir -p $out
-          arr=($srcs)
-          tar xf ''${arr[0]} -C $out --strip-components=1
-          unpack_jar ''${arr[1]}
-          unpack_jar ''${arr[2]}
-          unpack_jar ''${arr[3]}
-          unpack_jar ''${arr[4]}
-          unpack_jar ''${arr[5]}
-        '';
-
-        installPhase = {
-          "8" = ''
-            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
-            substituteInPlace $out/jre/lib/security/java.security \
-              --replace file:/dev/random    file:/dev/./urandom \
-              --replace NativePRNGBlocking  SHA1PRNG
-
-            # provide libraries needed for static compilation
-            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
-              ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f)
-            done
-
-            # allow using external truffle-api.jar and languages not included in the distrubution
-            rm $out/jre/lib/jvmci/parentClassLoader.classpath
-          '';
-          "11" = ''
-            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
-            substituteInPlace $out/conf/security/java.security \
-              --replace file:/dev/random    file:/dev/./urandom \
-              --replace NativePRNGBlocking  SHA1PRNG
-
-            # provide libraries needed for static compilation
-            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
-              ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f)
-            done
-           '';
-        }.${javaVersion};
-
-        dontStrip = true;
-
-        # copy-paste openjdk's preFixup
-        preFixup = ''
-          # Set JAVA_HOME automatically.
-          mkdir -p $out/nix-support
-          cat <<EOF > $out/nix-support/setup-hook
-            if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-          EOF
-        '';
-
-        postFixup = ''
-          rpath="${ {  "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64";
-                      "11" = "$out/lib/jli:$out/lib/server:$out/lib";
-                    }.${javaVersion}
-                 }:${
-            lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
-                                                 glib zlib bzip2 alsa-lib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
-
-          for f in $(find $out -type f -perm -0100); do
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
-            patchelf --set-rpath   "$rpath"                                    "$f" || true
-          done
-
-          for f in $(find $out -type f -perm -0100); do
-            if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
-          done
-        '';
-
-        propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables
-
-        doInstallCheck = true;
-        installCheckPhase = ''
-          echo ${lib.escapeShellArg ''
-                   public class HelloWorld {
-                     public static void main(String[] args) {
-                       System.out.println("Hello World");
-                     }
-                   }
-                 ''} > HelloWorld.java
-          $out/bin/javac HelloWorld.java
-
-          # run on JVM with Graal Compiler
-          $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
-          $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
-
-          # Ahead-Of-Time compilation
-          $out/bin/native-image --no-server HelloWorld
-          ./helloworld
-          ./helloworld | fgrep 'Hello World'
-
-          # Ahead-Of-Time compilation with --static
-          $out/bin/native-image --no-server --static HelloWorld
-          ./helloworld
-          ./helloworld | fgrep 'Hello World'
-        '';
-
-        passthru.home = graalvmXXX-ee;
-
-        meta = with lib; {
-          homepage = "https://www.graalvm.org/";
-          description = "High-Performance Polyglot VM";
-          license = licenses.unfree;
-          maintainers = with maintainers; [ volth hlolli ];
-          platforms = [ "x86_64-linux" ];
-        };
-      };
-    in
-      graalvmXXX-ee;
-in {
-  graalvm8-ee  = common  "8";
-  graalvm11-ee = common "11";
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dde08c9d5e9..2e2c4e1fce1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -492,6 +492,8 @@ mapAliases ({
   graalvm11 = graalvm11-ce;
   graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19
   graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19
+  graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
+  graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
   gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
   grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
   gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0f80b57c95..208c5e5c0d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12788,10 +12788,6 @@ with pkgs;
     graalvm = graalvm11-ce;
   };
 
-  inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { })
-    graalvm8-ee
-    graalvm11-ee;
-
   openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
 
   lingua-franca = callPackage ../development/compilers/lingua-franca { };

From 399ed1f1bda0546f4fbd73cd5c4d1dc0acc51fb1 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 15 Apr 2022 20:08:43 +0100
Subject: [PATCH 12/35] graalvmXX-ce: remove Ruby/Python/WASM support

Those additional languages does not seem to really have much usage
(e.g.: none in nixpkgs). For example, Ruby is pretty much broken for all
environments for quite sometime already, however nobody seemed to border
enough to fix it. They also add a good amount of size to the derivation.

So let's remove them. It should be really easy if someone still cares
for them and want to add them back on their own system: just use the
`mkGraal` function (that we export) to generate their own version of
GraalVM with all extra features they want.
---
 .../graalvm/community-edition/default.nix     | 24 +++-----
 .../graalvm11-ce-sources.json                 | 44 ++-----------
 .../graalvm17-ce-sources.json                 | 36 ++---------
 .../graalvm/community-edition/mkGraal.nix     | 61 +++++++++----------
 .../graalvm/community-edition/update.nix      |  3 +-
 5 files changed, 52 insertions(+), 116 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index 6f42bfcc453..b4448cda9c3 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -18,11 +18,9 @@ let
   graalvm11-ce-dev-version = "22.2.0-dev-20220401_1942";
   graalvm17-ce-dev-version = "22.2.0-dev-20220401_1942";
 
-  commonProducts = [
+  products = [
     "graalvm-ce"
     "native-image-installable-svm"
-    "ruby-installable-svm"
-    "wasm-installable-svm"
   ];
 
 in
@@ -32,24 +30,21 @@ in
   graalvm11-ce = mkGraal rec {
     config = {
       x86_64-darwin = {
+        inherit products;
         arch = "darwin-amd64";
-        products = commonProducts ++ [ "python-installable-svm" ];
       };
       x86_64-linux = {
+        inherit products;
         arch = "linux-amd64";
-        products = commonProducts ++ [ "python-installable-svm" ];
       };
       aarch64-darwin = {
+        inherit products;
         arch = "darwin-aarch64";
-        products = [
-          "graalvm-ce"
-          "native-image-installable-svm"
-        ];
         version = graalvm11-ce-dev-version;
       };
       aarch64-linux = {
+        inherit products;
         arch = "linux-aarch64";
-        products = commonProducts;
       };
     };
     defaultVersion = graalvm11-ce-release-version;
@@ -65,19 +60,16 @@ in
   graalvm17-ce = mkGraal rec {
     config = {
       x86_64-darwin = {
+        inherit products;
         arch = "darwin-amd64";
-        products = commonProducts ++ [ "python-installable-svm" ];
       };
       x86_64-linux = {
+        inherit products;
         arch = "linux-amd64";
-        products = commonProducts ++ [ "python-installable-svm" ];
       };
       aarch64-darwin = {
+        inherit products;
         arch = "darwin-aarch64";
-        products = [
-          "graalvm-ce"
-          "native-image-installable-svm"
-        ];
         version = graalvm17-ce-dev-version;
       };
     };
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
index 070c783d033..e3d514d58b9 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
@@ -1,12 +1,12 @@
 {
   "darwin-aarch64": {
-    "graalvm-ce|java11|22.2.0-dev-20220401_1942": {
-      "sha256": "c83dee740ae148486598759e44a717b09d8124e4ea50f9da1e7d49d016572b89",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java11-darwin-aarch64-dev.tar.gz"
+    "graalvm-ce|java11|22.2.0-dev-20220414_2112": {
+      "sha256": "7d1d39a7cc2579112e745943fa5b557405b501f5c3c3fde441f9a31c7627d18d",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java11-darwin-aarch64-dev.tar.gz"
     },
-    "native-image-installable-svm|java11|22.2.0-dev-20220401_1942": {
-      "sha256": "661311ae26bfd6c46360b9e65aabe9361dc5cd05878a404343adf16925ae78fa",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java11-darwin-aarch64-dev.jar"
+    "native-image-installable-svm|java11|22.2.0-dev-20220414_2112": {
+      "sha256": "5ec82588bf493c38656ca7c31fff276342ce1cbadee41309ae7a3486f56f7ba7",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java11-darwin-aarch64-dev.jar"
     }
   },
   "darwin-amd64": {
@@ -17,18 +17,6 @@
     "native-image-installable-svm|java11|22.0.0.2": {
       "sha256": "03c27de6cce61ee8073e89252212457f3fbac2c0bc9bfa4acbff12176476c176",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-darwin-amd64-22.0.0.2.jar"
-    },
-    "python-installable-svm|java11|22.0.0.2": {
-      "sha256": "67ee2f1cc10b0189e359344c31b22f423e636ff4ec2dd7d9437c3eb0ef54e601",
-      "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java11-darwin-amd64-22.0.0.2.jar"
-    },
-    "ruby-installable-svm|java11|22.0.0.2": {
-      "sha256": "a25c0099a21ca1ca9904dd3acdeef509f67a13b96c6135b6de199e9805330df9",
-      "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-darwin-amd64-22.0.0.2.jar"
-    },
-    "wasm-installable-svm|java11|22.0.0.2": {
-      "sha256": "d74c210a8a87b8eb0c4d18a65fde6f2c03ebc94d9bf7ed87bbb9cacc460006d7",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-darwin-amd64-22.0.0.2.jar"
     }
   },
   "linux-aarch64": {
@@ -39,14 +27,6 @@
     "native-image-installable-svm|java11|22.0.0.2": {
       "sha256": "51d41e890a5aabf8e7b9d4f4e0f88206ee70a261f7dbb0315d51770ab8f3009e",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-aarch64-22.0.0.2.jar"
-    },
-    "ruby-installable-svm|java11|22.0.0.2": {
-      "sha256": "e0fb582a9c6b4167e7dc267c58ca1968bd1c471b3bc5c56061b436f175486d80",
-      "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-linux-aarch64-22.0.0.2.jar"
-    },
-    "wasm-installable-svm|java11|22.0.0.2": {
-      "sha256": "a48470ae391c75cb2805b7fe27cde2c925c0466fdbc0623dfbb67c54f19dbf8c",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-linux-aarch64-22.0.0.2.jar"
     }
   },
   "linux-amd64": {
@@ -57,18 +37,6 @@
     "native-image-installable-svm|java11|22.0.0.2": {
       "sha256": "8504a3441f5b28b8fd625f676674a9216f082ae63a4e30d43930c80f9672e71d",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-amd64-22.0.0.2.jar"
-    },
-    "python-installable-svm|java11|22.0.0.2": {
-      "sha256": "2f01d1bbc2ed2c507952d8ceaab1cb2176fc67e2d8c4b3bf5864e8d930c60c55",
-      "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java11-linux-amd64-22.0.0.2.jar"
-    },
-    "ruby-installable-svm|java11|22.0.0.2": {
-      "sha256": "e90f7ebc13b6c1f8e3f98881bb4fe2336870744174b2b6d41dc672d15f0b9a40",
-      "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-linux-amd64-22.0.0.2.jar"
-    },
-    "wasm-installable-svm|java11|22.0.0.2": {
-      "sha256": "c0fdfc40374b70f6f1597dd21660535c813dc5c3948c8a6ea9559a20f4d3fb5e",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-linux-amd64-22.0.0.2.jar"
     }
   }
 }
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
index 65e28b8b11c..861f5e454e2 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
@@ -1,12 +1,12 @@
 {
   "darwin-aarch64": {
-    "graalvm-ce|java17|22.2.0-dev-20220401_1942": {
-      "sha256": "f0409c59adbce62da7be46ab7d0e01abe5c080ef97d0b555e6c773f94dbfdecf",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
+    "graalvm-ce|java17|22.2.0-dev-20220414_2112": {
+      "sha256": "1ae8991d95814945d33cf8758a1e7072c48660680d1d90ec5629671e25f99344",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
     },
-    "native-image-installable-svm|java17|22.2.0-dev-20220401_1942": {
-      "sha256": "3770dc4810d7ebae8f9ca2212e91112629096a964d3caea1667b0aaf5f70c1e0",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
+    "native-image-installable-svm|java17|22.2.0-dev-20220414_2112": {
+      "sha256": "8a35491ea5487e755c087072fc827d81ec37a23075dcb29850e6f6cd5ff9630f",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
     }
   },
   "darwin-amd64": {
@@ -17,18 +17,6 @@
     "native-image-installable-svm|java17|22.0.0.2": {
       "sha256": "007fa742cd139d447f83d776b6d78e717c9df11d56a61061a5937547c20028b7",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
-    },
-    "python-installable-svm|java17|22.0.0.2": {
-      "sha256": "af887b0304d5ec98fab1be2cd1fca2aa3b10e84e823142a7f274560b1e0ea7c1",
-      "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
-    },
-    "ruby-installable-svm|java17|22.0.0.2": {
-      "sha256": "fc5eb6f833136ae3fda61f46fe0af66a8454ca2f803ca35eaff7336521cb468d",
-      "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
-    },
-    "wasm-installable-svm|java17|22.0.0.2": {
-      "sha256": "b76e6d872ce07ca9facd5b997dbb6e557ba72aa369ddd5f1664431bd11b98796",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
     }
   },
   "linux-amd64": {
@@ -39,18 +27,6 @@
     "native-image-installable-svm|java17|22.0.0.2": {
       "sha256": "8c25f650d58c2649c97061cb806dfaec9e685d5d2b80afc7cf72fe61d6891831",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-amd64-22.0.0.2.jar"
-    },
-    "python-installable-svm|java17|22.0.0.2": {
-      "sha256": "b3b78a15bd29b4eaaf0f2607e21181ca2a5b41b38ba43a3ff2656c2f6effda8a",
-      "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java17-linux-amd64-22.0.0.2.jar"
-    },
-    "ruby-installable-svm|java17|22.0.0.2": {
-      "sha256": "d86c9ad50cbed980fa69d69b2eccd47d31880d8c55553483f59ce9eda15628bd",
-      "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java17-linux-amd64-22.0.0.2.jar"
-    },
-    "wasm-installable-svm|java17|22.0.0.2": {
-      "sha256": "7f7e51e4a24384b3dd960c12ab9b05b1fea58a0457d6b80e3797228fab93c0bd",
-      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java17-linux-amd64-22.0.0.2.jar"
     }
   }
 }
diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
index 5b20890ced1..9758ca02067 100644
--- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
@@ -59,6 +59,11 @@ let
     (writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'')
   ]);
 
+  withNativeImageSvm = builtins.any (p: p == "native-image-installable-svm") platform.products;
+  withRubySvm = builtins.any (p: p == "ruby-installable-svm") platform.products;
+  withPythonSvm = builtins.any (p: p == "python-installable-svm") platform.products;
+  withWasmSvm = builtins.any (p: p == "wasm-installable-svm") platform.products;
+
   graalvmXXX-ce = stdenv.mkDerivation rec {
     inherit version;
     pname = name;
@@ -69,7 +74,6 @@ let
       alsa-lib # libasound.so wanted by lib/libjsound.so
       fontconfig
       freetype
-      openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so
       stdenv.cc.cc.lib # libstdc++.so.6
       xorg.libX11
       xorg.libXext
@@ -77,6 +81,8 @@ let
       xorg.libXrender
       xorg.libXtst
       zlib
+    ] ++ lib.optionals withRubySvm [
+      openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so
     ];
 
     nativeBuildInputs = [ unzip perl makeWrapper ]
@@ -172,7 +178,7 @@ let
 
     # Workaround for libssl.so.10 wanted by TruffleRuby
     # Resulting TruffleRuby cannot use `openssl` library.
-    autoPatchelfIgnoreMissingDeps = stdenv.isDarwin;
+    autoPatchelfIgnoreMissingDeps = withRubySvm && stdenv.isDarwin;
 
     preFixup = lib.optionalString (stdenv.isLinux) ''
       # We cannot use -exec since wrapProgram is a function but not a
@@ -191,10 +197,14 @@ let
       find "$out" -name libfontmanager.so -exec \
         patchelf --add-needed libfontconfig.so {} \;
 
-      # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby
-      patchelf $out/languages/ruby/lib/mri/openssl.so \
-        --replace-needed libssl.so.10 libssl.so \
-        --replace-needed libcrypto.so.10 libcrypto.so
+      ${
+        lib.optionalString withRubySvm ''
+          # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby
+          patchelf $out/languages/ruby/lib/mri/openssl.so \
+            --replace-needed libssl.so.10 libssl.so \
+            --replace-needed libcrypto.so.10 libcrypto.so
+        ''
+      }
     '';
 
     # $out/bin/native-image needs zlib to build native executables.
@@ -222,7 +232,7 @@ let
       $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
 
       ${# --static flag doesn't work for darwin
-        lib.optionalString (stdenv.isLinux && !useMusl) ''
+        lib.optionalString (withNativeImageSvm && stdenv.isLinux && !useMusl) ''
           echo "Ahead-Of-Time compilation"
           $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld
           ./helloworld | fgrep 'Hello World'
@@ -234,49 +244,38 @@ let
       }
 
       ${# --static flag doesn't work for darwin
-        lib.optionalString (stdenv.isLinux && useMusl) ''
+        lib.optionalString (withNativeImageSvm && stdenv.isLinux && useMusl) ''
           echo "Ahead-Of-Time compilation with --static and --libc=musl"
           $out/bin/native-image --no-server --libc=musl --static HelloWorld
           ./helloworld | fgrep 'Hello World'
         ''
       }
 
-      ${# TODO: Doesn't work on MacOS, we have this error:
-        # "Launching JShell execution engine threw: Operation not permitted (Bind failed)"
-        lib.optionalString (stdenv.isLinux) ''
+      ${
+        lib.optionalString withWasmSvm ''
           echo "Testing Jshell"
           echo '1 + 1' | $out/bin/jshell
         ''
       }
 
       ${
-        lib.optionalString (builtins.any (a: a == "python-installable-svm") platform.products) ''
+        lib.optionalString withPythonSvm ''
           echo "Testing GraalPython"
           $out/bin/graalpython -c 'print(1 + 1)'
           echo '1 + 1' | $out/bin/graalpython
         ''
       }
 
-      echo "Testing TruffleRuby"
       ${
-        lib.optionalString (builtins.any (a: a == "ruby-installable-svm") platform.products) ''
-      # Hide warnings about wrong locale
-      export LANG=C
-      export LC_ALL=C
-      $out/bin/ruby -e 'puts(1 + 1)'
-      ''
-      }
-      ${# FIXME: irb is broken in all platforms
-        # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL
-        # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even
-        # though `openssl` is in `propagatedBuildInputs`. For more details see:
-        # https://github.com/NixOS/nixpkgs/pull/105815
-        # TODO: "truffleruby: an internal exception escaped out of the interpreter"
-        # error on linux-aarch64
-        # TODO: "core/kernel.rb:234:in `gem_original_require':
-        # /nix/store/wlc5xalzj2ip1l83siqw8ac5fjd52ngm-graalvm11-ce/languages/llvm/native/lib:
-        # cannot read file data: Is a directory (RuntimeError)" error on linux-amd64
-        lib.optionalString false ''
+        lib.optionalString withRubySvm ''
+          echo "Testing TruffleRuby"
+          # Hide warnings about wrong locale
+          export LANG=C
+          export LC_ALL=C
+          $out/bin/ruby -e 'puts(1 + 1)'
+        ''
+        # FIXME: irb is broken in all platforms
+        + lib.optionalString false ''
           echo '1 + 1' | $out/bin/irb
         ''
       }
diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix
index 191f3cb45a1..6201ab10017 100644
--- a/pkgs/development/compilers/graalvm/community-edition/update.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/update.nix
@@ -8,6 +8,7 @@
 , writeShellScript
 , jq
 , gnused
+, forceUpdate ? false
 }:
 
 /*
@@ -199,7 +200,7 @@ let
   */
   updateScriptText = newVersion: currentVersion:
 
-    if isNew newVersion currentVersion
+    if (forceUpdate || (isNew newVersion currentVersion))
     then
       let
         versionKey = versionKeyInDefaultNix currentVersion;

From 4f8562f6824e99973c67dd220617fb4517d41209 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 15 Apr 2022 20:34:09 +0100
Subject: [PATCH 13/35] nixos/doc: add note about the recent graalvmXX-ce
 changes

---
 .../manual/from_md/release-notes/rl-2205.section.xml  | 11 +++++++++++
 nixos/doc/manual/release-notes/rl-2205.section.md     |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 96dbfd59c83..1521efc72aa 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1393,6 +1393,17 @@
           <literal>pkgs.cosmoc</literal>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>pkgs.graalvmXX-ce</literal> packages no longer
+          provide support for Python/Ruby/WASM, instead focusing only in
+          Java and Native Image Support. If you need to add support
+          back, please see the
+          <literal>pkgs.graalvmCEPackages.mkGraal</literal> function to
+          create your own customized version of GraalVM with support for
+          what you need.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-22.05-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a1b0212fafc..ef683e519c8 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -479,6 +479,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`.
 
+- `pkgs.graalvmXX-ce` packages no longer provide support for Python/Ruby/WASM, instead focusing only in Java and Native Image Support. If you need to add support back, please see the `pkgs.graalvmCEPackages.mkGraal` function to create your own customized version of GraalVM with support for what you need.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-22.05-notable-changes}

From 158b0e037f175cd3a93ed5766be8cc4d10f4b3ef Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 15 Apr 2022 20:49:29 +0100
Subject: [PATCH 14/35] graalvm17-ce: re-enable it on aarch64-linux

However without support for Native Image, since it is failing to build.
---
 .../graalvm/community-edition/default.nix          | 14 +++++++++-----
 .../community-edition/graalvm17-ce-sources.json    |  6 ++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index b4448cda9c3..32b77d0f6e1 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -52,11 +52,6 @@ in
     platforms = builtins.attrNames config;
   };
 
-  # TODO: fix aarch64-linux, failing during Native Image compilation
-  # "Caused by: java.io.IOException: Cannot run program
-  # "/nix/store/1q1mif7h3lgxdaxg6j39hli5azikrfla-gcc-wrapper-9.3.0/bin/gcc" (in
-  # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn
-  # helper: pid: 19865, exit value: 1"
   graalvm17-ce = mkGraal rec {
     config = {
       x86_64-darwin = {
@@ -72,6 +67,15 @@ in
         arch = "darwin-aarch64";
         version = graalvm17-ce-dev-version;
       };
+      aarch64-linux = {
+        # TODO: error with native-image-installable-svm in aarch64-linux:
+        # "Caused by: java.io.IOException: Cannot run program
+        # "/nix/store/00000000000000000000000000000000-gcc-wrapper-9.3.0/bin/gcc" (in
+        # directory"/tmp/SVM-0000000000000000000"): error=0, Failed to exec spawn
+        # helper: pid: 19865, exit value: 1"
+        products = [ "graalvm-ce" ];
+        arch = "linux-aarch64";
+      };
     };
     defaultVersion = graalvm17-ce-release-version;
     javaVersion = "17";
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
index 861f5e454e2..475c0feb050 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
@@ -19,6 +19,12 @@
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar"
     }
   },
+  "linux-aarch64": {
+    "graalvm-ce|java17|22.0.0.2": {
+      "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz"
+    }
+  },
   "linux-amd64": {
     "graalvm-ce|java17|22.0.0.2": {
       "sha256": "4f743e0ed3d974b7d619ca2ed6014554e8c12e5ebbb38b9bc9e820b182169bd4",

From 44a44019456f9a0b9697dcae4664724ab340f700 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 15 Apr 2022 23:20:52 +0100
Subject: [PATCH 15/35] buildGraalvmNativeImage: mark as broken if Native Image
 is not available

---
 .../build-support/build-graalvm-native-image/default.nix | 2 ++
 .../compilers/graalvm/community-edition/mkGraal.nix      | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index d34f562bc53..760896706ac 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -55,5 +55,7 @@ stdenv.mkDerivation (args // {
     platforms = graalvmDrv.meta.platforms;
     # default to executable name
     mainProgram = executable;
+    # need to have native-image-installable-svm available
+    broken = !(builtins.elem "native-image-installable-svm" graalvmDrv.products);
   } // meta;
 })
diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
index 9758ca02067..8f4aaba44f0 100644
--- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
@@ -59,10 +59,10 @@ let
     (writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'')
   ]);
 
-  withNativeImageSvm = builtins.any (p: p == "native-image-installable-svm") platform.products;
-  withRubySvm = builtins.any (p: p == "ruby-installable-svm") platform.products;
-  withPythonSvm = builtins.any (p: p == "python-installable-svm") platform.products;
-  withWasmSvm = builtins.any (p: p == "wasm-installable-svm") platform.products;
+  withNativeImageSvm = builtins.elem "native-image-installable-svm" platform.products;
+  withRubySvm = builtins.elem "ruby-installable-svm" platform.products;
+  withPythonSvm = builtins.elem "python-installable-svm" platform.products;
+  withWasmSvm = builtins.elem "wasm-installable-svm" platform.products;
 
   graalvmXXX-ce = stdenv.mkDerivation rec {
     inherit version;
@@ -282,6 +282,7 @@ let
     '';
 
     passthru = {
+      inherit (platform) products;
       home = graalvmXXX-ce;
       updateScript = import ./update.nix {
         inherit lib writeShellScript jq sourcesFilename name config gnused defaultVersion;

From d48d193e6b2adf6edb9ff08d64ca487aad44049e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Apr 2022 01:13:25 +0000
Subject: [PATCH 16/35] babashka: 0.8.0 -> 0.8.1

---
 pkgs/development/interpreters/clojure/babashka.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index de46d33bdf6..1f663b5488d 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "babashka";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-xe+WL2V56ETnWv6ey+3xrvC21MfhT5AMtmOkVPbX5N0=";
+    sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM=";
   };
 
   executable = "bb";

From d78ebf03f16a444999adea68305664f53f026768 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Apr 2022 01:16:53 +0000
Subject: [PATCH 17/35] python310Packages.pyamg: 4.2.2 -> 4.2.3

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

diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix
index b2a230685cc..09a113a4218 100644
--- a/pkgs/development/python-modules/pyamg/default.nix
+++ b/pkgs/development/python-modules/pyamg/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pyamg";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mtrFqUwEustYlCcCiV1FQZm7dJKohu650xHdiNg6D6E=";
+    sha256 = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4=";
   };
 
   nativeBuildInputs = [

From aa3157a802a9c9e24d60a7b92d9f5516493b882e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 16 Apr 2022 01:33:37 +0000
Subject: [PATCH 18/35] sudolikeaboss: remove

---
 pkgs/tools/security/sudolikeaboss/default.nix | 31 ---------------
 pkgs/tools/security/sudolikeaboss/deps.nix    | 39 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 pkgs/tools/security/sudolikeaboss/default.nix
 delete mode 100644 pkgs/tools/security/sudolikeaboss/deps.nix

diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
deleted file mode 100644
index 242da1a67bb..00000000000
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was generated by go2nix, then modified by hand for Darwin support.
-{ lib, buildGoPackage, fetchFromGitHub, darwin }:
-
-buildGoPackage rec {
-  pname = "sudolikeaboss-unstable";
-  version = "20161127-${lib.strings.substring 0 7 rev}";
-  rev = "2d9afe19f872c9f433d476e57ee86169781b164c";
-
-  goPackagePath = "github.com/ravenac95/sudolikeaboss";
-
-  src = fetchFromGitHub {
-    owner = "ravenac95";
-    repo = "sudolikeaboss";
-    inherit rev;
-    sha256 = "0ni3v4kanxfzxzjd48f5dgv62jbfrw7kdmq0snj09hw7ciw55yg6";
-  };
-
-  goDeps = ./deps.nix;
-
-  buildInputs = with darwin.apple_sdk.frameworks; [
-    Cocoa
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Get 1password access from iterm2";
-    license = licenses.mit;
-    maintainers = [ maintainers.grahamc ];
-    platforms = platforms.darwin;
-  };
-}
diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/pkgs/tools/security/sudolikeaboss/deps.nix
deleted file mode 100644
index 350306a24f4..00000000000
--- a/pkgs/tools/security/sudolikeaboss/deps.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was generated by go2nix.
-[
-  {
-    goPackagePath = "github.com/Sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Sirupsen/logrus";
-      rev = "881bee4e20a5d11a6a88a5667c6f292072ac1963";
-      sha256 = "176a09lp20f0qfhwwlh2xg0vk7z1g7gq8k2wr3sg1fd8m86wrzzg";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a";
-      sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
-      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "0c96df335ed3f17f758cba1a2c71b7849dd828e3";
-      sha256 = "02zn1f539y5yc1sx82ym8c3pp3z371d1ldhl20skwjwbdw1ln8hm";
-    };
-  }
-]
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dde08c9d5e9..cf2c4481252 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1205,6 +1205,7 @@ mapAliases ({
   steam-run-native = steam-run; # added 2022-02-21
   stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09
   subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31
+  sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16
   sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
   surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22
   svgcleaner = throw "svgcleaner has been removed"; # Added 2021-11-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22d842be922..f190e0e16a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28048,8 +28048,6 @@ with pkgs;
 
   stride = callPackage ../applications/networking/instant-messengers/stride { };
 
-  sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
-
   speedread = callPackage ../applications/misc/speedread { };
 
   station = callPackage ../applications/networking/station { };

From 913242e45c185b008f6e3bec8c3812bcba8b5491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 16 Apr 2022 05:01:35 +0000
Subject: [PATCH 19/35] python3Packages.git-annex-adapter: fix build

---
 pkgs/development/python-modules/git-annex-adapter/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index d41874cff3b..bcc4148c195 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -22,6 +22,10 @@ buildPythonPackage rec {
       url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch";
       sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi";
     })
+    (fetchpatch {
+      url = "https://github.com/alpernebbi/git-annex-adapter/commit/b78a8f445f1fb5cf34b28512fc61898ef166b5a1.patch";
+      hash = "sha256-BSVoOPWsgY1btvn68bco4yb90FAC7ay2kYZ+q9qDHHw=";
+    })
     (substituteAll {
       src = ./git-annex-path.patch;
       gitAnnex = "${git-annex}/bin/git-annex";

From 5e6bd5771bdf0ac79b705e1444b194ecb70adc4b Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 16 Apr 2022 08:45:50 +0200
Subject: [PATCH 20/35] kde-frameworks: update homepage

---
 pkgs/development/libraries/kde-frameworks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 2f7d0943dd4..9732fcb663d 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -82,7 +82,7 @@ let
             meta =
               let meta = args.meta or {}; in
               meta // {
-                homepage = meta.homepage or "http://www.kde.org";
+                homepage = meta.homepage or "https://kde.org";
                 license = meta.license or license;
                 maintainers = (meta.maintainers or []) ++ maintainers;
                 platforms = meta.platforms or lib.platforms.linux;

From b558afaa5f27e13808dfe03722fbb657f5265edf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Apr 2022 09:44:33 +0200
Subject: [PATCH 21/35] python3Packages.flux-led: 0.28.27 -> 0.28.28

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

diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index f07efbee7f3..9e1c881805e 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "flux-led";
-  version = "0.28.27";
+  version = "0.28.28";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "flux_led";
     rev = version;
-    sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I=";
+    sha256 = "sha256-FtZHZ48XGo+0aP4ARSfzI9xzFVptYhG6CDVGTT4oDBQ=";
   };
 
   propagatedBuildInputs = [

From 8fe13bfac72307b2e5b06d103e8c81239c255261 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Apr 2022 07:52:39 +0000
Subject: [PATCH 22/35] python310Packages.syslog-rfc5424-formatter: 1.2.2 ->
 1.2.3

---
 .../python-modules/syslog-rfc5424-formatter/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 040db8d1e07..392c7806786 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "syslog-rfc5424-formatter";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "easypost";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "17ym5ls5r6dd9pg9frdz8myfq5fxyqlwdq1gygc9vnrxbgw2c9kb";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
   };
 
   # Tests are not picked up, review later again

From 389ea38a85daef56c4e0f4cd0eb5ab65b48a0057 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Apr 2022 10:09:33 +0200
Subject: [PATCH 23/35] python3Packages.syslog-rfc5424-formatter: disable on
 older Python releases

---
 .../syslog-rfc5424-formatter/default.nix               | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 392c7806786..50ebc91d9e8 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -1,23 +1,29 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "syslog-rfc5424-formatter";
   version = "1.2.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "easypost";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
+    hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
   };
 
   # Tests are not picked up, review later again
   doCheck = false;
 
-  pythonImportsCheck = [ "syslog_rfc5424_formatter" ];
+  pythonImportsCheck = [
+    "syslog_rfc5424_formatter"
+  ];
 
   meta = with lib; {
     description = "Python logging formatter for emitting RFC5424 Syslog messages";

From a86ec5d4d60b7aebd07e3d465423430e93d985dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Apr 2022 10:15:51 +0200
Subject: [PATCH 24/35] python3Packages.pymazda: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix
index fdc7e1f6787..5ee3234b70d 100644
--- a/pkgs/development/python-modules/pymazda/default.nix
+++ b/pkgs/development/python-modules/pymazda/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pymazda";
-  version = "0.3.2";
+  version = "0.3.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9";
+    sha256 = "sha256-jvDjitS8r0oyANxUGbYksX7O7dbEqZeWEpYc9gABb78=";
   };
 
   propagatedBuildInputs = [

From 70d0e2456857dc10dd7d2654277fc1dd8d8cc216 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 1 Apr 2022 19:50:06 +0800
Subject: [PATCH 25/35] nixos/logrotate: use packages from buildPackages in
 configuration checkPhase, fixing cross compilation

---
 nixos/modules/services/logging/logrotate.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index 332a2a597ed..e6eb0552c9e 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -162,8 +162,8 @@ let
       # file exist, but we only have sandboxed users here so brown these
       # out. according to man page that means su, create and createolddir.
       # files required to exist also won't be present, so missingok is forced.
-      user=$(${pkgs.coreutils}/bin/id -un)
-      group=$(${pkgs.coreutils}/bin/id -gn)
+      user=$(${pkgs.buildPackages.coreutils}/bin/id -un)
+      group=$(${pkgs.buildPackages.coreutils}/bin/id -gn)
       sed -e "s/\bsu\s.*/su $user $group/" \
           -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \
           -e "1imissingok" -e "s/\bnomissingok\b//" \
@@ -173,7 +173,7 @@ let
       # 'error:' at common log level, so we can use grep, taking care
       # to keep error codes
       set -o pipefail
-      if ! ${pkgs.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \
+      if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \
           | ( ! grep "error:" ) > /tmp/logrotate-error; then
               echo "Logrotate configuration check failed."
               echo "The failing configuration (after adjustments to pass tests in sandbox) was:"

From 3016d0aeb8458210e449bf2adeafef2ee539e89c Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Thu, 3 Mar 2022 08:35:07 +0800
Subject: [PATCH 26/35] polybar: 3.5.7 -> 3.6.2

Co-authored-by: Alexander Foremny <aforemny@posteo.de>
---
 .../from_md/release-notes/rl-2205.section.xml  | 18 ++++++++++++++++++
 .../manual/release-notes/rl-2205.section.md    |  3 +++
 pkgs/applications/misc/polybar/default.nix     | 14 ++++++++++++--
 .../misc/polybar/remove-hardcoded-etc.diff     | 13 +++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/polybar/remove-hardcoded-etc.diff

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 33b0b3faea6..4048b882f0d 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -2002,6 +2002,24 @@
           </listitem>
         </itemizedlist>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>polybar</literal> package has been updated from
+          3.5.7 to 3.6.2. See
+          <link xlink:href="https://github.com/polybar/polybar/releases/tag/3.6.0">the
+          changelog</link> for more details.
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              Breaking changes include changes to escaping rules in
+              configuration values, changes in behavior when
+              encountering invalid tag names, and changes to
+              inter-process-messaging (IPC).
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
       <listitem>
         <para>
           Renamed option
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a671f08acfd..dab71c900dc 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -709,6 +709,9 @@ In addition to numerous new and upgraded packages, this release has the followin
   - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume.
   - A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver.
 
+- The `polybar` package has been updated from 3.5.7 to 3.6.2. See [the changelog](https://github.com/polybar/polybar/releases/tag/3.6.0) for more details.
+  - Breaking changes include changes to escaping rules in configuration values, changes in behavior when encountering invalid tag names, and changes to inter-process-messaging (IPC).
+
 - Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`.
   Reason is that the old name has been deprecated upstream.
   Using the old option name will still work, but produce a warning.
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 3660b0d7e0b..f737f18d158 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -2,6 +2,7 @@
 , cairo
 , cmake
 , fetchFromGitHub
+, libuv
 , libXdmcp
 , libpthreadstubs
 , libxcb
@@ -43,13 +44,13 @@
 
 stdenv.mkDerivation rec {
   pname = "polybar";
-  version = "3.5.7";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-h12VW3IY4do4cKz2Fd/QgVTBk+zJO+qXuRUCQUyO/x0=";
+    hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU=";
     fetchSubmodules = true;
   };
 
@@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cairo
+    libuv
     libXdmcp
     libpthreadstubs
     libxcb
@@ -84,6 +86,14 @@ stdenv.mkDerivation rec {
   ++ lib.optional i3Support i3
   ++ lib.optional i3GapsSupport i3-gaps;
 
+  patches = [ ./remove-hardcoded-etc.diff ];
+
+  # Replace hardcoded /etc when copying and reading the default config.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace "/etc" $out
+    substituteAllInPlace src/utils/file.cpp
+  '';
+
   postInstall =
     if i3Support then ''
       wrapProgram $out/bin/polybar \
diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff
new file mode 100644
index 00000000000..d0c6db8b6b0
--- /dev/null
+++ b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff
@@ -0,0 +1,13 @@
+diff --git a/src/utils/file.cpp b/src/utils/file.cpp
+index 9511ad61..d3d82b99 100644
+--- a/src/utils/file.cpp
++++ b/src/utils/file.cpp
+@@ -322,7 +322,7 @@ namespace file_util {
+       possible_paths.push_back(xdg_config_dir + suffix + ".ini");
+     }
+ 
+-    possible_paths.push_back("/etc" + suffix + ".ini");
++    possible_paths.push_back("@out@" + suffix + ".ini");
+ 
+     for (const string& p : possible_paths) {
+       if (exists(p)) {

From 0e9bebed0c0ed6f15d7c6873df57d463297eb02f Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Fri, 15 Apr 2022 21:53:13 -0300
Subject: [PATCH 27/35] neovim: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index e06096933c9..b4858b21eee 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -25,13 +25,13 @@ let
 in
   stdenv.mkDerivation rec {
     pname = "neovim-unwrapped";
-    version = "0.6.1";
+    version = "0.7.0";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A=";
+      sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8=";
     };
 
     patches = [

From bc73bc21ce933a4a9b31ff2ee64deb655498fb2d Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 16 Apr 2022 11:05:22 +0100
Subject: [PATCH 28/35] graalvm17-ce: enable Native Image in aarch64-linux

Co-authored-by: tricktron <tgagnaux@gmail.com>
---
 .../graalvm/community-edition/default.nix        |  7 +------
 .../community-edition/graalvm17-ce-sources.json  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index 32b77d0f6e1..e45c89b3f1b 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -68,12 +68,7 @@ in
         version = graalvm17-ce-dev-version;
       };
       aarch64-linux = {
-        # TODO: error with native-image-installable-svm in aarch64-linux:
-        # "Caused by: java.io.IOException: Cannot run program
-        # "/nix/store/00000000000000000000000000000000-gcc-wrapper-9.3.0/bin/gcc" (in
-        # directory"/tmp/SVM-0000000000000000000"): error=0, Failed to exec spawn
-        # helper: pid: 19865, exit value: 1"
-        products = [ "graalvm-ce" ];
+        inherit products;
         arch = "linux-aarch64";
       };
     };
diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
index 475c0feb050..57fdd4c2884 100644
--- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
@@ -1,12 +1,12 @@
 {
   "darwin-aarch64": {
-    "graalvm-ce|java17|22.2.0-dev-20220414_2112": {
-      "sha256": "1ae8991d95814945d33cf8758a1e7072c48660680d1d90ec5629671e25f99344",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
+    "graalvm-ce|java17|22.2.0-dev-20220415_1945": {
+      "sha256": "1dbb0e0b9c85391ea6f1a0bd95ae252a396152d83e3a0e79cffd988144259e68",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
     },
-    "native-image-installable-svm|java17|22.2.0-dev-20220414_2112": {
-      "sha256": "8a35491ea5487e755c087072fc827d81ec37a23075dcb29850e6f6cd5ff9630f",
-      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
+    "native-image-installable-svm|java17|22.2.0-dev-20220415_1945": {
+      "sha256": "029499c011ceb1a4560957db651805325a201488b5f0b7467f007c7385d004e2",
+      "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
     }
   },
   "darwin-amd64": {
@@ -23,6 +23,10 @@
     "graalvm-ce|java17|22.0.0.2": {
       "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7",
       "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz"
+    },
+    "native-image-installable-svm|java17|22.0.0.2": {
+      "sha256": "798947d0a93988929d2b8e3555f7c65225e789124cd99fbc0c3aae5f350175db",
+      "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-aarch64-22.0.0.2.jar"
     }
   },
   "linux-amd64": {

From 4f1fd175d300020f5b318500a57f974df9b2e8fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Apr 2022 01:34:02 +0000
Subject: [PATCH 29/35] brave: 1.37.113 -> 1.37.116

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 74ffdf3ccd8..5d6df5dac0d 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -93,11 +93,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.37.113";
+  version = "1.37.116";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "YjLUDoVrZitJEQOfoM/YmD55OOL/K3KF9v76zjguQHM=";
+    sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw=";
   };
 
   dontConfigure = true;

From 4624d0a8d30b6f5c67347114b05bd95baed7e2dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Apr 2022 02:30:07 +0000
Subject: [PATCH 30/35] bacon: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix
index 093a37e2b96..76478114df4 100644
--- a/pkgs/development/tools/bacon/default.nix
+++ b/pkgs/development/tools/bacon/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bacon";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck=";
+    sha256 = "sha256-SlyJSBgFRLMQX68QGSTtffYL7mRROR+AF/Kix6f4miQ=";
   };
 
-  cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo=";
+  cargoSha256 = "sha256-TIENdbXpMWdsnyTIHCMpa0KJnzJPlrDZoKoAdjBw2uM=";
 
   buildInputs = lib.optional stdenv.isDarwin CoreServices;
 

From bc5e8ae506d1d25cd62560e6bc626cf334f7336f Mon Sep 17 00:00:00 2001
From: Faye Duxovni <duxovni@duxovni.org>
Date: Fri, 15 Apr 2022 20:13:47 -0400
Subject: [PATCH 31/35] buildRustCrate: don't try to set CARGO_FEATURE_
 variables for dep: features

These features are internal-only, have special characters that bash
doesn't support in variable names, and aren't normally given
environment variables by cargo as far as I can tell.
---
 pkgs/build-support/rust/build-rust-crate/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index afb938e5118..20b93b1921f 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -277,9 +277,14 @@ crate_: lib.makeOverridable
 
       # Create a list of features that are enabled by the crate itself and
       # through the features argument of buildRustCrate. Exclude features
-      # with a forward slash, since they are passed through to dependencies.
+      # with a forward slash, since they are passed through to dependencies,
+      # and dep: features, since they're internal-only and do nothing except
+      # enable optional dependencies.
       crateFeatures = lib.optionals (crate ? features)
-        (builtins.filter (f: !lib.hasInfix "/" f) (crate.features ++ features));
+        (builtins.filter
+          (f: !(lib.hasInfix "/" f || lib.hasPrefix "dep:" f))
+          (crate.features ++ features)
+        );
 
       libName = if crate ? libName then crate.libName else crate.crateName;
       libPath = if crate ? libPath then crate.libPath else "";

From 077d187a4b37ba81ebe9f6985c1dbd0b19f6d33d Mon Sep 17 00:00:00 2001
From: X9VoiD <oscar.silvestrexx@gmail.com>
Date: Tue, 29 Mar 2022 14:48:01 +0800
Subject: [PATCH 32/35] broadcom_sta: fix build on linux 5.17

Fix build issues when compiling against Linux 5.17
---
 .../linux/broadcom-sta/default.nix            |  2 +
 .../linux/broadcom-sta/linux-5.17.patch       | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 5d86c2311f1..b15c61488cb 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
     ./linux-5.6.patch
     # source: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
     ./linux-5.9.patch
+    # source: https://github.com/archlinux/svntogit-community/blob/5ec5b248976f84fcd7e3d7fae49ee91289912d12/trunk/012-linux517.patch
+    ./linux-5.17.patch
     ./null-pointer-fix.patch
     ./gcc.patch
   ];
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch
new file mode 100644
index 00000000000..74847cb6bb4
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch
@@ -0,0 +1,39 @@
+diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2022-03-23 00:35:42.930416350 +0000
++++ b/src/wl/sys/wl_linux.c	2022-03-23 00:40:12.903771013 +0000
+@@ -2980,7 +2980,11 @@
+ 	else
+ 		dev->type = ARPHRD_IEEE80211_RADIOTAP;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
++#else
++	eth_hw_addr_set(wl->dev, dev->dev_addr);
++#endif
+ 
+ #if defined(WL_USE_NETDEV_OPS)
+ 	dev->netdev_ops = &wl_netdev_monitor_ops;
+@@ -3261,7 +3265,11 @@
+ static ssize_t
+ wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#else
++	wl_info_t * wl = pde_data(file_inode(filp));
++#endif
+ #endif
+ 	int bcmerror, len;
+ 	int to_user = 0;
+@@ -3318,7 +3326,11 @@
+ static ssize_t
+ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#else
++	wl_info_t * wl = pde_data(file_inode(filp));
++#endif
+ #endif
+ 	int from_user = 0;
+ 	int bcmerror;

From 6b2eca8d5654837a2e7ac2caf2938e79d02778cb Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 15 Apr 2022 20:54:38 +0200
Subject: [PATCH 33/35] nixos/ipfs: remove unused code

This code became obsolete with 4044d81d5cea617e58ec9682f9cc447dde326850, just a couple days after it was introduced.
---
 nixos/modules/services/network-filesystems/ipfs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index a670551d9f3..fe375e6ad19 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -1,8 +1,7 @@
-{ config, lib, pkgs, options, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 with lib;
 let
   cfg = config.services.ipfs;
-  opt = options.services.ipfs;
 
   ipfsFlags = utils.escapeSystemdExecArgs (
     optional cfg.autoMount "--mount" ++

From 8a5e51525d44b1468018c0b0a4c0758bcb533657 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 15 Apr 2022 21:06:21 +0200
Subject: [PATCH 34/35] nixos/ipfs: add Luflosi as maintainer

---
 nixos/modules/services/network-filesystems/ipfs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index fe375e6ad19..45fb58e6336 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -315,6 +315,9 @@ in
         in
         [ "" "%t/ipfs.sock" ] ++ lib.optional (fromCfg != null) fromCfg;
     };
+  };
 
+  meta = {
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
 }

From faad370edcb37162401be50d45526f52bb16a713 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 15 Apr 2022 21:09:07 +0200
Subject: [PATCH 35/35] nixos/ipfs: fix the services.ipfs.autoMigrate option

Apparently this was never properly tested and never worked. When the IPFS repo needs upgrading, the first call to ipfs, which is run before running the migration, fails with the error message "Error: ipfs repo needs migration".
To fix this, simply run the migration before any `ipfs config` calls but don't run it when `dataDir` is empty and we need to call `ipfs init`.
Writing a NixOS test for this would require keeping at least two versions of IPFS in Nixpkgs, which we don't currently do.
---
 nixos/modules/services/network-filesystems/ipfs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 45fb58e6336..395b9788855 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -254,15 +254,15 @@ in
         else
           # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open.
           rm -vf "$IPFS_PATH/api"
-
+      '' + optionalString cfg.autoMigrate ''
+        ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y
+      '' + ''
           ipfs --offline config profile apply ${profile}
         fi
       '' + optionalString cfg.autoMount ''
         ipfs --offline config Mounts.FuseAllowOther --json true
         ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir}
         ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}
-      '' + optionalString cfg.autoMigrate ''
-        ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y
       '' + ''
         ipfs --offline config show \
           | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${