Merge master into staging-next

2022-07-14 18:01:27 +00:00 · 2022-07-14 18:01:27 +00:00 · 1a74c5d703
commit 1a74c5d703
parent 58eb752984 89b876316c
69 changed files with 1282 additions and 684 deletions
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@ -1,7 +1,7 @@
 {
-  x86_64-linux = "/nix/store/6g4fla3vkcxihph282a0v3cd10709y7c-nix-2.9.1";
-  i686-linux = "/nix/store/j143221z44469zx21f5m9a47x7y1jpr5-nix-2.9.1";
-  aarch64-linux = "/nix/store/c4z3vy1sgm49la8bvmdrrpssgk4iw2nk-nix-2.9.1";
-  x86_64-darwin = "/nix/store/cqdwb7khf6zg94bz7lnvfjqx6z775qaw-nix-2.9.1";
-  aarch64-darwin = "/nix/store/1brkxcs287n1px2i4fq39l7h51hjv0f8-nix-2.9.1";
+  x86_64-linux = "/nix/store/qx384jvdjk2vzd2wpr9pmkcimk12g3as-nix-2.10.2";
+  i686-linux = "/nix/store/8mhknp6flnlnbj11zmskb3972ia1mdl5-nix-2.10.2";
+  aarch64-linux = "/nix/store/digzqw2vgdsg0fdzf7qlwbl4xii9i458-nix-2.10.2";
+  x86_64-darwin = "/nix/store/w62jxmpvjykw707qr9s5nxi90r35xqmd-nix-2.10.2";
+  aarch64-darwin = "/nix/store/6pjrn22f57n854x88a9kkbqnxw1yai73-nix-2.10.2";
 }
