Merge master into staging-next

2022-09-21 18:01:25 +00:00 · 2022-09-21 18:01:25 +00:00 · 57e15d64c3
commit 57e15d64c3
parent feec896b13 9b6e32ee67
65 changed files with 2425 additions and 1337 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -15407,4 +15407,10 @@
    github = "zuzuleinen";
    githubId = 944919;
  };
+  quasigod-io = {
+    email = "quasigod-io@protonmail.com";
+    name = "Michael Belsanti";
+    github = "quasigod-io";
+    githubId = 62124625;
+  };
 }
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@ -58,7 +58,14 @@ sed -r \
    -e '/ jailbreak-cabal /d' \
    -e '/ language-nix /d' \
    -e '/ cabal-install /d' \
+    -e '/ lsp /d' \
+    -e '/ lsp-types /d' \
+    -e '/ lsp-test /d' \
+    -e '/ hie-bios /d' \
    < "${tmpfile_new}" >> $stackage_config
+# Explanations:
+# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
+# lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage.

 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
--- a/nixos/doc/manual/development/option-declarations.section.md
+++ b/nixos/doc/manual/development/option-declarations.section.md
@ -124,14 +124,14 @@ lib.mkOption {
 ```nix
 lib.mkPackageOption pkgs "GHC" {
  default = [ "ghc" ];
-  example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
+  example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
 }
 # is like
 lib.mkOption {
  type = lib.types.package;
  default = pkgs.ghc;
  defaultText = lib.literalExpression "pkgs.ghc";
-  example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
+  example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
  description = "The GHC package to use.";
 }
 ```
--- a/nixos/doc/manual/from_md/development/option-declarations.section.xml
+++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml
@ -189,14 +189,14 @@ lib.mkOption {
        <programlisting language="bash">
 lib.mkPackageOption pkgs &quot;GHC&quot; {
  default = [ &quot;ghc&quot; ];
-  example = &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
+  example = &quot;pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
 }
 # is like
 lib.mkOption {
  type = lib.types.package;
  default = pkgs.ghc;
  defaultText = lib.literalExpression &quot;pkgs.ghc&quot;;
-  example = lib.literalExpression &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
+  example = lib.literalExpression &quot;pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
  description = &quot;The GHC package to use.&quot;;
 }
 </programlisting>
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@ -1469,6 +1469,16 @@ Superuser created successfully.
          extent.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>pkgs.haskell-language-server</literal> will now by
+          default be linked dynamically to improve TemplateHaskell
+          compatibility. To mitigate the increased closure size it will
+          now by default only support our current default ghc (at the
+          moment 9.0.2). Add other ghc versions via e.g.
+          <literal>pkgs.haskell-language-server.override { supportedGhcVersions = [ &quot;90&quot; &quot;92&quot; ]; }</literal>.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-21.11-notable-changes">
@ -2087,6 +2097,18 @@ Superuser created successfully.
          <literal>java-packages.compiler</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The sets <literal>haskell.packages</literal> and
+          <literal>haskell.compiler</literal> now contain for every ghc
+          version an attribute with the minor version dropped. E.g. for
+          <literal>ghc8107</literal> there also now exists
+          <literal>ghc810</literal>. Those attributes point to the same
+          compilers and packagesets but have the advantage that e.g.
+          <literal>ghc92</literal> stays stable when we update from
+          <literal>ghc924</literal> to <literal>ghc925</literal>.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
 </section>
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -508,6 +508,14 @@
          been removed due to lack of upstream maintenance.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>aws</literal> package has been removed due to
+          being abandoned by the upstream. It is recommended to use
+          <literal>awscli</literal> or <literal>awscli2</literal>
+          instead.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>meta.mainProgram</literal> attribute of packages
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@ -437,6 +437,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 - `/usr` will always be included in the initial ramdisk. See the `fileSystems.<name>.neededForBoot` option.
  If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent.

+- `pkgs.haskell-language-server` will now by default be linked dynamically to improve TemplateHaskell compatibility. To mitigate the increased closure size it will now by default only support our current default ghc (at the moment 9.0.2). Add other ghc versions via e.g. `pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }`.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}


@ -573,3 +575,5 @@ In addition to numerous new and upgraded packages, this release has the followin
 - hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates).

 - More jdk and jre versions are now exposed via `java-packages.compiler`.
+
+- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`.
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -176,6 +176,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
  `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
  maintenance.

+- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
+
 - The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.

 - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone.
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@ -71,9 +71,6 @@ in
  };

  config =
-    let
-      localPostgres = (cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql");
-    in
    lib.mkIf cfg.enable {
      services.lemmy.settings = (mapAttrs (name: mkDefault)
        {
@ -100,8 +97,13 @@ in
        };
      });

-      services.postgresql = mkIf localPostgres {
-        enable = mkDefault true;
+      services.postgresql = mkIf cfg.database.createLocally {
+        enable = true;
+        ensureDatabases = [ cfg.settings.database.database ];
+        ensureUsers = [{
+          name = cfg.settings.database.user;
+          ensurePermissions."DATABASE ${cfg.settings.database.database}" = "ALL PRIVILEGES";
+        }];
      };

      services.pict-rs.enable = true;
@ -141,7 +143,7 @@ in
      };

      assertions = [{
-        assertion = cfg.database.createLocally -> localPostgres;
+        assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
        message = "if you want to create the database locally, you need to use a local database";
      }];

@ -162,9 +164,9 @@ in

        wantedBy = [ "multi-user.target" ];

-        after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
+        after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];

-        requires = lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];
+        requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];

        serviceConfig = {
          DynamicUser = true;
@ -201,27 +203,6 @@ in
          ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js";
        };
      };
