Merge staging-next into staging

2022-04-21 06:01:42 +00:00 · 2022-04-21 06:01:42 +00:00 · 9eedd2d752
commit 9eedd2d752
parent c51b7991d8 6f8aad4e25
44 changed files with 2356 additions and 2156 deletions
--- a/pkgs/applications/blockchains/solana/default.nix
+++ b/pkgs/applications/blockchains/solana/default.nix
@ -10,19 +10,23 @@
 , zlib
 , protobuf
 }:
+let
+  pinData = lib.importJSON ./pin.json;
+  version = pinData.version;
+  sha256 = pinData.sha256;
+  cargoSha256 = pinData.cargoSha256;
+in
 rustPlatform.buildRustPackage rec {
  pname = "solana-testnet-cli";
-  version = "1.9.2";
+  inherit version cargoSha256;

  src = fetchFromGitHub {
    owner = "solana-labs";
    repo = "solana";
    rev = "v${version}";
-    sha256 = "sha256-wrv35vBohLztMZPb6gfZdCaXcjj/Y7vnQqINaI6dBM4=";
+    inherit sha256;
  };

-  cargoSha256 = "sha256-A5uVa+cRmrkVyw7MFH4QAr0VIFi18wcc2VPFvQyT9EM=";
-
  buildAndTestSubdir = "cli";

  nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ];
@ -53,4 +57,5 @@ rustPlatform.buildRustPackage rec {
    maintainers = with maintainers; [ happysalada ];
    platforms = platforms.unix;
  };
+  passthru.updateScript = ./update.sh;
 }
--- a/pkgs/applications/blockchains/solana/pin.json
+++ b/pkgs/applications/blockchains/solana/pin.json
@ -0,0 +1,5 @@
+{
+  "version": "1.10.9",
+  "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
+  "cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4="
+}
--- a/pkgs/applications/blockchains/solana/update.sh
+++ b/pkgs/applications/blockchains/solana/update.sh
@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
+
+# TODO set to `verbose` or `extdebug` once implemented in oil
+shopt --set xtrace
+# we need failures inside of command subs to get the correct cargoSha256
+shopt --unset inherit_errexit
+
+const directory = $(dirname $0 | xargs realpath)
+const owner = "solana-labs"
+const repo = "solana"
+const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
+  jq -r '.tag_name')
+const latest_version = $(echo $latest_rev | sd 'v' '')
+const current_version = $(jq -r '.version' $directory/pin.json)
+if ("$latest_version" === "$current_version") {
+  echo "solana is already up-to-date"
+  return 0
+} else {
+  const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
+  const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
+
+  jq ".version = \"$latest_version\" | \
+      .\"sha256\" = \"$tarball_hash\" | \
+      .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
+
+  const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
+    tail -n 2 | \
+    head -n 1 | \
+    sd '\s+got:\s+' '')
+
+  jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
+}
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@ -2,52 +2,45 @@
 , stdenv
 , fetchFromGitHub
 , gtk4
-, hicolor-icon-theme
 , json-glib
 , libadwaita
 , libgee
+, desktop-file-utils
 , meson
 , ninja
 , nix-update-script
 , pkg-config
