Merge master into staging-next

2022-01-24 12:01:16 +00:00 · 2022-01-24 12:01:16 +00:00 · 6fee71d339
commit 6fee71d339
parent 4bde5a3a68 e7dbfd7ece
46 changed files with 1045 additions and 1054 deletions
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@ -410,6 +410,24 @@
          <literal>~/.local/share/polymc/polymc.cfg</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The terraform 0.12 compatibility has been removed and the
+          <literal>terraform.withPlugins</literal> and
+          <literal>terraform-providers.mkProvider</literal>
+          implementations simplified. Providers now need to be stored
+          under
+          <literal>$out/libexec/terraform-providers/&lt;registry&gt;/&lt;owner&gt;/&lt;name&gt;/&lt;version&gt;/&lt;os&gt;_&lt;arch&gt;/terraform-provider-&lt;name&gt;_v&lt;version&gt;</literal>
+          (which mkProvider does).
+        </para>
+        <para>
+          This breaks back-compat so it’s not possible to mix-and-match
+          with previous versions of nixpkgs. In exchange, it now becomes
+          possible to use the providers from
+          <link xlink:href="https://github.com/numtide/nixpkgs-terraform-providers-bin">nixpkgs-terraform-providers-bin</link>
+          directly.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>pkgs.noto-fonts-cjk</literal> is now deprecated in
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@ -130,6 +130,11 @@ In addition to numerous new and upgraded packages, this release has the followin

 - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.