-
-      systemd.services.lemmy-postgresql = mkIf cfg.database.createLocally {
-        description = "Lemmy postgresql db";
-        after = [ "postgresql.service" ];
-        partOf = [ "lemmy.service" ];
-        script = with cfg.settings.database; ''
-          PSQL() {
-            ${config.services.postgresql.package}/bin/psql --port=${toString cfg.settings.database.port} "$@"
-          }
-          # check if the database already exists
-          if ! PSQL -lqt | ${pkgs.coreutils}/bin/cut -d \| -f 1 | ${pkgs.gnugrep}/bin/grep -qw ${database} ; then
-            PSQL -tAc "CREATE ROLE ${user} WITH LOGIN;"
-            PSQL -tAc "CREATE DATABASE ${database} WITH OWNER ${user};"
-          fi
-        '';
-        serviceConfig = {
-          User = config.services.postgresql.superUser;
-          Type = "oneshot";
-          RemainAfterExit = true;
-        };
-      };
    };

 }
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@ -46,7 +46,7 @@ in {
      haskellPackages = mkOption {
        default = pkgs.haskellPackages;
        defaultText = literalExpression "pkgs.haskellPackages";
-        example = literalExpression "pkgs.haskell.packages.ghc8107";
+        example = literalExpression "pkgs.haskell.packages.ghc810";
        type = types.attrs;
        description = lib.mdDoc ''
          haskellPackages used to build Xmonad and other packages.
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hugo";
-  version = "0.103.0";
+  version = "0.103.1";

  src = fetchFromGitHub {
    owner = "gohugoio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-X78wmxEjw2noOjOj3uujXZHsPOSdZJ4KPz4Ia5sOu3I=";
+    sha256 = "sha256-KSNBbSJROx65WxOd98XLLbbSDL0x4ESEKVIsrZV911k=";
  };

  vendorSha256 = "sha256-Y0+D5H7kWi+bacJm1pouYDPHnnSRPatOt6qPfkk92X4=";
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@ -22,6 +22,7 @@
 , zstd
 , yq-go
 , nixosTests
+, pkgsBuildBuild
 }:

 with lib;
@ -240,7 +241,11 @@ buildGoModule rec {

    substituteInPlace scripts/package-cli \
      --replace '"''${GO}" generate' \
-                'GOFLAGS="" "''${GO}" generate'
+                'GOFLAGS="" \
+                 GOOS="${pkgsBuildBuild.go.GOOS}" \
+                 GOARCH="${pkgsBuildBuild.go.GOARCH}" \
+                 CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \
+                 "''${GO}" generate'
  '';

  # Important utilities used by the kubelet, see
--- a/pkgs/applications/networking/cluster/kubebuilder/default.nix
+++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix
@ -9,15 +9,15 @@

 buildGoModule rec {
  pname = "kubebuilder";
-  version = "3.6.0";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = "kubebuilder";
    rev = "v${version}";
-    sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ=";
+    sha256 = "sha256-nLjmz9OakBLTBWdYA6czgtJmCuP96abNwLcLZo+yZ48=";
  };
-  vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ=";
+  vendorSha256 = "sha256-xljLDwubwr6rZ/ZpW9/WithClaMo88ivlBhWFb0iAvo=";

  subPackages = ["cmd"];

--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -168,9 +168,9 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.2.9";
-    sha256 = "sha256-Q5AJiFnbHXhIJP06SCJNvuMKGwEJUOsmueCI7QCeQlk=";
-    vendorSha256 = "sha256-VKJ+aWZYD6N8HDJwUEtgWxoBMGOa27K9ze2RUJvuipc=";
+    version = "1.3.0";
+    sha256 = "1bl2d1wzarhglfc2vxg4m080d6z5mm35h3i4vg7n93wj9x3wkkq8";
+    vendorSha256 = "1kjbrwn6k0fycal8g189pda1w3qyjzfk2qjvm1fyj60dr155gncw";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
      inherit plugins;
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -39,13 +39,13 @@ rec {
  };
  thunderbird-102 = (buildMozillaMach rec {
    pname = "thunderbird";
-    version = "102.2.2";
+    version = "102.3.0";
    application = "comm/mail";
    applicationName = "Mozilla Thunderbird";
    binaryName = pname;
    src = fetchurl {
      url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-      sha512 = "fe72ddb81d35d4a85b25a6d955a0b0f705aeda2dca0f572efca7ce94041c4ddcead6c690bda8d4bded4c43e12a15669f9608db6debec38d8b5157a914e280db5";
+      sha512 = "9b9908d9f7b1281df5b2c74a25211973e25d9b780f05b9550c89e5aeb8b39070c517a1a33d0d84a33ed26dbcef99058308b76c056bd4e34987c32f0600e3882e";
    };
    extraPatches = [
      # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34.tar.gz",
-  "sha256": "1kdb392fhm2jvf3rsznx2gzwqki978bj3dpmpjfjxqadbzz9cl34",
-  "msg": "Update from Hackage at 2022-09-11T02:31:18Z"
+  "commit": "e456824564bb5457549a70dc03c7ae00b3dfaec3",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e456824564bb5457549a70dc03c7ae00b3dfaec3.tar.gz",
+  "sha256": "0kvjhghjhs5b6ldp4yyyy158lqk54aahqqp4n0mm67p7qv09i5xr",
+  "msg": "Update from Hackage at 2022-09-19T12:29:18Z"
 }
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@ -1,49 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }:
+{ lib
+, mkXfceDerivation
+, imagemagick
+, libwnck
+, libxfce4ui
+, python3
+, xfce4-panel
+, xfconf
+}:

-stdenv.mkDerivation rec {
+mkXfceDerivation {
+  category = "panel-plugins";
  pname = "xfce4-windowck-plugin";
-  version = "0.4.10";
-
-  src = fetchFromGitHub {
-    owner = "invidian";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-luCQzqWX3Jl2MlBa3vi1q7z1XOhpFxE8PUxscoIyBlA=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
+  version = "0.5.0";
+  rev-prefix = "v";
+  odd-unstable = false;
+  sha256 = "sha256-MhNSgI74VLdoS5yL6nfRrVrPvv7+0P5meO4zQheYFzo=";

  buildInputs = [
-    python3
    imagemagick
    libwnck
    libxfce4ui
+    python3
    xfce4-panel
    xfconf
-    xfce4-dev-tools
  ];

-  preConfigure = ''
-    ./autogen.sh
-    patchShebangs .
+  postPatch = ''
+    patchShebangs themes/windowck{,-dark}/{xfwm4,unity}/generator.py
  '';

-  enableParallelBuilding = true;
-
-  passthru.updateScript = gitUpdater {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    rev-prefix = "v";
-  };
-
  meta = with lib; {
-    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin";
-    description = "Xfce plugins which allows to put the maximized window title and buttons on the panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    description = "Xfce panel plugin for displaying window title and buttons";
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ ] ++ teams.xfce.members;
  };
 }
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@ -7,7 +7,7 @@ let

  fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };

-  hsPkgs = self: pkgs.haskell.packages.ghc8107.override {
+  hsPkgs = self: pkgs.haskell.packages.ghc810.override {
    overrides = self: super: with pkgs.haskell.lib.compose; with lib;
    let elmPkgs = rec {
      elm = overrideCabal (drv: {
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -817,12 +817,12 @@ self: super: {
  # requires git at test-time *and* runtime, but we'll just rely on users to
  # bring their own git at runtime
  sensei = overrideCabal (drv: {
-    testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
+    testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
    testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
  }) (super.sensei.override {
-    hspec = self.hspec_2_10_5;
+    hspec = self.hspec_2_10_6;
    hspec-wai = super.hspec-wai.override {
-      hspec = self.hspec_2_10_5;
+      hspec = self.hspec_2_10_6;
    };
  });

@ -1010,27 +1010,14 @@ self: super: {
  # https://github.com/haskell-hvr/hgettext/issues/14
  hgettext = doJailbreak super.hgettext;

-  # Generate shell completion.
-  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-
-  ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
-
  stack =
    generateOptparseApplicativeCompletion "stack"
-      (doJailbreak # for Cabal constraint added on hackage
-        (appendPatch
-          (fetchpatch {
-            # https://github.com/commercialhaskell/stack/pull/5559
-            # When removing, also remove doJailbreak.
-            name = "stack-pull-5559.patch";
-            url = "https://github.com/hercules-ci/stack/compare/v2.7.5...brandon-leapyear/chinn/cabal-0.patch";
-            sha256 = "sha256-OXmdGgQ2KSKtQKOK6eePLgvUOTlzac544HQYKJpcjnU=";
-          })
+      # stack has a bunch of constraints in its .cabal file that don't seem to be necessary
+      (doJailbreak
          (super.stack.overrideScope (self: super: {
-            # stack 2.7.5 requires aeson <= 1.6.
-            aeson = self.aeson_1_5_6_0;
-          }))
-      ));
+            # Needs Cabal-3.6
+            Cabal = self.Cabal_3_6_3_0;
+          })));

  # Too strict version bound on hashable-time.
  # Tests require newer package version.
@ -1299,13 +1286,17 @@ self: super: {
  # upstream: https://github.com/obsidiansystems/which/pull/6
  which = doJailbreak super.which;

-  # the test suite attempts to run the binaries built in this package
-  # through $PATH but they aren't in $PATH
-  dhall-lsp-server = dontCheck super.dhall-lsp-server;
-
  # https://github.com/ocharles/weeder/issues/15
  weeder = doJailbreak super.weeder;

+  # 2022-09-20: We have overridden lsp to not be the stackage version.
+  # dhall-lsp-server needs the older 1.4.0.0 lsp
+  dhall-lsp-server = super.dhall-lsp-server.override {
+    lsp = dontCheck (super.lsp_1_4_0_0.override {
+      lsp-types = super.lsp-types_1_4_0_1;
+    });
+  };
+
  # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32
  constraints-extras = doJailbreak super.constraints-extras;

@ -1531,20 +1522,28 @@ self: super: {
    })
  ] super.binary-strict;

-  # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
-  # https://github.com/haskell/haskell-language-server/issues/610
-  # https://github.com/haskell/haskell-language-server/issues/611
-  haskell-language-server = lib.pipe super.haskell-language-server [
+  haskell-language-server = (lib.pipe super.haskell-language-server [
    dontCheck
-    (appendConfigureFlags ["-ftactics"])
-    (overrideCabal (old: {
-      libraryHaskellDepends = old.libraryHaskellDepends ++ [
-        super.hls-tactics-plugin
-      ];
-    }))
-  ];
+    (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
+  ]).overrideScope (lself: lsuper: {
+    ormolu = doJailbreak lself.ormolu_0_5_0_1;
+    fourmolu = doJailbreak lself.fourmolu_0_8_2_0;
+    hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
+    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
+    ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
+  });

-  lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp;
+  hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
+    # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
+    hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
+    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
+    ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
+  });
+
+  # For -f-auto see cabal.project in haskell-language-server.
+  ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override {
+    ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
+  });

  # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
  hls-eval-plugin = dontCheck super.hls-eval-plugin;
@ -1565,6 +1564,9 @@ self: super: {
  # https://github.com/haskell/haskell-language-server/issues/2375
  hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;

+  # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
+  hls-refactor-plugin = dontCheck super.hls-refactor-plugin;
+
  # 2021-03-21: Test hangs
  # https://github.com/haskell/haskell-language-server/issues/1562
  # 2021-11-13: Too strict upper bound on implicit-hie-cradle
@ -1642,15 +1644,15 @@ self: super: {
  servant-openapi3 = dontCheck super.servant-openapi3;

  # Give hspec 2.10.* correct dependency versions without overrideScope
-  hspec_2_10_5 = doDistribute (super.hspec_2_10_5.override {
-    hspec-discover = self.hspec-discover_2_10_5;
-    hspec-core = self.hspec-core_2_10_5;
+  hspec_2_10_6 = doDistribute (super.hspec_2_10_6.override {
+    hspec-discover = self.hspec-discover_2_10_6;
+    hspec-core = self.hspec-core_2_10_6;
  });
-  hspec-discover_2_10_5 = super.hspec-discover_2_10_5.override {
-    hspec-meta = self.hspec-meta_2_9_3;
+  hspec-discover_2_10_6 = super.hspec-discover_2_10_6.override {
+    hspec-meta = self.hspec-meta_2_10_5;
  };
-  hspec-core_2_10_5 = super.hspec-core_2_10_5.override {
-    hspec-meta = self.hspec-meta_2_9_3;
+  hspec-core_2_10_6 = super.hspec-core_2_10_6.override {
+    hspec-meta = self.hspec-meta_2_10_5;
  };

  # Point hspec 2.7.10 to correct dependencies
@ -2109,26 +2111,9 @@ self: super: {
  # https://github.com/plow-technologies/hspec-golden-aeson/issues/17
  hspec-golden-aeson = dontCheck super.hspec-golden-aeson;

-  # 2021-11-05: jailBreak the too tight upper bound on haskus-utils-variant
-  ghcup = doJailbreak (super.ghcup.overrideScope (self: super: {
-    Cabal = self.Cabal_3_6_3_0;
-  }));
-
  # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
  stylish-haskell = (super.stylish-haskell.override {
-    ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
-    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_1;
-  });
-
-  ghc-lib-parser-ex_9_2_1_1 = super.ghc-lib-parser-ex_9_2_1_1.override {
-    ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
-  };
-
-  ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
-    ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
-  };
-
-  hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {
+    ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
  });

@ -2159,10 +2144,6 @@ self: super: {
  # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
  streamly-posix = doJailbreak super.streamly-posix;

-  # Not running the "example" test because it requires a binary from lsps test
-  # suite which is not part of the output of lsp.
-  lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test;
-
  # 2021-09-14: Tests are flaky.
  hls-splice-plugin = dontCheck super.hls-splice-plugin;

@ -2510,13 +2491,8 @@ self: super: {
  # has been resolved.
  lucid-htmx = doJailbreak super.lucid-htmx;

-  lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override {
-    lsp-types = self.lsp-types_1_5_0_0;
-  });
-
-  futhark = super.futhark.override {
-    lsp = self.lsp_1_5_0_0;
-  };
+  # 2022-09-20: Restrictive upper bound on lsp
+  futhark = doJailbreak super.futhark;

  # Too strict bounds on hspec
  # https://github.com/klapaucius/vector-hashtables/issues/11
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@ -96,31 +96,20 @@ self: super: {
      executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
    }) super.hnix);

+  haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: {
+    Cabal = lself.Cabal_3_6_3_0;
+    aeson = lself.aeson_1_5_6_0;
+    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
+  }));
+
+  hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: {
+    brittany = doJailbreak lself.brittany_0_13_1_2;
+    aeson = lself.aeson_1_5_6_0;
+    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
+  });
+
  mime-string = disableOptimization super.mime-string;

-  # Older compilers need the latest ghc-lib to build this package.
-  # Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7
-  # https://github.com/haskell/haskell-language-server/issues/2728
-  hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch {
-    name = "hls-hlint-plugin-workaround.patch";
-    url = "https://github.com/haskell/haskell-language-server/pull/2854.patch";
-    hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong=";
-    stripLen = 2;
-    includes = ["src/Ide/Plugin/Hlint.hs"];
-  }) super.hls-hlint-plugin);
-
-  haskell-language-server = appendConfigureFlags [
-      "-f-stylishhaskell"
-      "-f-brittany"
-    ]
-  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;
-
  # weeder 2.3.0 no longer supports GHC 8.10
  weeder = doDistribute (doJailbreak self.weeder_2_2_0);

--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@ -141,20 +141,30 @@ 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 = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: {
+    ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219;
+    ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24;
+    # Pick old ormolu and fourmolu because ghc-lib-parser is not compatible
+    ormolu = doJailbreak lself.ormolu_0_1_4_1;
+    fourmolu = doJailbreak lself.fourmolu_0_3_0_0;
+    hlint = lself.hlint_3_2_8;
+    aeson = lself.aeson_1_5_6_0;
+    stylish-haskell = lself.stylish-haskell_0_13_0_0;
+    lsp-types = doJailbreak lsuper.lsp-types;
+  }));

-  haskell-language-server = appendConfigureFlags [
-      "-f-stylishhaskell"
-      "-f-brittany"
-    ]
-  super.haskell-language-server;
+  hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
+    # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
+    hlint = lself.hlint_3_2_8;
+    ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219;
+    ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24;
+  });
+
+  hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: {
+    brittany = doJailbreak lself.brittany_0_13_1_2;
+    aeson = lself.aeson_1_5_6_0;
+    lsp-types = doJailbreak lsuper.lsp-types;
+  });

  # has a restrictive lower bound on Cabal
  fourmolu = doJailbreak super.fourmolu;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -99,6 +99,12 @@ self: super: {
    sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
  }) (doJailbreak super.language-haskell-extract);