-, python3
 , vala
 , wrapGAppsHook4
 }:

 stdenv.mkDerivation rec {
  pname = "notejot";
-  version = "3.4.9";
+  version = "3.5.1";

  src = fetchFromGitHub {
    owner = "lainsce";
    repo = pname;
    rev = version;
-    hash = "sha256-42k9CAnXAb7Ic580SIa95MDCkCWtso1F+0eD69HX8WI=";
+    hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU=";
  };

  nativeBuildInputs = [
+    desktop-file-utils
    meson
    ninja
    pkg-config
-    python3
    vala
    wrapGAppsHook4
  ];

  buildInputs = [
    gtk4
-    hicolor-icon-theme
    json-glib
    libadwaita
    libgee
  ];

-  postPatch = ''
-    chmod +x build-aux/post_install.py
-    patchShebangs build-aux/post_install.py
-  '';
-
  passthru.updateScript = nix-update-script {
    attrPath = pname;
  };
--- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {

    installShellCompletion --cmd kubectl \
      --bash <($out/bin/kubectl completion bash) \
+      --fish <($out/bin/kubectl completion fish) \
      --zsh <($out/bin/kubectl completion zsh)
    runHook postInstall
  '';
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "6387c3141750050e170d6ac030c063536c39aede",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz",
-  "sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j",
-  "msg": "Update from Hackage at 2022-04-06T22:24:53Z"
+  "commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz",
+  "sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j",
+  "msg": "Update from Hackage at 2022-04-09T11:23:17Z"
 }
--- a/pkgs/development/compilers/cudatoolkit/versions.toml
+++ b/pkgs/development/compilers/cudatoolkit/versions.toml
@ -44,13 +44,15 @@ gcc = "gcc9"
 version = "11.4.2"
 url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run"
 sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo="
-gcc = "gcc11"
+gcc = "gcc10"

 ["11.5"]
 version = "11.5.0"
 url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run"
 sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw="
-gcc = "gcc11"
+# cuda 11.5 has problems with glibc 2.4 -> keeping gcc10
+# cf. https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15
+gcc = "gcc10"

 ["11.6"]
 version = "11.6.1"
--- a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix
@ -1,8 +1,37 @@
-{ haskellLib }:
+{ haskellLib, fetchpatch, buildPackages }:

-let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
+let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak markUnbroken overrideCabal;
 in self: super: {
-  ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: {
+  ghcjs = overrideCabal (drv: {
+    # Jailbreak and patch can be dropped after https://github.com/ghcjs/ghcjs/pull/833
+    jailbreak = true;
+    patches = drv.patches or [] ++ [
+      (fetchpatch {
+        name = "ghcjs-aeson-2.0.patch";
+        url = "https://github.com/ghcjs/ghcjs/commit/9ef1f92d740e8503d15d91699f57db147f0474cc.patch";
+        sha256 = "0cgxcy6b5870bv4kj54n3bzcqinh4gl4w4r78dg43h2mblhkzbnj";
+      })
+    ];
+  }) (super.ghcjs.overrideScope (self: super: {
    optparse-applicative = self.optparse-applicative_0_15_1_0;
+    webdriver = overrideCabal (drv: {
+      patches = drv.patches or [] ++ [
+        # Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally
+        # Pending https://github.com/kallisti-dev/hs-webdriver/pull/183
+        (fetchpatch {
+          name = "webdriver-aeson-2.0.patch";
+          url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch";
+          sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0";
+          excludes = [ "webdriver.cabal" ];
+        })
+      ];
+      # Fix line endings so patch applies
+      prePatch = drv.prePatch or "" + ''
+        find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix"
+      '';
+
+      jailbreak = true;
+      broken = false;
+    }) super.webdriver;
  }));
 }
--- a/pkgs/development/compilers/ghcjs/8.10/default.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/default.nix
@ -2,6 +2,7 @@
 , pkgsHostHost
 , callPackage
 , fetchgit
+, fetchpatch
 , ghcjsSrcJson ? null
 , ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson)
 , bootPkgs
@ -36,7 +37,7 @@ let
      })

      (callPackage ./common-overrides.nix {
-        inherit haskellLib;
+        inherit haskellLib fetchpatch buildPackages;
      })
      ghcjsDepOverrides
    ]);
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -252,7 +252,7 @@ self: super: {
  binary-protocol = dontCheck super.binary-protocol;    # http://hydra.cryp.to/build/499749/log/raw
  binary-search = dontCheck super.binary-search;
  bits = dontCheck super.bits;                          # http://hydra.cryp.to/build/500239/log/raw
-  bloodhound = dontCheck super.bloodhound;
+  bloodhound = dontCheck super.bloodhound;              # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10
  buildwrapper = dontCheck super.buildwrapper;
  burst-detection = dontCheck super.burst-detection;    # http://hydra.cryp.to/build/496948/log/raw
  cabal-meta = dontCheck super.cabal-meta;              # http://hydra.cryp.to/build/497892/log/raw
@ -2584,6 +2584,15 @@ self: super: {
  # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15
  base-noprelude = doJailbreak super.base-noprelude;

+  # Manually upgrade cryptostore to work around
+  # https://github.com/ocheron/cryptostore/issues/7
+  cryptostore = assert super.cryptostore.version == "0.2.1.0"; overrideCabal {
+    version = "0.2.2.0";
+    sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx";
+    revision = null;
+    editedCabalFile = null;
+  } super.cryptostore;
+
  # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10
  dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans;

--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@ -89,20 +89,22 @@ self: super: {
  mime-string = disableOptimization super.mime-string;

  # Older compilers need the latest ghc-lib to build this package.
-  hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin;
+  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
+      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
+      postPatch = ''
+        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
+      '';
+    })
+     super.hls-hlint-plugin);

  haskell-language-server = appendConfigureFlags [
-      "-f-fourmolu"
      "-f-stylishhaskell"
      "-f-brittany"
-      "-f-hlint"
    ]
-  (super.haskell-language-server.override {
-    # Not buildable on 8.10
-    hls-fourmolu-plugin = null;
-    # https://github.com/haskell/haskell-language-server/issues/2728
-    hls-hlint-plugin = null;
-  });
+  super.haskell-language-server;
+
+  # has a restrictive lower bound on Cabal
+  fourmolu = doJailbreak super.fourmolu;

  # ormolu 0.3 requires Cabal == 3.4
  ormolu = super.ormolu_0_2_0_0;
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@ -131,18 +131,23 @@ self: super: {

  mime-string = disableOptimization super.mime-string;

+  # Older compilers need the latest ghc-lib to build this package.
+  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
+      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
+      postPatch = ''
+        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
+      '';
+    })
+     super.hls-hlint-plugin);
+
  haskell-language-server = appendConfigureFlags [
-      "-f-fourmolu"
      "-f-stylishhaskell"
      "-f-brittany"
-      "-f-hlint"
    ]