--- a/nixos/modules/programs/dmrconfig.nix
+++ b/nixos/modules/programs/dmrconfig.nix
@ -6,7 +6,7 @@ let
  cfg = config.programs.dmrconfig;

 in {
-  meta.maintainers = [ maintainers.etu ];
+  meta.maintainers = with maintainers; [ ];

  ###### interface
  options = {
--- a/nixos/modules/services/system/cachix-agent/default.nix
+++ b/nixos/modules/services/system/cachix-agent/default.nix
@ -52,12 +52,15 @@ in {
      path = [ config.nix.package ];
      wantedBy = [ "multi-user.target" ];

-      # don't restart while changing
-      restartIfChanged = false;
+      # Cachix requires $USER to be set
+      environment.USER = "root";
+
+      # don't stop the service if the unit disappears
      unitConfig.X-StopOnRemoval = false;

-      environment.USER = "root";
      serviceConfig = {
+        # we don't want to kill children processes as those are deployments
+        KillMode = "process";
        Restart = "on-failure";
        EnvironmentFile = cfg.credentialsFile;
        ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
--- a/pkgs/applications/audio/redux/default.nix
+++ b/pkgs/applications/audio/redux/default.nix
@ -2,6 +2,7 @@
 , stdenv
 , fetchurl
 , libX11
+, libXext
 , alsa-lib
 , autoPatchelfHook
 , releasePath ? null
@ -15,19 +16,24 @@

 stdenv.mkDerivation rec {
  pname = "redux";
-  version = "1.2.2";
+  version = "1.3.2";

  src = if releasePath != null then releasePath
    else fetchurl {
-      url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux.tar.gz";
-      sha256 = "0zbwsg7nh9x3q29jv2kpqb3vwi0ksdwybhb4m2qr95rxrpx1kxhm";
+      url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz";
+      sha256 = "sha256-wafOeNvVIHc8pOHoNQcCwV8+OwnuevJo1EcRQKRX4YA=";
    };

  nativeBuildInputs = [
    autoPatchelfHook
  ];

-  buildInputs = [ libX11 alsa-lib stdenv.cc.cc.lib ];
+  buildInputs = [
+    libX11
+    libXext
+    alsa-lib
+    stdenv.cc.cc.lib
+  ];

  installPhase = ''
    runHook preInstall
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, python3
 , pkg-config
 , which
 , makeWrapper
@ -12,19 +13,21 @@
 , vorbis-tools
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "uade123";
-  version = "unstable-2021-05-21";
+  version = "3.01";

  src = fetchFromGitLab {
    owner = "uade-music-player";
    repo = "uade";
-    rev = "7169a46e777d19957cd7ff8ac31843203e725ddc";
-    sha256 = "1dm7c924fy79y3wkb0qi71m1k6yw1x6j3whw7d0w4ka9hv6za03b";
+    rev = "uade-${version}";
+    sha256 = "0fam3g8mlzrirrac3iwcwsz9jmsqwdy7lkwwdr2q4pkq9cpmh8m5";
  };

  postPatch = ''
-    patchShebangs .
+    patchShebangs configure
+    substituteInPlace configure \
+      --replace 'PYTHON_SETUP_ARGS=""' 'PYTHON_SETUP_ARGS="--prefix=$out"'
    substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \
      --replace '-e stat' '-n stat' \
      --replace '/usr/local' "$out"
@ -34,6 +37,7 @@ stdenv.mkDerivation {
    pkg-config
    which
    makeWrapper
+    python3
  ];

  buildInputs = [
@ -43,6 +47,10 @@ stdenv.mkDerivation {
    lame
    flac
    vorbis-tools
+    (python3.withPackages (p: with p; [
+      pillow
+      tqdm
+    ]))
  ];

  configureFlags = [
@ -58,6 +66,8 @@ stdenv.mkDerivation {
      --prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]}
    # This is an old script, don't break expectations by renaming it
    ln -s $out/bin/mod2ogg2{.sh,}
+    wrapProgram $out/bin/generate_amiga_oscilloscope_view \
+      --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
  '';

  meta = with lib; {
--- a/pkgs/applications/blockchains/besu/default.nix
+++ b/pkgs/applications/blockchains/besu/default.nix
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
    description = "An enterprise-grade Java-based, Apache 2.0 licensed Ethereum client";
    homepage = "https://www.hyperledger.org/projects/besu";
    license = licenses.asl20;
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
    platforms = platforms.all;
    maintainers = with maintainers; [ mmahut ];
  };
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
    '';
    homepage = "https://github.com/Alecaddd/sequeler";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ etu ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
    platforms = platforms.linux;
    mainProgram = "com.github.alecaddd.sequeler";
  };
--- a/pkgs/applications/misc/sunwait/default.nix
+++ b/pkgs/applications/misc/sunwait/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation {
    description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights";
    homepage = "https://github.com/risacher/sunwait";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@ -11,17 +11,17 @@

 buildGoModule rec {
  pname = "aerc";
-  version = "0.10.0";
+  version = "0.11.0";

  src = fetchFromSourcehut {
    owner = "~rjarry";
    repo = pname;
    rev = version;
-    sha256 = "sha256-v1+12UCgBbH/2PxZ9QdDN30LmyzVcfGlYiVNVPYO3zs=";
+    sha256 = "sha256-w0h6BNuGwXV1CzyvXvsRs2MXHKLbK3EUaK4mKiuNBxc=";
  };

  proxyVendor = true;
-  vendorSha256 = "sha256-fGQ15i3mWNmmfypRt5A7SAVYSEg9m4so4FYlUY+7mW8=";
+  vendorSha256 = "sha256-vw9lDIZMswh/vrF1g8FvZ/faN5jWWPwfgnm66EWaohw=";

  doCheck = false;

--- a/pkgs/applications/radio/aldo/default.nix
+++ b/pkgs/applications/radio/aldo/default.nix
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
    description = "Morse code training program";
    homepage = "http://aldo.nongnu.org/";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://github.com/sergev/dmrconfig";
    license = licenses.asl20;
-    maintainers = [ maintainers.etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/pkgs/applications/radio/tlf/default.nix
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://tlf.github.io/";
    license = licenses.gpl2;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/version-management/git-and-tools/conform/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/conform/default.nix
@ -2,21 +2,20 @@

 buildGoModule rec {
  pname = "conform";
-  version = "0.1.0-alpha.25";
+  version = "0.1.0-alpha.26";

  src = fetchFromGitHub {
    owner = "siderolabs";
    repo = "conform";
    rev = "v${version}";
-    sha256 = "sha256-WgWgigpqPoEBY4tLjbzK02WFwrCWPGQWJ5eakLv5IWw=";
+    sha256 = "sha256-+VOwQE2uhoQ4sSXa/SVbyjLn9An08D4GQHxxDRRuXks=";
  };
-
  vendorSha256 = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E=";

  ldflags = [
    "-s"
    "-w"
-    "-X github.com/talos-systems/conform/internal/version.Tag=v${version}"
+    "-X github.com/siderolabs/conform/internal/version.Tag=v${version}"
  ];

  checkInputs = [ git ];
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@ -21,11 +21,11 @@ let

  self = python3Packages.buildPythonApplication rec {
    pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.1.4";
+    version = "6.2";

    src = fetchurl {
      url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      sha256 = "sha256-82H5gCs241esAZzrcSyhHegzKwfere7Y36kE8Fv3yng=";
+      sha256 = "sha256-04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=";
    };

    format = "other";
@ -35,7 +35,7 @@ let
    cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
      inherit src;
      name = "mercurial-${version}";
-      sha256 = "sha256-GEsRA8od2S9v5xipCwsCmkdLvKKpbbKJGNqPFmrZASQ=";
+      sha256 = "sha256-L4BbU6GTq54DFucqvBZeWtA8zUPvPCwmtIxv/SxgAXk=";
      sourceRoot = "mercurial-${version}/rust";
    } else null;
    cargoRoot = if rustSupport then "rust" else null;
--- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix
@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, ghcWithPackages, ... }:
+
+let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]);
+in stdenv.mkDerivation rec {
+  pname = "xmonadctl";
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "xmonad";
+    repo = "xmonad-contrib";
+    rev = "v${version}";
+    sha256 = "142ycg7dammq98drimv6xbih8dla9qindxds9fgkspmrrils3sar";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    ${xmonadctlEnv}/bin/ghc -o $out/bin/xmonadctl \
+      --make scripts/xmonadctl.hs
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    platforms = platforms.unix;
+    description = "Send commands to a running instance of xmonad";
+    homepage = "https://github.com/xmonad/xmonad-contrib";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.ajgrf ];
+  };
+}
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c096b9d83b86ab92dffac5d97927e8458ebd4dfa.tar.gz",
-  "sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg",
-  "msg": "Update from Hackage at 2022-07-07T10:54:07Z"
+  "commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b418fc93e5dd9f19c4ca625c57e2cf984267e90.tar.gz",
+  "sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx",
+  "msg": "Update from Hackage at 2022-07-12T21:40:07Z"
 }
--- a/pkgs/desktops/surf-display/default.nix
+++ b/pkgs/desktops/surf-display/default.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Kiosk browser session manager based on the surf browser";
    homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/";
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    license = licenses.gpl2;
    platforms = platforms.linux;
  };
--- a/pkgs/development/compilers/gnatboot/default.nix
+++ b/pkgs/development/compilers/gnatboot/default.nix
@ -1,41 +1,37 @@
-{ lib, stdenv, fetchurl }:
+{ stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, readline, gmp, mpfr
+, expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc
+}:

-if stdenv.hostPlatform != stdenv.targetPlatform
-then builtins.throw "gnatboot can't cross-compile"
-else
+stdenv.mkDerivation rec {
+  pname = "gnatboot";
+  version = "11.2.0-4";

-stdenv.mkDerivation {
-  pname = "gentoo-gnatboot";
-  version = "4.1";
+  src = fetchzip {
+    url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-x86_64-linux-${version}.tar.gz";
+    hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ=";
+  };

-  src = if stdenv.hostPlatform.system == "i686-linux" then
-    fetchurl {
-      url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2";
-      sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr";
-    }
-  else if stdenv.hostPlatform.system == "x86_64-linux" then
-    fetchurl {
-      url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2";
-      sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4";
-    }
-  else
-    throw "Platform not supported";
-
-  dontStrip = 1;
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dejagnu
+    elfutils
+    expat
+    glibc
+    gmp
+    guile
+    libipt
+    mpfr
+    ncurses5
+    python3
+    readline
+    sourceHighlight
+    xz
+    zlib
+  ];

  installPhase = ''
    mkdir -p $out
-    cp -R * $out
-
-    set +e
-    for a in $out/bin/* ; do
-      patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a
-    done
-    set -e
-
-    mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc
-    ln -s $out/bin/gnatgcc $out/bin/gcc
+    cp -ar * $out/
  '';

  passthru = {
@ -46,10 +42,10 @@ stdenv.mkDerivation {
  };

  meta = with lib; {
-    homepage = "https://gentoo.org";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.lucus16 ];
-
-    platforms = platforms.linux;
+    description = "GNAT, the GNU Ada Translator";
+    homepage = "https://www.gnu.org/software/gnat";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ethindp ];
+    platforms = with platforms; [ "x86_64-linux" ];
  };
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -352,15 +352,22 @@ self: super: {
  lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
  matplotlib = dontCheck super.matplotlib;

-  brick_0_71_1 = super.brick_0_71_1.overrideScope (self: super: {
+  brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {
    vty = self.vty_5_36;
-  });
+    text-zipper = self.text-zipper_0_12;
+  }));

  # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
-  # Needs brick ^>= 0.70
-  matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
-    brick = self.brick_0_71_1;
-  }));
+  matterhorn = doJailbreak (appendPatches [
+    # Fix build with brick 0.73
+    (fetchpatch {
+      name = "matterhorn-brick-0.72.patch";
+      url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";
+      sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";
+    })
+  ] (super.matterhorn.overrideScope (self: super: {
+    brick = self.brick_0_73;
+  })));

  memcache = dontCheck super.memcache;
  metrics = dontCheck super.metrics;
@ -2139,14 +2146,22 @@ self: super: {

  # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
  stylish-haskell = (super.stylish-haskell.override {
-    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
+    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
  });

  ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {
-    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
+    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
  };

+  ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
+    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
+  };
+
+  hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {
+    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
+  });
+
  # To strict bound on hspec
  # https://github.com/dagit/zenc/issues/5
  zenc = doJailbreak super.zenc;
@ -2207,9 +2222,10 @@ self: super: {
  # file revision on hackage was gifted CRLF line endings
  gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core;

-  # Too strict bound on deepseq
-  # https://github.com/hadolint/hadolint/issues/800
-  hadolint = doJailbreak super.hadolint;
+  # Stackage LTS 19 still has 10.*
+  hadolint = super.hadolint.override {
+    language-docker = self.language-docker_11_0_0;
+  };

  nix-tree = super.nix-tree;

--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -51,11 +51,8 @@ self: super: {
  # Tests fail because of typechecking changes
  conduit = dontCheck super.conduit;

-  # 0.30 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed
-  cryptonite = assert super.cryptonite.version == "0.29"; appendPatch (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch";
-    sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";
-  }) super.cryptonite;
+  # 0.30 introduced support for GHC 9.2.
+  cryptonite = doDistribute self.cryptonite_0_30;

  # cabal-install needs more recent versions of Cabal
  cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
@ -82,7 +79,7 @@ self: super: {
  constraints = doJailbreak super.constraints;
  cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
  data-fix = doJailbreak super.data-fix;
-  dbus = super.dbus_1_2_24;
+  dbus = self.dbus_1_2_25;
  dec = doJailbreak super.dec;
  ed25519 = doJailbreak super.ed25519;
  ghc-byteorder = doJailbreak super.ghc-byteorder;
@ -100,8 +97,8 @@ self: super: {
      self.data-default
    ] ++ drv.libraryHaskellDepends or [];
  }) super.ghc-exactprint;
-  ghc-lib = self.ghc-lib_9_2_3_20220527;
-  ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527;
+  ghc-lib = self.ghc-lib_9_2_3_20220709;
+  ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220709;
  ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
  hackage-security = doJailbreak super.hackage-security;
  hashable = super.hashable_1_4_0_2;
@ -126,14 +123,6 @@ self: super: {
  singleton-bool = doJailbreak super.singleton-bool;
  servant = doJailbreak super.servant;
  servant-auth = doJailbreak super.servant-auth;
-  servant-server = appendPatches [
-    # awaiting release
-    (pkgs.fetchpatch {
-      url = "https://github.com/haskell-servant/servant/commit/61d0d14b5cb01db3d589101b3f17b0178f52e386.diff";
-      relative = "servant-server";
-      sha256 = "sha256-3lM8xLO8avVRo8oncJR8QLDSWEzOaoCmzgVtyaEBEw8=";
-    })
-  ] (doJailbreak super.servant-server);
  servant-swagger = doJailbreak super.servant-swagger;
  servant-auth-swagger = doJailbreak super.servant-auth-swagger;
  shelly = doJailbreak super.shelly;
@ -180,7 +169,7 @@ self: super: {
  } super.memory);

  # Use hlint from git for GHC 9.2.1 support
-  hlint = self.hlint_3_4;
+  hlint = self.hlint_3_4_1;

  # https://github.com/sjakobi/bsb-http-chunked/issues/38
  bsb-http-chunked = dontCheck super.bsb-http-chunked;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -421,6 +421,7 @@ broken-packages:
  - bizzlelude-js
  - bkr
  - blakesum
+  - Blammo
  - blas
  - blaze-html-contrib
  - blaze-html-hexpat
@ -1268,6 +1269,7 @@ broken-packages:
  - effin
  - egison-pattern-src
  - ehaskell
+  - ehlo
  - ehs
  - eibd-client-simple
  - eigen
@ -1380,6 +1382,7 @@ broken-packages:
  - exinst
  - exists
  - exitcode
+  - exon
  - exp-cache
  - explain
  - explicit-constraint-lens
@ -2150,6 +2153,7 @@ broken-packages:
  - heist-emanote
  - helic
  - helisp
+  - helix
  - hell
  - helm
  - help-esb
@ -2180,6 +2184,7 @@ broken-packages:
  - hext
  - hextra
  - heyefi
+  - heystone
  - hF2
  - hfann
  - HFitUI
@ -4146,6 +4151,7 @@ broken-packages:
  - pyfi
  - python-pickle
  - q4c12-twofinger
+  - qbe
  - qc-oi-testgenerator
  - qd
  - qed
@ -4323,6 +4329,7 @@ broken-packages:
  - relacion
  - relapse
  - relevant-time
+  - reload
  - remark
  - remarks
  - remote
@ -4655,6 +4662,7 @@ broken-packages:
  - simple-form
  - simple-genetic-algorithm
  - SimpleH
+  - SimpleServer
  - simple-index
  - simpleirc
  - simple-log
@ -4785,6 +4793,7 @@ broken-packages:
  - sodium
  - soegtk
  - softfloat-hs
+  - solga
  - sonic-visualiser
  - Sonnex
  - SoOSiM
@ -5059,6 +5068,7 @@ broken-packages:
  - tapioca
  - TaskMonad
  - tasty-auto
+  - tasty-autocollect
  - tasty-fail-fast
  - tasty-grading-system
  - tasty-hedgehog-coverage
@ -5573,6 +5583,7 @@ broken-packages:
  - wai-request-spec
  - wai-responsible
  - wai-router
+  - wai-routes
  - wai-secure-cookies
  - wai-session-alt
  - wai-session-mysql
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -123,6 +123,7 @@ extra-packages:
  - ghc-lib == 8.10.7.*                 # 2022-02-17: preserve for GHC 8.10.7
  - ghc-lib-parser == 8.10.7.*          # 2022-02-17: preserve for GHC 8.10.7
  - ghc-lib-parser-ex == 8.10.*         # 2022-02-17: preserve for GHC 8.10.7
+  - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
  - doctest == 0.18.*                   # 2021-11-19: closest to stackage version for GHC 9.*
  - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
  - ormolu == 0.2.*                     # 2022-02-21: For ghc 8.8 and 8.10
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 19.14
+# Stackage LTS 19.15
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -91,7 +91,7 @@ default-package-overrides:
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
-  - assert-failure ==0.1.2.5
+  - assert-failure ==0.1.2.6
  - assoc ==1.0.2
  - astro ==0.4.3.0
  - async ==2.2.4
@ -912,7 +912,7 @@ default-package-overrides:
  - gi-harfbuzz ==0.0.5
  - gi-javascriptcore ==4.0.24
  - ginger ==0.10.4.0
-  - gi-pango ==1.0.25
+  - gi-pango ==1.0.26
  - githash ==0.1.6.2
  - github ==0.27
  - github-release ==2.0.0.1
@ -1051,7 +1051,7 @@ default-package-overrides:
  - hi-file-parser ==0.1.2.0
  - higher-leveldb ==0.6.0.0
  - highlighting-kate ==0.6.4
-  - hindent ==5.3.2
+  - hindent ==5.3.4
  - hinfo ==0.0.3.0
  - hinotify ==0.4.1
  - hint ==0.9.0.6
@ -1481,7 +1481,7 @@ default-package-overrides:
  - markov-chain ==0.0.3.4
  - massiv ==1.0.1.1
  - massiv-io ==1.0.0.1
-  - massiv-persist ==1.0.0.2
+  - massiv-persist ==1.0.0.3
  - massiv-serialise ==1.0.0.2
  - massiv-test ==1.0.0.0
  - mathexpr ==0.3.0.0
@ -1532,9 +1532,9 @@ default-package-overrides:
  - mime-mail-ses ==0.4.3
  - mime-types ==0.1.0.9
  - minimal-configuration ==0.1.4
-  - minimorph ==0.3.0.0
+  - minimorph ==0.3.0.1
  - minio-hs ==1.6.0
-  - miniutter ==0.5.1.1
+  - miniutter ==0.5.1.2
  - min-max-pqueue ==0.1.0.2
  - mintty ==0.1.4
  - missing-foreign ==0.1.1
@ -1939,7 +1939,7 @@ default-package-overrides:
  - proto-lens ==0.7.1.1
  - proto-lens-arbitrary ==0.1.2.11
  - proto-lens-optparse ==0.1.1.9
-  - proto-lens-protobuf-types ==0.7.1.1
+  - proto-lens-protobuf-types ==0.7.1.2
  - proto-lens-protoc ==0.7.1.1
  - proto-lens-runtime ==0.7.0.2
  - proto-lens-setup ==0.4.0.6
@ -2016,7 +2016,7 @@ default-package-overrides:
  - read-env-var ==1.0.0.0
  - reanimate-svg ==0.13.0.1
  - rebase ==1.15.0.3
-  - record-dot-preprocessor ==0.2.14
+  - record-dot-preprocessor ==0.2.15
  - record-hasfield ==1.0
  - records-sop ==0.1.1.0
  - record-wrangler ==0.1.1.0
@ -2195,7 +2195,7 @@ default-package-overrides:
  - servant-swagger-ui-redoc ==0.3.4.1.22.3
  - servant-websockets ==2.0.0
  - servant-xml ==1.0.1.4
-  - serversession ==1.0.2
+  - serversession ==1.0.3
  - serversession-frontend-wai ==1.0
  - servius ==1.2.3.0
  - ses-html ==0.4.0.0
@ -2210,7 +2210,7 @@ default-package-overrides:
  - shake ==0.19.6
  - shake-language-c ==0.12.0
  - shake-plus ==0.3.4.0
-  - shakespeare ==2.0.29
+  - shakespeare ==2.0.30
  - shared-memory ==0.2.0.0
  - ShellCheck ==0.8.0
  - shell-conduit ==5.0.0
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -346,7 +346,6 @@ dont-distribute-packages:
 - Shpadoinkle-widgets
 - SimpleGL
 - SimpleLog
- - SimpleServer
 - Smooth
 - Snusmumrik
 - SoccerFun
@ -2077,7 +2076,6 @@ dont-distribute-packages:
 - helics
 - helics-wai
 - helium
- - helix
 - hellage
 - hellnet
 - hemokit
@ -3346,7 +3344,6 @@ dont-distribute-packages:
 - relational-record-examples
 - relational-schemas
 - relative-date
- - reload
 - remote-json
 - remote-json-client
 - remote-json-server
@ -3659,7 +3656,6 @@ dont-distribute-packages:
 - sock2stream
 - socket-io
 - sockets
- - solga
 - solga-swagger
 - solr
 - souffle-dsl
@ -4068,7 +4064,6 @@ dont-distribute-packages:
 - wai-middleware-rollbar
 - wai-middleware-route
 - wai-middleware-throttle
- - wai-routes
 - wai-routing
 - wai-session-tokyocabinet
 - wai-thrift
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/cjose/default.nix
+++ b/pkgs/development/libraries/cjose/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "cjose";
-  version = "0.6.1";
+  version = "0.6.2";

  src = fetchFromGitHub {
-    owner = "cisco";
+    owner = "zmartzone";
    repo = "cjose";
-    rev = version;
-    sha256 = "1msyjwmylb5c7jc16ryx3xb9cdwx682ihsm0ni766y6dfwx8bkhp";
+    rev = "v${version}";
+    sha256 = "sha256-FHKuaf4Gg3On7d3UBbGD8k1gA8kGsCOaWtLMohr5woA=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
  ];

  meta = with lib; {
-    homepage = "https://github.com/cisco/cjose";
-    changelog = "https://github.com/cisco/cjose/blob/${version}/CHANGELOG.md";
-    description = "C library for Javascript Object Signing and Encryption";
+    homepage = "https://github.com/zmartzone/cjose";
+    changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md";
+    description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project";
    license = licenses.mit;
    maintainers = with maintainers; [ midchildan ];
    platforms = platforms.all;
--- a/pkgs/development/libraries/libbencodetools/default.nix
+++ b/pkgs/development/libraries/libbencodetools/default.nix
@ -1,23 +1,30 @@
-{ stdenv, lib, fetchFromGitLab
+{ stdenv
+, lib
+, fetchFromGitLab
+, python3
 }:

 stdenv.mkDerivation rec {
  pname = "libbencodetools";
-  version = "unstable-2021-04-15";
+  version = "unstable-2022-05-11";

  src = fetchFromGitLab {
    owner = "heikkiorsila";
    repo = "bencodetools";
-    rev = "1ab11f6509a348975e8aec829d7abbf2f8e9b7d1";
-    sha256 = "1i2dgvxxwj844yn45hnfx3785ljbvbkri0nv0jx51z4i08w7cz0h";
+    rev = "384d78d297a561dddbbd0f4632f0c74c0db41577";
+    sha256 = "1d699q9r33hkmmqkbh92ax54mcdf9smscmc0dza2gp4srkhr83qm";
  };

  postPatch = ''
-    patchShebangs .
+    patchShebangs configure
+    substituteInPlace configure \
+      --replace 'python_install_option=""' 'python_install_option="--prefix=$out"'
  '';

-  configureFlags = [
-    "--without-python"
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    python3
  ];

  meta = with lib; {
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller";
    homepage = "http://www.openzwave.net/";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
@ -22,6 +22,11 @@ qtUnseenHostPath() {
 qtHostPathHook() {
    qtUnseenHostPath "$1" || return 0

+    if ! [ -v qtPluginPrefix ]
+    then
+        echo "wrapQtAppsHook qtHostPathHook: qtPluginPrefix is unset. hint: add qt6.qtbase to buildInputs"
+    fi
+
    local pluginDir="$1/${qtPluginPrefix:?}"
    if [ -d "$pluginDir" ]
    then
@ -34,7 +39,7 @@ qtHostPathHook() {
        qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir")
    fi
 }
-addEnvHooks "$hostOffset" qtHostPathHook
+addEnvHooks "$targetOffset" qtHostPathHook

 makeQtWrapper() {
    local original="$1"
@ -85,8 +90,6 @@ wrapQtAppsHook() {

        find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
        do
-            isELF "$file" || isMachO "$file" || continue
-
            if [ -f "$file" ]
            then
                echo "wrapping $file"
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@ -54,6 +54,6 @@ buildPythonPackage rec {
    description = "Python module to implement EZSP for EmberZNet devices";
    homepage = "https://github.com/zigpy/bellows";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
  };
 }
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@ -20,7 +20,7 @@ in buildPythonPackage {
    description = "Python library for CRCs and checksums";
    homepage = "https://sourceforge.net/projects/crccheck/";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2022.7.7";
+  version = "2022.7.8";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-obkvx7P2nkn7z3kMJeY9ERzkuCAlmE27mwjUUPxOisc=";
+    sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@ -7,12 +7,12 @@
 }:

 buildPythonPackage rec {
-  version = "4.0.9";
+  version = "4.1.0";
  pname = "icalendar";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "cc73fa9c848744843046228cb66ea86cd8c18d73a51b140f7c003f760b84a997";
+    sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U=";
  };

  buildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@ -77,6 +77,8 @@ buildPythonPackage rec {
  ] ++ lib.optionals stdenv.isDarwin [
    # attempts to use trashcan, build env doesn't allow this
    "test_delete"
+    # test is presumable broken in sandbox
+    "test_authorized_requests"
  ];

  disabledTestPaths = [
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@ -49,7 +49,6 @@ buildPythonPackage rec {
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
-    broken = stdenv.isDarwin;
    description = "JupyterLab Server";
    homepage = "https://jupyter.org";
    license = licenses.bsdOriginal;
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "jupytext";
-  version = "1.13.8";
+  version = "1.14.0";
  format = "pyproject";

  disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "mwouts";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-ebe5sQJxA8QE6eJp6vPUyMaEvZUPqzCmQ6damzo1BVo=";
+    sha256 = "sha256-a/dvY7MLCjYGOvsCC5tiIIJpApNriRtBN63VK+McEVw=";
  };

  buildInputs = [
@ -51,12 +51,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  postPatch = ''
-    # https://github.com/mwouts/jupytext/pull/885
-    substituteInPlace setup.py \
-      --replace "markdown-it-py~=1.0" "markdown-it-py>=1.0.0,<3.0.0"
-  '';
-
  preCheck = ''
    # Tests that use a Jupyter notebook require $HOME to be writable
    export HOME=$(mktemp -d);
--- a/pkgs/development/python-modules/oslo-context/default.nix
+++ b/pkgs/development/python-modules/oslo-context/default.nix
@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "oslo.context";
-  version = "4.1.0";
+  version = "5.0.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-damnIqVS+6ionooBAo+oKmGQqzF6lZG7gzA6IhCnkUQ=";
+    sha256 = "sha256-iMDG0HZoHGDVYPfWZWXkKsEWxaqKKKBNt8CsACUTMiQ=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "pex";
-  version = "2.1.97";
+  version = "2.1.98";
  format = "flit";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-h2fDyL1spMBjnqTvjj3C3eXFFmgtvX7NyTUo5my6Lk4=";
+    hash = "sha256-5qvcaxbRR6Mt4lgSxQlcfSEfxjzW134hLJxxMZxg6LQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/pkgs/development/python-modules/pure-pcapy3/default.nix
@ -24,6 +24,6 @@ buildPythonPackage rec {
    description = "Reimplementation of pcapy";
    homepage = "https://github.com/rcloran/pure-pcapy-3";
    license = licenses.bsd2;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix
@ -28,7 +28,7 @@ buildPythonPackage rec {
    description = "Asyncio extension package for pyserial";
    homepage = "https://github.com/pyserial/pyserial-asyncio";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@ -36,7 +36,7 @@ buildPythonPackage rec {
    description = "Python wrapper for the OpenZWave C++ library";
    homepage = "https://github.com/OpenZWave/python-openzwave";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    inherit (openzwave.meta) platforms;
  };
 }
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@ -7,11 +7,11 @@

 buildPythonPackage rec {
  pname = "sqlmap";
-  version = "1.6.6";
+  version = "1.6.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-eXQ3sddIDHJ/pc6n5pmJoi3FvA8j2GMyWtToiKVIaVg=";
+    sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@ -32,6 +32,6 @@ buildPythonPackage rec  {
    homepage = "https://github.com/home-assistant-libs/voluptuous-serialize";
    license = licenses.asl20;
    description = "Convert Voluptuous schemas to dictionaries so they can be serialized";
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@ -40,7 +40,7 @@ buildPythonPackage rec {
    description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
    homepage = "https://github.com/dmulcahey/zha-device-handlers";
    license = licenses.asl20;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@ -54,7 +54,7 @@ buildPythonPackage rec {
    description = "Library which communicates with Texas Instruments CC2531 radios for zigpy";
    homepage = "https://github.com/zigpy/zigpy-cc";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@ -44,7 +44,7 @@ buildPythonPackage rec {
    description = "Library which communicates with Deconz radios for zigpy";
    homepage = "https://github.com/zigpy/zigpy-deconz";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@ -47,7 +47,7 @@ buildPythonPackage rec {
    description = "A library which communicates with XBee radios for zigpy";
    homepage = "https://github.com/zigpy/zigpy-xbee";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@ -51,7 +51,7 @@ buildPythonPackage rec {
    description = "Library which communicates with ZiGate radios for zigpy";
    homepage = "https://github.com/zigpy/zigpy-zigate";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@ -64,7 +64,7 @@ buildPythonPackage rec {
    description = "Library implementing a ZigBee stack";
    homepage = "https://github.com/zigpy/zigpy";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ etu mvnetbiz ];
+    maintainers = with maintainers; [ mvnetbiz ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "gopls";
-  version = "0.9.0";
+  version = "0.9.1";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "tools";
    rev = "gopls/v${version}";
-    sha256 = "sha256-pEEqzaV3B/eDSiqJa5AZydlmYrvpD9CDryy2rHf4N5Y=";
+    sha256 = "sha256-+9NOQRu7cwEkRMB+HFEVrF7Z8y5UCxdUL005vZFPUHk=";
  };

  modRoot = "gopls";
-  vendorSha256 = "sha256-ZdFYAQxStbY6KPyRAHvnwPeKLrOLVrr59MMyjknyK5Y=";
+  vendorSha256 = "sha256-V5HQAKRFtHfJJzdQ8eutCpVmnOWe0yYKKnlGxphulAc=";

  doCheck = false;

--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@ -4,6 +4,8 @@
 , fetchFromGitHub
 , rustPlatform
 , installShellFiles
+, fetchpatch
+, tinycc
 , libiconv
 , libobjc
 , Security
@ -14,17 +16,38 @@
 , librusty_v8 ? callPackage ./librusty_v8.nix { }
 }:

+let
+  libtcc = tinycc.overrideAttrs (oa: {
+    makeFlags = [ "libtcc.a" ];
+    # tests want tcc binary
+    doCheck = false;
+    outputs = [ "out" ];
+    installPhase = ''
+      mkdir -p $out/lib/
+      mv libtcc.a $out/lib/
+    '';
+  });
+in
 rustPlatform.buildRustPackage rec {
  pname = "deno";
-  version = "1.23.3";
+  version = "1.23.4";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-kxQZDuqVddooYeelW3gJBbU7N/PnARj/IG7eBVJoAJ8=";
+    sha256 = "sha256-nLQqfLRuh9mhZfjeiPaGpQbi5bXEg7HiGwrwDmaIRWM=";
  };
-  cargoSha256 = "sha256-bQZpE3kBqN5+lPdHWiiUQsWQwuMkvnfHLy3S1HnS4lk=";
+  cargoSha256 = "sha256-l5Ce/ypYXZKEi859OFskwC/Unpo842ZPxIHvp6lCjQc=";
+
+  patches = [
+    # remove after https://github.com/denoland/deno/pull/15193 is in a release
+    (fetchpatch {
+      name = "byo-tcc.patch";
+      url = "https://github.com/denoland/deno/pull/15193/commits/c43698b2b58af1ef69b1558d55c8ebea0268dfea.patch";
+      sha256 = "sha256-YE5mGHyEm20FjFhr8yveBRlrOVL3+qQYxz2xp/IfmJs=";
+    })
+  ];

  postPatch = ''
    # upstream uses lld on aarch64-darwin for faster builds
@ -32,18 +55,21 @@ rustPlatform.buildRustPackage rec {
    substituteInPlace .cargo/config.toml --replace '"-C", "link-arg=-fuse-ld=lld"' ""
  '';

-  # Install completions post-install
  nativeBuildInputs = [ installShellFiles ];
-
-  buildAndTestSubdir = "cli";
-
  buildInputs = lib.optionals stdenv.isDarwin
    [ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ];

+  buildAndTestSubdir = "cli";
+
  # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
  # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
  RUSTY_V8_ARCHIVE = librusty_v8;

+  # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time
+  # To avoid this we point it to our copy (dir)
+  # In the future tinycc will be replaced with asm
+  DENO_FFI_LIBTCC = "${libtcc}/lib";
+
  # Tests have some inconsistencies between runs with output integration tests
  # Skipping until resolved
  doCheck = false;
--- a/pkgs/development/web/deno/librusty_v8.nix
+++ b/pkgs/development/web/deno/librusty_v8.nix
@ -11,11 +11,11 @@ let
  };
 in
 fetch_librusty_v8 {
-  version = "0.44.3";
+  version = "0.45.0";
  shas = {
-    x86_64-linux = "sha256-0l05QWfWICFTStB0AVGMAzB28MFOe4kH7Y5mT6CxvGc=";
-    aarch64-linux = "sha256-G2yZPD1lXHZvEX3CwnijoFyWF2dv6fM07+xK0oYKMVU=";
-    x86_64-darwin = "sha256-f0lBrayYNo7ivCqeJcYF5EMEnmrgH+qHLofMzbUJ+Os=";
-    aarch64-darwin = "sha256-3DG8IIMeniYLk+GyK0znFpx/f3URxFy5SFMusEPzykU=";
+    x86_64-linux = "sha256-yZw6zwEhJyRntqOmyk03N+sHxzIrbY/e67AQ21ePlAU=";
+    aarch64-linux = "sha256-2p21Smm5wZycv9u+yDbyerKTjSTB7yau5WC2aJ+Vr8w=";
+    x86_64-darwin = "sha256-HO287V+iBwdqKZUWhZJnuGJO9RE4wGG4cQMN8CkB7WQ=";
+    aarch64-darwin = "sha256-ekoMhWMQpBUdM7R7i82NWrNtQMNqCujNYy1ijOxT64U=";
  };
 }
--- a/pkgs/development/web/deno/update/librusty_v8.ts
+++ b/pkgs/development/web/deno/update/librusty_v8.ts
@ -1,3 +1,4 @@
+import * as toml from "https://deno.land/std@0.148.0/encoding/toml.ts";
 import {
  genValueRegExp,
  getExistingVersion,
@ -7,6 +8,7 @@ import {
  write,
 } from "./common.ts";

+
 const log = logger("librusty_v8");

 export interface Architecture {
@ -25,7 +27,7 @@ const getLibrustyV8Version = async (
 ) =>
  fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
    .then((res) => res.text())
-    .then((txt) => txt.match(genValueRegExp("v8", versionRegExp))?.shift());
+    .then((txt) => mod.parse(txt).dependencies.v8.version);

 const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
  arches.map(
--- a/pkgs/os-specific/linux/tuigreet/default.nix
+++ b/pkgs/os-specific/linux/tuigreet/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "tuigreet";
-  version = "0.7.2";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "apognu";
    repo = pname;
    rev = version;
-    sha256 = "sha256-Mu4GGlX7ZjBaBECXRD6iJCqDMSzcj17BriJ6Nas0J70=";
+    sha256 = "sha256-8/2I6bk29/GqZ1ACuN9RgBiGAy7yt0iw2fagHfu4/BI=";
  };

-  cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs=";
+  cargoSha256 = "sha256-fOs9a0/1c8Kh4JA5up3XSQ+km/FwSYzl0w4UDL4yU4M=";

  meta = with lib; {
    description = "Graphical console greeter for greetd";
--- a/pkgs/os-specific/linux/usbtop/default.nix
+++ b/pkgs/os-specific/linux/usbtop/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    homepage = "https://github.com/aguinet/usbtop";
    description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    license = licenses.bsd3;
    platforms = platforms.linux;
  };
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "redis";
-  version = "7.0.2";
+  version = "7.0.3";

  src = fetchurl {
    url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Xlfq/n1Kxey2p9ZNa2Hbd1YW2/kDKTs/zGYHFtvaXus=";
+    sha256 = "sha256-LN59FyFP/jBZU9qf/xIzPopyyqV/1JI+SHL2NiogjnM=";
  };

  # Cross-compiling fixes
--- a/pkgs/tools/admin/iredis/default.nix
+++ b/pkgs/tools/admin/iredis/default.nix
@ -0,0 +1,58 @@
+{ lib, python3Packages }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  pname = "iredis";
+  version = "1.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c3031094db0aa03d48b6f9be750e32d3e901942a96cc05283029086cb871cd81";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "click>=7.0,<8.0" "click" \
+      --replace "wcwidth==0.1.9" "wcwidth" \
+      --replace "redis>=3.4.0,<4.0.0" "redis" \
+      --replace "mistune>=2.0,<3.0" "mistune"
+  '';
+
+  propagatedBuildInputs = [
+    pygments
+    click
+    configobj
+    importlib-resources
+    mistune_2_0
+    packaging
+    pendulum
+    prompt-toolkit
+    redis
+    wcwidth
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pexpect
+  ];
+
+  pytestFlagsArray = [
+    # Fails on sandbox
+    "--ignore=tests/unittests/test_client.py"
+    "--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw"
+    "--deselect=tests/unittests/test_render_functions.py::test_render_time"
+    # Only execute unittests, because cli tests require a running Redis
+    "tests/unittests/"
+  ];
+
+  pythonImportsCheck = [ "iredis" ];
+
+  meta = with lib; {
+    description = "A Terminal Client for Redis with AutoCompletion and Syntax Highlighting";
+    changelog = "https://github.com/laixintao/iredis/raw/v${version}/CHANGELOG.md";
+    homepage = "https://iredis.io/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@ -38,7 +38,7 @@ in stdenv.mkDerivation {
    '';
    homepage = "https://www.fsarchiver.org/";
    license = licenses.lgpl2;
-    maintainers = [ maintainers.etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix
+++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix
@ -208,5 +208,6 @@ in stdenv.mkDerivation rec {
    maintainers = with maintainers; [ k4leg AndersonTorres ];
    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = "ventoy";
  };
 }
--- a/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/pkgs/tools/misc/adafruit-ampy/default.nix
@ -21,6 +21,6 @@ buildPythonApplication rec {
    homepage = "https://github.com/pycampers/ampy";
    license = licenses.mit;
    description = "Utility to interact with a MicroPython board over a serial connection";
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@ -15,14 +15,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "broot";
-  version = "1.14.1";
+  version = "1.14.2";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-6t2yJM3LAG1LY5MAXg/7lwmufEEO8dqOZJgQXICmLf8=";
+    sha256 = "sha256-3SaR3ug9J1nqhbM8OW9oIM8mJwbw99YXrPgSIHsDG/0=";
  };

-  cargoHash = "sha256-NsKiTsdfC1UPTLKBibVGXSx5wZubAMgIWLiEMzR5p6g=";
+  cargoHash = "sha256-bNDM7RJCclEMRZ+BlXy0ALLZZ3Wu7wjxPMRmSeWNaVw=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/tools/misc/paps/default.nix
+++ b/pkgs/tools/misc/paps/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    description = "Pango to PostScript converter";
    homepage = "https://github.com/dov/paps";
    license = licenses.lgpl2;
-    maintainers = with maintainers; [ etu ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@ -11,6 +11,7 @@ let
  atLeast24 = lib.versionAtLeast version "2.4pre";
  atLeast25 = lib.versionAtLeast version "2.5pre";
  atLeast27 = lib.versionAtLeast version "2.7pre";
+  atLeast210 = lib.versionAtLeast version "2.10pre";
 in
 { stdenv
 , autoconf-archive
@ -176,6 +177,7 @@ self = stdenv.mkDerivation {
  installFlags = [ "sysconfdir=$(out)/etc" ];

  doInstallCheck = true;
+  installCheckTarget = if atLeast210 then "installcheck" else null;

  # socket path becomes too long otherwise
  preInstallCheck = lib.optionalString stdenv.isDarwin ''
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@ -47,39 +47,13 @@ in lib.makeExtensible (self: {
    };
  }).override { boehmgc = boehmgc-nix_2_3; };

-  nix_2_4 = common {
-    version = "2.4";
-    sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k=";
-    # https://github.com/NixOS/nix/pull/5537
-    patches = [ ./patches/install-nlohmann_json-headers.patch ];
-  };
+  nix_2_4 = throw "nixVersions.nix_2_4 has been removed";

-  nix_2_5 = common {
-    version = "2.5.1";
-    sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU=";
-    # https://github.com/NixOS/nix/pull/5536
-    patches = [ ./patches/install-nlohmann_json-headers.patch ];
-  };
+  nix_2_5 = throw "nixVersions.nix_2_5 has been removed";

-  nix_2_6 = common {
-    version = "2.6.1";
-    sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=";
-  };
+  nix_2_6 = throw "nixVersions.nix_2_6 has been removed";

-  nix_2_7 = common {
-    version = "2.7.0";
-    sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=";
-    patches = [
-      # remove when there's a 2.7.1 release
-      # https://github.com/NixOS/nix/pull/6297
-      # https://github.com/NixOS/nix/issues/6243
-      # https://github.com/NixOS/nixpkgs/issues/163374
-      (fetchpatch {
-        url = "https://github.com/NixOS/nix/commit/c9afca59e87afe7d716101e6a75565b4f4b631f7.patch";
-        sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q=";
-      })
-    ];
-  };
+  nix_2_7 = throw "nixVersions.nix_2_7 has been removed";

  nix_2_8 = common {
    version = "2.8.1";
@ -87,19 +61,17 @@ in lib.makeExtensible (self: {
  };

  nix_2_9 = common {
-    version = "2.9.1";
-    sha256 = "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g=";
-    patches = [
-      # add missing --git-dir flags
-      # remove once 2.9.2 is out
-      (fetchpatch {
-        url = "https://github.com/NixOS/nix/commit/1a994cc35b33dcfd484e7a96be0e76e23bfb9029.patch";
-        sha256 = "sha256-7rDlqWRSVPijbvrTm4P+YykbMWyJryorXqGLEgg8/Wo=";
-      })
-    ];
+    version = "2.9.2";
+    sha256 = "sha256-uZCaBo9rdWRO/AlQMvVVjpAwzYijB2H5KKQqde6eHkg=";
  };

-  stable = self.nix_2_9;
+  nix_2_10 = common {
+    version = "2.10.2";
+    sha256 = "sha256-/8zlkXoZEZd+LgJq5xw8h+u2STqeKLrGTARZklE3CP8=";
+    patches = [ ./patches/flaky-tests.patch ];
+  };
+
+  stable = self.nix_2_10;

  unstable = self.stable;
 })
--- a/pkgs/tools/package-management/nix/patches/flaky-tests.patch
+++ b/pkgs/tools/package-management/nix/patches/flaky-tests.patch
@ -0,0 +1,12 @@
+diff --git a/mk/run_test.sh b/mk/run_test.sh
+index 7e95df2ac..58420c317 100755
+--- a/mk/run_test.sh
+++ b/mk/run_test.sh
+@@ -27,7 +27,6 @@ run_test "$1"
+ # appear randomly without anyone knowing why.
+ # See https://github.com/NixOS/nix/issues/3605 for more info
+ if [[ $status -ne 0 && $status -ne 99 && \
+-    "$(uname)" == "Darwin" && \
+     "$log" =~ "unexpected EOF reading a line" \
+ ]]; then
+     echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)"
--- a/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch
+++ b/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch
@ -1,36 +0,0 @@
-From 3884f7a69a57d8ecfcbcaae476ec2ff53ffbd549 Mon Sep 17 00:00:00 2001
-From: Robert Hensing <robert@roberthensing.nl>
-Date: Thu, 11 Nov 2021 11:03:21 +0100
-Subject: [PATCH] Install nlohmann_json headers
-
-These headers are included by the libexpr, libfetchers, libstore
-and libutil headers.
-Considering that these are vendored sources, Nix should expose them,
-as it is not a good idea for reverse dependencies to rely on a
-potentially different source that can go out of sync.
---
- Makefile              | 1 +
- src/nlohmann/local.mk | 2 ++
- 2 files changed, 3 insertions(+)
- create mode 100644 src/nlohmann/local.mk
-
-diff --git a/Makefile b/Makefile
-index 5040d288485..e6ce50cbdb7 100644
--- a/Makefile
-+++ b/Makefile
-@@ -10,6 +10,7 @@ makefiles = \
-   src/libexpr/local.mk \
-   src/libcmd/local.mk \
-   src/nix/local.mk \
-+  src/nlohmann/local.mk \
-   src/resolve-system-dependencies/local.mk \
-   scripts/local.mk \
-   misc/bash/local.mk \
-diff --git a/src/nlohmann/local.mk b/src/nlohmann/local.mk
-new file mode 100644
-index 00000000000..63c427e000e
--- /dev/null
-+++ b/src/nlohmann/local.mk
-@@ -0,0 +1,2 @@
-+$(foreach i, $(wildcard src/nlohmann/*.hpp), \
-+  $(eval $(call install-file-in, $(i), $(includedir)/nlohmann, 0644)))
--- a/pkgs/tools/security/httpx/default.nix
+++ b/pkgs/tools/security/httpx/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "httpx";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "httpx";
    rev = "v${version}";
-    sha256 = "sha256-DfbogRkxFiiW/UF9mKrq8x4nQvNj7D7D76/DsaTA/A0=";
+    sha256 = "sha256-gBt1xllfzw8M+n+vgUmOQ3vgDxDuDaQ7YXfWdLWnpVk=";
  };

-  vendorSha256 = "sha256-ZI56as5eD2Q2JNc5+lv4A7ja6cbZ9kha7ofUaOAkeHg=";
+  vendorSha256 = "sha256-9ZwRbeZ1iSuJiIJDBauU1U9PpGn8QQPTd3MfrnSmF+w=";

  meta = with lib; {
    description = "Fast and multi-purpose HTTP toolkit";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -8144,6 +8144,8 @@ with pkgs;

  kea = callPackage ../tools/networking/kea { };

+  iredis = callPackage ../tools/admin/iredis { };
+
  ispell = callPackage ../tools/text/ispell {};

  iodash = callPackage ../development/libraries/iodash { };
@ -13198,7 +13200,7 @@ with pkgs;
    inherit (gnome2) libart_lgpl;
  });

-  gnat = gnat11;
+  gnat = gnat12;

  gnat6 = wrapCC (gcc6.cc.override {
    name = "gnat";
@ -13229,7 +13231,7 @@ with pkgs;
    gnatboot =
      if stdenv.hostPlatform == stdenv.targetPlatform
         && stdenv.buildPlatform == stdenv.hostPlatform
-      then buildPackages.gnat6
+      then buildPackages.gnatboot
      else buildPackages.gnat9;
  });

@ -13245,7 +13247,7 @@ with pkgs;
    gnatboot =
      if stdenv.hostPlatform == stdenv.targetPlatform
         && stdenv.buildPlatform == stdenv.hostPlatform
-      then buildPackages.gnat6
+      then buildPackages.gnatboot
      else buildPackages.gnat10;
  });

@ -13261,7 +13263,7 @@ with pkgs;
    gnatboot =
      if stdenv.hostPlatform == stdenv.targetPlatform
         && stdenv.buildPlatform == stdenv.hostPlatform
-      then buildPackages.gnat6
+      then buildPackages.gnatboot
      else buildPackages.gnat11;
  });

@ -13277,7 +13279,7 @@ with pkgs;
    gnatboot =
      if stdenv.hostPlatform == stdenv.targetPlatform
         && stdenv.buildPlatform == stdenv.hostPlatform
-      then buildPackages.gnat6
+      then buildPackages.gnatboot
      else buildPackages.gnat12;
  });

@ -16472,7 +16474,7 @@ with pkgs;

  rman = callPackage ../development/tools/misc/rman { };

-  rnix-lsp = callPackage ../development/tools/rnix-lsp { };
+  rnix-lsp = callPackage ../development/tools/rnix-lsp { nix = nixVersions.nix_2_9; };

  rnginline = with python3Packages; toPythonApplication rnginline;

@ -31336,6 +31338,10 @@ with pkgs;
    packages = _: [ haskellPackages.xmonad-contrib ];
  };

+  xmonadctl = callPackage ../applications/window-managers/xmonad/xmonadctl.nix {
+    inherit (haskellPackages) ghcWithPackages;
+  };
+
  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
    inherit (xfce) libxfce4util xfce4-panel;
  };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -257,6 +257,7 @@ let
        vaultenv
        wstunnel
        xmobar
+        xmonadctl
        xmonad-with-packages
        yi
        zsh-git-prompt