+  haskell-language-server = super.haskell-language-server.overrideScope (lself: lsuper: {
+    # Needed for modern ormolu and fourmolu.
+    # Apply this here and not in common, because other ghc versions offer different Cabal versions.
+    Cabal = lself.Cabal_3_6_3_0;
+  });
+
  # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
  unordered-containers = dontCheck super.unordered-containers;

--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -190,8 +190,13 @@ self: super: {
    revision = null;
  } super.memory);

-  # Use hlint from git for GHC 9.2.1 support
-  hlint = self.hlint_3_4_1;
+  # For -fghc-lib see cabal.project in haskell-language-server.
+  stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell;
+
+  # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
+  hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override {
+    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
+  }));

  # https://github.com/sjakobi/bsb-http-chunked/issues/38
  bsb-http-chunked = dontCheck super.bsb-http-chunked;
@ -201,13 +206,8 @@ self: super: {
  jacinda = doDistribute super.jacinda;
  some = doJailbreak super.some;

-  # 2022-06-05: this is not the latest version of fourmolu because
-  # hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one.
-  fourmolu = super.fourmolu_0_6_0_0;
-  # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
-  hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
+  fourmolu = super.fourmolu_0_8_2_0;

-  hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
  implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
  # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
  hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
@ -215,20 +215,15 @@ self: super: {
  # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
  hiedb = doJailbreak (dontCheck super.hiedb);

+  apply-refact = doDistribute super.apply-refact_0_10_0_0;
+
  # 2022-02-05: The following plugins don‘t work yet on ghc9.2.
  # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
-  haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;})
-    (appendConfigureFlags [
-    "-f-haddockComments"
-    "-f-retrie"
-    "-f-splice"
-    "-f-tactics"
-  ] (super.haskell-language-server.override {
+  haskell-language-server = super.haskell-language-server.override {
    hls-haddock-comments-plugin = null;
-    hls-hlint-plugin = null;
-    hls-retrie-plugin = null;
    hls-splice-plugin = null;
-  }));
+    hls-tactics-plugin = null;
+  };

  # https://github.com/fpco/inline-c/pull/131
  inline-c-cpp =
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -1245,6 +1245,7 @@ broken-packages:
  - ebnf-bff
  - eccrypto-ed25519-bindings
  - ecma262
+  - ecta-plugin
  - ecu
  - eddie
  - ede
@ -1516,6 +1517,7 @@ broken-packages:
  - forbidden-fruit
  - fordo
  - forecast-io
+  - foreign
  - foreign-var
  - forest
  - forest-fire
@ -2233,6 +2235,7 @@ broken-packages:
  - HJVM
  - hkd-delta
  - hkd-lens
+  - hkd-records
  - hkt
  - hlbfgsb
  - hleap
@ -2250,6 +2253,8 @@ broken-packages:
  - hlongurl
  - hlrdb-core
  - hls-exactprint-utils
+  - hls-selection-range-plugin
+  - hls-stan-plugin
  - hlwm
  - hmarkup
  - hmatrix-banded
@ -2275,6 +2280,7 @@ broken-packages:
  - hnn
  - hnop
  - hoauth
+  - hoauth2-tutorial
  - hobbes
  - hobbits
  - hocilib
@ -3247,6 +3253,7 @@ broken-packages:
  - mios
  - MIP
  - mismi-s3-core
+  - miso-action-logger
  - miso-examples
  - mit-3qvpPyAi6mH
  - mix-arrows
@ -3756,6 +3763,7 @@ broken-packages:
  - Pathfinder
  - pathfindingcore
  - PathTree
+  - patrol
  - patronscraper
  - paypal-adaptive-hoops
  - paypal-api
@ -4321,6 +4329,7 @@ broken-packages:
  - reversi
  - ReviewBoard
  - rewrite-inspector
+  - rfc
  - rfc-prelude
  - r-glpk-phonetic-languages-ukrainian-durations
  - rhbzquery
@ -4927,6 +4936,8 @@ broken-packages:
  - SVD2HS
  - svfactor
  - svg-builder-fork
+  - svg-icons
+  - SvgIcons
  - svgutils
  - svm-light-utils
  - svm-simple
@ -5300,6 +5311,7 @@ broken-packages:
  - type-of-html-static
  - typeparams
  - type-prelude
+  - type-rig
  - types-compat
  - type-settheory
  - type-spine
@ -5308,6 +5320,7 @@ broken-packages:
  - typograffiti
  - typson-core
  - tyro
+  - tztime
  - uAgda
  - uberlast
  - ucam-webauth-types
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -113,7 +113,6 @@ extra-packages:
  - dhall == 1.29.0                     # required for ats-pkg
  - dhall == 1.38.1                     # required for spago
  - doctest == 0.18.*                   # 2021-11-19: closest to stackage version for GHC 9.*
-  - fourmolu == 0.6.0.0                 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
  - ghc-api-compat == 8.10.7            # 2022-02-17: preserve for GHC 8.10.7
  - ghc-api-compat == 8.6               # 2021-09-07: preserve for GHC 8.8.4
  - ghc-lib == 8.10.7.*                 # 2022-02-17: preserve for GHC 8.10.7
@ -153,6 +152,13 @@ extra-packages:
  - basement < 0.0.15                   # 2022-08-30: last version to support GHC < 8.10
  - foundation < 0.0.29                 # 2022-08-30: last version to support GHC < 8.10
  - cabal-install-parsers < 0.5         # 2022-08-31: required by haskell-ci 0.14.3
+  - lsp == 1.4.0.0                      # 2022-09-18: need for dhall-lsp-server 1.1.2
+  - lsp-types == 1.4.0.1                # 2022-09-18: need for dhall-lsp-server 1.1.2
+  - stylish-haskell == 0.13.0.0         # 2022-09-19: needed for hls on ghc 8.8
+  - brittany == 0.13.1.2                # 2022-09-20: needed for hls on ghc 8.8
+  - fourmolu == 0.3.0.0                 # 2022-09-21: needed for hls on ghc 8.8
+  - ormolu == 0.1.4.1                   # 2022-09-21: needed for hls on ghc 8.8
+  - hlint == 3.2.8                      # 2022-09-21: needed for hls on ghc 8.8

 package-maintainers:
  abbradar:
--- 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.22
+# Stackage LTS 19.23
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -122,7 +122,7 @@ default-package-overrides:
  - aws-xray-client-persistent ==0.1.0.5
  - aws-xray-client-wai ==0.1.0.2
  - backtracking ==0.1.0
-  - bank-holidays-england ==0.2.0.7
+  - bank-holidays-england ==0.2.0.8
  - barbies ==2.0.3.1
  - barrier ==0.1.1
  - base16 ==0.3.2.0
@ -846,7 +846,7 @@ default-package-overrides:
  - genvalidity-bytestring ==1.0.0.0
  - genvalidity-containers ==1.0.0.0
  - genvalidity-criterion ==1.0.0.0
-  - genvalidity-hspec ==1.0.0.0
+  - genvalidity-hspec ==1.0.0.1
  - genvalidity-hspec-aeson ==1.0.0.0
  - genvalidity-hspec-binary ==1.0.0.0
  - genvalidity-hspec-cereal ==1.0.0.0
@ -962,7 +962,7 @@ default-package-overrides:
  - groups ==0.5.3
  - gtk2hs-buildtools ==0.13.8.3
  - gtk-sni-tray ==0.1.8.0
-  - gtk-strut ==0.1.3.0
+  - gtk-strut ==0.1.3.1
  - guarded-allocation ==0.0.1
  - hackage-cli ==0.0.3.6
  - hackage-db ==2.1.2
@ -1002,7 +1002,7 @@ default-package-overrides:
  - haskell-src-exts-util ==0.2.5
  - haskell-src-meta ==0.8.10
  - haskey-btree ==0.3.0.1
-  - haskintex ==0.8.0.0
+  - haskintex ==0.8.0.1
  - haskoin-core ==0.21.2
  - hasktags ==0.72.0
  - hasql ==1.5.1
@ -1048,7 +1048,6 @@ default-package-overrides:
  - hgeometry-combinatorial ==0.14
  - hid ==0.2.2
  - hidapi ==0.1.8
-  - hie-bios ==0.9.1
  - hi-file-parser ==0.1.3.0
  - higher-leveldb ==0.6.0.0
  - highlighting-kate ==0.6.4
@ -1309,7 +1308,7 @@ default-package-overrides:
  - irc-client ==1.1.2.2
  - irc-conduit ==0.3.0.5
  - irc-ctcp ==0.1.3.1
-  - isbn ==1.1.0.3
+  - isbn ==1.1.0.4
  - islink ==0.1.0.0
  - iso3166-country-codes ==0.20140203.8
  - iso639 ==0.1.0.3
@ -1330,7 +1329,7 @@ default-package-overrides:
  - json-feed ==2.0.0.4
  - jsonifier ==0.2.1.1
  - jsonpath ==0.2.1.0