-  (super.haskell-language-server.override {
-    # Not buildable on 8.8
-    hls-fourmolu-plugin = null;
-    # https://github.com/haskell/haskell-language-server/issues/2728
-    hls-hlint-plugin = null;
-  });
+  super.haskell-language-server;
+
+  # has a restrictive lower bound on Cabal
+  fourmolu = doJailbreak super.fourmolu;

  # OneTuple needs hashable instead of ghc-prim for GHC < 9
  OneTuple = super.OneTuple.override {
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -357,6 +357,7 @@ broken-packages:
  - binary-communicator
  - binary-derive
  - binary-ext
+  - binary-generic-combinators
  - binary-indexed-tree
  - binary-protocol
  - binary-tree
@ -433,7 +434,6 @@ broken-packages:
  - blockfrost-api
  - blockhash
  - Blogdown
-  - bloodhound
  - bloomfilter-redis
  - blubber-server
  - bludigon
@ -1688,6 +1688,7 @@ broken-packages:
  - ghcup
  - ghc-usage
  - gh-labeler
+  - gi-adwaita
  - giak
  - gi-cogl
  - Gifcurry
@ -2546,6 +2547,7 @@ broken-packages:
  - hylolib
  - hyperdrive
  - hyperfunctions
+  - hyper-haskell-server
  - hyperion
  - hyperloglogplus
  - hyperscript
@ -2779,6 +2781,7 @@ broken-packages:
  - kangaroo
  - karabiner-config
  - katip-datadog
+  - katip-elasticsearch
  - katip-kafka
  - katip-logzio
  - katip-scalyr-scribe
@ -3331,6 +3334,7 @@ broken-packages:
  - msgpack
  - msgpack-binary
  - msgpack-persist
+  - msgpack-types
  - msh
  - msi-kb-backlit
  - MTGBuilder
@ -3596,6 +3600,7 @@ broken-packages:
  - open-signals
  - opensoundcontrol-ht
  - openssh-protocol
+  - opentelemetry-extra
  - opentelemetry-http-client
  - opentheory-char
  - opentok
@ -4025,6 +4030,7 @@ broken-packages:
  - process-leksah
  - process-listlike
  - processmemory
+  - procex
  - procrastinating-variable
  - procstat
  - prof2pretty
@ -4331,6 +4337,7 @@ broken-packages:
  - robin
  - robots-txt
  - roc-cluster
+  - roc-id
  - roku-api
  - rollbar-client
  - rollbar-hs
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -68,8 +68,7 @@ core-packages:
 # tracked in stackage.yaml. Adding conflicting overrides with stackage here will
 # not work.
 default-package-overrides:
-  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
-  # not yet available in Nixpkgs
+  # gi-gdkx11-4.x requires gtk-4.x, but stackage still restricts gi-gtk to 3.*
  - gi-gdkx11 < 4
  # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
  - reflex-dom-pandoc < 1.0.0.0
--- 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.2
+# Stackage LTS 19.3
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -296,7 +296,7 @@ default-package-overrides:
  - cborg ==0.2.6.0
  - cborg-json ==0.2.3.0
  - cdar-mBound ==0.1.0.4
-  - c-enum ==0.1.1.2
+  - c-enum ==0.1.1.3
  - cereal ==0.5.8.2
  - cereal-conduit ==0.8.0
  - cereal-text ==0.1.0.2
@ -329,9 +329,9 @@ default-package-overrides:
  - circle-packing ==0.1.0.6
  - circular ==0.4.0.2
  - citeproc ==0.6.0.1
-  - clash-ghc ==1.6.2
-  - clash-lib ==1.6.2
-  - clash-prelude ==1.6.2
+  - clash-ghc ==1.6.3
+  - clash-lib ==1.6.3
+  - clash-prelude ==1.6.3
  - classy-prelude ==1.5.0.2
  - classy-prelude-conduit ==1.5.0
  - classy-prelude-yesod ==1.5.0
@ -423,8 +423,8 @@ default-package-overrides:
  - cookie ==0.4.5
  - copr-api ==0.1.0
  - core-data ==0.3.1.1
-  - core-program ==0.4.4.0
-  - core-telemetry ==0.1.9.1
+  - core-program ==0.4.5.1
+  - core-telemetry ==0.1.9.2
  - core-text ==0.3.5.0
  - countable ==1.0
  - covariance ==0.1.0.6
@ -708,7 +708,7 @@ default-package-overrides:
  - explainable-predicates ==0.1.2.1
  - explicit-exception ==0.1.10
  - exp-pairs ==0.2.1.0
-  - express ==1.0.8
+  - express ==1.0.10
  - extended-reals ==0.2.4.0
  - extensible-effects ==5.0.0.1
  - extensible-exceptions ==0.1.1.4
@ -823,7 +823,7 @@ default-package-overrides:
  - gdp ==0.0.3.0
  - general-games ==1.1.1
  - generic-aeson ==0.2.0.13
-  - generic-arbitrary ==0.2.0
+  - generic-arbitrary ==0.2.1
  - generic-constraints ==1.1.1.1
  - generic-data ==0.9.2.1
  - generic-data-surgery ==0.3.0.0
@ -1091,7 +1091,7 @@ default-package-overrides:
  - hpack-dhall ==0.5.4
  - hpc-codecov ==0.3.0.0
  - HPDF ==1.6.0
-  - hpp ==0.6.4
+  - hpp ==0.6.5
  - hpqtypes ==1.9.3.1
  - hprotoc ==2.4.17
  - hreader ==1.1.0
@ -1116,7 +1116,7 @@ default-package-overrides:
  - hslua-classes ==2.1.0
  - hslua-core ==2.1.0
  - hslua-marshalling ==2.1.0
-  - hslua-module-doclayout ==1.0.3
+  - hslua-module-doclayout ==1.0.4
  - hslua-module-path ==1.0.2
  - hslua-module-system ==1.0.2
  - hslua-module-text ==1.0.2
@ -1354,7 +1354,7 @@ default-package-overrides:
  - LambdaHack ==0.11.0.0
  - lame ==0.2.0
  - language-bash ==0.9.2
-  - language-c ==0.9.0.2
+  - language-c ==0.9.1
  - language-c-quote ==0.13
  - language-docker ==10.4.3
  - language-dot ==0.1.1
@ -1462,7 +1462,7 @@ default-package-overrides:
  - lz4-frame-conduit ==0.1.0.1
  - lzma ==0.0.0.3
  - lzma-clib ==5.2.2
-  - lzma-conduit ==1.2.2
+  - lzma-conduit ==1.2.3
  - machines ==0.7.2
  - magic ==1.1
  - magico ==0.0.2.3
@ -1533,9 +1533,9 @@ default-package-overrides:
  - MissingH ==1.5.0.1
  - mixed-types-num ==0.5.9.1
  - mmap ==0.5.9
-  - mmark ==0.0.7.5
+  - mmark ==0.0.7.6
  - mmark-cli ==0.0.5.1
-  - mmark-ext ==0.2.1.4
+  - mmark-ext ==0.2.1.5
  - mmorph ==1.1.5
  - mnist-idx ==0.1.3.0
  - mnist-idx-conduit ==0.4.0.0
@ -1543,7 +1543,7 @@ default-package-overrides:
  - mock-time ==0.1.0
  - mod ==0.1.2.2
  - model ==0.5
-  - modern-uri ==0.3.4.3
+  - modern-uri ==0.3.4.4
  - modular ==0.1.0.8
  - monad-chronicle ==1.0.0.1
  - monad-control ==1.0.3.1
@ -1797,7 +1797,7 @@ default-package-overrides:
  - perf ==0.9.0
  - perfect-hash-generator ==0.2.0.6
  - persist ==0.1.1.5
-  - persistent ==2.13.3.3
+  - persistent ==2.13.3.4
  - persistent-discover ==0.1.0.5
  - persistent-documentation ==0.1.0.4
  - persistent-mongoDB ==2.13.0.1
@ -1833,7 +1833,7 @@ default-package-overrides:
  - pipes-ordered-zip ==1.2.1
  - pipes-parse ==3.0.9
  - pipes-random ==1.0.0.5
-  - pipes-safe ==2.3.3
+  - pipes-safe ==2.3.4
  - pipes-wai ==3.2.0
  - pkgtreediff ==0.5.0
  - place-cursor-at ==1.0.1
@ -1930,13 +1930,13 @@ default-package-overrides:
  - protocol-buffers-descriptor ==2.4.17
  - protocol-radius ==0.0.1.1
  - protocol-radius-test ==0.1.0.1
-  - proto-lens ==0.7.1.0
-  - proto-lens-arbitrary ==0.1.2.10
-  - proto-lens-optparse ==0.1.1.8
-  - proto-lens-protobuf-types ==0.7.1.0
-  - proto-lens-protoc ==0.7.1.0
-  - proto-lens-runtime ==0.7.0.1
-  - proto-lens-setup ==0.4.0.5
+  - 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-protoc ==0.7.1.1
+  - proto-lens-runtime ==0.7.0.2
+  - proto-lens-setup ==0.4.0.6
  - proxied ==0.3.1
  - psql-helpers ==0.1.0.0
  - psqueues ==0.2.7.3
@ -2839,7 +2839,7 @@ default-package-overrides:
  - yesod-form-bootstrap4 ==3.0.1
  - yesod-gitrepo ==0.3.0
  - yesod-gitrev ==0.2.2
-  - yesod-markdown ==0.12.6.12
+  - yesod-markdown ==0.12.6.13
  - yesod-newsfeed ==1.7.0.0
  - yesod-page-cursor ==2.0.0.10
  - yesod-paginator ==1.1.2.1
@ -2847,30 +2847,4 @@ default-package-overrides:
  - yesod-recaptcha2 ==1.0.2
  - yesod-routes-flow ==3.0.0.2
  - yesod-sitemap ==1.6.0
-  - yesod-static ==1.6.1.0
-  - yesod-test ==1.6.12
-  - yesod-websockets ==0.3.0.3
  - yes-precure5-command ==5.5.3
-  - yi-rope ==0.11
-  - yjsvg ==0.2.0.1
-  - yjtools ==0.9.18
-  - yoga ==0.0.0.5
-  - youtube ==0.2.1.1
-  - zenacy-html ==2.0.4
-  - zenacy-unicode ==1.0.1
-  - zero ==0.1.5
-  - zeromq4-haskell ==0.8.0
-  - zeromq4-patterns ==0.3.1.0
-  - zim-parser ==0.2.1.0
-  - zio ==0.1.0.2
-  - zip ==1.7.2
-  - zip-archive ==0.4.2.1
-  - zipper-extra ==0.1.3.2
-  - zippers ==0.3.2
-  - zip-stream ==0.2.1.0
-  - zlib ==0.6.2.3
-  - zlib-bindings ==0.1.1.5
-  - zlib-lens ==0.1.2.1
-  - zot ==0.0.3
-  - zstd ==0.1.3.0
-  - ztail ==1.2.0.3
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -2446,7 +2446,6 @@ dont-distribute-packages:
 - kansas-lava-shake
 - karakuri
 - karps
- - katip-elasticsearch
 - katip-raven
 - katip-rollbar
 - keenser
@ -2789,6 +2788,7 @@ dont-distribute-packages:
 - moonshine
 - morley
 - morley-client
+ - morley-prelude
 - morley-upgradeable
 - morpheus-graphql
 - morpheus-graphql-app
@ -2811,9 +2811,11 @@ dont-distribute-packages:
 - mptcp-pm
 - mptcpanalyzer
 - msgpack-aeson
+ - msgpack-arbitrary
 - msgpack-idl
 - msgpack-rpc
 - msgpack-rpc-conduit
+ - msgpack-testsuite
 - mtgoxapi
 - mu-avro
 - mu-graphql
@ -2965,6 +2967,8 @@ dont-distribute-packages:
 - openpgp-Crypto
 - openpgp-crypto-api
 - openssh-github-keys
+ - opentelemetry-lightstep
+ - opentelemetry-lightstep_0_8_0
 - optima-for-hasql
 - optimal-blocks
 - optimusprime
@ -3650,7 +3654,6 @@ dont-distribute-packages:
 - soundgen
 - source-code-server
 - spade
- - spago
 - sparkle
 - sparrow
 - sparsebit
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -619,8 +619,15 @@ self: super: builtins.intersectAttrs super {
        '';
      }) super.spago;