+- The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under
+`$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does).
+
+  This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
+
 - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
  and `pkgs.noto-fonts-cjk-serif` because they each have different release
  schedules. To maintain compatibility with prior releases of Nixpkgs,
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@ -671,8 +671,6 @@ in {
          "modprobe bcache",
          "udevadm settle",
          "make-bcache -B /dev/vda4 -C /dev/vda3",
-          "echo /dev/vda3 > /sys/fs/bcache/register",
-          "echo /dev/vda4 > /sys/fs/bcache/register",
          "udevadm settle",
          "mkfs.ext3 -L nixos /dev/bcache0",
          "mount LABEL=nixos /mnt",
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@ -19,7 +19,8 @@ let
    , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */
    , deleteVendor ? false
    , proxyVendor ? false
-    , provider-source-address
+    , # Looks like "registry.terraform.io/vancluever/acme"
+      provider-source-address
    }@attrs:
    buildGoModule {
      pname = repo;
@ -34,9 +35,15 @@ let
        inherit owner repo rev sha256;
      };

-      # Terraform allow checking the provider versions, but this breaks
-      # if the versions are not provided via file paths.
-      postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}";
+      # Move the provider to libexec
+      postInstall = ''
+        dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH}
+        mkdir -p "$dir"
+        mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}"
+        rmdir $out/bin
+      '';
+
+      # Keep the attributes around for later consumption
      passthru = attrs;
    };

--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -1,5 +1,6 @@
 { stdenv
 , lib
+, buildEnv
 , buildGoModule
 , fetchFromGitHub
 , makeWrapper
@ -62,9 +63,9 @@ let
          babariviere
          kalbasit
          marsam
+          maxeaubrey
          timstott
          zimbatm
-          maxeaubrey
          zowoq
        ];
      };
@ -76,39 +77,6 @@ let
        let
          actualPlugins = plugins terraform.plugins;

-          # Make providers available in Terraform 0.13 and 0.12 search paths.
-          pluginDir = lib.concatMapStrings
-            (pl:
-              let
-                inherit (pl) version GOOS GOARCH;
-
-                pname = pl.pname or (throw "${pl.name} is missing a pname attribute");
-
-                # This is just the name, without the terraform-provider- prefix
-                plugin_name = lib.removePrefix "terraform-provider-" pname;
-
-                slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}";
-
-                shim = writeText "shim" ''
-                  #!${runtimeShell}
-                  exec ${pl}/bin/${pname}_v${version} "$@"
-                '';
-              in
-              ''
-                TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version}
-                mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)"
-
-                cp ${shim} "$TF_0_13_PROVIDER_PATH"
-                chmod +x "$TF_0_13_PROVIDER_PATH"
-
-                TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version}
-
-                cp ${shim} "$TF_0_12_PROVIDER_PATH"
-                chmod +x "$TF_0_12_PROVIDER_PATH"
-              ''
-            )
-            actualPlugins;
-
          # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
          wrapperInputs = lib.unique (lib.flatten
            (lib.catAttrs "propagatedBuildInputs"
@ -134,18 +102,16 @@ let
          terraform.overrideAttrs
            (orig: { passthru = orig.passthru // passthru; })
        else
-          lib.appendToName "with-plugins" (stdenv.mkDerivation {
+          lib.appendToName "with-plugins" (buildEnv {
            inherit (terraform) name meta;
+            paths = actualPlugins;
            nativeBuildInputs = [ makeWrapper ];
-
-            buildCommand = pluginDir + ''
-              mkdir -p $out/bin/
+            postBuild = ''
+              mkdir -p $out/bin
              makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \
-                --set NIX_TERRAFORM_PLUGIN_DIR $out/plugins \
+                --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \
                --prefix PATH : "${lib.makeBinPath wrapperInputs}"
            '';
-
-            inherit passthru;
          });
    in
    withPlugins (_: [ ]);
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "rssguard";
-  version = "4.0.4";
+  version = "4.1.2";

  src = fetchFromGitHub {
    owner = "martinrotter";
    repo = pname;
    rev = version;
-    sha256 = "sha256-c6+SlZx3ACG0nJRW+zcDDzVd/oSLAdSaq2fHrPpt6zw=";
+    sha256 = "sha256-aG7Wkn2CHe7Dumskd0+DMja95lzvBWnFXACSqfU7Ow0=";
  };

  buildInputs =  [ qtwebengine qttools ];
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@ -7,7 +7,7 @@ let

  # Please keep the version x.y.0.z and do not update to x.y.76.z because the
  # source of the latter disappears much faster.
-  version = "8.79.0.95";
+  version = "8.80.0.143";

  rpath = lib.makeLibraryPath [
    alsa-lib
@ -69,7 +69,7 @@ let
          "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
          "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
        ];
-        sha256 = "sha256-a6ZtgA0cMAuNVQWAeiIDJ2noPhXjV8KPE8ibkGR7Dns=";
+        sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY=";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@ -2,11 +2,11 @@

 mkDerivation rec {
  pname = "owncloud-client";
-  version = "2.9.2.6206";
+  version = "2.10.0.6519";

  src = fetchurl {
    url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
-    sha256 = "sha256-i6TmJFEuH4A1jTyoKiJoVU7yC+AXZIH4miYSk3XzVEo=";
+    sha256 = "sha256-HDH8s/VPeOAbkyrfE7hbhePhtWcx1IUdlhDCnodomh8=";
  };

  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz",
-  "sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27",
-  "msg": "Update from Hackage at 2022-01-14T12:47:41Z"
+  "commit": "6f406277d7106375f7148466c985061d20cb028b",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6f406277d7106375f7148466c985061d20cb028b.tar.gz",
+  "sha256": "0jvxybgv975lmk268x12dlp8xxv12vmpwc00k3nv6qqp0xd9bwla",
+  "msg": "Update from Hackage at 2022-01-18T22:54:05Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -182,7 +182,7 @@ self: super: {
  digit = doJailbreak super.digit;

  # hnix.patch needed until the next release is bumped
-  hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"
+  hnix = generateOptparseApplicativeCompletion "hnix"
    (overrideCabal (drv: {
      # 2020-06-05: HACK: does not pass own build suite - `dontCheck`
      doCheck = false;
@ -190,7 +190,7 @@ self: super: {
      # needs newer version of relude and semialign than stackage has
      relude = self.relude_1_0_0_1;
      semialign = self.semialign_1_2_0_1;
-    })));
+    }));

  # Fails for non-obvious reasons while attempting to use doctest.
  focuslist = dontCheck super.focuslist;
@ -1110,14 +1110,16 @@ self: super: {
  # https://github.com/elliottt/hsopenid/issues/15
  openid = markBroken super.openid;

-  # The test suite needs the packages's executables in $PATH to succeed.
-  arbtt = overrideCabal (drv: {
+  # Version constraints on test dependency tasty-golden need to be relaxed:
+  # https://github.com/nomeata/arbtt/pull/146
+  arbtt = doJailbreak (overrideCabal (drv: {
+    # The test suite needs the packages's executables in $PATH to succeed.
    preCheck = ''
      for i in $PWD/dist/build/*; do
        export PATH="$i:$PATH"
      done
    '';
-  }) super.arbtt;
+  }) super.arbtt);

  # https://github.com/erikd/hjsmin/issues/32
  hjsmin = dontCheck super.hjsmin;
@ -1745,6 +1747,8 @@ self: super: {
  # Too strict version bounds on ghc-events
  # https://github.com/haskell/ThreadScope/issues/118
  threadscope = doJailbreak super.threadscope;
+  # https://github.com/mpickering/hs-speedscope/issues/16
+  hs-speedscope = doJailbreak super.hs-speedscope;

  # Too strict version bounds on tasty
  # Can likely be removed next week (2021-04-09) when 1.1.1.1 is released.
@ -2100,7 +2104,7 @@ self: super: {

  # Needs brick > 0.64
  nix-tree = super.nix-tree.override {
-    brick = self.brick_0_65;
+    brick = self.brick_0_66;
  };

  # build newer version for `pkgs.shellcheck`
@ -2220,6 +2224,16 @@ self: super: {
  # Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
  memory-cd = dontCheck super.memory-cd;

+  # raaz-0.3 onwards uses backpack and it does not play nicely with
+  # parallel builds using -j
+  #
+  # See: https://gitlab.haskell.org/ghc/ghc/-/issues/17188
+  #
+  # Overwrite the build cores
+  raaz = overrideCabal (drv: {
+    enableParallelBuilding = false;
+  }) super.raaz;
+
  # https://github.com/andreymulik/sdp/issues/3
  sdp = disableLibraryProfiling super.sdp;
  sdp-binary = disableLibraryProfiling super.sdp-binary;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -241,4 +241,8 @@ self: super: {

  # https://github.com/sjakobi/bsb-http-chunked/issues/38
  bsb-http-chunked = dontCheck super.bsb-http-chunked;
+
+  # need bytestring >= 0.11 which is only bundled with GHC >= 9.2
+  regex-rure = doDistribute (markUnbroken super.regex-rure);
+  jacinda = doDistribute super.jacinda;
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -354,6 +354,7 @@ broken-packages:
  - binary-derive
  - binary-ext
  - binary-indexed-tree
+  - binary-io
  - binary-protocol
  - binary-typed
  - BinderAnn
@ -755,6 +756,7 @@ broken-packages:
  - compact-socket
  - compact-string
  - compact-string-fix
+  - comparse
  - compdata-dags
  - compdata-param
  - competition
@ -1308,7 +1310,6 @@ broken-packages:
  - event-driven
  - eventful-dynamodb
  - eventful-sql-common
-  - eventlog2html
  - eventloop
  - eventstore
  - ewe
@ -2404,7 +2405,6 @@ broken-packages:
  - hsseccomp
  - hssh
  - hs-snowtify
-  - hs-speedscope
  - hsSqlite3
  - hssqlppp
  - HsSVN
@ -3855,6 +3855,7 @@ broken-packages:
  - powerdns
  - powermate
  - powerpc
+  - powerqueue-distributed
  - powerqueue-levelmem
  - pprecord
  - PPrinter
@ -4013,7 +4014,6 @@ broken-packages:
  - quiver
  - quokka
  - quoridor-hs
-  - raaz
  - RabbitMQ
  - rad
  - radian
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -133,6 +133,9 @@ default-package-overrides:
  # Pinning patch because it is mainly used by the reflex-frp ecosystem which is not yet compatible with it.
  # https://github.com/reflex-frp/reflex-dom/issues/431
  - patch < 0.0.5.0
+  # On the recommendation of hnix author:
+  # https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883
+  - hnix < 0.15

 extra-packages:
  - base16-bytestring < 1               # required for cabal-install etc.
@ -399,6 +402,8 @@ package-maintainers:
    - haskell-ci
    - diagrams
    - rel8
+    - regex-rure
+    - jacinda
    # owothia
    - irc-client
    - chatter
@ -446,6 +451,7 @@ unsupported-platforms:
  FTGL:                                         [ x86_64-darwin, aarch64-darwin ]
  fuzzytime:                                    [ x86_64-darwin, aarch64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
  ghcjs-dom-hello:                              [ x86_64-darwin, aarch64-darwin ]
+  gi-adwaita:                                   [ x86_64-darwin, aarch64-darwin ]
  gi-dbusmenugtk3:                              [ x86_64-darwin, aarch64-darwin ]
  gi-dbusmenu:                                  [ x86_64-darwin, aarch64-darwin ]
  gi-ggit:                                      [ x86_64-darwin, aarch64-darwin ]
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 18.21
+# Stackage LTS 18.22
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -164,14 +164,14 @@ default-package-overrides:
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
  - ascii ==1.0.1.6
-  - ascii-case ==1.0.0.8
-  - ascii-char ==1.0.0.12
+  - ascii-case ==1.0.0.10
+  - ascii-char ==1.0.0.14
  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.8
-  - ascii-predicates ==1.0.0.6
+  - ascii-group ==1.0.0.10
+  - ascii-predicates ==1.0.0.8
  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.8
-  - ascii-th ==1.0.0.6
+  - ascii-superset ==1.0.1.10
+  - ascii-th ==1.0.0.8
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
@ -206,7 +206,7 @@ default-package-overrides:
  - backprop ==0.2.6.4
  - backtracking ==0.1.0
  - bank-holidays-england ==0.2.0.6
-  - barbies ==2.0.3.0
+  - barbies ==2.0.3.1
  - base16 ==0.3.1.0
  - base16-bytestring ==1.0.2.0
  - base16-lens ==0.1.3.2
@ -229,7 +229,7 @@ default-package-overrides:
  - basic-prelude ==0.7.0
  - bazel-runfiles ==0.12
  - bbdb ==0.8
-  - bcp47 ==0.2.0.4
+  - bcp47 ==0.2.0.5
  - bcp47-orphans ==0.1.0.4
  - bcrypt ==0.0.11
  - bech32 ==1.1.2
@ -249,7 +249,7 @@ default-package-overrides:
  - binary-instances ==1.0.2
  - binary-list ==1.1.1.2
  - binary-orphans ==1.0.1
-  - binary-parser ==0.5.7
+  - binary-parser ==0.5.7.1
  - binary-parsers ==0.2.4.0
  - binary-search ==2.0.0
  - binary-shared ==0.8.3
@ -295,13 +295,13 @@ default-package-overrides:
  - bower-json ==1.0.0.1
  - boxes ==0.1.5
  - brick ==0.62
-  - broadcast-chan ==0.2.1.1
+  - broadcast-chan ==0.2.1.2
  - bsb-http-chunked ==0.0.0.4
  - bson ==0.4.0.1
  - btrfs ==0.2.0.0
  - buffer-builder ==0.2.4.7
  - buffer-pipe ==0.0
-  - bugsnag-haskell ==0.0.4.2
+  - bugsnag-haskell ==0.0.4.3
  - bugsnag-hs ==0.2.0.8
  - bugzilla-redhat ==0.3.3
  - burrito ==1.2.0.4
@ -426,8 +426,8 @@ default-package-overrides:
  - comfort-array ==0.4.1
  - comfort-graph ==0.0.3.1
  - commonmark ==0.2.1.1
-  - commonmark-extensions ==0.2.2.1
-  - commonmark-pandoc ==0.2.1.1
+  - commonmark-extensions ==0.2.3
+  - commonmark-pandoc ==0.2.1.2
  - commutative ==0.0.2
  - comonad ==5.0.8
  - comonad-extras ==4.0.1
@ -579,7 +579,7 @@ default-package-overrides:
  - declarative ==0.5.4
  - deepseq-generics ==0.2.0.0
  - deepseq-instances ==0.1.0.1
-  - deferred-folds ==0.9.17
+  - deferred-folds ==0.9.18
  - dejafu ==2.4.0.3
  - dense-linear-algebra ==0.1.0.0
  - dependent-map ==0.4.0.0
@ -790,7 +790,7 @@ default-package-overrides:
  - fmt ==0.6.3.0
  - fn ==0.3.0.2
  - focus ==1.0.3
-  - focuslist ==0.1.0.2
+  - focuslist ==0.1.1.0
  - foldable1 ==0.1.0.0
  - fold-debounce ==0.2.0.9
  - fold-debounce-conduit ==0.2.0.6
@ -809,7 +809,7 @@ default-package-overrides:
  - free ==5.1.7
  - free-categories ==0.2.0.2
  - freenect ==1.2.1
-  - freer-simple ==1.2.1.1
+  - freer-simple ==1.2.1.2
  - freetype2 ==0.2.0
  - free-vl ==0.1.4
  - friendly-time ==0.4.1
@ -924,7 +924,7 @@ default-package-overrides:
  - gingersnap ==0.3.1.0
  - gi-pango ==1.0.24
  - githash ==0.1.6.2
-  - github-release ==1.3.8
+  - github-release ==1.3.10
  - github-rest ==1.0.3
  - github-types ==0.2.1
  - github-webhooks ==0.15.0
@ -1004,10 +1004,10 @@ default-package-overrides:
  - hasktags ==0.72.0
  - hasql ==1.4.5.3
  - hasql-notifications ==0.2.0.0
-  - hasql-optparse-applicative ==0.3.0.6
-  - hasql-pool ==0.5.2
+  - hasql-optparse-applicative ==0.3.0.7
+  - hasql-pool ==0.5.2.2
  - hasql-queue ==1.2.0.2
-  - hasql-transaction ==1.0.1
+  - hasql-transaction ==1.0.1.1
  - hasty-hamiltonian ==1.3.4
  - HaTeX ==3.22.3.0
  - HaXml ==1.25.8
@ -1118,7 +1118,7 @@ default-package-overrides:
  - hspec-expectations ==0.8.2
  - hspec-expectations-json ==1.0.0.4
  - hspec-expectations-lifted ==0.10.0
-  - hspec-expectations-pretty-diff ==0.7.2.5
+  - hspec-expectations-pretty-diff ==0.7.2.6
  - hspec-golden ==0.1.0.3
  - hspec-golden-aeson ==0.7.0.0
  - hspec-hedgehog ==0.0.1.2
@ -1134,7 +1134,7 @@ default-package-overrides:
  - hspec-wai-json ==0.11.0
  - hs-php-session ==0.0.9.3
  - hsshellscript ==3.5.0
-  - hs-tags ==0.1.5.2
+  - hs-tags ==0.1.5.3
  - HStringTemplate ==0.8.8
  - HSvm ==0.1.1.3.25
  - HsYAML ==0.2.1.0
@ -1266,17 +1266,17 @@ default-package-overrides:
  - io-storage ==0.3
  - io-streams ==1.5.2.1
  - io-streams-haproxy ==1.0.1.0
-  - ip6addr ==1.0.2
+  - ip6addr ==1.0.3
  - ipa ==0.3.1.1
  - iproute ==1.7.12
-  - IPv6Addr ==2.0.3
+  - IPv6Addr ==2.0.4
  - ipynb ==0.1.0.2
  - ipython-kernel ==0.10.2.2
  - irc ==0.6.1.0
  - irc-client ==1.1.2.2
  - irc-conduit ==0.3.0.5
  - irc-ctcp ==0.1.3.1
-  - isbn ==1.1.0.2
+  - isbn ==1.1.0.3
  - islink ==0.1.0.0
  - iso3166-country-codes ==0.20140203.8
  - iso639 ==0.1.0.3
@ -1412,7 +1412,7 @@ default-package-overrides:
  - llvm-hs-pure ==9.0.0
  - lmdb ==0.2.5
  - load-env ==0.2.1.0
-  - loc ==0.1.3.10
+  - loc ==0.1.3.16
  - locators ==0.3.0.3
  - loch-th ==0.2.2
  - lockfree-queue ==0.2.3.1
@ -1536,7 +1536,7 @@ default-package-overrides:
  - monad-logger-logstash ==0.1.0.0
  - monad-logger-prefix ==0.1.12
  - monad-loops ==0.4.3
-  - monad-memo ==0.5.3
+  - monad-memo ==0.5.4
  - monad-metrics ==0.2.2.0
  - monad-par ==0.3.5
  - monad-parallel ==0.7.2.5
@ -1599,7 +1599,7 @@ default-package-overrides:
  - natural-sort ==0.1.2
  - natural-transformation ==0.4
  - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.5.1.2
+  - neat-interpolation ==0.5.1.3
  - netcode-io ==0.0.3
  - netlib-carray ==0.1
  - netlib-comfort-array ==0.0.0.2
@ -1726,7 +1726,7 @@ default-package-overrides:
  - parsers ==0.12.10
  - partial-handler ==1.0.3
  - partial-isomorphisms ==0.2.2.1
-  - partial-semigroup ==0.5.1.12
+  - partial-semigroup ==0.5.1.14
  - password ==3.0.0.0
  - password-instances ==3.0.0.0
  - password-types ==1.0.0.0
@ -1858,7 +1858,7 @@ default-package-overrides:
  - profunctors ==5.6.2
  - projectroot ==0.2.0.1
  - project-template ==0.2.1.0
-  - prometheus ==2.2.2
+  - prometheus ==2.2.3
  - prometheus-client ==1.0.1
  - prometheus-metrics-ghc ==1.0.1.2
  - prometheus-wai-middleware ==1.0.1.0
@ -1953,7 +1953,7 @@ default-package-overrides:
  - reducers ==3.12.4
  - refact ==0.3.0.2
  - ref-fd ==0.5
-  - refined ==0.6.2
+  - refined ==0.6.3
  - reflection ==2.1.6
  - reform ==0.2.7.4
  - reform-blaze ==0.2.4.3
@ -2071,7 +2071,7 @@ default-package-overrides:
  - semialign-indexed ==1.1
  - semialign-optics ==1.1
  - semigroupoid-extras ==5
-  - semigroupoids ==5.3.6
+  - semigroupoids ==5.3.7
  - semigroups ==0.19.2
  - semirings ==0.6
  - semiring-simple ==1.0.0.1
@ -2267,7 +2267,7 @@ default-package-overrides:
  - string-random ==0.1.4.1
  - stringsearch ==0.3.6.6
  - string-transform ==1.1.1
-  - stripe-concepts ==1.0.3
+  - stripe-concepts ==1.0.3.1
  - stripe-core ==2.6.2
  - stripe-haskell ==2.6.2
  - stripe-http-client ==2.6.2
@ -2320,7 +2320,7 @@ default-package-overrides:
  - tasty-discover ==4.2.2
  - tasty-expected-failure ==0.12.3
  - tasty-focus ==1.0.1
-  - tasty-golden ==2.3.4
+  - tasty-golden ==2.3.5
  - tasty-hedgehog ==1.1.0.0
  - tasty-hspec ==1.1.6
  - tasty-hunit ==0.10.0.3
@ -2389,9 +2389,9 @@ default-package-overrides:
  - these ==1.1.1.1
  - these-lens ==1.0.1.2
  - these-optics ==1.0.1.2
-  - these-skinny ==0.7.4
+  - these-skinny ==0.7.5
  - th-expand-syns ==0.4.8.0
-  - th-extras ==0.0.0.5
+  - th-extras ==0.0.0.6
  - th-lift ==0.8.2
  - th-lift-instances ==0.1.19
  - th-nowq ==0.1.0.5
@ -2475,7 +2475,7 @@ default-package-overrides:
  - type-level-natural-number ==2.0
  - type-level-numbers ==0.1.1.1
  - typelits-witnesses ==0.4.0.0
-  - type-map ==0.1.6.0
+  - type-map ==0.1.7.0
  - type-natural ==1.1.0.1
  - typenums ==0.1.4
  - type-of-html ==1.6.2.0
@ -2520,7 +2520,7 @@ default-package-overrides:
  - universe-some ==1.2.1
  - universum ==1.7.2
  - unix-bytestring ==0.3.7.6
-  - unix-compat ==0.5.3
+  - unix-compat ==0.5.4
  - unix-time ==0.4.7
  - unliftio ==0.2.20
  - unliftio-core ==0.2.0.1
@ -2590,7 +2590,7 @@ default-package-overrides:
  - wai-cors ==0.2.7
  - wai-enforce-https ==0.0.2.1
  - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.7
+  - wai-extra ==3.1.8
  - wai-feature-flags ==0.1.0.3
  - wai-handler-launch ==3.0.3.1
  - wai-logger ==2.3.7
@ -2636,7 +2636,7 @@ default-package-overrides:
  - wizards ==1.0.3
  - wl-pprint-annotated ==0.1.0.1
  - wl-pprint-console ==0.1.0.2
-  - wl-pprint-text ==1.2.0.1
+  - wl-pprint-text ==1.2.0.2
  - word24 ==2.0.1
  - word8 ==0.1.3
  - wordpress-auth ==1.0.0.1
@ -2668,7 +2668,7 @@ default-package-overrides:
  - xml-conduit ==1.9.1.1
  - xml-conduit-writer ==0.1.1.2
  - xmlgen ==0.6.2.2
-  - xml-hamlet ==0.5.0.1
+  - xml-hamlet ==0.5.0.2
  - xml-helpers ==1.0.0
  - xml-html-qq ==0.1.0.1
  - xml-indexed-cursor ==0.1.1.0
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -965,6 +965,8 @@ dont-distribute-packages:
 - diplomacy
 - diplomacy-server
 - dirfiles
+ - dirtree
+ - disco
 - discogs-haskell
 - discord-gateway
 - discord-hs
@ -1625,6 +1627,7 @@ dont-distribute-packages:
 - hreq-conduit
 - hs-blake2
 - hs-brotli
+ - hs-duktape
 - hs-ffmpeg
 - hs-gen-iface
 - hs-pkpass
@ -1658,7 +1661,7 @@ dont-distribute-packages:
 - hsfacter
 - hslogstash
 - hspec-expectations-pretty
- - hspec-expectations-pretty-diff_0_7_2_6
+ - hspec-expectations-pretty-diff
 - hspec-pg-transact
 - hspec-setup
 - hspec-shouldbe
@ -2305,7 +2308,7 @@ dont-distribute-packages:
 - pairing
 - panda
 - pandoc-japanese-filters
- - pandoc_2_17
+ - pandoc_2_17_0_1
 - papa
 - papa-base
 - papa-base-implement
@ -2461,6 +2464,7 @@ dont-distribute-packages:
 - puppetresources
 - pure-cdb
 - pure-priority-queue-tests
+ - purescript-bridge
 - purescript-iso
 - push-notify
 - push-notify-apn
@ -2746,6 +2750,7 @@ dont-distribute-packages:
 - servant-streaming-client
 - servant-streaming-docs
 - servant-streaming-server
+ - servant-subscriber
 - servant-swagger-tags
 - servant-waargonaut
 - servant-zeppelin-client
@ -3058,6 +3063,7 @@ dont-distribute-packages:
 - trek-db
 - triangulation
 - tries
+ - trimdent
 - trimpolya
 - truelevel
 - trurl
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -1054,4 +1054,22 @@ self: super: builtins.intersectAttrs super {
      "-p" "!/Can be used with http-client/"
    ] ++ drv.testFlags or [];
  }) super.http-api-data-qq;
+
+  # Additionally install documentation
+  jacinda = overrideCabal (drv: {
+    enableSeparateDocOutput = true;
+    postInstall = ''
+      ${drv.postInstall or ""}
+
+      docDir="$doc/share/doc/${drv.pname}-${drv.version}"
+
+      # man page goes to $out, it's small enough and haskellPackages has no
+      # support for a man output at the moment and $doc requires downloading
+      # a full PDF
+      install -Dm644 man/ja.1 -t "$out/share/man/man1"
+      # language guide and examples
+      install -Dm644 doc/guide.pdf -t "$docDir"
+      install -Dm644 test/examples/*.jac -t "$docDir/examples"
+    '';
+  }) super.jacinda;
 }
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/lib/default.nix
+++ b/pkgs/development/haskell-modules/lib/default.nix
@ -9,7 +9,7 @@ rec {
     between the function name and argument of another. haskell.lib.compose is
     preferred for any new code.
  */
-  compose = import ./lib/compose.nix { inherit pkgs lib; };
+  compose = import ./compose.nix { inherit pkgs lib; };

  /* This function takes a file like `hackage-packages.nix` and constructs
     a full package set out of that.
--- a/pkgs/development/haskell-modules/patches/hnix.patch
+++ b/pkgs/development/haskell-modules/patches/hnix.patch
@ -1,24 +0,0 @@
-From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001
-From: Anton Latukha <anton.latukha@gmail.com>
-Date: Sun, 16 Jan 2022 18:16:50 +0200
-Subject: [PATCH] fix aeson <2 support
-
---
- src/Nix/Json.hs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs
-index 3fe05269..329899e4 100644
--- a/src/Nix/Json.hs
-+++ b/src/Nix/Json.hs
-@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding       as TL
- #if MIN_VERSION_aeson(2,0,0)
- import qualified Data.Aeson.Key                as AKM
- import qualified Data.Aeson.KeyMap             as AKM
-+#else
-+import           Nix.Expr.Types
- #endif
- import qualified Data.Vector                   as V
- import           Nix.Atoms
-- 
-2.34.1
--- a/pkgs/development/libraries/rure/Cargo.lock
+++ b/pkgs/development/libraries/rure/Cargo.lock
@ -0,0 +1,49 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+
+[[package]]
+name = "memchr"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "regex"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "rure"
+version = "0.2.1"
+dependencies = [
+ "libc",
+ "regex",
+]
--- a/pkgs/development/libraries/rure/default.nix
+++ b/pkgs/development/libraries/rure/default.nix
@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchCrate
+}:
+
+let
+  pin = lib.importJSON ./pin.json;
+in
+
+rustPlatform.buildRustPackage {
+  inherit (pin) pname version;
+
+  src = fetchCrate pin;
+
+  # upstream doesn't ship a Cargo.lock, is generated by the update script
+  postPatch = ''
+    cp ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  outputs = [ "out" "dev" ];
+
+  # Headers are not handled by cargo nor buildRustPackage
+  postInstall = ''
+    install -Dm644 include/rure.h -t "$dev/include"
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "A C API for Rust's regular expression library";
+    homepage = "https://crates.io/crates/rure";
+    license = [
+      lib.licenses.mit
+      lib.licenses.asl20
+    ];
+    maintainers = [ lib.maintainers.sternenseemann ];
+  };
+}
--- a/pkgs/development/libraries/rure/pin.json
+++ b/pkgs/development/libraries/rure/pin.json
@ -0,0 +1,5 @@
+{
+  "pname": "rure",
+  "version": "0.2.1",
+  "sha256": "18sd1dfagf2338mp32kfjbqpc3n0agm61p044jl7yhy299ws21r8"
+}
--- a/pkgs/development/libraries/rure/update.sh
+++ b/pkgs/development/libraries/rure/update.sh
@ -0,0 +1,51 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -p nix jq curl cargo rsync
+#! nix-shell -i bash
+
+set -eu
+
+cd "$(dirname "$0")"
+
+crate=rure
+
+echo "Getting latest version from crates.io API" >&2
+
+curlOpts=(
+  -H "Accept: application/json"
+  -H "User-Agent: $crate update script (https://github.com/nixos/nixpkgs/)"
+)
+
+version="$(curl "${curlOpts[@]}" "https://crates.io/api/v1/crates/$crate" \
+  | jq -r .crate.max_stable_version)"
+
+echo "Prefetching latest tarball from crates.io" >&2
+
+url="https://crates.io/api/v1/crates/$crate/$version/download"
+prefetch="$(nix-prefetch-url --print-path --type sha256 --unpack "$url")"
+
+cat > pin.json <<EOF
+{
+  "pname": "$crate",
+  "version": "$version",
+  "sha256": "$(printf '%s' "$prefetch" | head -n1)"
+}
+EOF
+
+echo "Generating updated Cargo.lock" >&2
+
+tmp="$(mktemp -d)"
+
+cleanup() {
+  echo "Removing $tmp" >&2
+  rm -rf "$tmp"
+}
+
+trap cleanup EXIT
+
+rsync -a --chmod=ugo=rwX "$(printf '%s' "$prefetch" | tail -n1)/" "$tmp"
+
+pushd "$tmp"
+cargo update
+popd
+
+cp "$tmp/Cargo.lock" ./Cargo.lock
--- a/pkgs/development/misc/resholve/source.nix
+++ b/pkgs/development/misc/resholve/source.nix
@ -3,7 +3,7 @@
 }:

 rec {
-  version = "0.6.8";
+  version = "0.6.9";
  rSrc =
    # local build -> `make ci`; `make clean` to restore
    # return to remote source
@ -14,6 +14,6 @@ rec {
        owner = "abathur";
        repo = "resholve";
        rev = "v${version}";
-        hash = "sha256-1bb22GcOIzmQ31ULZuNNCJ8Vcz4Y0+qAhsJ9PhbqnDM=";
+        hash = "sha256-y9O5w4wA/kR8zoPay9pGs3vwxNqq3JEeZmX0wBJq4UQ=";
      };
 }
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@ -23,12 +23,12 @@

 buildPythonPackage rec {
  pname = "gradient";
-  version = "1.9.1";
+  version = "1.10.0";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zimOh4bc9EQGpqMky/etwnAF04onJ2m/KAl29IaAeAY=";
+    hash = "sha256-wLdxU+PSREmTlX51scazmTC+U/mE95sSpfaUgHb8/Oc=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/intensity-normalization/default.nix
+++ b/pkgs/development/python-modules/intensity-normalization/default.nix
@ -15,25 +15,16 @@

 buildPythonPackage rec {
  pname = "intensity-normalization";
-  version = "2.1.2";
+  version = "2.1.4";
+  format = "setuptools";
+
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-92STD5sOc9TLf3Ooaoi3afWkXiGjVgUUFvSVTeP8MaA=";
+    sha256 = "e7b46039311bcbba40224d85eb07eefe1488bd8a6faa893a180e15e65c48b7f5";
  };

-  postPatch = ''
-    substituteInPlace setup.cfg --replace "pytest-runner" ""
-  '';
-
-  checkInputs = [ pytestCheckHook ];
-  pythonImportsCheck = [
-    "intensity_normalization"
-    "intensity_normalization.normalize"
-    "intensity_normalization.plot"
-    "intensity_normalization.util"
-  ];
  propagatedBuildInputs = [
    matplotlib
    nibabel
@ -45,6 +36,22 @@ buildPythonPackage rec {
    statsmodels
  ];

+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pytest-runner" ""
+  '';
+
+  pythonImportsCheck = [
+    "intensity_normalization"
+    "intensity_normalization.normalize"
+    "intensity_normalization.plot"
+    "intensity_normalization.util"
+  ];
+
  meta = with lib; {
    homepage = "https://github.com/jcreinhold/intensity-normalization";
    description = "MRI intensity normalization tools";
--- a/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/pkgs/development/python-modules/precis-i18n/default.nix
@ -1,21 +1,31 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:

 buildPythonPackage rec {
  pname = "precis-i18n";
-  version = "1.0.3";
+  version = "1.0.4";
+  format = "setuptools";

-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "byllyfish";
    repo = "precis_i18n";
    rev = "v${version}";
-    hash = "sha256-pBmllX1RVdFnZsDSW7Hh5uVqK2d++kcp1NQLN/phXdU=";
+    hash = "sha256-90yNusUyz8qJi7WWYIFhHzrpvu1TqxfpT+lv2CVhSR8=";
  };

-  meta = {
+  pythonImportsCheck = [
+    "precis_i18n"
+  ];
+
+  meta = with lib; {
    homepage = "https://github.com/byllyfish/precis_i18n";
    description = "Internationalized usernames and passwords";
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/pyenvisalink/default.nix
+++ b/pkgs/development/python-modules/pyenvisalink/default.nix
@ -9,12 +9,14 @@

 buildPythonPackage rec {
  pname = "pyenvisalink";
-  version = "4.2";
-  disabled = pythonOlder "3.5";
+  version = "4.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "64f128212ba0257ae8e47612891a2dae7de2c155c81326257582d565f53778ad";
+    sha256 = "151a9bdefa2772cc9d2f913a32792625a4dc80c6c08086783ebc57de355e68a1";
  };

  propagatedBuildInputs = [
@ -25,7 +27,10 @@ buildPythonPackage rec {

  # Tests require an Envisalink device
  doCheck = false;
-  pythonImportsCheck = [ "pyenvisalink" ];
+
+  pythonImportsCheck = [
+    "pyenvisalink"
+  ];

  meta = with lib; {
    description = "Python interface for Envisalink 2DS/3 Alarm API";
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "cloud-nuke";
-  version = "0.7.3";
+  version = "0.9.1";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-rAyS9S7kZzc9BBciI3aK3PyMmjP2LRQz9H6mMLQt34I=";
+    sha256 = "sha256-dTS3HNGd5Ga18tERuDAhclWP3zvYO4RWx2nkd+x5D1w=";
  };

-  vendorSha256 = "sha256-ZKv68j/4X48c6ipf4Ei4UnVPn7435wI2igQ9UjM2yOM=";
+  vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI=";

  ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];

--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-expand";
-  version = "1.0.13";
+  version = "1.0.14";

  src = fetchFromGitHub {
    owner = "dtolnay";
    repo = pname;
    rev = version;
-    sha256 = "sha256-uusPj4lt1tjS2WaFMjSr8MN3NxHXod4t7EoNRIDsjvA=";
+    sha256 = "sha256-6Wm/qnrSUswWnXt6CPUJUvqNj06eSYuYOmGhbpO1hvo=";
  };

-  cargoSha256 = "sha256-iIrnlDKni0kUjp0Qonq98H+UhqV45jnVSOx8BJKyBpg=";
+  cargoSha256 = "sha256-1+3NMfUhL5sPu92r+B0DRmJ03ZREkFZHjMjvabLyFgs=";

  buildInputs = lib.optional stdenv.isDarwin libiconv;

--- a/pkgs/development/tools/symfony-cli/default.nix
+++ b/pkgs/development/tools/symfony-cli/default.nix
@ -2,14 +2,14 @@

 buildGoModule rec {
  pname = "symfony-cli";
-  version = "5.1.0";
+  version = "5.2.1";
  vendorSha256 = "sha256-vnevuJoDiAx/Z6uKO/SX3UV3j/jsXXNlnui6Nzm+tBA=";

  src = fetchFromGitHub {
    owner = "symfony-cli";
    repo = "symfony-cli";
    rev = "v${version}";
-    sha256 = "sha256-leoR/zW6MHuZH/9xJlO0kYpr1UWpA1WWjXP7+4JkPBg=";
+    sha256 = "sha256-51TkiOf3QkwuLv3l+aj5r5tgpDD/VglqeAjliCm5E5M=";
  };

  # Tests requires network access
--- a/pkgs/games/purpur/default.nix
+++ b/pkgs/games/purpur/default.nix
@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, nixosTests, jre_headless, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "purpur";
+  version = "1.18.1r1522";
+
+  src = fetchurl {
+    url = "https://api.purpurmc.org/v2/purpur/${builtins.replaceStrings [ "r" ] [ "/" ] version}/download";
+    sha256 = "1060fsfcw6m30d47wla1vsnmc4czyla6m8wf91ws095hbvc22qsm";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  preferLocalBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/minecraft
+    cp -v $src $out/lib/minecraft/server.jar
+
+    makeWrapper ${jre_headless}/bin/java $out/bin/minecraft-server \
+      --add-flags "-jar $out/lib/minecraft/server.jar nogui"
+  '';
+
+  dontUnpack = true;
+
+  passthru = {
+    tests = { inherit (nixosTests) minecraft-server; };
+  };
+
+  meta = with lib; {
+    description = "A drop-in replacement for Minecraft Paper servers";
+    longDescription = ''
+      Purpur is a drop-in replacement for Minecraft Paper servers designed for configurability, new fun and exciting
+      gameplay features, and performance built on top of Airplane.
+    '';
+    homepage = "https://purpurmc.org/";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ jyooru ];
+  };
+}
--- a/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/pkgs/os-specific/linux/rtl8189es/default.nix
@ -0,0 +1,50 @@
+{ stdenv, lib, fetchFromGitHub, kernel, bc, nukeReferences }:
+
+stdenv.mkDerivation rec {
+  name = "rtl8189es-${kernel.version}-${version}";
+  version = "2020-10-03";
+
+  src = fetchFromGitHub {
+    owner = "jwrdegoede";
+    repo = "rtl8189ES_linux";
+    rev = "03ac413135a355b55b693154c44b70f86a39732e";
+    sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56";
+  };
+
+  nativeBuildInputs = [ bc nukeReferences ];
+  buildInputs = kernel.moduleBuildDependencies;
+
+  hardeningDisable = [ "pic" "format" ];
+
+  prePatch = ''
+    substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
+    substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
+    substituteInPlace ./Makefile --replace /sbin/depmod \#
+    substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
+    ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
+  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
+
+  preInstall = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  postInstall = ''
+    nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+  '';
+
+  meta = with lib; {
+    description = "Driver for Realtek rtl8189es";
+    homepage = "https://github.com/jwrdegoede/rtl8189ES_linux";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ danielfullmer lheckemann ];
+  };
+}
--- a/pkgs/servers/heisenbridge/default.nix
+++ b/pkgs/servers/heisenbridge/default.nix
@ -12,6 +12,9 @@ python3.pkgs.buildPythonApplication rec {

  postPatch = ''
    echo "${version}" > heisenbridge/version.txt
+
+    substituteInPlace setup.cfg \
+      --replace "irc >=19.0.0, <20.0" "irc"
  '';

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
  pname = "aws-vault";
-  version = "6.3.1";
+  version = "6.4.0";

  src = fetchFromGitHub {
    owner = "99designs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-yNmjoCq9fYzt/lZQlVgxQvxKWCh5Lxd4NSX7c+gE/As=";
+    sha256 = "sha256-5cBQFkagDfMb8xvEQgWlVbYp++mXIHl2p5TZuiaO4Rw=";
  };

-  vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw=";
+  vendorSha256 = "sha256-iRJjN+fG5tFhMvHHR3pnWW8Y9VWopuKVv/AgivJC4Eo=";

  nativeBuildInputs = [ installShellFiles makeWrapper ];

--- a/pkgs/tools/graphics/agi/default.nix
+++ b/pkgs/tools/graphics/agi/default.nix
@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "agi";
-  version = "2.1.0-dev-20210924";
+  version = "2.2.0-dev-20220120";

  src = fetchzip {
    url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
-    sha256 = "sha256-OX26qoyJMG54BA/62GbGRjqdYA7n56SUVVOcdyVAGmM=";
+    sha256 = "sha256-0f17CAANxomtx1fvhj+mI6k4IqwIimmcTSTXZGbbWDY=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gifski";
-  version = "1.6.1";
+  version = "1.6.4";

  src = fetchFromGitHub {
    owner = "ImageOptim";
    repo = "gifski";
    rev = version;
-    sha256 = "sha256-mM+gxBmMsdPUBOYyRdomd5+v+bqGN+udcuXI/stMZ4Y=";
+    sha256 = "sha256-TD6MSZfvJ8fLJxvDh4fc4Dij5t4WSH2/i9Jz7eBmlME=";
  };

-  cargoSha256 = "sha256-5effx4tgMbnoVMO2Fza1naGFnMCvm0vhx6njo9/8bq0=";
+  cargoSha256 = "sha256-kG0svhytDzm2dc//8WTFm1sI3WS0Ny9yhYTSMoXnt8I=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/tools/misc/nncp/default.nix
+++ b/pkgs/tools/misc/nncp/default.nix
@ -3,12 +3,12 @@

 stdenv.mkDerivation rec {
  pname = "nncp";
-  version = "8.2.0";
+  version = "8.3.0";
  outputs = [ "out" "doc" "info" ];

  src = fetchurl {
    url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
-    sha256 = "sha256-WbDW4kjTAokpOVtjXU4M8RS8TeD0+fEFLgSShJgO6t0=";
+    sha256 = "sha256-bBSIep72htYRLyCW7R2la6q+X+tLqSVziazGsm0KI+o=";
  };

  nativeBuildInputs = [ go redo-apenwarr ];
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@ -3,6 +3,8 @@
 , lib
 , stdenv
 , fetchpatch
+, pkg-config
+, zstd
 , CoreFoundation
 , libiconv
 , libresolv
@ -11,18 +13,24 @@

 rustPlatform.buildRustPackage rec {
  pname = "onefetch";
-  version = "2.10.2";
+  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "o2sh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ=";
+    sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM=";
  };

-  cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg=";
+  # enable pkg-config feature of zstd
+  cargoPatches = [ ./zstd-pkg-config.patch ];

-  buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ];
+  cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ zstd ]
+    ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ];

  meta = with lib; {
    description = "Git repository summary on your terminal";
--- a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
+++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
@ -0,0 +1,31 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 202cda0..bc864cc 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -872,6 +872,7 @@ dependencies = [
+  "tokei",
+  "toml",
+  "yaml-rust",
+ "zstd-sys",
+ ]
+ 
+ [[package]]
+@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7"
+ dependencies = [
+  "cc",
+  "libc",
+ "pkg-config",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index 8e0b5ff..48959b4 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -57,6 +57,8 @@ libc = "0.2.112"
+ [dev-dependencies]
+ more-asserts = "0.2"
+ paste = "1.0.6"
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
+zstd-sys = { version = "1", features = [ "pkg-config" ] }
+ 
+ [features]
+ fail-on-deprecated = []
--- a/pkgs/tools/networking/checkip/default.nix
+++ b/pkgs/tools/networking/checkip/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "checkip";
-  version = "0.16.2";
+  version = "0.17.3";

  src = fetchFromGitHub {
    owner = "jreisinger";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ktAb5kUwEE4xCgsuj0gO4jP6EybOBLjdlskUF/zwrqU=";
+    sha256 = "sha256-sSXl2I5vZ8PVLaZWlMl5phcqQ1k1OBy5v+X0O8nHtvw=";
  };

  vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag=";
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "crowdin-cli";
-  version = "3.7.5";
+  version = "3.7.7";

  src = fetchurl {
    url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
-    sha256 = "sha256-p2lfE3fxUpgTGgIP6KojQ5uC3kF7KWDIU2ILpi90Sso=";
+    sha256 = "sha256-9YDWuTniXeTr9t7LzTPBljSrgNw3VeZskFRTlekoMT0=";
  };

  nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -13534,6 +13534,8 @@ with pkgs;
    stdenv = clangStdenv;
  };

+  jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc921.jacinda;
+
  janet = callPackage ../development/interpreters/janet {};

  jelly = callPackage ../development/interpreters/jelly {};
@ -19715,6 +19717,8 @@ with pkgs;

  rubberband = callPackage ../development/libraries/rubberband { };

+  rure = callPackage ../development/libraries/rure { };
+
  rustc-demangle = callPackage ../development/libraries/rustc-demangle { };

  s2geometry = callPackage ../development/libraries/s2geometry { };
@ -28084,6 +28088,8 @@ with pkgs;

  purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };

+  purpur = callPackage ../games/purpur { };
+
  pikopixel = callPackage ../applications/graphics/pikopixel { };

  pithos = callPackage ../applications/audio/pithos {
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -19,7 +19,7 @@ let
    "ghcHEAD"
  ];

-  haskellLibUncomposable = import ../development/haskell-modules/lib.nix {
+  haskellLibUncomposable = import ../development/haskell-modules/lib {
    inherit (pkgs) lib;
    inherit pkgs;
  };
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@ -348,6 +348,8 @@ in {

    rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { };

+    rtl8189es = callPackage ../os-specific/linux/rtl8189es { };
+
    rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };

    rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -188,6 +188,7 @@ let
        icepeak
        idris
        ihaskell
+        jacinda
        jl
        koka
        krank