-  - json-stream ==0.4.4.1
+  - json-stream ==0.4.4.2
  - JuicyPixels ==3.3.7
  - JuicyPixels-blurhash ==0.1.0.3
  - JuicyPixels-extra ==0.5.2
@ -1455,9 +1454,6 @@ default-package-overrides:
  - lpeg ==1.0.3
  - lrucache ==1.2.0.1
  - lrucaching ==0.3.3
-  - lsp ==1.4.0.0
-  - lsp-test ==0.14.0.2
-  - lsp-types ==1.4.0.1
  - lua ==2.1.0
  - lua-arbitrary ==1.0.1
  - lucid ==2.11.1
@ -1531,7 +1527,7 @@ default-package-overrides:
  - mighty-metropolis ==2.0.0
  - mime-mail ==0.5.1
  - mime-mail-ses ==0.4.3
-  - mime-types ==0.1.0.9
+  - mime-types ==0.1.1.0
  - minimal-configuration ==0.1.4
  - minimorph ==0.3.0.1
  - minio-hs ==1.6.0
@ -1857,14 +1853,14 @@ default-package-overrides:
  - polynomials-bernstein ==1.1.2
  - polyparse ==1.13
  - polysemy ==1.6.0.0
-  - polysemy-extra ==0.2.0.0
+  - polysemy-extra ==0.2.1.0
  - polysemy-fs ==0.1.0.0
  - polysemy-fskvstore ==0.1.1.0
  - polysemy-kvstore ==0.1.3.0
-  - polysemy-methodology ==0.2.1.0
+  - polysemy-methodology ==0.2.2.0
  - polysemy-path ==0.2.1.0
  - polysemy-plugin ==0.4.1.1
-  - polysemy-several ==0.1.0.0
+  - polysemy-several ==0.1.1.0
  - polysemy-socket ==0.0.2.0
  - polysemy-uncontrolled ==0.1.1.0
  - polysemy-video ==0.2.0.1
@ -1875,7 +1871,7 @@ default-package-overrides:
  - posix-paths ==0.3.0.0
  - possibly ==1.0.0.0
  - postgres-options ==0.2.0.0
-  - postgresql-binary ==0.12.4.4
+  - postgresql-binary ==0.12.5
  - postgresql-libpq ==0.9.4.3
  - postgresql-libpq-notify ==0.2.0.0
  - postgresql-migration ==0.2.1.3
@ -1954,7 +1950,7 @@ default-package-overrides:
  - pulse-simple ==0.1.14
  - pureMD5 ==2.1.4
  - purescript-bridge ==0.14.0.0
-  - pusher-http-haskell ==2.1.0.11
+  - pusher-http-haskell ==2.1.0.12
  - pvar ==1.0.0.0
  - PyF ==0.10.2.0
  - qchas ==1.1.0.1
@ -2119,7 +2115,7 @@ default-package-overrides:
  - sample-frame ==0.0.3
  - sample-frame-np ==0.0.4.1
  - sampling ==0.3.5
-  - sandwich ==0.1.0.10
+  - sandwich ==0.1.0.11
  - sandwich-quickcheck ==0.1.0.6
  - sandwich-slack ==0.1.0.6
  - say ==0.1.0.1
@ -2386,7 +2382,7 @@ default-package-overrides:
  - swagger2 ==2.8.4
  - swish ==0.10.2.0
  - syb ==0.7.2.1
-  - sydtest-discover ==0.0.0.1
+  - sydtest-discover ==0.0.0.2
  - symbol ==0.2.4
  - symengine ==0.1.2.0
  - symmetry-operations-symbols ==0.0.2.1
@ -2638,7 +2634,7 @@ default-package-overrides:
  - universum ==1.7.3
  - unix-bytestring ==0.3.7.8
  - unix-compat ==0.5.4
-  - unix-time ==0.4.7
+  - unix-time ==0.4.8
  - unliftio ==0.2.22.0
  - unliftio-core ==0.2.0.1
  - unliftio-path ==0.0.2.0
@ -2768,7 +2764,7 @@ default-package-overrides:
  - Win32-notify ==0.3.0.3
  - windns ==0.1.0.1
  - wire-streams ==0.1.1.0
-  - witch ==1.0.0.3
+  - witch ==1.0.0.4
 with-compiler: ghc-9.0.2
  - withdependencies ==0.3.0
  - witherable ==0.4.2
@ -2836,13 +2832,13 @@ with-compiler: ghc-9.0.2
  - yaml-unscrambler ==0.1.0.9
  - yarn-lock ==0.6.5
  - yeshql-core ==4.2.0.0
-  - yesod ==1.6.2
+  - yesod ==1.6.2.1
  - yesod-alerts ==0.1.3.0
  - yesod-auth ==1.6.11
  - yesod-auth-basic ==0.1.0.3
  - yesod-auth-hashdb ==1.7.1.7
  - yesod-auth-oauth2 ==0.7.0.2
-  - yesod-bin ==1.6.2.1
+  - yesod-bin ==1.6.2.2
  - yesod-core ==1.6.24.0
  - yesod-eventsource ==1.6.0.1
  - yesod-form ==1.7.0
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -940,6 +940,7 @@ dont-distribute-packages:
 - claferwiki
 - clash
 - classify-frog
+ - classy-miso
 - clckwrks
 - clckwrks-cli
 - clckwrks-dot-com
@ -2068,6 +2069,7 @@ dont-distribute-packages:
 - hipbot
 - hipsql-client
 - hipsql-server
+ - hipsql-tx-simple
 - hirt
 - hist-pl
 - hist-pl-dawg
@ -2204,6 +2206,7 @@ dont-distribute-packages:
 - hunt-searchengine
 - hunt-server
 - hurdle
+ - hurl-xml
 - huzzy
 - hw-all
 - hw-aws-sqs-conduit
@ -2680,6 +2683,7 @@ dont-distribute-packages:
 - monad-stlike-stm
 - monad-unlift-ref
 - monadiccp-gecode
+ - monadology
 - monarch
 - monetdb-mapi
 - mongrel2-handler
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -96,8 +96,11 @@ self: super: builtins.intersectAttrs super {

  # avoid compiling twice by providing executable as a separate output (with small closure size)
  niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
-  ormolu = enableSeparateBinOutput super.ormolu;
  ghcid = enableSeparateBinOutput super.ghcid;
+  ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu);
+
+  # Generate shell completion.
+  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;

  arbtt = overrideCabal (drv: {
    # The test suite needs the packages's executables in $PATH to succeed.
@ -495,6 +498,14 @@ self: super: builtins.intersectAttrs super {
    librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
  }) super.LDAP);

+  # Not running the "example" test because it requires a binary from lsps test
+  # suite which is not part of the output of lsp.
+  lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test;
+
+  # the test suite attempts to run the binaries built in this package
+  # through $PATH but they aren't in $PATH
+  dhall-lsp-server = dontCheck super.dhall-lsp-server;
+
  # Expects z3 to be on path so we replace it with a hard
  #
  # The tests expect additional solvers on the path, replace the
@ -676,7 +687,6 @@ self: super: builtins.intersectAttrs super {

  # Tests access homeless-shelter.
  hie-bios = dontCheck super.hie-bios;
-  hie-bios_0_5_0 = dontCheck super.hie-bios_0_5_0;

  # Compiling the readme throws errors and has no purpose in nixpkgs
  aeson-gadt-th =
@ -933,11 +943,11 @@ self: super: builtins.intersectAttrs super {
  }) super.procex;

  # Test suite wants to run main executable
-  fourmolu_0_7_0_1 = overrideCabal (drv: {
+  fourmolu_0_8_2_0 = overrideCabal (drv: {
    preCheck = drv.preCheck or "" + ''
      export PATH="$PWD/dist/build/fourmolu:$PATH"
    '';
-  }) super.fourmolu_0_7_0_1;
+  }) super.fourmolu_0_8_2_0;

  # Apply a patch which hardcodes the store path of graphviz instead of using
  # whatever graphviz is in PATH.