+      spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: {
+        # spago (and its dependency, bower-json) is not yet updated for aeson-2.0
+        aeson = hfinal.aeson_1_5_6_0;
+        # bower-json needs aeson_1_5_6_0 and is marked broken without it.
+        bower-json = doDistribute (markUnbroken hprev.bower-json);
+      });
+
      # Tests require network access.
-      spagoWithoutChecks = dontCheck spagoDocs;
+      spagoWithoutChecks = dontCheck spagoOldAeson;
    in
    spagoWithoutChecks;

@ -869,7 +876,10 @@ self: super: builtins.intersectAttrs super {
  cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; });

  hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; };
-  hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; };
+  hercules-ci-cnix-expr =
+    addTestToolDepend pkgs.git (
+      super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; }
+    );
  hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; };

  # Enable extra optimisations which increase build time, but also
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/pkgs/development/libraries/science/math/nccl/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
-  version = "2.7.8-1";
+  version = "2.12.10-1";

  src = fetchFromGitHub {
    owner = "NVIDIA";
    repo = "nccl";
    rev = "v${version}";
-    sha256 = "0xxiwaw239dc9g015fka3k1nvm5zyl00dzgxnwzkang61dys9wln";
+    sha256 = "sha256-QqORzm0gD+QG+P8rId8bQn2oZsxL5YyxCIobUVs85wE=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
@ -96,4 +96,9 @@ mkDerivation {
  description = "GraphQL API over Postgres";
  license = lib.licenses.asl20;
  maintainers = with lib.maintainers; [ lassulus ];
+
+  # Needs to be updated for aeson-2.0
+  # https://github.com/hasura/graphql-engine/issues/8369
+  hydraPlatforms = lib.platforms.none;
+  broken = true;
 }
--- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
@ -29,4 +29,9 @@ mkDerivation {
  description = "A native Haskell GraphQL parser";
  license = lib.licenses.bsd3;
  maintainers = with lib.maintainers; [ lassulus ];
+
+  # Needs to be updated for aeson-2.0
+  # https://github.com/hasura/graphql-engine/issues/8369
+  hydraPlatforms = lib.platforms.none;
+  broken = true;
 }
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@ -0,0 +1,40 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aioqsw";
+  version = "0.0.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "Noltari";
+    repo = pname;
+    rev = version;
+    hash = "sha256-2MuJrWrjcRkdeVkKfv/nUVfHyBtKKsq1sC5ISSEtyEE=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "aioqsw"
+  ];
+
+  meta = with lib; {
+    description = "Library to fetch data from QNAP QSW switches";
+    homepage = "https://github.com/Noltari/aioqsw";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/eagle100/default.nix
+++ b/pkgs/development/python-modules/eagle100/default.nix
@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "eagle100";
+  version = "0.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-i9ZvbjxSENJlQ+9sqWnIl1fL6tVbG3E/IUhe7b59sBk=";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "eagle100"
+  ];
+
+  meta = with lib; {
+    description = "Python library for interacting with Rainforest EAGLE devices";
+    homepage = "https://github.com/hastarin/eagle100";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- 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.81";
+  version = "2.1.82";
  format = "flit";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-EW7kOUTzLjmBVKcdRrcdx+AAMSp1hw2LJ/mHMuKViLE=";
+    hash = "sha256-VwbpcKPtPH/43E+lfzUken8JvX8QtTa6o0H0S2RXbYk=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pykeyatome/default.nix
+++ b/pkgs/development/python-modules/pykeyatome/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pykeyatome";
-  version = "1.5.1";
+  version = "1.5.2";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "jugla";
    repo = "pyKeyAtome";
    rev = "refs/tags/V${version}";
-    sha256 = "sha256-LIPNCItD+qmk9NKAYbhEQC/A05Le9CNXECg7X2SlfdI=";
+    sha256 = "sha256-9J8MaQs3+/Ld+v3WmA98lSu3iMrX4Se4q1jD1KeRTpw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@ -2,24 +2,29 @@
 , buildPythonPackage
 , fetchFromGitHub
 , importlib-resources
+, proxy_tools
+, pygobject3
 , pyqtwebengine
 , pytest
 , pythonOlder
 , qt5
+, qtpy
+, six
 , xvfb-run
-, proxy_tools
 }:

 buildPythonPackage rec {
  pname = "pywebview";
-  version = "3.6.1";
+  version = "3.6.3";
+  format = "setuptools";
+
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "r0x0r";
    repo = "pywebview";
    rev = version;
-    sha256 = "sha256-9o9ghqvU9Hnmf2aj/BqX7WBgS9ilRSnicR+qd25OfjI=";
+    hash = "sha256-qOLK4MHdpmcCazCNfojncD8XH7OJB2H/pIW5XAJAlDo=";
  };

  nativeBuildInputs = [
@ -29,10 +34,15 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    pyqtwebengine
    proxy_tools
-  ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+    six
+  ] ++ lib.optionals (pythonOlder "3.7") [
+    importlib-resources
+  ];

  checkInputs = [
+    pygobject3
    pytest
+    qtpy
    xvfb-run
  ];

@ -54,11 +64,13 @@ buildPythonPackage rec {
    popd
  '';

-  pythonImportsCheck = [ "webview" ];
+  pythonImportsCheck = [
+    "webview"
+  ];

  meta = with lib; {
-    homepage = "https://github.com/r0x0r/pywebview";
    description = "Lightweight cross-platform wrapper around a webview";
+    homepage = "https://github.com/r0x0r/pywebview";
    license = licenses.bsd3;
    maintainers = with maintainers; [ jojosch ];
  };
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@ -0,0 +1,61 @@
+{ lib
+, aiohttp
+, aresponses
+, async-timeout
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, pytz
+}:
+
+buildPythonPackage rec {
+  pname = "seventeentrack";
+  version = "2022.04.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "McSwindler";
+    repo = pname;
+    rev = version;
+    hash = "sha256-r77UA9NDQ1EQIVXZK6povmp/jIIX/f+NbpH0qmYiHZs=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+    attrs
+    pytz
+  ];
+
+  checkInputs = [
+    aresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Ignore the examples directory as the files are prefixed with test_
+    "examples/"
+  ];
+
+  pythonImportsCheck = [
+    "seventeentrack"
+  ];
+
+  meta = with lib; {
+    description = "Python library to track package info from 17track.com";
+    homepage = "https://github.com/McSwindler/seventeentrack";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "types-requests";
-  version = "2.27.19";
+  version = "2.27.20";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-eV43gRcIjR5L9BosAaFTtz1upAqp18CsdTq96EwNOo8=";
+    sha256 = "sha256-YzRFc83mxO/UTYZ8AVjZ+35r65VyHL6YgvP4V+6KU5g=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/west/default.nix
+++ b/pkgs/development/python-modules/west/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "west";
-  version = "0.13.0";
+  version = "0.13.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-jlOmeIM6NfgYykjhgs7KpnAXFMbT/lpbT/bBaJ2CGY4=";
+    hash = "sha256-B6B7shZ8FM5pyXzXknJv9mwr+ERq4kiEzRf5jLTCicM=";
  };

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

 buildPythonPackage rec {
  pname = "xknx";
-  version = "0.20.3";
+  version = "0.20.4";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -20,8 +20,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "XKNX";
    repo = pname;
-    rev = version;
-    sha256 = "sha256-RGwo6IH1WDNBanpQ14gB3/75db3NPwNUsFy0wPP1Yok=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-uqFS/kveWLEmu+8L9dOprcQcO+Odq9lzfTI9lqIhaSw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix
@ -13,13 +13,16 @@
 , linkFarmFromDrvs
 , lttng-ust
 , makeWrapper
-, nodejs-12_x
 , nodejs-16_x
 , openssl
 , stdenv
 , zlib
 , writeShellApplication
 , nuget-to-nix
+# Keeping this option until upstream removes support for EoL Node.js 12 entirely
+# Also refer to: https://github.com/actions/runner/pull/1716
+, withNode12 ? false
+, nodejs-12_x
 }:
 let
  nugetSource = linkFarmFromDrvs "nuget-packages" (
@ -187,15 +190,17 @@ stdenv.mkDerivation rec {
    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
      # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
      "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
+    ]
+    ++ lib.optionals (!withNode12) [
+      "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
    ];
-
  checkInputs = [ git ];

  checkPhase = ''
    runHook preCheck

    mkdir -p _layout/externals
-    ln -s ${nodejs-12_x} _layout/externals/node12
+    ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} _layout/externals/node12"}
    ln -s ${nodejs-16_x} _layout/externals/node16

    printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'
@ -244,7 +249,7 @@ stdenv.mkDerivation rec {
    # externals/node{12,16}. As opposed to the official releases, we don't
    # link the Alpine Node flavors.
    mkdir -p $out/externals
-    ln -s ${nodejs-12_x} $out/externals/node12
+    ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} $out/externals/node12"}
    ln -s ${nodejs-16_x} $out/externals/node16

    # Install Nodejs scripts called from workflows
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@ -1,4 +1,4 @@
-{ stdenv, ghcWithPackages, makeWrapper, packages }:
+{ stdenv, ghcWithPackages, makeWrapper, packages, lib }:

 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
@ -19,4 +19,11 @@ in stdenv.mkDerivation {
  # trivial derivation
  preferLocalBuild = true;
  allowSubstitutes = false;
+
+  meta = {
+    # Marked as broken because the underlying
+    # haskellPackages.hyper-haskell-server is marked as broken.
+    hydraPlatforms = lib.platforms.none;
+    broken = true;
+  };
 }
--- a/pkgs/development/tools/jl/default.nix
+++ b/pkgs/development/tools/jl/default.nix
@ -34,4 +34,10 @@ mkDerivation rec {
  description = "Functional sed for JSON";
  maintainers = with lib.maintainers; [ fgaz ];
  homepage = "https://github.com/chrisdone/jl";
+
+  # jl needs to be updated to work with aeson-2.0.
+  # As far as I can tell, there is unfortunately no where to report issues upstream
+  # for us to be able to track when upstream adds aeson-2.0 support.
+  hydraPlatforms = lib.platforms.none;
+  broken = true;
 }
--- a/pkgs/servers/jellyfin/node-composition.nix
+++ b/pkgs/servers/jellyfin/node-composition.nix
@ -2,7 +2,7 @@

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:

 let
  nodeEnv = import ../../development/node-packages/node-env.nix {
--- a/pkgs/servers/jellyfin/node-deps.nix
+++ b/pkgs/servers/jellyfin/node-deps.nix
--- a/pkgs/servers/jellyfin/web-update.sh
+++ b/pkgs/servers/jellyfin/web-update.sh
@ -22,7 +22,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 # TODO: use package-lock.json on the next major release
 # https://github.com/jellyfin/jellyfin-web/commit/6efef9680d55a93f4333ef8bfb65a8a650c99a49
 node2nix \
-  --nodejs-12 \
+  --nodejs-14 \
  --development \
  --node-env ../../development/node-packages/node-env.nix \
  --output ./node-deps.nix \
--- a/pkgs/servers/radicale/3.x.nix
+++ b/pkgs/servers/radicale/3.x.nix
@ -2,13 +2,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "radicale";
-  version = "3.1.6";
+  version = "3.1.7";

  src = fetchFromGitHub {
    owner = "Kozea";
    repo = "Radicale";
    rev = "v${version}";
-    hash = "sha256-qu3s/rx5649l7oeiumPtQ9zS9jorMwWMPfO7YdOeGfQ=";
+    hash = "sha256-D/JPq8p+iLmm0XaoXvNonRHr9PIhQ11yTDqur3DiYdc=";
  };

  postPatch = ''
--- a/pkgs/servers/web-apps/lemmy/update.sh
+++ b/pkgs/servers/web-apps/lemmy/update.sh
@ -3,6 +3,8 @@

 # TODO set to `verbose` or `extdebug` once implemented in oil
 shopt --set xtrace
+# we need failures inside of command subs to get the correct dependency sha256
+shopt --unset inherit_errexit

 const directory = $(dirname $0 | xargs realpath)
 const owner = "LemmyNet"
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "nushell";
-  version = "0.60.0";
+  version = "0.61.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "1qfqn2q2bam0jrr4yqq9rb29k8qj9w9g0j9x4n8h0zp28vn7c2bq";
+    sha256 = "sha256-1wTMXlFViJh/x+W7WqZ9uf1SV6X4er6SWO6qTjf9C94=";
  };

-  cargoSha256 = "sha256-gZ9r1Ryp5a7MjG9yM0pGCBYtM4GylZg7Sg9wCiB+SW0=";
+  cargoSha256 = "sha256-aG5otxeVGBAi8uZd7xRnvwapfKT3kToBiYhFUTYIgHM=";

  nativeBuildInputs = [ pkg-config ]
    ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "siege";
-  version = "4.1.2";
+  version = "4.1.3";

  src = fetchurl {
    url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
-    hash = "sha256-5HKr4Zxak/a+W/1k3/JvZo2ixtIQr4ITtgycDbF+ynk=";
+    hash = "sha256-IlC8qPylOfGk5Mvluomv0yxHObL7xgx8phaNmngveQo=";
  };

  NIX_LDFLAGS = lib.optionalString stdenv.isLinux [
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3584,7 +3584,6 @@ with pkgs;
  gpu-burn = callPackage ../applications/misc/gpu-burn {
    # gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use
    # pre-gcc11, in particular gcc9.
-    cudatoolkit = cudaPackages_11_3.cudatoolkit;
    stdenv = gcc9Stdenv;
  };

@ -4884,7 +4883,7 @@ with pkgs;
  cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; };
  cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; };
  cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