@ -1035,6 +1045,9 @@ self: super: builtins.intersectAttrs super {

  keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;

+  # ghcide-bench tests need network
+  ghcide-bench = dontCheck super.ghcide-bench;
+
 # haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
 } // pkgs.lib.mapAttrs
  (_: overrideCabal (drv: {
@ -1051,9 +1064,13 @@ self: super: builtins.intersectAttrs super {
    hls-fourmolu-plugin
    hls-module-name-plugin
    hls-pragmas-plugin
-    hls-splice-plugin;
+    hls-splice-plugin
+    hls-refactor-plugin
+    hls-code-range-plugin
+    hls-explicit-fixity-plugin;
  # Tests have file permissions expections that don‘t work with the nix store.
  hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
+  hls-gadt-plugin = dontCheck super.hls-gadt-plugin;

  # Flaky tests
  hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/audio/game-music-emu/default.nix
+++ b/pkgs/development/libraries/audio/game-music-emu/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
    sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
  };
-  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
+  cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ];
  nativeBuildInputs = [ cmake removeReferencesTo ];

  # It used to reference it, in the past, but thanks to the postFixup hook, now
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@ -67,7 +67,8 @@ let
      !(stdenv.hostPlatform.useLLVM or false) &&
      stdenv.cc.isGNU;

-    nativeBuildInputs = [ perl ];
+    nativeBuildInputs = [ perl ]
+      ++ lib.optionals static [ removeReferencesTo ];
    buildInputs = lib.optional withCryptodev cryptodev
      # perl is included to allow the interpreter path fixup hook to set the
      # correct interpreter in c_rehash.
@ -155,7 +156,7 @@ let
    postInstall =
    (if static then ''
      # OPENSSLDIR has a reference to self
-      ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
+      remove-references-to -t $out $out/lib/*.a
    '' else ''
      # If we're building dynamic libraries, then don't install static
      # libraries.
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@ -49,6 +49,7 @@ let
        withGtk3 = true;
        inherit (srcs.qtbase) src version;
        inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
+        patches = [ ./patches/0007-qtbase-xcursor.patch ];
      };

      qt3d = callPackage ./modules/qt3d.nix { };
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@ -201,6 +201,10 @@ stdenv.mkDerivation rec {
    "-DQT_FEATURE_openssl_linked=ON"
  ];

+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+  ];
+
  outputs = [ "out" "dev" ];

  postInstall = ''
--- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
+++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
@ -0,0 +1,29 @@
+From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Tue, 17 Sep 2019 05:35:58 -0500
+Subject: [PATCH 07/10] qtbase-xcursor
+
+---
+ src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
+index fbadab4d50..c83ce0af5b 100644
+--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
+@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
+     static bool function_ptrs_not_initialized = true;
+     if (function_ptrs_not_initialized) {
+-        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
+        QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
+         bool xcursorFound = xcursorLib.load();
+         if (!xcursorFound) { // try without the version number
+-            xcursorLib.setFileName(QLatin1String("Xcursor"));
+            xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
+             xcursorFound = xcursorLib.load();
+         }
+         if (xcursorFound) {
+-- 
+2.25.1
+
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@ -1,4 +1,4 @@
-{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
+{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec
 , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
 , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
 , randomconv, alcotest
@ -19,6 +19,7 @@ buildDunePackage {
    dns-client
    dns-server
    dns-certify
+    dnssec
    bos
    cmdliner
    fpath
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@ -1,19 +1,20 @@
 { lib, buildDunePackage, fetchurl, alcotest
 , cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
+, base64
 }:

 buildDunePackage rec {
  pname = "dns";
-  version = "6.1.4";
+  version = "6.3.0";

  minimalOCamlVersion = "4.08";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
+    sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
  };

-  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
+  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];

  doCheck = true;
  checkInputs = [ alcotest ];
--- a/pkgs/development/ocaml-modules/dns/dnssec.nix
+++ b/pkgs/development/ocaml-modules/dns/dnssec.nix
@ -0,0 +1,30 @@
+{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
+, domain-name, logs
+, alcotest, base64
+}:
+
+buildDunePackage {
+  pname = "dnssec";
+
+  inherit (dns) version src;
+
+  propagatedBuildInputs = [
+    cstruct
+    dns
+    mirage-crypto
+    mirage-crypto-pk
+    mirage-crypto-ec
+    domain-name
+    logs
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    base64
+  ];
+
+  meta = dns.meta // {
+    description = "DNSSec support for OCaml-DNS";
+  };
+}
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@ -1,6 +1,6 @@
 { buildDunePackage, dns, dns-server, dns-mirage, lru, duration
 , randomconv, lwt, mirage-time, mirage-clock, mirage-random
-, tcpip, tls, tls-mirage
+, tcpip, tls, tls-mirage, dnssec
 , alcotest
 }:

@ -13,6 +13,7 @@ buildDunePackage {
    dns
    dns-server
    dns-mirage
+    dnssec
    lru
    duration
    randomconv
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@ -7,11 +7,6 @@

 buildPythonPackage (rec {
  pname = "elasticsearch";
-  # In 7.14.0, the package was intentionally made incompatible with
-  # the OSS version of elasticsearch - don't update past 7.13.x until
-  # there's a clear path forward. See
-  # https://github.com/elastic/elasticsearch-py/issues/1639 for more
-  # info.
  version = "7.16.3";

  src = fetchPypi {
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@ -41,6 +41,11 @@ buildPythonPackage rec {
    substituteInPlace setup.cfg \
      --replace "--cov=watchdog" "" \
      --replace "--cov-report=term-missing" ""
+  '' + lib.optionalString stdenv.hostPlatform.isMusl
+  # https://github.com/gorakhargosh/watchdog/issues/920
+  ''
+    substituteInPlace tests/test_inotify_c.py \
+      --replace "Unknown error -1" "No error information"
  '';

  disabledTests = [
--- a/pkgs/development/tools/changie/default.nix
+++ b/pkgs/development/tools/changie/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "changie";
-  version = "1.9.0";
+  version = "1.9.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "miniscruff";
    repo = pname;
-    sha256 = "sha256-3i+GInsxGeHXdFYfI664sOshHFsEIVXgXolzPhc9eoM=";
+    sha256 = "sha256-3AGz84z0YmDiLxlbDO0f9ny75hyLB4fnYQSICElJVK4=";
  };

-  vendorSha256 = "sha256-/tYhoHk4+gbdfeBNqcBSM0y4V3tVH67Xta3+e+Sctsg=";
+  vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg=";

  meta = with lib; {
    homepage = "https://changie.dev";
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "doctl";
-  version = "1.79.0";
+  version = "1.81.0";

  vendorSha256 = null;

@ -31,7 +31,7 @@ buildGoModule rec {
    owner = "digitalocean";
    repo = "doctl";
    rev = "v${version}";
-    sha256 = "sha256-0tl79nVvnY2KECrfgEXQ8tOHnwEX+34uiJ/jshK5oFA=";
+    sha256 = "sha256-9sBuuRDbd44XH/DJVQrwiw+MhhQ8pl8uKcnsAa8nXGM=";
  };

  meta = with lib; {
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@ -1,14 +1,14 @@
 { lib
 , stdenv
-, supportedGhcVersions ? [ "884" "8107" "902" "924" ]
-, dynamic ? false
+, supportedGhcVersions ? [ "90" ]
+, dynamic ? true
 , haskellPackages
 , haskell
 }:
 #
 # The recommended way to override this package is
 #
-# pkgs.haskell-language-server.override { supportedGhcVersions = [ "902" ]; }
+# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92"]; }
 #
 # for example. Read more about this in the haskell-language-server section of the nixpkgs manual.
 #
@ -57,8 +57,7 @@ in stdenv.mkDerivation {
        concatMapStringsSep ", " (x: concatStringsSep ", " (targets x))
        supportedGhcVersions
      }.
-
-      You can override the list supportedGhcVersions.
+      You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }.
    '';
  };
 }
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
       hedgehog or hedgehogs after a player's or CPU turn is shown only when
       all movement on the battlefield has ceased).'';
    maintainers = with maintainers; [ kragniz fpletz ];
-    inherit (fpc.meta) platforms;
+    broken = stdenv.isDarwin;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@ -27,11 +27,11 @@ rec {
  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;

  production = generic {
-    version = "515.65.01";
-    sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek=";
-    openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
-    settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
-    persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
+    version = "515.76";
+    sha256_64bit = "sha256-xqKhjOuWX0mAvOTlzqNv1iLNwaXzGg6xu9NZqen2v0Q=";
+    openSha256 = "sha256-843l42atzaTm4pX5UC/JZjXAvhwmBpE8k3SQFEFdcdY=";
+    settingsSha256 = "sha256-2GdqmuvROLa8xFfyFY/F4YzEBq+SlVIYM4CVEARh9MI=";
+    persistencedSha256 = "sha256-nIfP7xBIVy+BUa9VBCNQ9v5RT4l4S9X0GHLpNiN/WRg=";

    brokenOpen = kernelModVersion == "5.4" && kernel.isHardened;
  };
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  pname = "pdns-recursor";
-  version = "4.7.2";
+  version = "4.7.3";

  src = fetchurl {
    url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "sha256-vbQZB5D+dZd41vBRWvu8wKKLPn4bg8Vwyq84QZ1Xgg0=";
+    sha256 = "sha256-IG12bMjwGJ951pr2TY2TfsxhpNE+jqZZTXj+MOYUBfI=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/servers/geospatial/mapserver/default.nix
+++ b/pkgs/servers/geospatial/mapserver/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "mapserver";
-  version = "7.6.4";
+  version = "8.0.0";

  src = fetchFromGitHub {
    owner = "MapServer";
    repo = "MapServer";
    rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "sha256-NMo/7CtWYIP1oPKki09oDWLCbj2vPk3xCU4rkHq8YKY=";
+    sha256 = "sha256-t9tthHszqtbFEh50IhQMtBb9rD9tU3QbDlUsVRVkQ6U=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@ -15,11 +15,11 @@

 stdenv.mkDerivation rec {
  pname = "lighttpd";
-  version = "1.4.66";
+  version = "1.4.67";

  src = fetchurl {
    url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-R6xuYCcaoBluZUctAtAZVW3HxtCd87Zd8sGraGY0jjs=";
+    sha256 = "sha256-fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=";
  };

  postPatch = ''
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "check_ssl_cert";
-  version = "2.45.0";
+  version = "2.46.0";

  src = fetchFromGitHub {
    owner = "matteocorti";
    repo = "check_ssl_cert";
    rev = "v${version}";
-    hash = "sha256-JmSSGt6rm4eSOVIT9eDN8FmQogG8kevHE2jgZfCzmgU=";
+    hash = "sha256-19goHso7jfG5agLB2xetYP2nv0HuXhXYDB6vBC0Pr5M=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@ -11,13 +11,13 @@

 buildDotnetModule rec {
  pname = "EventStore";
-  version = "21.10.5";
+  version = "22.6.0";

  src = fetchFromGitHub {
    owner = "EventStore";
    repo = "EventStore";
    rev = "oss-v${version}";
-    sha256 = "sha256-uUDjTGCiQgXmvOUsujIA0JkGQGuw9U4zLKDP1WIFq1o=";
+    sha256 = "sha256-+s/FjHKBpcpxFecuPrc26fA6WW20Uurxx1RunRY3JWI=";
    leaveDotGit = true;
  };

@ -32,8 +32,8 @@ buildDotnetModule rec {
  runtimeDeps = [ mono ];

  nugetBinariesToPatch = lib.optionals stdenv.isLinux [
-    "grpc.tools/2.39.1/tools/linux_x64/protoc"
-    "grpc.tools/2.39.1/tools/linux_x64/grpc_csharp_plugin"
+    "grpc.tools/2.41.0/tools/linux_x64/protoc"
+    "grpc.tools/2.41.0/tools/linux_x64/grpc_csharp_plugin"
  ];

  postConfigure = ''
@ -71,6 +71,8 @@ buildDotnetModule rec {
    kill "$PID";
  '';

+  passthru.updateScript = ./updater.sh;
+
  meta = with lib; {
    homepage = "https://geteventstore.com/";
    description = "Event sourcing database with processing logic in JavaScript";
--- a/pkgs/servers/nosql/eventstore/deps.nix
+++ b/pkgs/servers/nosql/eventstore/deps.nix
@ -1,3 +1,6 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
 { fetchNuGet }: [
  (fetchNuGet { pname = "CompareNETObjects"; version = "4.65.0"; sha256 = "09p4xs6f7y8dykxx369ycp7z0jl7ai9bx23nazn8yxs5s38d9x2g"; })
  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "4.0.0"; sha256 = "013pzi7f4hf68wjswg0pzamjjsj63rl6jr1ivpd15v86y7vs6r9g"; })
@ -5,17 +8,18 @@
  (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; })
  (fetchNuGet { pname = "EventStore.Plugins"; version = "21.2.0"; sha256 = "0fn2c2xi6yrwznnff3xpkhv5z5rnpka6wsaq1hb1jpxlxfscp670"; })
  (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "1.2.0"; sha256 = "0kndl162zas1ic185v10bm23hmrai54ng7wqlk3sp39gmdqhmyf5"; })
+  (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.0"; sha256 = "0579akfqnb6r3jrr5x6fi5c2pm58m00pjl0g74mxf0xp10sslg5b"; })
  (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; })
-  (fetchNuGet { pname = "Google.Protobuf"; version = "3.15.8"; sha256 = "0k7hiijdrjw2y37yadd0jxx6hm4cd969v8svvddhksh6yqwnzh08"; })
-  (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.39.0"; sha256 = "05im3lh8ar47m2zciwykjn6yqh2m4791pfzqr26408027wjm9vya"; })
-  (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.39.0"; sha256 = "17dhi75q2q0ra5n8qp0dlpgq1vqh186hgs3pqda60ya6hyc1fa45"; })
-  (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.39.0"; sha256 = "0n21bfk1gabqpy9wpyzrzmilz4p8r1b4h0nq9waiqphkbv8g6frh"; })
-  (fetchNuGet { pname = "Grpc.Core"; version = "2.39.1"; sha256 = "1c302krbhy063lpd52mgg9xx9ripp17314mfhym78r1q3nwrp15l"; })
-  (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.39.1"; sha256 = "014b57zhflycsvdc2gmyv2a1vji7qzj1c7l4d1vgksb3ndwaxzrx"; })
-  (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.39.0"; sha256 = "0km3zlkm3yq14yzcyq9g62i7a9qfihg1mczhbm6g8v5xkwbf667l"; })
-  (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.39.0"; sha256 = "115iky8qcazzl993mdf34v6hxzvhk9mpnk7kgxlw4cc1cf0iv16q"; })
-  (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.39.0"; sha256 = "19mghqpgvr5slnlmjvv8hxhq3v9wq7bzab3bcg2b7623z0yxylr4"; })
-  (fetchNuGet { pname = "Grpc.Tools"; version = "2.39.1"; sha256 = "1i5x4sm4rqfs8hc3vgwj05nlhqf0zx9vp72na65z2xyfabc0ybgc"; })
+  (fetchNuGet { pname = "Google.Protobuf"; version = "3.18.0"; sha256 = "0ldfgw6zjjwdw66y3mbq4db54bsbqkklqanm78c8gij3pbvd223z"; })
+  (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.41.0"; sha256 = "0sh9406vs7qfq852b24qxy4ivgxww0paf8rxsn7gs943si6dvj0n"; })
+  (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.41.0"; sha256 = "1ij5wvk3147jdmlybal59xbmlyr50xmzrxsnn77rj2l8g54ajyk2"; })
+  (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.41.0"; sha256 = "0pb4vnc6dfwhrmgraicvqjf3gfz6d9g0qdhicahzsm1ngcj36klc"; })
+  (fetchNuGet { pname = "Grpc.Core"; version = "2.41.0"; sha256 = "1caavhi66r9a0nwyk4vm8mhaayg899d6l0p71cv9n5qgc5xhkwqs"; })
+  (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.41.0"; sha256 = "0524fv8mkdszhblfp1v2d5azdb1vg1rpy30yqpsfn00m7qr3smbv"; })
+  (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.41.0"; sha256 = "0skn1sinkfk8fjpjd2qwr13x62pvk50n8nyy0nwb75n1bp9n8rwc"; })
+  (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.41.0"; sha256 = "08rin624q0w1vk59naxhnn20236yix7g7xb7jfciyv851b4ib1b4"; })
+  (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.41.0"; sha256 = "0cp9xav7bzzy31s1xx221kzslrahnqmcj967lwrk6h949b2g552v"; })
+  (fetchNuGet { pname = "Grpc.Tools"; version = "2.41.0"; sha256 = "153c994q14pyj6dyw8k3ckjkawn8m2ja34fv0w9wnxv4g2b6i4qd"; })
  (fetchNuGet { pname = "HdrHistogram"; version = "2.5.0"; sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; })
  (fetchNuGet { pname = "HostStat.NET"; version = "1.0.2"; sha256 = "1khxpp1fy36njjcmikr0xnxk7zv9d3rcnm6f7x2s94agins23hg7"; })
  (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2038"; sha256 = "0gnp5pqsxd9lr7b4i73mpq5lyq16vzn0pr8rcyvnjjf3fanls8kc"; })
@ -77,6 +81,7 @@
  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; })
  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.3"; sha256 = "0szyg2p18w9lhlp52iylrr97w3kdalab089imhc53x1850avddsg"; })
  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; })
  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
@ -84,13 +89,15 @@
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; })
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; })
  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; })
-  (fetchNuGet { pname = "MinVer"; version = "2.3.0"; sha256 = "0h6mhh76jhmf60kyjrw8daxpsvprml814v7a8dc3vf5s1lvn2x4j"; })
+  (fetchNuGet { pname = "MinVer"; version = "2.5.0"; sha256 = "0p6b80f1xv7k53lpanhh2spcz3l1krvr1j7xaij2kcrp275zsjyk"; })
  (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
  (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; })
  (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; })
  (fetchNuGet { pname = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; })
--- a/pkgs/servers/nosql/eventstore/updater.sh
+++ b/pkgs/servers/nosql/eventstore/updater.sh
@ -0,0 +1,23 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
+# shellcheck shell=bash
+
+set -euo pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+deps_file="$(realpath "./deps.nix")"
+
+new_version="$(curl -s "https://api.github.com/repos/EventStore/EventStore/releases/latest" | jq -r '.name')"
+new_version="${new_version#oss-v}"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+
+if [[ "$new_version" == "$old_version" ]]; then
+  echo "Already up to date!"
+  exit 0
+fi
+
+cd ../../../..
+update-source-version eventstore "${new_version//v}"
+
+$(nix-build -A eventstore.fetch-deps --no-out-link) "$deps_file"
--- a/pkgs/tools/games/minecraft/optifine/default.nix
+++ b/pkgs/tools/games/minecraft/optifine/default.nix
@ -1,67 +1,17 @@
 { recurseIntoAttrs
 , callPackage
+, lib
 }:

-recurseIntoAttrs rec {
-  optifine-latest = optifine_1_18_1;
+# All versions are taken from `version.json` created by `update.py`, and realised with `generic.nix`.
+# The `update.py` is a web scraper script that writes the latest versions into `version.json`.

-  optifine_1_18_1 = callPackage ./generic.nix {
-    version = "1.18.1_HD_U_H4";
-    sha256 = "sha256-MlFoVpshotzegpmYdvaeydivdSAqcCFpHyq+3k2B3Ow=";
-  };
+# The `versions.json` can be automatically updated and committed with a commit summary.
+# To do so, change directory to nixpkgs root, and do:
+# $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true

-  optifine_1_17_1 = callPackage ./generic.nix {
-    version = "1.17.1_HD_U_H1";
-    sha256 = "sha256-HHt747bIHYY/WNAx19mNgvnLrLCqaKIqwXmmB7A895M=";
-  };
-
-  optifine_1_16_5 = callPackage ./generic.nix {
-    version = "1.16.5_HD_U_G8";
-    sha256 = "sha256-PHa8kO1EvOVnzufCDrLENhkm8jqG5TZ9WW9uYk0LSU8=";
-  };
-
-  optifine_1_15_2 = callPackage ./generic.nix {
-    version = "1.16.5_HD_U_G8";
-    sha256 = "sha256-PHa8kO1EvOVnzufCDrLENhkm8jqG5TZ9WW9uYk0LSU8=";
-  };
-
-  optifine_1_14_4 = callPackage ./generic.nix {
-    version = "1.14.4_HD_U_G5";
-    sha256 = "sha256-I+65vQO6yG4AQ0ZLAfX73ImsFKAQkTyrIOnQHldTibs=";
-  };
-
-  optifine_1_13_2 = callPackage ./generic.nix {
-    version = "1.13.2_HD_U_G5";
-    sha256 = "sha256-sjUQot8fPdbZTiLqt+exbF5T8kI5bLQevu7atW9Xu3E=";
-  };
-
-  optifine_1_12_2 = callPackage ./generic.nix {
-    version = "1.12.2_HD_U_G5";
-    sha256 = "sha256-OwAGeXdx/rl/LQ0pCK58mnjO+y5zCvHC6F0IqDm6Jx4=";
-  };
-
-  optifine_1_11_2 = callPackage ./generic.nix {
-    version = "1.11.2_HD_U_G5";
-    sha256 = "sha256-1sLUBtM5e5LDTUFCRZf9UeH6WOA8zY6TAmB9PCS5iv4=";
-  };
-
-  optifine_1_10 = callPackage ./generic.nix {
-    version = "1.10_HD_U_I5";
-    sha256 = "sha256-oKOsaNFnOKfhWLDDYG/0Z4h/ZCDtyJWS9LXPaKAApc0=";
-  };
-
-  optifine_1_9_4 = callPackage ./generic.nix {
-    version = "1.9.4_HD_U_I5";
-    sha256 = "sha256-t+OxIf0Tl/NZxUTl+LGnWRUhEwZ+vxiZfhclxEAf6yI=";
-  };
-
-  optifine_1_8_9 = callPackage ./generic.nix {
-    version = "1.8.9_HD_U_M5";
-    sha256 = "sha256-Jzl2CnD8pq5cfcgXvMYoPxj1Xjj6I3eNp/OHprckssQ=";
-  };
-
-  optifine_1_7_10 = callPackage ./generic.nix {
-    version = "1.7.10_HD_U_E7";
-    sha256 = "sha256-i82dg94AGgWR9JgQXzafBwxH0skZJ3TVpbafZG5E+rQ=";
-  };
-}
+recurseIntoAttrs (
+  lib.mapAttrs
+    (name: value: callPackage ./generic.nix value)
+    (lib.importJSON ./versions.json)
+)
--- a/pkgs/tools/games/minecraft/optifine/generic.nix
+++ b/pkgs/tools/games/minecraft/optifine/generic.nix
@ -22,6 +22,11 @@ runCommand "optifine-${mcVersion}" {

  nativeBuildInputs = [ jre makeWrapper ];

+  passthru.updateScript = {
+    command = [ ./update.py ];
+    supportedFeatures = [ "commit" ];
+  };
+
  meta = with lib; {
    homepage = "https://optifine.net/";
    description = "A Minecraft ${mcVersion} optimization mod";
--- a/pkgs/tools/games/minecraft/optifine/update.py
+++ b/pkgs/tools/games/minecraft/optifine/update.py
@ -0,0 +1,60 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i python3 -p python3.pkgs.requests python3.pkgs.lxml nix
+
+from lxml import html
+import json
+import os.path
+import re
+import requests
+import subprocess
+
+def nix_prefetch_sha256(name):
+    return subprocess.run(['nix-prefetch-url', '--type', 'sha256', 'https://optifine.net/download?f=' + name], capture_output=True, text=True).stdout.strip()
+
+# fetch download page
+sess = requests.session()
+page = sess.get('https://optifine.net/downloads')
+tree = html.fromstring(page.content)
+
+# parse and extract main jar file names
+href = tree.xpath('//tr[@class="downloadLine downloadLineMain"]/td[@class="colMirror"]/a/@href')
+expr = re.compile('(OptiFine_)([0-9.]*)(.*)\.jar')
+result = [ expr.search(x) for x in href ]
+
+# format name, version and hash for each file
+catalogue = {}
+for i, r in enumerate(result):
+    index = r.group(1).lower() + r.group(2).replace('.', '_')
+    version = r.group(2) + r.group(3)
+    catalogue[index] = {
+        "version": version,
+        "sha256": nix_prefetch_sha256(r.group(0))
+    }
+
+# latest version should be the first entry
+if len(catalogue) > 0:
+    catalogue['optifine-latest'] = list(catalogue.values())[0]
+
+# read previous versions
+d = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(d, 'versions.json'), 'r') as f:
+    prev = json.load(f)
+
+# `maintainers/scripts/update.py` will extract stdout to write commit message
+# embed the commit message in json and print it
+changes = [ { 'commitMessage': 'optifinePackages: update versions\n\n' } ]
+
+# build a longest common subsequence, natural sorted by keys
+for key, value in sorted({**prev, **catalogue}.items(), key=lambda item: [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', item[0])]):
+    if key not in prev:
+        changes[0]['commitMessage'] += 'optifinePackages.{}: init at {}\n'.format(key, value['version'])
+    elif value['version'] != prev[key]['version']:
+        changes[0]['commitMessage'] += 'optifinePackages.{}: {} -> {}\n'.format(key, prev[key]['version'], value['version'])
+
+# print the changes in stdout
+print(json.dumps(changes))
+
+# write catalogue to file
+with open(os.path.join(d, 'versions.json'), 'w') as f:
+    json.dump(catalogue, f, indent=4)
+    f.write('\n')
--- a/pkgs/tools/games/minecraft/optifine/versions.json
+++ b/pkgs/tools/games/minecraft/optifine/versions.json
@ -0,0 +1,142 @@
+{
+    "optifine_1_19_2": {
+        "version": "1.19.2_HD_U_H9",
+        "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx"
+    },
+    "optifine_1_19_1": {
+        "version": "1.19.1_HD_U_H9",
+        "sha256": "1p5a3i383ca2l3snsm36dyngfz9a1f9xffaxk439149h0i2d0nlj"
+    },
+    "optifine_1_19": {
+        "version": "1.19_HD_U_H9",
+        "sha256": "19zjvwg0sr6279plj5qxj7hdlw9w8q3qd78dg6911m356z6g87ah"
+    },
+    "optifine_1_18_2": {
+        "version": "1.18.2_HD_U_H7",
+        "sha256": "169ajvw3zrb0xrz2h1z3x6vdr4122s8m3rxb461s8y2fk6i4y9kr"
+    },
+    "optifine_1_18_1": {
+        "version": "1.18.1_HD_U_H6",
+        "sha256": "0nh8ls306rs1qcbyibb6idapws4z5cyaqrgh9ipvm1vcwvxxj9ys"
+    },
+    "optifine_1_18": {
+        "version": "1.18_HD_U_H3",
+        "sha256": "11zqiwmqj4ja6l87acwzs7cnabsgn2x36510hap8gj139l3vbrvb"
+    },
+    "optifine_1_17_1": {
+        "version": "1.17.1_HD_U_H1",
+        "sha256": "14zp7jq0g9krq4ma4s5an2ncpyc2ipcxfcfhb0zqc7f8nvipnyqw"
+    },
+    "optifine_1_16_5": {
+        "version": "1.16.5_HD_U_G8",
+        "sha256": "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw"
+    },
+    "optifine_1_16_4": {
+        "version": "1.16.4_HD_U_G7",
+        "sha256": "063zdfmhzq5jgfdy27c8b0008sribl8rbvfxa7nkk86qwpvz6v8h"
+    },
+    "optifine_1_16_3": {
+        "version": "1.16.3_HD_U_G5",
+        "sha256": "0pipr77jrva5wrllil40myansyrxxvcckxlvf4k2vhqf2g1mfigl"
+    },
+    "optifine_1_16_2": {
+        "version": "1.16.2_HD_U_G5",
+        "sha256": "1iav08qqk7wb43ars9nilbgm4ybdi02pd0ahb0xy7clkxvlnjcx2"
+    },
+    "optifine_1_16_1": {
+        "version": "1.16.1_HD_U_G2",
+        "sha256": "1gwbxv3dx82lxkbp9gaf1nqczkcxdzlfsspxlrv6gcn7w8vvwf5v"
+    },
+    "optifine_1_15_2": {
+        "version": "1.15.2_HD_U_G6",
+        "sha256": "10qz6y3h80s56wsk3f5wwg52d0d7mkklhhhvgp6y84zlzq6xdbq4"
+    },
+    "optifine_1_14_4": {
+        "version": "1.14.4_HD_U_G5",
+        "sha256": "1fw9adbixl7942mkr48hl0aar2fwzgsh2js68c06xj5s0fyvkvi3"
+    },
+    "optifine_1_14_3": {
+        "version": "1.14.3_HD_U_F2",
+        "sha256": "00wys29pmgfsc4j2jy2mpfl493vy52jdxprxl92hcg2xz77ipqjh"
+    },
+    "optifine_1_14_2": {
+        "version": "1.14.2_HD_U_F1",
+        "sha256": "0645d38z8llnnv546zfkflqp441kxvf8vd0l3zjsls81w3bpc6n8"
+    },
+    "optifine_1_13_2": {
+        "version": "1.13.2_HD_U_G5",
+        "sha256": "0wdvaxpvbnpfpqgb8v1r8br56pkcn7kvgsi29vcxcg8zvyi10ddj"
+    },
+    "optifine_1_13_1": {
+        "version": "1.13.1_HD_U_E4",
+        "sha256": "0r5x703pgwi8vakii0nhlij7j24zkq1xvyscqd8lv6w3yq7xd5b3"
+    },
+    "optifine_1_13": {
+        "version": "1.13_HD_U_E4",
+        "sha256": "0x8ynnm9dglzrajb3ffmvmwkx6ipzs306qadwhcp0ah148wiz1l3"
+    },
+    "optifine_1_12_2": {
+        "version": "1.12.2_HD_U_G5",
+        "sha256": "07i7p8wsh22xx31g22kk5vxwwy4sgjp0ha8d5mzvkzkifxwhc01v"
+    },
+    "optifine_1_12_1": {
+        "version": "1.12.1_HD_U_G5",
+        "sha256": "1jn02mknpf622q6i942v63x3kzs9q7n394x188nfh508rn9fpipn"
+    },
+    "optifine_1_12": {
+        "version": "1.12_HD_U_G5",
+        "sha256": "1slbz0ss670gwlzv4dw362cc5wlpxjv81004n04vcsip8l491pdb"
+    },
+    "optifine_1_11_2": {
+        "version": "1.11.2_HD_U_G5",
+        "sha256": "1zlap4j3qzb00a9qxk9ww1cgmqaiznblahj19p1r4yrrsc3d9hnn"
+    },
+    "optifine_1_11": {
+        "version": "1.11_HD_U_G5",
+        "sha256": "1azgnsqbl71087i83dn6wyb7qdz2wa42f04cabnlhmdcmdd4kcsj"
+    },
+    "optifine_1_10_2": {
+        "version": "1.10.2_HD_U_I5",
+        "sha256": "0m05xqcmh8kaqvlb57yz0mslf22wr89wamlf1q1cma4fn385i57f"
+    },
+    "optifine_1_10": {
+        "version": "1.10_HD_U_I5",
+        "sha256": "1kd502h6ikxmyj99bj7d41j7z237yipn1hxhb3hsff37s5lar8x0"
+    },
+    "optifine_1_9_4": {
+        "version": "1.9.4_HD_U_I5",
+        "sha256": "08pb3x0c898pgsciigvy0q9j25arlyqzira4qmcz75qkzlhv3qxp"
+    },
+    "optifine_1_9_2": {
+        "version": "1.9.2_HD_U_E3",
+        "sha256": "1bgyxhs554wswavidsnmm6mahngndd5bc98jma6wgi7g5qrngcrp"
+    },
+    "optifine_1_9_0": {
+        "version": "1.9.0_HD_U_I5",
+        "sha256": "1nyiv91hm9765244xa6mh9cf62l329ppm8rdib35lb3ghgasid9n"
+    },
+    "optifine_1_8_9": {
+        "version": "1.8.9_HD_U_M5",
+        "sha256": "1i5j4jvsd1zkly6pf8zs71gga61z533bq5y8gmfax9pwf057cf97"
+    },
+    "optifine_1_8_8": {
+        "version": "1.8.8_HD_U_I7",
+        "sha256": "0x4aambs2kww9lanm4kp2jw4h3cwk25fa6xwsm9r7a1jv42jlyay"
+    },
+    "optifine_1_8_0": {
+        "version": "1.8.0_HD_U_I7",
+        "sha256": "1ig013l61f7yj061ncnvmjsp9j2nd8fy8j03f8ry045d0s7idnfk"
+    },
+    "optifine_1_7_10": {
+        "version": "1.7.10_HD_U_E7",
+        "sha256": "1d7s8ip697xnlpap89qrr794f307kwv5y44qyj8ha6h0vs1rvkcb"
+    },
+    "optifine_1_7_2": {
+        "version": "1.7.2_HD_U_F7",
+        "sha256": "18lzyh639mi7r2hzwnmxv0a6v1ay7dk9bzasvwff82dxq0y9zi7m"
+    },
+    "optifine-latest": {
+        "version": "1.19.2_HD_U_H9",
+        "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx"
+    }
+}
--- a/pkgs/tools/misc/nitch/default.nix
+++ b/pkgs/tools/misc/nitch/default.nix
@ -0,0 +1,28 @@
+{ lib, nimPackages, fetchFromGitHub, fetchpatch }:
+nimPackages.buildNimPackage rec {
+  pname = "nitch";
+  version = "0.1.6";
+  nimBinOnly = true;
+  src = fetchFromGitHub {
+    owner = "unxsh";
+    repo = "nitch";
+    rev = "42ad6899931dd5e0cec7b021c2b7e383fcc891f3";
+    hash = "sha256-QI7CbP0lvvjD+g29FR/YJjuZboZ+PoHynsNbpYC9SvE=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch";
+      sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Incredibly fast system fetch written in nim";
+    homepage = "https://github.com/unxsh/nitch";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ quasigod-io ];
+    mainProgram = "nitch";
+  };
+}
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@ -68,5 +68,6 @@ python3Packages.buildPythonPackage rec {
    license = licenses.bsd2;
    platforms = platforms.unix;
    maintainers = with maintainers; [ benley lassulus pinpox ];
+    mainProgram = "ykman";
  };
 }
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, perl, curl }:
-
-stdenv.mkDerivation {
-  pname = "aws";
-  version = "2019.06.18";
-
-  src = fetchurl {
-    url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";
-    sha256 = "02bym9wicqpdr7mdim13zw5ssh97xfswzab9q29rsbg7058ddbil";
-  };
-
-  buildInputs = [ perl ];
-
-  dontUnpack = true;
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws
-      chmod +x $out/bin/aws
-    '';
-
-  meta = {
-    homepage = "https://www.timkay.com/aws/";
-    description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.unix;
-  };
-}
--- a/pkgs/tools/virtualization/kubevirt/default.nix
+++ b/pkgs/tools/virtualization/kubevirt/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "kubevirt";
-  version = "0.56.1";
+  version = "0.57.0";

  src = fetchFromGitHub {
    owner = "kubevirt";
    repo = "kubevirt";
    rev = "v${version}";
-    sha256 = "sha256-PYVV/0qCBhR2l+rLuoPTe3FvLX9NmHHcA9gOeUj1IVw=";
+    sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU=";
  };

  vendorSha256 = null;
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -97,6 +97,7 @@ mapAliases ({
  avldrums-lv2 = x42-avldrums; # Added 2020-03-29
  avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
  awesome-4-0 = awesome; # Added 2022-05-05
+  aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21
  awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30
  aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;
  axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2899,8 +2899,6 @@ with pkgs;

  avro-cpp = callPackage ../development/libraries/avro-c++ { };

-  aws = callPackage ../tools/virtualization/aws { };
-
  aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };

  awsls = callPackage ../tools/admin/awsls { };
@ -4451,6 +4449,8 @@ with pkgs;

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

+  nitch = callPackage ../tools/misc/nitch { };
+
  nix-direnv = callPackage ../tools/misc/nix-direnv { };

  nixel = callPackage ../tools/nix/nixel { };
@ -9817,7 +9817,7 @@ with pkgs;
  pakcs = callPackage ../development/compilers/pakcs {
    # Doesn't compile with GHC 9.0 due to whitespace syntax changes
    # see also https://github.com/NixOS/nixpkgs/issues/166108
-    haskellPackages = haskell.packages.ghc8107;
+    haskellPackages = haskell.packages.ghc810;
  };

  pal = callPackage ../tools/misc/pal { };
@ -12735,7 +12735,7 @@ with pkgs;

  # To expose more packages for Yi, override the extraPackages arg.
  yi = callPackage ../applications/editors/yi/wrapper.nix {
-    haskellPackages = haskell.packages.ghc8107;
+    haskellPackages = haskell.packages.ghc810;
  };

  yj = callPackage ../development/tools/yj { };
@ -13852,8 +13852,8 @@ with pkgs;
  haskellPackages = dontRecurseIntoAttrs
    # Prefer native-bignum to avoid linking issues with gmp
    (if stdenv.hostPlatform.isStatic
-       then haskell.packages.native-bignum.ghc902
-       else haskell.packages.ghc902);
+       then haskell.packages.native-bignum.ghc90
+       else haskell.packages.ghc90);

  # haskellPackages.ghc is build->host (it exposes the compiler used to build the
  # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
@ -13866,8 +13866,8 @@ with pkgs;
  ghc = targetPackages.haskellPackages.ghc or
    # Prefer native-bignum to avoid linking issues with gmp
    (if stdenv.targetPlatform.isStatic
-       then haskell.compiler.native-bignum.ghc902
-       else haskell.compiler.ghc902);
+       then haskell.compiler.native-bignum.ghc90
+       else haskell.compiler.ghc90);

  cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;

@ -15151,7 +15151,7 @@ with pkgs;
    stdenv = clangStdenv;
  };

-  jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda;
+  jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda;

  janet = callPackage ../development/interpreters/janet {};

@ -18297,6 +18297,8 @@ with pkgs;

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

+  game-music-emu = callPackage ../development/libraries/audio/game-music-emu { };
+
  gamin = callPackage ../development/libraries/gamin { };
  fam = gamin; # added 2018-04-25

@ -23007,7 +23009,7 @@ with pkgs;

  hashi-ui = callPackage ../servers/hashi-ui {};

-  hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine;
+  hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;

  hasura-cli = callPackage ../servers/hasura/cli.nix { };

@ -28081,8 +28083,6 @@ with pkgs;

  g933-utils = callPackage ../tools/misc/g933-utils { };

-  game-music-emu = callPackage ../applications/audio/game-music-emu { };
-
  gavrasm = callPackage ../development/compilers/gavrasm { };

  gcalcli = callPackage ../applications/misc/gcalcli { };
@ -31396,7 +31396,7 @@ with pkgs;
  # Use GHC 9.0 when this asserts starts to fire
  taffybar = assert haskellPackages.taffybar.version == "3.3.0";
  callPackage ../applications/window-managers/taffybar {
-    inherit (haskell.packages.ghc8107) ghcWithPackages taffybar;
+    inherit (haskell.packages.ghc810) ghcWithPackages taffybar;
  };

  tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {};
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -15,14 +15,20 @@ let
    "integer-simple"
    "native-bignum"
    "ghc902"
+    "ghc90"
    "ghc924"
+    "ghc92"
    "ghc942"
+    "ghc94"
    "ghcHEAD"
  ];

  nativeBignumIncludes = [
+    "ghc90"
    "ghc902"
+    "ghc92"
    "ghc924"
+    "ghc94"
    "ghc942"
    "ghcHEAD"
  ];
@ -56,7 +62,7 @@ in {

  package-list = callPackage ../development/haskell-modules/package-list.nix {};

-  compiler = {
+  compiler = rec {

    ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix {
      llvmPackages = pkgs.llvmPackages_6;
@ -103,6 +109,7 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
      llvmPackages = pkgs.llvmPackages_7;
    };
+    ghc88 = ghc884;
    ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
      bootPkgs =
        # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
@ -123,6 +130,7 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
      llvmPackages = pkgs.llvmPackages_12;
    };
+    ghc810 = ghc8107;
    ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix {
      bootPkgs =
        # aarch64 ghc8107Binary exceeds max output size on hydra
@ -130,7 +138,7 @@ in {
        if stdenv.hostPlatform.isAarch then
          packages.ghc8107BinaryMinimal
        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
-          packages.ghc8107
+          packages.ghc810
        else
          packages.ghc8107Binary;
      inherit (buildPackages.python3Packages) sphinx;
@ -138,13 +146,14 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
      llvmPackages = pkgs.llvmPackages_12;
    };
+    ghc90 = ghc902;
    ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix {
      bootPkgs =
        # aarch64 ghc8107Binary exceeds max output size on hydra
        if stdenv.hostPlatform.isAarch then
          packages.ghc8107BinaryMinimal
        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
-          packages.ghc8107
+          packages.ghc810
        else
          packages.ghc8107Binary;
      inherit (buildPackages.python3Packages) sphinx;
@ -155,6 +164,7 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
      llvmPackages = pkgs.llvmPackages_12;
    };
+    ghc92 = ghc924;
    ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
      bootPkgs =
        # Building with 9.2 is broken due to
@ -179,6 +189,7 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
      llvmPackages = pkgs.llvmPackages_12;
    };
+    ghc94 = ghc942;
    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
      bootPkgs =
        if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
@ -197,7 +208,7 @@ in {

    ghcjs = compiler.ghcjs810;
    ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 {
-      bootPkgs = packages.ghc8107;
+      bootPkgs = packages.ghc810;
      ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json;
      stage0 = ../development/compilers/ghcjs/8.10/stage0.nix;
    };
@ -227,7 +238,7 @@ in {
  packageOverrides = self : super : {};

  # Always get compilers from `buildPackages`
-  packages = let bh = buildPackages.haskell; in {
+  packages = let bh = buildPackages.haskell; in rec {

    ghc865Binary = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc865Binary;
@ -276,26 +287,31 @@ in {
      ghc = bh.compiler.ghc884;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
    };
+    ghc88 = ghc884;
    ghc8107 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc8107;
      ghc = bh.compiler.ghc8107;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
    };
+    ghc810 = ghc8107;
    ghc902 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc902;
      ghc = bh.compiler.ghc902;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
    };
+    ghc90 = ghc902;
    ghc924 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc924;
      ghc = bh.compiler.ghc924;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
    };
+    ghc92 = ghc924;
    ghc942 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc942;
      ghc = bh.compiler.ghc942;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
    };
+    ghc94= ghc942;
    ghcHEAD = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghcHEAD;
      ghc = bh.compiler.ghcHEAD;
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -319,6 +319,8 @@ let

    dns-tsig = callPackage ../development/ocaml-modules/dns/tsig.nix { };

+    dnssec = callPackage ../development/ocaml-modules/dns/dnssec.nix { };
+
    dolmen =  callPackage ../development/ocaml-modules/dolmen { };

    dolog = callPackage ../development/ocaml-modules/dolog { };
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -287,6 +287,7 @@ let

          # Can't be built with musl, see meta.broken comment in the drv
          integer-simple.ghc884 = {};
+          integer-simple.ghc88 = {};
        };

      # Get some cache going for MUSL-enabled GHC.
@ -332,7 +333,7 @@ let
            };

            haskell.packages.native-bignum.ghc924 = {
-              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924)
+              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92)
                hello
                lens
                random