-  cudaPackages_11 = cudaPackages_11_5;
+  cudaPackages_11 = cudaPackages_11_6;
  cudaPackages = recurseIntoAttrs cudaPackages_11;

  # TODO: move to alias
@ -23114,7 +23113,6 @@ with pkgs;
    cudaSupport = true;
    # librealsenseWithCuda doesn't build on gcc11. CUDA 11.3 is the last version
    # to use pre-gcc11, in particular gcc9.
-    cudaPackages = cudaPackages_11_3;
    stdenv = gcc9Stdenv;
  };

--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -79,9 +79,12 @@ in {
    ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
      bootPkgs =
        # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
-        # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
-        if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then
+        # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities
+        if stdenv.isAarch64 then
          packages.ghc8102BinaryMinimal
+        # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
+        else if stdenv.hostPlatform.isMusl then
+          packages.ghc8102Binary
        else
          packages.ghc865Binary;
      inherit (buildPackages.python3Packages) sphinx;
@ -245,29 +248,36 @@ in {

    # The integer-simple attribute set contains package sets for all the GHC compilers
    # using integer-simple instead of integer-gmp.
-    integer-simple = let
-      integerSimpleGhcNames = pkgs.lib.filter
-        (name: ! builtins.elem name integerSimpleExcludes)
-        (pkgs.lib.attrNames packages);
-    in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override {
-      ghc = bh.compiler.integer-simple.${name};
-      buildHaskellPackages = bh.packages.integer-simple.${name};
-      overrides = _self : _super : {
-        integer-simple = null;
-        integer-gmp = null;
-      };
-    });
+    integer-simple =
+      let
+        integerSimpleGhcNames = pkgs.lib.filter
+          (name: ! builtins.elem name integerSimpleExcludes)
+          (pkgs.lib.attrNames packages);
+      in
+      pkgs.lib.genAttrs integerSimpleGhcNames
+        (name:
+          packages.${name}.override (oldAttrs: {
+            ghc = bh.compiler.integer-simple.${name};
+            buildHaskellPackages = bh.packages.integer-simple.${name};
+            overrides =
+              pkgs.lib.composeExtensions
+                (oldAttrs.overrides or (_: _: {}))
+                (_: _: { integer-simple = null; });
+          })
+        );

-    native-bignum = let
-      nativeBignumGhcNames = pkgs.lib.filter
-        (name: builtins.elem name nativeBignumIncludes)
-        (pkgs.lib.attrNames compiler);
-    in pkgs.lib.genAttrs nativeBignumGhcNames (name: packages.${name}.override {
-      ghc = bh.compiler.native-bignum.${name};
-      buildHaskellPackages = bh.packages.native-bignum.${name};
-      overrides = _self : _super : {
-        integer-gmp = null;
-      };
-    });
+    native-bignum =
+      let
+        nativeBignumGhcNames = pkgs.lib.filter
+          (name: builtins.elem name nativeBignumIncludes)
+          (pkgs.lib.attrNames compiler);
+      in
+      pkgs.lib.genAttrs nativeBignumGhcNames
+        (name:
+          packages.${name}.override {
+            ghc = bh.compiler.native-bignum.${name};
+            buildHaskellPackages = bh.packages.native-bignum.${name};
+          }
+        );
  };
 }
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -375,6 +375,8 @@ in {

  aiopylgtv = callPackage ../development/python-modules/aiopylgtv { };

+  aioqsw = callPackage ../development/python-modules/aioqsw { };
+
  aiorecollect = callPackage ../development/python-modules/aiorecollect { };

  aioredis = callPackage ../development/python-modules/aioredis { };
@ -1958,11 +1960,7 @@ in {

  cufflinks = callPackage ../development/python-modules/cufflinks { };

-  cupy = callPackage ../development/python-modules/cupy {
-    # cupy doesn't build on gcc11. CUDA 11.3 is the last version to use
-    # pre-gcc11, in particular gcc9.
-    cudaPackages = pkgs.cudaPackages_11_3;
-  };
+  cupy = callPackage ../development/python-modules/cupy { };

  curio = callPackage ../development/python-modules/curio { };

@ -2540,6 +2538,8 @@ in {

  dynd = callPackage ../development/python-modules/dynd { };

+  eagle100 = callPackage ../development/python-modules/eagle100 { };
+
  easydict = callPackage ../development/python-modules/easydict { };

  easygui = callPackage ../development/python-modules/easygui { };
@ -9266,6 +9266,8 @@ in {

  setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { };

+  seventeentrack = callPackage ../development/python-modules/seventeentrack { };
+
  sexpdata = callPackage ../development/python-modules/sexpdata { };

  sfepy = callPackage ../development/python-modules/sfepy { };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -129,7 +129,18 @@ let
  jobs = recursiveUpdateMany [
    (mapTestOn {
      haskellPackages = packagePlatforms pkgs.haskellPackages;
-      haskell.compiler = packagePlatforms pkgs.haskell.compiler;
+      haskell.compiler = packagePlatforms pkgs.haskell.compiler // (lib.genAttrs [
+        "ghcjs"
+        "ghcjs810"
+      ] (ghcjsName: {
+        # We can't build ghcjs itself, since it exceeds 3GB (Hydra's output limit) due
+        # to the size of its bundled libs. We can however save users a bit of compile
+        # time by building the bootstrap ghcjs on Hydra. For this reason, we overwrite
+        # the ghcjs attributes in haskell.compiler with a reference to the bootstrap
+        # ghcjs attribute in their bootstrap package set (exposed via passthru) which
+        # would otherwise be ignored by Hydra.
+        bootGhcjs = (packagePlatforms pkgs.haskell.compiler.${ghcjsName}.passthru).bootGhcjs;
+      }));

      tests.haskell = packagePlatforms pkgs.tests.haskell;