Merge master into staging-next

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -30,11 +30,11 @@
 
   firefox-beta = buildMozillaMach rec {
     pname = "firefox-beta";
-    version = "119.0b4";
+    version = "119.0b9";
     applicationName = "Mozilla Firefox Beta";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54";
+      sha512 = "11d07474e3ca72a4e2f60053882e09a215e0d29d6830d0cd41447bb67370118356090af7adcbacd7703ad9fcdda83c9f909419c86b8f3bf2eacd9ca3d3aa3f54";
     };
 
     meta = {
@@ -58,12 +58,12 @@
 
   firefox-devedition = (buildMozillaMach rec {
     pname = "firefox-devedition";
-    version = "119.0b4";
+    version = "119.0b9";
     applicationName = "Mozilla Firefox Developer Edition";
     branding = "browser/branding/aurora";
     src = fetchurl {
       url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb";
+      sha512 = "ce3e2adb3171aa05c7af3b7a4ea25eaafbc109c522b90e26aad577192a0902000fb7d705fa5707a9a7d0be2ab1c0cddc5a98abbe6549e1377c0a1d765bda62eb";
     };
 
     meta = {

pkgs/applications/version-management/git-repo/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.37";
+  version = "2.38";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0=";
+    hash = "sha256-o3uNFGnccFU3ZSc8BZLh8JTc8517bho/qX6otC5oC5s=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

pkgs/by-name/oe/oelint-adv/package.nix

@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "oelint-adv";
-  version = "3.25.0";
+  version = "3.26.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "oelint_adv";
-    hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs=";
+    hash = "sha256-xQC3y9YeY8o4L4pLV+nLs1Ao8KH6q1BprwTeUm8f+2w=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "ad59313651a92d9b7356f616268c7a3d80f52886",
+  "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz",
-  "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc",
+  "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v",
-  "msg": "Update from Hackage at 2023-09-13T23:29:30Z"
+  "msg": "Update from Hackage at 2023-10-04T18:27:12Z"
 }

pkgs/development/compilers/elm/default.nix

@@ -69,7 +69,7 @@ let
       attoparsec = self.attoparsec_0_13_2_5;
 
       # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5
-      aeson = self.aeson_1_5_6_0;
+      aeson = doJailbreak self.aeson_1_5_6_0;
 
       # elm-instrument needs this
       indents = self.callPackage ./packages/indents.nix {};

pkgs/development/compilers/ghc/9.4.7.nix

@@ -0,0 +1,388 @@
+# DO NOT port this expression to hadrian. It is not possible to build a GHC
+# cross compiler with 9.4.* and hadrian.
+{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
+, xattr, autoSignDarwinBinariesHook
+, bash
+
+, libiconv ? null, ncurses
+, glibcLocales ? null
+
+, # GHC can be built with system libffi or a bundled one.
+  libffi ? null
+
+, useLLVM ? !(stdenv.targetPlatform.isx86
+              || stdenv.targetPlatform.isPower
+              || stdenv.targetPlatform.isSparc
+              || stdenv.targetPlatform.isAarch64)
+, # LLVM is conceptually a run-time-only dependency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildTargetLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slightly slower native
+  # bignum backend instead of the faster but GPLed gmp backend.
+  enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp
+                         && lib.meta.availableOn stdenv.targetPlatform gmp)
+, gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, enableProfiledLibs ? true
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic
+
+, # Whether to build terminfo.
+  enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+    (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, #  Whether to build sphinx documentation.
+  enableDocs ? (
+    # Docs disabled for musl and cross because it's a large task to keep
+    # all `sphinx` dependencies building in those environments.
+    # `sphinx` pulls in among others:
+    # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
+    (stdenv.targetPlatform == stdenv.hostPlatform)
+    && !stdenv.hostPlatform.isMusl
+  )
+
+, enableHaddockProgram ?
+    # Disabled for cross; see note [HADDOCK_DOCS].
+    (stdenv.targetPlatform == stdenv.hostPlatform)
+
+, # Whether to disable the large address space allocator
+  # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+  disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
+}:
+
+assert !enableNativeBignum -> gmp != null;
+
+# Cross cannot currently build the `haddock` program for silly reasons,
+# see note [HADDOCK_DOCS].
+assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram;
+
+let
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
+    BUILD_SPHINX_PDF = NO
+  '' +
+  # Note [HADDOCK_DOCS]:
+  # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
+  # program is built (which we generally always want to have a complete GHC install)
+  # and whether it is run on the GHC sources to generate hyperlinked source code
+  # (which is impossible for cross-compilation); see:
+  # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+  # This implies that currently a cross-compiled GHC will never have a `haddock`
+  # program, so it can never generate haddocks for any packages.
+  # If this is solved in the future, we'd like to unconditionally
+  # build the haddock program (removing the `enableHaddockProgram` option).
+  ''
+    HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
+    # Build haddocks for boot packages with hyperlinking
+    EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
+
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+    BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+  '' + lib.optionalString (!enableProfiledLibs) ''
+    GhcLibWays = "v dyn"
+  '' +
+  # -fexternal-dynamic-refs apparently (because it's not clear from the documentation)
+  # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell.
+  # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
+  lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC -fexternal-dynamic-refs
+    GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: lib.optional enableTerminfo ncurses
+    ++ [libffi]
+    ++ lib.optional (!enableNativeBignum) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  # TODO(@sternenseemann): is buildTarget LLVM unnecessary?
+  # GHC doesn't seem to have {LLC,OPT}_HOST
+  toolsForTarget = [
+    pkgsBuildTarget.targetPackages.stdenv.cc
+  ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+  # Sometimes we have to dispatch between the bintools wrapper and the unwrapped
+  # derivation for certain tools depending on the platform.
+  bintoolsFor = {
+    # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
+    # part of the bintools wrapper (due to codesigning requirements), but not on
+    # x86_64-darwin.
+    install_name_tool =
+      if stdenv.targetPlatform.isAarch64
+      then targetCC.bintools
+      else targetCC.bintools.bintools;
+    # Same goes for strip.
+    strip =
+      # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
+      if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+      then targetCC.bintools
+      else targetCC.bintools.bintools;
+  };
+
+  # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
+  # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
+  # see #84670 and #49071 for more background.
+  useLdGold = targetPlatform.linker == "gold" ||
+    (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl);
+
+  # Makes debugging easier to see which variant is at play in `nix-store -q --tree`.
+  variantSuffix = lib.concatStrings [
+    (lib.optionalString stdenv.hostPlatform.isMusl "-musl")
+    (lib.optionalString enableNativeBignum "-native-bignum")
+  ];
+
+in
+
+# C compiler, bintools and LLVM are used at build time, but will also leak into
+# the resulting GHC's settings file and used at runtime. This means that we are
+# currently only able to build GHC if hostPlatform == buildPlatform.
+assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc;
+assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
+assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
+
+stdenv.mkDerivation (rec {
+  version = "9.4.7";
+  pname = "${targetPrefix}ghc${variantSuffix}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  patches = [
+    # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
+    # Can be removed if the Cabal library included with ghc backports the linked fix
+    (fetchpatch {
+      url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
+      stripLen = 1;
+      extraPrefix = "libraries/Cabal/";
+      sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
+    })
+  ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
+    # Prevent the paths module from emitting symbols that we don't use
+    # when building with separate outputs.
+    #
+    # These cause problems as they're not eliminated by GHC's dead code
+    # elimination on aarch64-darwin. (see
+    # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+    ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
+  ];
+
+  postPatch = "patchShebangs .";
+
+  # GHC needs the locale configured during the Haddock phase.
+  LANG = "en_US.UTF-8";
+
+  # GHC is a bit confused on its cross terminology.
+  # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip"
+  '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
+    export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool"
+    export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool"
+  '' + lib.optionalString useLLVM ''
+    export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
+    export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
+  '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
+    # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
+    export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
+  '' + ''
+
+    echo -n "${buildMK}" > mk/build.mk
+
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
+    export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+  '' + lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+
+    # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
+    export XATTR=${lib.getBin xattr}/bin/xattr
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+  ''
+  # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have
+  # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.
+  + ''
+    substituteInPlace configure --replace \
+      'MinBootGhcVersion="9.0"' \
+      'MinBootGhcVersion="8.10"'
+  '';
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ]
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
+
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ lib.optionals (libffi != null) [
+    "--with-system-libffi"
+    "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+    "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+    "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+    "--with-iconv-includes=${libiconv}/include"
+    "--with-iconv-libraries=${libiconv}/lib"
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ lib.optionals useLdGold [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ lib.optionals (disableLargeAddressSpace) [
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatibility.
+  strictDeps = true;
+
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+    autoSignDarwinBinariesHook
+  ] ++ lib.optionals enableDocs [
+    sphinx
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
+
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable =
+    [ "format" ]
+    # In nixpkgs, musl based builds currently enable `pie` hardening by default
+    # (see `defaultHardeningFlags` in `make-derivation.nix`).
+    # But GHC cannot currently produce outputs that are ready for `-pie` linking.
+    # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
+    # See:
+    # * https://github.com/NixOS/nixpkgs/issues/129247
+    # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
+    ++ lib.optional stdenv.targetPlatform.isMusl "pie";
+
+  # big-parallel allows us to build with more than 2 cores on
+  # Hydra which already warrants a significant speedup
+  requiredSystemFeatures = [ "big-parallel" ];
+
+  postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+    inherit enableShared;
+
+    # This is used by the haskell builder to query
+    # the presence of the haddock program.
+    hasHaddock = enableHaddockProgram;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  };
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with lib.maintainers; [
+      guibou
+    ] ++ lib.teams.haskell.members;
+    timeout = 24 * 3600;
+    inherit (ghc.meta) license platforms;
+  };
+
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})

pkgs/development/compilers/ghc/9.8.1.nix

@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.8.1";
+  sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751";
+}

pkgs/development/compilers/ghc/common-hadrian.nix

@@ -155,7 +155,10 @@
     ghcVersion = version;
     userSettings = hadrianUserSettings;
     # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux
-    enableHyperlinkedSource = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux);
+    enableHyperlinkedSource =
+      # TODO(@sternenseemann): Disabling currently doesn't work with GHC >= 9.8
+      lib.versionAtLeast version "9.8" ||
+      !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux);
   }
 
 , #  Whether to build sphinx documentation.

pkgs/development/haskell-modules/configuration-common.nix

@@ -24,7 +24,7 @@ self: super: {
     Cabal-syntax = self.Cabal-syntax_3_10_1_0;
   } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
     # Use process core package when possible
-    process = self.process_1_6_17_0;
+    process = self.process_1_6_18_0;
   }));
 
   # cabal-install needs most recent versions of Cabal and Cabal-syntax,
@@ -50,22 +50,22 @@ self: super: {
           # cabal-install, but we need to recompile process even if the correct
           # version is available to prevent inconsistent dependencies:
           # process depends on directory.
-          process = cself.process_1_6_17_0;
+          process = cself.process_1_6_18_0;
 
           # hspec < 2.10 depends on ghc (the library) directly which in turn
           # depends on directory, causing a dependency conflict which is practically
           # not solvable short of recompiling GHC. Instead of adding
           # allowInconsistentDependencies for all reverse dependencies of hspec-core,
           # just upgrade to an hspec version without the offending dependency.
-          hspec-core = cself.hspec-core_2_11_4;
+          hspec-core = cself.hspec-core_2_11_5;
-          hspec-discover = cself.hspec-discover_2_11_4;
+          hspec-discover = cself.hspec-discover_2_11_5;
-          hspec = cself.hspec_2_11_4;
+          hspec = cself.hspec_2_11_5;
 
           # hspec-discover and hspec-core depend on hspec-meta for testing which
           # we need to avoid since it depends on ghc as well. Since hspec*_2_11*
           # are overridden to take the versioned attributes as inputs, we need
           # to make sure to override the versioned attribute with this fix.
-          hspec-discover_2_11_4 = dontCheck csuper.hspec-discover_2_11_4;
+          hspec-discover_2_11_5 = dontCheck csuper.hspec-discover_2_11_5;
 
           # Prevent dependency on doctest which causes an inconsistent dependency
           # due to depending on ghc which depends on directory etc.
@@ -96,10 +96,7 @@ self: super: {
   ### HASKELL-LANGUAGE-SERVER SECTION ###
   #######################################
 
-  haskell-language-server = (lib.pipe super.haskell-language-server [
+  haskell-language-server = dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: {
-    dontCheck
-    (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: {
     # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
     # because some packages, like ormolu, need a newer Cabal version.
     # ghc-paths is special because it depends on Cabal for building
@@ -110,7 +107,12 @@ self: super: {
     # otherwise we have different versions of ghc-paths
     # around which have the same abi-hash, which can lead to confusions and conflicts.
     ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
-  });
+  }));
+
+  # hasn't bumped upper bounds
+  # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)"
+  # https://github.com/ennocramer/floskell/issues/48
+  floskell = dontCheck (doJailbreak super.floskell);
 
   # 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3546#issuecomment-1494139751
   # There will probably be a new revision soon.
@@ -119,19 +121,6 @@ self: super: {
   # For -f-auto see cabal.project in haskell-language-server.
   ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);
 
-  # Test ldap server test/ldap.js is missing from sdist
-  # https://github.com/supki/ldap-client/issues/18
-  ldap-client-og = dontCheck super.ldap-client-og;
-
-  stylish-haskell =
-    # Too-strict upper bounds, no Hackage revisions
-    doJailbreak
-      # For -fghc-lib see cabal.project in haskell-language-server.
-      (if lib.versionAtLeast super.ghc.version "9.2"
-       then enableCabalFlag "ghc-lib" super.stylish-haskell
-       else super.stylish-haskell
-      );
-
   hiedb =
     lib.pipe
       super.hiedb
@@ -153,6 +142,10 @@ self: super: {
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
 
+  # Test ldap server test/ldap.js is missing from sdist
+  # https://github.com/supki/ldap-client/issues/18
+  ldap-client-og = dontCheck super.ldap-client-og;
+
   vector = overrideCabal (old: {
     # Too strict bounds on doctest which isn't used, but is part of the configuration
     jailbreak = true;
@@ -215,7 +208,7 @@ self: super: {
 
   # 2023-08-09: Jailbreak because of vector < 0.13
   monad-bayes = doJailbreak (super.monad-bayes.override {
-    hspec = self.hspec_2_11_4;
+    hspec = self.hspec_2_11_5;
   });
 
   # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3
@@ -316,12 +309,7 @@ self: super: {
 
   # Overriding the version pandoc dependency uses as the latest release has version bounds
   # defined as >= 3.1  && < 3.2, can be removed once pandoc gets bumped by Stackage.
-  #
+  patat = super.patat.override { pandoc = self.pandoc_3_1_8; };
-  # The patch can be removed once the commit being pulled is in a release.
-  patat = appendPatch (fetchpatch {
-    url = "https://github.com/jaspervdj/patat/pull/143/commits/cb5d5b6439204b5bd52939e42a11518ac81139fe.patch";
-    sha256 = "sha256-EPiyxziPtn2fAExKknI2uKUGahWCFnv7K8bpVkAgezQ=";
-  }) (super.patat.override { pandoc = self.pandoc_3_1_8; });
 
   # http2 also overridden in all-packages.nix for mailctl.
   # twain is currently only used by mailctl, so the .overrideScope shouldn't
@@ -352,7 +340,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "sha256-+buXiG9auq46+reMrs2rBWoxHgPkHmP8BY5BugooU+Q=";
+      sha256 = "14x7avdvf0fjqncwxydlrv32lbyfiqrm346nvypzg27gq46fvkcg";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -890,10 +878,6 @@ self: super: {
     '';
   }) super.ghc-mod;
 
-  # 2022-03-20: descriptive is unmaintained since 2018 and archived on github.com
-  # It does not support aeson 2.0
-  descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; };
-
   # Apply compatibility patches until a new release arrives
   # https://github.com/phadej/spdx/issues/33
   spdx = appendPatches [
@@ -1193,39 +1177,33 @@ self: super: {
       jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true;
     }) super.dhall-nixpkgs);
 
+  crypton-connection = super.crypton-connection.override {
+    # requires tls >= 1.7
+    tls = self.tls_1_9_0;
+  };
+
   stack =
     lib.pipe
       super.stack
       [
         (self.generateOptparseApplicativeCompletions [ "stack" ])
 
-        # Seems to be an unnecessarily strict dep on ansi-terminal
+        # stack-2.13.1 requires a bunch of the latest packages.
-        doJailbreak
+        (drv: drv.overrideScope (hfinal: hprev: {
-
+          ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0
-        # The below patch has unix line endings, but the actual file
+          crypton = hprev.crypton_0_33; # needs crypton >= 0.33
-        # has CRLF line endings.  The following override changes the
+          hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal
-        # file to unix line endings before applying the patch.
+          hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0
-        (overrideCabal (oldAttrs: {
+          http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2
-          prePatch = oldAttrs.prePatch or "" + ''
+          http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network
-            "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" src/main/BuildInfo.hs
+          optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0
-          '';
+          pantry = dontCheck hprev.pantry_0_9_2; # needs pantry >= 0.9.2, tests access network
+          syb = dontCheck hprev.syb; # cyclic dependencies
+          tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0
+          temporary = dontCheck hprev.temporary; # cyclic dependencies
         }))
-        # stack-2.11.1 has a bug when building without git.
-        # https://github.com/commercialhaskell/stack/pull/6127
-        (appendPatch
-          (fetchpatch {
-            name = "stack-fix-building-without-git.patch";
-            url = "https://github.com/commercialhaskell/stack/pull/6127/commits/086f93933d547736a7007fc4110f7816ef21f691.patch";
-            hash = "sha256-1nwzMoumWceVu8RNnH2mmSxYT24G1FAnFRJvUMeD3po=";
-            includes = [ "src/main/BuildInfo.hs" ];
-          })
-        )
       ];
 
-  # Too strict version bound on hashable-time.
-  # Tests require newer package version.
-  aeson_1_5_6_0 = dontCheck (doJailbreak super.aeson_1_5_6_0);
-
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
   unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
@@ -1509,11 +1487,6 @@ self: super: {
   # See: https://github.com/robstewart57/rdf4h/issues/39
   rdf4h = dontCheck super.rdf4h;
 
-  # hasn't bumped upper bounds
-  # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)"
-  # https://github.com/ennocramer/floskell/issues/48
-  floskell = dontCheck (doJailbreak super.floskell);
-
   # hasn't bumped upper bounds
   # test fails because of a "Warning: Unused LANGUAGE pragma"
   # https://github.com/ennocramer/monad-dijkstra/issues/4
@@ -1706,19 +1679,19 @@ self: super: {
   servant-openapi3 = dontCheck super.servant-openapi3;
 
   # Give latest hspec correct dependency versions without overrideScope
-  hspec_2_11_4 = doDistribute (super.hspec_2_11_4.override {
+  hspec_2_11_5 = doDistribute (super.hspec_2_11_5.override {
-    hspec-discover = self.hspec-discover_2_11_4;
+    hspec-discover = self.hspec-discover_2_11_5;
-    hspec-core = self.hspec-core_2_11_4;
+    hspec-core = self.hspec-core_2_11_5;
   });
-  hspec-meta_2_11_4 = doDistribute (super.hspec-meta_2_11_4.override {
+  hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override {
     hspec-expectations = self.hspec-expectations_0_8_4;
   });
-  hspec-discover_2_11_4 = doDistribute (super.hspec-discover_2_11_4.override {
+  hspec-discover_2_11_5 = doDistribute (super.hspec-discover_2_11_5.override {
-    hspec-meta = self.hspec-meta_2_11_4;
+    hspec-meta = self.hspec-meta_2_11_5;
   });
-  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_4
+  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5
   # is overlayed to hspec-core.
-  hspec-core_2_11_4 = doDistribute (dontCheck (super.hspec-core_2_11_4.override {
+  hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override {
     hspec-expectations = self.hspec-expectations_0_8_4;
   }));
 
@@ -1794,11 +1767,6 @@ self: super: {
   # compatible with Cabal 3. No upstream repository found so far
   readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline;
 
-  # 2020-12-05: this package requires a newer version of http-client,
-  # but it still compiles with older version:
-  # https://github.com/turion/essence-of-live-coding/pull/86
-  essence-of-live-coding-warp = doJailbreak super.essence-of-live-coding-warp;
-
   # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
   pandoc-include-code = doJailbreak super.pandoc-include-code;
 
@@ -1883,10 +1851,6 @@ self: super: {
       # pandoc-cli requires pandoc >= 3.1
       pandoc = self.pandoc_3_1_8;
 
-      # pandoc depends on crypton-connection, which requires tls >= 1.7
-      tls = self.tls_1_9_0;
-      crypton-connection = unmarkBroken super.crypton-connection;
-
       # pandoc depends on http-client-tls, which only starts depending
       # on crypton-connection in http-client-tls-0.3.6.2.
       http-client-tls = self.http-client-tls_0_3_6_3;
@@ -2449,11 +2413,6 @@ self: super: {
   ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core;
   hasura-ekg-core = doJailbreak super.hasura-ekg-core;
 
-  # https://github.com/Synthetica9/nix-linter/issues/65
-  nix-linter = super.nix-linter.overrideScope (self: super: {
-    aeson = self.aeson_1_5_6_0;
-  });
-
   # Test suite doesn't support hspec 2.8
   # https://github.com/zellige/hs-geojson/issues/29
   geojson = dontCheck super.geojson;
@@ -2704,11 +2663,6 @@ self: super: {
   # libfuse3 fails to mount fuse file systems within the build environment
   libfuse3 = dontCheck super.libfuse3;
 
-  # Tests fail due to the newly-build fourmolu not being in PATH
-  # https://github.com/fourmolu/fourmolu/issues/231
-  fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0;
-  fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0;
-
   # Merged upstream, but never released. Allows both intel and aarch64 darwin to build.
   # https://github.com/vincenthz/hs-gauge/pull/106
   gauge = appendPatch (pkgs.fetchpatch {
@@ -2728,4 +2682,6 @@ self: super: {
   # https://github.com/kowainik/typerep-map/pull/128
   typerep-map = doJailbreak super.typerep-map;
 
+  # Too strict bounds on base
+  kewar = doJailbreak super.kewar;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix

@@ -99,21 +99,7 @@ self: super: {
       executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
     }) super.hnix);
 
-  haskell-language-server = let
+  haskell-language-server =  throw "haskell-language-server dropped support for ghc 8.10 in version 2.3.0.0 please use a newer ghc version or an older nixpkgs version";
-    # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported.
-    # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
-    additionalDeps = with self.haskell-language-server.scope; [
-      hls-haddock-comments-plugin
-      (unmarkBroken hls-splice-plugin)
-      hls-tactics-plugin
-    ];
-  in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: {
-    Cabal = lself.Cabal_3_6_3_0;
-    aeson = lself.aeson_1_5_6_0;
-    lens-aeson = doJailbreak lself.lens-aeson_1_1_3;
-    lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0
-    hls-overloaded-record-dot-plugin = null;
-  }));
 
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
@@ -122,27 +108,12 @@ self: super: {
   mod = super.mod_0_1_2_2;
   path-io = doJailbreak super.path-io;
 
-  hls-cabal-plugin = super.hls-cabal-plugin.override {
-    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
-  };
 
   ormolu = self.ormolu_0_5_0_1;
   fourmolu = dontCheck self.fourmolu_0_9_0_0;
   hlint = self.hlint_3_4_1;
   stylish-haskell = doJailbreak self.stylish-haskell_0_14_3_0;
 
-  hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [
-    aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide
-    hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec
-    parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers
-  ]) super.hls-tactics-plugin);
-
-  # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies.
-  # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
-  hls-haddock-comments-plugin =  unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [
-    ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers
-  ]) super.hls-haddock-comments-plugin);
-
   mime-string = disableOptimization super.mime-string;
 
   # weeder 2.3.* no longer supports GHC 8.10
@@ -196,10 +167,6 @@ self: super: {
 
   apply-refact = self.apply-refact_0_9_3_0;
 
-  hls-hlint-plugin = super.hls-hlint-plugin.override {
-    inherit (self) apply-refact;
-  };
-
   # Needs OneTuple for ghc < 9.2
   binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
 

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -76,9 +76,7 @@ self: super: {
     Cabal-syntax = self.Cabal-syntax_3_8_1_0;
   };
 
-  fourmolu = self.fourmolu_0_10_1_0.override {
+  stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0;
-    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
-  };
 
   doctest = dontCheck super.doctest;
   # Apply patches from head.hackage.
@@ -91,16 +89,15 @@ self: super: {
     # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported.
     # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
     additionalDeps = with self.haskell-language-server.scope; [
-      hls-haddock-comments-plugin
       (unmarkBroken hls-splice-plugin)
-      hls-tactics-plugin
     ];
-  in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: {
+  in addBuildDepends additionalDeps (disableCabalFlag "fourmolu" (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;
     hls-overloaded-record-dot-plugin = null;
-  }));
+    hls-fourmolu-plugin = null;
+  })));
 
   # Needs to use ghc-lib due to incompatible GHC
   ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5);

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

@@ -71,10 +71,9 @@ self: super: {
     Cabal-syntax = self.Cabal-syntax_3_8_1_0;
   };
 
-  fourmolu = self.fourmolu_0_10_1_0.override {
+  stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0;
-    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
-  };
 
+  haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { hls-fourmolu-plugin = null; });
   # For GHC < 9.4, some packages need data-array-byte as an extra dependency
   hashable = addBuildDepends [ self.data-array-byte ] super.hashable;
   primitive = addBuildDepends [ self.data-array-byte ] super.primitive;

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

@@ -111,7 +111,32 @@ in {
   # https://github.com/kowainik/relude/issues/436
   relude = dontCheck super.relude;
 
-  fourmolu = overrideCabal (drv: {
+  inherit
-    libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
+    (
-  }) (disableCabalFlag "fixity-th" super.fourmolu);
+      let
+        hls_overlay = lself: lsuper: {
+          ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523;
+          ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2;
+          Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
+        };
+      in
+      lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
+        haskell-language-server = allowInconsistentDependencies super.haskell-language-server;
+        # Tests fail due to the newly-build fourmolu not being in PATH
+        # https://github.com/fourmolu/fourmolu/issues/231
+        fourmolu = dontCheck super.fourmolu_0_14_0_0;
+        ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0);
+        hlint = super.hlint_3_6_1;
+        stylish-haskell = super.stylish-haskell;
+      }
+    )
+    haskell-language-server
+    # HLS from 2.3 needs at least formolu 0.14.
+    # This means we need to bump a lot of other tools, too, because they all us ghc-lib-parser
+    # We do this globally to prevent inconsistent formatting or lints between hls and the command line tools.
+    fourmolu
+    ormolu
+    hlint
+    stylish-haskell
+  ;
 }

pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix

@@ -74,6 +74,7 @@ self: super: {
   bifunctors = doDistribute self.bifunctors_5_6_1;
   base-compat = doDistribute self.base-compat_0_13_0;
   base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
+  fgl = doDistribute self.fgl_5_8_1_1;
 
   # Because we bumped the version of th-abstraction above.^
   aeson = doJailbreak super.aeson;
@@ -90,6 +91,12 @@ self: super: {
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2;
 
+  # Tests fail due to the newly-build fourmolu not being in PATH
+  # https://github.com/fourmolu/fourmolu/issues/231
+  fourmolu = dontCheck super.fourmolu_0_14_0_0;
+  ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0);
+  hlint = super.hlint_3_6_1;
+
   # v0.1.6 forbids base >= 4.18
   singleton-bool = doDistribute super.singleton-bool_0_1_7;
 
@@ -141,16 +148,6 @@ self: super: {
     sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
   }) (doJailbreak super.language-haskell-extract);
 
-  # Patch for support of mtl-2.3
-  monad-par = appendPatch
-    (pkgs.fetchpatch {
-      name = "monad-par-mtl-2.3.patch";
-      url = "https://github.com/simonmar/monad-par/pull/75/commits/ce53f6c1f8246224bfe0223f4aa3d077b7b6cc6c.patch";
-      sha256 = "1jxkl3b3lkjhk83f5q220nmjxbkmni0jswivdw4wfbzp571djrlx";
-      stripLen = 1;
-    })
-    (doJailbreak super.monad-par);
-
   # Patch 0.17.1 for support of mtl-2.3
   xmonad-contrib = appendPatch
     (pkgs.fetchpatch {
@@ -175,23 +172,19 @@ self: super: {
       hls-floskell-plugin = null;
     };
 
-  fourmolu = super.fourmolu_0_13_1_0;
-  ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0);
-  stylish-haskell = super.stylish-haskell_0_14_5_0;
-
   # Newer version of servant required for GHC 9.6
-  servant = self.servant_0_20;
+  servant = self.servant_0_20_1;
   servant-server = self.servant-server_0_20;
   servant-client = self.servant-client_0_20;
   servant-client-core = self.servant-client-core_0_20;
-  # Select versions compatible with servant_0_20
+  # Select versions compatible with servant_0_20_1
   servant-docs = self.servant-docs_0_13;
   servant-swagger = self.servant-swagger_1_2;
   # Jailbreaks for servant <0.20
   servant-lucid = doJailbreak super.servant-lucid;
 
   # Jailbreak strict upper bounds: http-api-data <0.6
-  servant_0_20 = doJailbreak super.servant_0_20;
+  servant_0_20_1 = doJailbreak super.servant_0_20_1;
   servant-server_0_20 = doJailbreak super.servant-server_0_20;
   servant-client_0_20 = doJailbreak super.servant-client_0_20;
   servant-client-core_0_20 = doJailbreak super.servant-client-core_0_20;
@@ -214,8 +207,6 @@ self: super: {
    HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
   ]) super.ghc-exactprint_1_7_0_1);
 
-  hlint = super.hlint_3_6_1;
-
   inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
     hls-cabal-plugin
     algebraic-graphs
@@ -271,7 +262,7 @@ self: super: {
   }) super.ConfigFile;
 
   # The curl executable is required for withApplication tests.
-  warp_3_3_28 = addTestToolDepend pkgs.curl super.warp_3_3_28;
+  warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29;
 
   # The NCG backend for aarch64 generates invalid jumps in some situations,
   # the workaround on 9.6 is to revert to the LLVM backend (which is used

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -139,6 +139,7 @@ broken-packages:
   - altfloat # failure in job https://hydra.nixos.org/build/233197874 at 2023-09-02
   - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02
   - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02
+  - amazonka-contrib-rds-utils # failure building library in job https://hydra.nixos.org/build/237240275 at 2023-10-21
   - amazonka-iam-policy # failure in job https://hydra.nixos.org/build/233233098 at 2023-09-02
   - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02
   - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02
@@ -163,6 +164,12 @@ broken-packages:
   - antfarm # failure in job https://hydra.nixos.org/build/233225661 at 2023-09-02
   - antigate # failure in job https://hydra.nixos.org/build/233194081 at 2023-09-02
   - antimirov # failure in job https://hydra.nixos.org/build/233210987 at 2023-09-02
+  - antiope-athena # failure building library in job https://hydra.nixos.org/build/237246022 at 2023-10-21
+  - antiope-es # failure building library in job https://hydra.nixos.org/build/237237240 at 2023-10-21
+  - antiope-messages # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237239158 at 2023-10-21
+  - antiope-optparse-applicative # failure in job https://hydra.nixos.org/build/237235649 at 2023-10-21
+  - antiope-sns # failure in job https://hydra.nixos.org/build/237241347 at 2023-10-21
+  - antiope-sqs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237241846 at 2023-10-21
   - antiope-swf # failure in job https://hydra.nixos.org/build/233206369 at 2023-09-02
   - antiquoter # failure in job https://hydra.nixos.org/build/233221962 at 2023-09-02
   - antisplice # failure in job https://hydra.nixos.org/build/233238144 at 2023-09-02
@@ -290,6 +297,7 @@ broken-packages:
   - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02
   - awesomium-raw # failure in job https://hydra.nixos.org/build/233241036 at 2023-09-02
   - aws-cloudfront-signer # failure in job https://hydra.nixos.org/build/233194723 at 2023-09-02
+  - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21
   - aws-ec2 # failure in job https://hydra.nixos.org/build/233201556 at 2023-09-02
   - aws-ec2-knownhosts # failure in job https://hydra.nixos.org/build/233237078 at 2023-09-02
   - aws-general # failure in job https://hydra.nixos.org/build/233211106 at 2023-09-02
@@ -298,6 +306,8 @@ broken-packages:
   - aws-performance-tests # failure in job https://hydra.nixos.org/build/233259271 at 2023-09-02
   - aws-route53 # failure in job https://hydra.nixos.org/build/233218200 at 2023-09-02
   - aws-sdk-text-converter # failure in job https://hydra.nixos.org/build/233237525 at 2023-09-02
+  - aws-ses-easy # failure building library in job https://hydra.nixos.org/build/237249788 at 2023-10-21
+  - aws-simple # failure building library in job https://hydra.nixos.org/build/237242730 at 2023-10-21
   - azubi # failure in job https://hydra.nixos.org/build/233258480 at 2023-09-02
   - azure-acs # failure in job https://hydra.nixos.org/build/233252578 at 2023-09-02
   - azure-email # failure in job https://hydra.nixos.org/build/233255535 at 2023-09-02
@@ -457,6 +467,7 @@ broken-packages:
   - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02
   - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02
   - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02
+  - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21
   - bloomfilter-redis # failure in job https://hydra.nixos.org/build/233226393 at 2023-09-02
   - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02
   - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02
@@ -601,6 +612,7 @@ broken-packages:
   - cairo-core # failure in job https://hydra.nixos.org/build/233248151 at 2023-09-02
   - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02
   - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02
+  - calamity # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238601583 at 2023-10-21
   - caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02
   - calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02
   - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02
@@ -618,6 +630,7 @@ broken-packages:
   - ca-patterns # failure in job https://hydra.nixos.org/build/233246800 at 2023-09-02
   - capped-list # failure in job https://hydra.nixos.org/build/233232627 at 2023-09-02
   - capri # failure in job https://hydra.nixos.org/build/233247984 at 2023-09-02
+  - caps # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237244140 at 2023-10-21
   - caramia # failure in job https://hydra.nixos.org/build/233257225 at 2023-09-02
   - carbonara # failure in job https://hydra.nixos.org/build/233201166 at 2023-09-02
   - carettah # failure in job https://hydra.nixos.org/build/233230612 at 2023-09-02
@@ -730,6 +743,7 @@ broken-packages:
   - clash-prelude # failure in job https://hydra.nixos.org/build/233252128 at 2023-09-02
   - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02
   - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02
+  - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21
   - classy-influxdb-simple # failure in job https://hydra.nixos.org/build/233253418 at 2023-09-02
   - classy-parallel # failure in job https://hydra.nixos.org/build/233213514 at 2023-09-02
   - classyplate # failure in job https://hydra.nixos.org/build/233212613 at 2023-09-02
@@ -794,6 +808,7 @@ broken-packages:
   - collate # failure in job https://hydra.nixos.org/build/233243978 at 2023-09-02
   - collections-api # failure in job https://hydra.nixos.org/build/233220769 at 2023-09-02
   - collections # failure in job https://hydra.nixos.org/build/233251207 at 2023-09-02
+  - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21
   - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02
   - colonnade # failure in job https://hydra.nixos.org/build/233248956 at 2023-09-02
   - colorless # failure in job https://hydra.nixos.org/build/233220728 at 2023-09-02
@@ -954,6 +969,7 @@ broken-packages:
   - crdt-event-fold # failure in job https://hydra.nixos.org/build/233191438 at 2023-09-02
   - crdt # failure in job https://hydra.nixos.org/build/233254930 at 2023-09-02
   - creatur # failure in job https://hydra.nixos.org/build/233252591 at 2023-09-02
+  - credentials # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237240683 at 2023-10-21
   - credential-store # failure in job https://hydra.nixos.org/build/233230143 at 2023-09-02
   - crem # failure in job https://hydra.nixos.org/build/233240415 at 2023-09-02
   - cr # failure in job https://hydra.nixos.org/build/233235318 at 2023-09-02
@@ -974,7 +990,6 @@ broken-packages:
   - cryptoids-types # failure in job https://hydra.nixos.org/build/233242596 at 2023-09-02
   - crypto-keys-ssh # failure in job https://hydra.nixos.org/build/233222227 at 2023-09-02
   - crypto-multihash # failure in job https://hydra.nixos.org/build/233220770 at 2023-09-02
-  - crypton-connection # failure in job https://hydra.nixos.org/build/233230068 at 2023-09-02
   - crypto-numbers # failure in job https://hydra.nixos.org/build/233225721 at 2023-09-02
   - crypto-pubkey-openssh # failure in job https://hydra.nixos.org/build/233207007 at 2023-09-02
   - crypto-random-effect # failure in job https://hydra.nixos.org/build/233236324 at 2023-09-02
@@ -1012,6 +1027,7 @@ broken-packages:
   - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02
   - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02
   - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02
+  - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21
   - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02
   - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02
   - dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02
@@ -1019,6 +1035,7 @@ broken-packages:
   - danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02
   - Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02
   - dao # failure in job https://hydra.nixos.org/build/233240654 at 2023-09-02
+  - dap # failure in job https://hydra.nixos.org/build/237239767 at 2023-10-21
   - darcs2dot # failure in job https://hydra.nixos.org/build/233209236 at 2023-09-02
   - darcs-buildpackage # failure in job https://hydra.nixos.org/build/233213566 at 2023-09-02
   - darcs-cabalized # failure in job https://hydra.nixos.org/build/233234765 at 2023-09-02
@@ -1152,6 +1169,7 @@ broken-packages:
   - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02
   - derp-lib # failure in job https://hydra.nixos.org/build/233199053 at 2023-09-02
   - describe # failure in job https://hydra.nixos.org/build/233207296 at 2023-09-02
+  - descriptive # failure building library in job https://hydra.nixos.org/build/237623359 at 2023-10-21
   - desktop-portal # failure in job https://hydra.nixos.org/build/233241462 at 2023-09-02
   - deterministic-game-engine # failure in job https://hydra.nixos.org/build/233259188 at 2023-09-02
   - detrospector # failure in job https://hydra.nixos.org/build/233209424 at 2023-09-02
@@ -1199,6 +1217,7 @@ broken-packages:
   - digest-pure # failure in job https://hydra.nixos.org/build/233194135 at 2023-09-02
   - DigitalOcean # failure in job https://hydra.nixos.org/build/233231291 at 2023-09-02
   - digitalocean-kzs # failure in job https://hydra.nixos.org/build/233251576 at 2023-09-02
+  - digit # failure in job https://hydra.nixos.org/build/237241758 at 2023-10-21
   - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02
   - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02
   - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02
@@ -1312,6 +1331,7 @@ broken-packages:
   - dynamic-mvector # failure in job https://hydra.nixos.org/build/233252826 at 2023-09-02
   - dynamic-object # failure in job https://hydra.nixos.org/build/233216605 at 2023-09-02
   - DynamicTimeWarp # failure in job https://hydra.nixos.org/build/233238244 at 2023-09-02
+  - dynamodb-simple # failure building library in job https://hydra.nixos.org/build/237238415 at 2023-10-21
   - dyna-processing # failure in job https://hydra.nixos.org/build/234451875 at 2023-09-13
   - dynloader # failure in job https://hydra.nixos.org/build/233239248 at 2023-09-02
   - DysFRP # failure in job https://hydra.nixos.org/build/233214134 at 2023-09-02
@@ -1331,6 +1351,7 @@ broken-packages:
   - easytest # failure in job https://hydra.nixos.org/build/233209710 at 2023-09-02
   - ebeats # failure in job https://hydra.nixos.org/build/233235039 at 2023-09-02
   - ebnf-bff # failure in job https://hydra.nixos.org/build/233221694 at 2023-09-02
+  - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21
   - eccrypto-ed25519-bindings # failure in job https://hydra.nixos.org/build/233217399 at 2023-09-02
   - ecma262 # failure in job https://hydra.nixos.org/build/233260026 at 2023-09-02
   - ecta-plugin # failure in job https://hydra.nixos.org/build/233224764 at 2023-09-02
@@ -1360,6 +1381,7 @@ broken-packages:
   - either-unwrap # failure in job https://hydra.nixos.org/build/233254495 at 2023-09-02
   - ejdb2-binding # failure in job https://hydra.nixos.org/build/233253666 at 2023-09-02
   - ekg-bosun # failure in job https://hydra.nixos.org/build/233250564 at 2023-09-02
+  - ekg-cloudwatch # failure in job https://hydra.nixos.org/build/237236508 at 2023-10-21
   - ekg-elastic # failure in job https://hydra.nixos.org/build/233204565 at 2023-09-02
   - ekg-elasticsearch # failure in job https://hydra.nixos.org/build/233234000 at 2023-09-02
   - ekg-json # failure in job https://hydra.nixos.org/build/233245374 at 2023-09-02
@@ -1446,6 +1468,7 @@ broken-packages:
   - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02
   - eventstore # failure in job https://hydra.nixos.org/build/233202734 at 2023-09-02
   - evoke # failure in job https://hydra.nixos.org/build/233213948 at 2023-09-02
+  - EVP # failure in job https://hydra.nixos.org/build/237241792 at 2023-10-21
   - ewe # failure in job https://hydra.nixos.org/build/233217228 at 2023-09-02
   - exact-cover # failure in job https://hydra.nixos.org/build/233203182 at 2023-09-02
   - exact-real-positional # failure in job https://hydra.nixos.org/build/233239627 at 2023-09-02
@@ -1485,6 +1508,7 @@ broken-packages:
   - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02
   - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02
   - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02
+  - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21
   - extractelf # failure in job https://hydra.nixos.org/build/233240806 at 2023-09-02
   - Extra # failure in job https://hydra.nixos.org/build/233243671 at 2023-09-02
   - extralife # failure in job https://hydra.nixos.org/build/233236550 at 2023-09-02
@@ -1556,6 +1580,7 @@ broken-packages:
   - FileManipCompat # failure in job https://hydra.nixos.org/build/233254887 at 2023-09-02
   - FileManip # failure in job https://hydra.nixos.org/build/233237292 at 2023-09-02
   - fileneglect # failure in job https://hydra.nixos.org/build/233209920 at 2023-09-02
+  - filepather # failure in job https://hydra.nixos.org/build/237242258 at 2023-10-21
   - Files # failure in job https://hydra.nixos.org/build/233207543 at 2023-09-02
   - filesystem-conduit # failure in job https://hydra.nixos.org/build/233239975 at 2023-09-02
   - FileSystem # failure in job https://hydra.nixos.org/build/233230289 at 2023-09-02
@@ -1952,6 +1977,7 @@ broken-packages:
   - gridfs # failure in job https://hydra.nixos.org/build/233213958 at 2023-09-02
   - grids # failure in job https://hydra.nixos.org/build/233218294 at 2023-09-02
   - grm # failure in job https://hydra.nixos.org/build/233259788 at 2023-09-02
+  - groot # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248418 at 2023-10-21
   - GroteTrap # failure in job https://hydra.nixos.org/build/233203176 at 2023-09-02
   - groundhog # failure in job https://hydra.nixos.org/build/233199269 at 2023-09-02
   - grouped-list # failure in job https://hydra.nixos.org/build/233240891 at 2023-09-02
@@ -2077,6 +2103,7 @@ broken-packages:
   - HaPy # failure in job https://hydra.nixos.org/build/233256693 at 2023-09-02
   - haquery # failure in job https://hydra.nixos.org/build/233216714 at 2023-09-02
   - harchive # failure in job https://hydra.nixos.org/build/233259819 at 2023-09-02
+  - harfbuzz-pure # failure in job https://hydra.nixos.org/build/237235780 at 2023-10-21
   - harg # failure in job https://hydra.nixos.org/build/233232453 at 2023-09-02
   - HARM # failure in job https://hydra.nixos.org/build/233232650 at 2023-09-02
   - HarmTrace-Base # failure in job https://hydra.nixos.org/build/233213843 at 2023-09-02
@@ -2169,6 +2196,7 @@ broken-packages:
   - haskintex # failure in job https://hydra.nixos.org/build/233238166 at 2023-09-02
   - haskmon # failure in job https://hydra.nixos.org/build/233228390 at 2023-09-02
   - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02
+  - haskoin-store # failure in job https://hydra.nixos.org/build/238048371 at 2023-10-21
   - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02
   - haskoin-wallet # failure in job https://hydra.nixos.org/build/233206922 at 2023-09-02
   - haskore # failure in job https://hydra.nixos.org/build/233238668 at 2023-09-02
@@ -2255,6 +2283,7 @@ broken-packages:
   - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02
   - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02
   - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02
+  - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21
   - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02
   - hedgehog-lens # failure in job https://hydra.nixos.org/build/233251825 at 2023-09-02
   - hedgehog-servant # failure in job https://hydra.nixos.org/build/233258223 at 2023-09-02
@@ -2379,6 +2408,7 @@ broken-packages:
   - hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02
   - hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02
   - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02
+  - hledger-iadd # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238288021 at 2023-10-21
   - hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02
   - hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02
   - hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02
@@ -2571,6 +2601,7 @@ broken-packages:
   - hsns # failure in job https://hydra.nixos.org/build/233240328 at 2023-09-02
   - hsnsq # failure in job https://hydra.nixos.org/build/233215245 at 2023-09-02
   - hsntp # failure in job https://hydra.nixos.org/build/233206211 at 2023-09-02
+  - hs-opentelemetry-propagator-datadog # failure in job https://hydra.nixos.org/build/237245341 at 2023-10-21
   - hsoptions # failure in job https://hydra.nixos.org/build/233198363 at 2023-09-02
   - hsoz # failure in job https://hydra.nixos.org/build/233217005 at 2023-09-02
   - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02
@@ -2692,6 +2723,7 @@ broken-packages:
   - huttons-razor # failure in job https://hydra.nixos.org/build/233224736 at 2023-09-02
   - hVOIDP # failure in job https://hydra.nixos.org/build/233227778 at 2023-09-02
   - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02
+  - hw-aws-sqs-conduit # failure building library in job https://hydra.nixos.org/build/237235400 at 2023-10-21
   - hw-ci-assist # failure in job https://hydra.nixos.org/build/233207990 at 2023-09-02
   - hw-dsv # failure in job https://hydra.nixos.org/build/233252280 at 2023-09-02
   - hw-dump # failure in job https://hydra.nixos.org/build/233208818 at 2023-09-02
@@ -2769,6 +2801,7 @@ broken-packages:
   - imapget # failure in job https://hydra.nixos.org/build/233235664 at 2023-09-02
   - imgur # failure in job https://hydra.nixos.org/build/233191096 at 2023-09-02
   - imj-prelude # failure in job https://hydra.nixos.org/build/233234877 at 2023-09-02
+  - imm # failure in job https://hydra.nixos.org/build/237239261 at 2023-10-21
   - immortal-worker # failure in job https://hydra.nixos.org/build/233246961 at 2023-09-02
   - ImperativeHaskell # failure in job https://hydra.nixos.org/build/233240920 at 2023-09-02
   - impl # failure in job https://hydra.nixos.org/build/233203425 at 2023-09-02
@@ -2799,6 +2832,7 @@ broken-packages:
   - inj-base # failure in job https://hydra.nixos.org/build/233198720 at 2023-09-02
   - inject-function # failure in job https://hydra.nixos.org/build/233252462 at 2023-09-02
   - injections # failure in job https://hydra.nixos.org/build/233207796 at 2023-09-02
+  - inline-c-cuda # failure in job https://hydra.nixos.org/build/237234701 at 2023-10-21
   - inline-c-objc # failure in job https://hydra.nixos.org/build/233223704 at 2023-09-02
   - inline-r # failure in job https://hydra.nixos.org/build/233210520 at 2023-09-02
   - in-other-words-plugin # failure in job https://hydra.nixos.org/build/233202396 at 2023-09-02
@@ -3228,6 +3262,7 @@ broken-packages:
   - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02
   - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02
   - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02
+  - llvm-ffi # failure in job https://hydra.nixos.org/build/237230725 at 2023-10-21
   - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02
   - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02
   - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02
@@ -3719,6 +3754,7 @@ broken-packages:
   - nextstep-plist # failure in job https://hydra.nixos.org/build/233227343 at 2023-09-02
   - NGrams # failure in job https://hydra.nixos.org/build/233230426 at 2023-09-02
   - ngrams-loader # failure in job https://hydra.nixos.org/build/233211319 at 2023-09-02
+  - ngx-export-healthcheck # failure in job https://hydra.nixos.org/build/238601669 at 2023-10-21
   - ngx-export-log # failure in job https://hydra.nixos.org/build/233193133 at 2023-09-02
   - niagra # failure in job https://hydra.nixos.org/build/233234016 at 2023-09-02
   - nibblestring # failure in job https://hydra.nixos.org/build/233224888 at 2023-09-02
@@ -4005,6 +4041,7 @@ broken-packages:
   - patches-vector # failure in job https://hydra.nixos.org/build/233244862 at 2023-09-02
   - Pathfinder # failure in job https://hydra.nixos.org/build/233236573 at 2023-09-02
   - path-formatting # failure in job https://hydra.nixos.org/build/233199358 at 2023-09-02
+  - path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21
   - PathTree # failure in job https://hydra.nixos.org/build/233216203 at 2023-09-02
   - patronscraper # failure in job https://hydra.nixos.org/build/233258571 at 2023-09-02
   - pattern-trie # failure in job https://hydra.nixos.org/build/233237252 at 2023-09-02
@@ -4080,6 +4117,7 @@ broken-packages:
   - phone-push # failure in job https://hydra.nixos.org/build/233246934 at 2023-09-02
   - phonetic-languages-constaints # failure in job https://hydra.nixos.org/build/233232580 at 2023-09-02
   - phonetic-languages-simplified-generalized-examples-array # failure in job https://hydra.nixos.org/build/233245242 at 2023-09-02
+  - phonetic-languages-simplified-generalized-properties-array # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248983 at 2023-10-21
   - phonetic-languages-simplified-properties-array # failure in job https://hydra.nixos.org/build/233195530 at 2023-09-02
   - phonetic-languages-simplified-properties-array-old # failure in job https://hydra.nixos.org/build/233258258 at 2023-09-02
   - phonetic-languages-vector # failure in job https://hydra.nixos.org/build/233258156 at 2023-09-02
@@ -5070,6 +5108,7 @@ broken-packages:
   - sparse-merkle-trees # failure in job https://hydra.nixos.org/build/233251228 at 2023-09-02
   - sparse-tensor # failure in job https://hydra.nixos.org/build/233224869 at 2023-09-02
   - spars # failure in job https://hydra.nixos.org/build/233221560 at 2023-09-02
+  - SpatialMath # failure in job https://hydra.nixos.org/build/237243985 at 2023-10-21
   - special-functors # failure in job https://hydra.nixos.org/build/233215268 at 2023-09-02
   - special-keys # failure in job https://hydra.nixos.org/build/233191988 at 2023-09-02
   - spectacle # failure in job https://hydra.nixos.org/build/233207488 at 2023-09-02
@@ -5100,6 +5139,7 @@ broken-packages:
   - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02
   - sql-simple # failure in job https://hydra.nixos.org/build/233252834 at 2023-09-02
   - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02
+  - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21
   - srcinst # failure in job https://hydra.nixos.org/build/233221356 at 2023-09-02
   - srt-attoparsec # failure in job https://hydra.nixos.org/build/233248456 at 2023-09-02
   - sscan # failure in job https://hydra.nixos.org/build/233248144 at 2023-09-02
@@ -5111,6 +5151,7 @@ broken-packages:
   - stack2cabal # failure in job https://hydra.nixos.org/build/233663091 at 2023-09-02
   - stack2nix # failure in job https://hydra.nixos.org/build/233662912 at 2023-09-02
   - stackage-cli # failure in job https://hydra.nixos.org/build/233213721 at 2023-09-02
+  - stackage-curator # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237229157 at 2023-10-21
   - stackage-metadata # failure in job https://hydra.nixos.org/build/233197359 at 2023-09-02
   - stackage-to-hackage # failure in job https://hydra.nixos.org/build/233233948 at 2023-09-02
   - stackage-types # failure in job https://hydra.nixos.org/build/233239995 at 2023-09-02
@@ -5320,6 +5361,7 @@ broken-packages:
   - tagsoup-selection # failure in job https://hydra.nixos.org/build/233228969 at 2023-09-02
   - tagtree # failure in job https://hydra.nixos.org/build/233209409 at 2023-09-02
   - tahoe-capabilities # failure in job https://hydra.nixos.org/build/233253813 at 2023-09-02
+  - tahoe-chk # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237298038 at 2023-10-21
   - tai64 # failure in job https://hydra.nixos.org/build/233257422 at 2023-09-02
   - tai # failure in job https://hydra.nixos.org/build/233210483 at 2023-09-02
   - tailwind # failure in job https://hydra.nixos.org/build/233238757 at 2023-09-02
@@ -5368,6 +5410,7 @@ broken-packages:
   - templatepg # failure in job https://hydra.nixos.org/build/233250442 at 2023-09-02
   - template-toolkit # failure in job https://hydra.nixos.org/build/233195990 at 2023-09-02
   - template-yj # failure in job https://hydra.nixos.org/build/233236245 at 2023-09-02
+  - templatise # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237235933 at 2023-10-21
   - tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02
   - tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02
   - ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02
@@ -5526,6 +5569,7 @@ broken-packages:
   - tonalude # failure in job https://hydra.nixos.org/build/233204874 at 2023-09-02
   - tonaparser # failure in job https://hydra.nixos.org/build/233224261 at 2023-09-02
   - toodles # failure in job https://hydra.nixos.org/build/233245612 at 2023-09-02
+  - toolbox # failure in job https://hydra.nixos.org/build/237240871 at 2023-10-21
   - Top # failure in job https://hydra.nixos.org/build/233234827 at 2023-09-02
   - topkata # failure in job https://hydra.nixos.org/build/233231937 at 2023-09-02
   - torch # failure in job https://hydra.nixos.org/build/233222854 at 2023-09-02
@@ -5700,6 +5744,7 @@ broken-packages:
   - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02
   - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02
   - unix-recursive # failure in job https://hydra.nixos.org/build/233194742 at 2023-09-02
+  - unleash-client-haskell-core # failure in job https://hydra.nixos.org/build/237229757 at 2023-10-21
   - unlifted-list # failure in job https://hydra.nixos.org/build/233205239 at 2023-09-02
   - unlift # failure in job https://hydra.nixos.org/build/233217875 at 2023-09-02
   - unliftio-messagebox # failure in job https://hydra.nixos.org/build/233200633 at 2023-09-02
@@ -5977,6 +6022,7 @@ broken-packages:
   - writer-cps-morph # failure in job https://hydra.nixos.org/build/233241891 at 2023-09-02
   - wsdl # failure in job https://hydra.nixos.org/build/233208187 at 2023-09-02
   - wsedit # failure in job https://hydra.nixos.org/build/233232333 at 2023-09-02
+  - ws # failure building executable 'ws' in job https://hydra.nixos.org/build/237237311 at 2023-10-21
   - wtk # failure in job https://hydra.nixos.org/build/233220668 at 2023-09-02
   - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02
   - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -47,9 +47,8 @@ default-package-overrides:
   - implicit-hie < 0.1.3
   - hie-bios < 0.13
 
-  # 2023-07-06: newer versions of stylish-haskell require
+  # pandoc-crossref 0.3.17 needs pandoc >= 3.1.8
-  # ghc-lib-parser-ex >= 9.6, but LTS-21 contains ghc-lib-parser-ex-9.4
+  - pandoc-crossref < 0.3.17.0
-  - stylish-haskell < 0.14.5.0
 
   # 2023-09-17: reflex-dom 0.6.3.0 is broken https://github.com/reflex-frp/reflex-dom/issues/462
   - reflex-dom < 0.6.2.0
@@ -58,6 +57,9 @@ default-package-overrides:
   # https://github.com/obsidiansystems/dependent-sum-template/issues/5
   - dependent-sum-template < 0.1.2
 
+  # hls-floskell-plugin 2.4 does not yet support floskell 0.11
+  - floskell < 0.11
+
 extra-packages:
   - Cabal-syntax == 3.6.*               # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
   - Cabal == 3.2.*                      # Used for packages needing newer Cabal on ghc 8.6 and 8.8
@@ -121,17 +123,13 @@ extra-packages:
   - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
   - optparse-applicative < 0.16         # needed for niv-0.2.19
-  - ormolu == 0.5.0.1                   # 2022-02-21: for hls on ghc 8.10
+  - fourmolu == 0.11.*                  # 2023-10-22: for hls on ghc 9.0
   - ormolu == 0.5.2.0                   # 2023-08-08: for hls on ghc 9.0 and 9.2
-  - fourmolu == 0.9.0.0                 # 2022-09-21: for hls on ghc 8.10
-  - fourmolu == 0.10.1.0                # 2023-04-18: for hls on ghc 9.0 and 9.2
-  - fourmolu == 0.13.*                  # 2023-09-16: latest version compatible with hls 2.2.* on ghc 9.6
-  - mod == 0.1.2.2                      # needed for hls on ghc 8.10
   - pantry == 0.5.2.1                   # needed for stack-2.7.3
   - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
   - resolv < 0.2                        # required to build cabal-install-3.10.1.0 with Stackage LTS 21
   - sbv == 7.13                         # required for pkgs.petrinizer
-  - stylish-haskell == 0.14.3.0         # 2022-09-19: needed for hls on ghc 8.8
+  - stylish-haskell == 0.14.4.0         # 2022-09-19: needed for hls on ghc 9.2
   - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
   - text == 2.0.2                       # 2023-09-14: Needed for elm (which is currently on ghc-8.10)
   - th-abstraction < 0.6                # 2023-09-11: needed for aeson-2.2.0.0

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml

@@ -1,4 +1,4 @@
-# Stackage LTS 21.11
+# Stackage LTS 21.14
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -115,9 +115,9 @@ default-package-overrides:
   - attoparsec-run ==0.0.2.0
   - attoparsec-time ==1.0.3
   - audacity ==0.0.2.1
-  - authenticate ==1.3.5.1
+  - authenticate ==1.3.5.2
   - authenticate-oauth ==1.7
-  - autodocodec ==0.2.0.4
+  - autodocodec ==0.2.0.5
   - autodocodec-openapi3 ==0.2.1.1
   - autodocodec-schema ==0.1.0.3
   - autodocodec-yaml ==0.2.0.3
@@ -209,7 +209,7 @@ default-package-overrides:
   - blaze-builder ==0.4.2.3
   - blaze-colonnade ==1.2.2.1
   - blaze-html ==0.9.1.2
-  - blaze-markup ==0.8.2.8
+  - blaze-markup ==0.8.3.0
   - blaze-svg ==0.3.7
   - blaze-textual ==0.2.3.1
   - bloodhound ==0.21.0.0
@@ -245,7 +245,7 @@ default-package-overrides:
   - buffer-pipe ==0.0
   - bugsnag ==1.0.0.1
   - bugsnag-haskell ==0.0.4.4
-  - bugsnag-hs ==0.2.0.11
+  - bugsnag-hs ==0.2.0.12
   - bugsnag-wai ==1.0.0.1
   - bugsnag-yesod ==1.0.0.1
   - bugzilla-redhat ==1.0.1
@@ -259,7 +259,7 @@ default-package-overrides:
   - byte-order ==0.1.3.0
   - byteorder ==1.0.4
   - bytes ==0.17.3
-  - byteset ==0.1.1.0
+  - byteset ==0.1.1.1
   - byteslice ==0.2.11.1
   - bytesmith ==0.3.10.0
   - bytestring-builder ==0.10.8.2.0
@@ -279,7 +279,7 @@ default-package-overrides:
   - cabal-doctest ==1.0.9
   - cabal-file ==0.1.1
   - cabal-install-solver ==3.8.1.0
-  - cabal-rpm ==2.1.2
+  - cabal-rpm ==2.1.3
   - cache ==0.1.3.0
   - cached-json-file ==0.1.1
   - cacophony ==0.10.1
@@ -370,9 +370,9 @@ default-package-overrides:
   - comfort-blas ==0.0.0.1
   - comfort-fftw ==0.0.0.1
   - comfort-glpk ==0.1
-  - comfort-graph ==0.0.3.2
+  - comfort-graph ==0.0.4
   - commonmark ==0.2.3
-  - commonmark-extensions ==0.2.3.5
+  - commonmark-extensions ==0.2.3.6
   - commonmark-pandoc ==0.2.1.3
   - commutative ==0.0.2
   - commutative-semigroups ==0.1.0.1
@@ -416,10 +416,10 @@ default-package-overrides:
   - constraints ==0.13.4
   - constraints-extras ==0.4.0.0
   - constraint-tuples ==0.1.2
-  - context ==0.2.0.1
+  - context ==0.2.0.2
-  - context-http-client ==0.2.0.1
+  - context-http-client ==0.2.0.2
-  - context-resource ==0.2.0.1
+  - context-resource ==0.2.0.2
-  - context-wai-middleware ==0.2.0.1
+  - context-wai-middleware ==0.2.0.2
   - contiguous ==0.6.3.0
   - contravariant ==1.5.5
   - contravariant-extras ==0.3.5.3
@@ -539,7 +539,7 @@ default-package-overrides:
   - DBFunctor ==0.1.2.1
   - dbus ==1.2.29
   - dbus-hslogger ==0.1.0.1
-  - debian ==4.0.4
+  - debian ==4.0.5
   - debian-build ==0.10.2.1
   - debug-trace-var ==0.2.0
   - dec ==0.0.5
@@ -567,6 +567,7 @@ default-package-overrides:
   - dhall-yaml ==1.2.12
   - di ==1.3
   - diagrams ==1.4.1
+  - diagrams-cairo ==1.4.2.1
   - diagrams-canvas ==1.4.1.2
   - diagrams-contrib ==1.4.5.1
   - diagrams-core ==1.5.1
@@ -656,7 +657,7 @@ default-package-overrides:
   - editor-open ==0.6.0.0
   - effectful ==2.2.2.0
   - effectful-core ==2.2.2.2
-  - effectful-plugin ==1.1.0.1
+  - effectful-plugin ==1.1.0.2
   - effectful-th ==1.0.0.1
   - either ==5.0.2
   - either-both ==0.1.1.1
@@ -868,7 +869,6 @@ default-package-overrides:
   - genvalidity-hspec-persistent ==1.0.0.0
   - genvalidity-mergeful ==0.3.0.0
   - genvalidity-mergeless ==0.3.0.0
-  - genvalidity-path ==1.0.0.1
   - genvalidity-persistent ==1.0.0.1
   - genvalidity-property ==1.0.0.0
   - genvalidity-scientific ==1.0.0.0
@@ -954,7 +954,7 @@ default-package-overrides:
   - glpk-headers ==0.5.1
   - GLURaw ==2.0.0.5
   - GLUT ==2.7.0.16
-  - gmail-simple ==0.1.0.4
+  - gmail-simple ==0.1.0.5
   - gnuplot ==0.5.7
   - goldplate ==0.2.1.1
   - google-isbn ==1.0.3
@@ -984,7 +984,7 @@ default-package-overrides:
   - hackage-security ==0.6.2.3
   - haddock-library ==1.11.0
   - haha ==0.3.1.1
-  - hakyll ==4.16.1.0
+  - hakyll ==4.16.2.0
   - hal ==1.0.0.1
   - half ==0.3.1
   - hall-symbols ==0.1.0.6
@@ -1000,7 +1000,7 @@ default-package-overrides:
   - happy-meta ==0.2.1.0
   - harp ==0.4.3.6
   - HasBigDecimal ==0.2.0.0
-  - hasbolt ==0.1.6.2
+  - hasbolt ==0.1.6.3
   - hashable ==1.4.3.0
   - hashing ==0.1.1.0
   - hashmap ==1.3.3
@@ -1034,7 +1034,7 @@ default-package-overrides:
   - hasql-transaction ==1.0.1.2
   - has-transformers ==0.1.0.4
   - hasty-hamiltonian ==1.3.4
-  - HaTeX ==3.22.3.2
+  - HaTeX ==3.22.4.0
   - HaXml ==1.25.13
   - haxr ==3000.11.5
   - HCodecs ==0.5.2
@@ -1111,7 +1111,7 @@ default-package-overrides:
   - hpack-dhall ==0.5.7
   - hpc-codecov ==0.3.0.0
   - hpc-lcov ==1.1.1
-  - HPDF ==1.6.1
+  - HPDF ==1.6.2
   - hpp ==0.6.5
   - hpqtypes ==1.11.1.1
   - hpqtypes-extras ==1.16.4.4
@@ -1120,7 +1120,7 @@ default-package-overrides:
   - hruby ==0.5.0.0
   - hsass ==0.8.0
   - hs-bibutils ==6.10.0.0
-  - hsc2hs ==0.68.9
+  - hsc2hs ==0.68.10
   - hscolour ==1.24.4
   - hsdns ==1.8
   - hse-cpp ==0.2
@@ -1128,7 +1128,7 @@ default-package-overrides:
   - hset ==2.2.0
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
-  - hsini ==0.5.2.1
+  - hsini ==0.5.2.2
   - hsinstall ==2.8
   - HSlippyMap ==3.0.1
   - hslogger ==1.3.1.0
@@ -1180,7 +1180,7 @@ default-package-overrides:
   - HSvm ==0.1.1.3.25
   - hsx2hs ==0.14.1.11
   - hsx-jmacro ==7.3.8.2
-  - HsYAML ==0.2.1.1
+  - HsYAML ==0.2.1.2
   - HsYAML-aeson ==0.2.0.1
   - hsyslog ==5.0.2
   - htaglib ==1.2.0
@@ -1209,7 +1209,7 @@ default-package-overrides:
   - httpd-shed ==0.4.1.1
   - http-io-streams ==0.1.6.2
   - http-link-header ==1.2.1
-  - http-media ==0.8.1.0
+  - http-media ==0.8.1.1
   - http-query ==0.1.3
   - http-reverse-proxy ==0.6.0.1
   - http-streams ==0.8.9.8
@@ -1219,7 +1219,7 @@ default-package-overrides:
   - HUnit-approx ==1.1.1.1
   - hunit-dejafu ==2.0.0.6
   - hvect ==0.4.0.1
-  - hvega ==0.12.0.5
+  - hvega ==0.12.0.7
   - hw-balancedparens ==0.4.1.3
   - hw-bits ==0.7.2.2
   - hw-conduit ==0.2.1.1
@@ -1289,8 +1289,8 @@ default-package-overrides:
   - infinite-list ==0.1
   - ini ==0.4.2
   - inj ==1.0
-  - inline-c ==0.9.1.8
+  - inline-c ==0.9.1.10
-  - inline-c-cpp ==0.5.0.1
+  - inline-c-cpp ==0.5.0.2
   - inline-r ==1.0.1
   - input-parsers ==0.3.0.1
   - insert-ordered-containers ==0.2.5.3
@@ -1343,7 +1343,7 @@ default-package-overrides:
   - jmacro ==0.6.18
   - jose ==0.10
   - jose-jwt ==0.9.6
-  - journalctl-stream ==0.6.0.4
+  - journalctl-stream ==0.6.0.5
   - js-chart ==2.9.4.1
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
@@ -1357,7 +1357,7 @@ default-package-overrides:
   - JuicyPixels ==3.3.8
   - JuicyPixels-extra ==0.6.0
   - JuicyPixels-scale-dct ==0.1.2
-  - junit-xml ==0.1.0.2
+  - junit-xml ==0.1.0.3
   - justified-containers ==0.3.0.0
   - jwt ==0.11.0
   - kan-extensions ==5.2.5
@@ -1571,7 +1571,7 @@ default-package-overrides:
   - mintty ==0.1.4
   - misfortune ==0.1.2.1
   - missing-foreign ==0.1.1
-  - MissingH ==1.6.0.0
+  - MissingH ==1.6.0.1
   - mixed-types-num ==0.5.12
   - mmap ==0.5.9
   - mmark ==0.0.7.6
@@ -1603,7 +1603,7 @@ default-package-overrides:
   - monad-memo ==0.5.4
   - monadoid ==0.0.3
   - monadology ==0.1
-  - monad-par ==0.3.5
+  - monad-par ==0.3.6
   - monad-parallel ==0.8
   - monad-par-extras ==0.3.3
   - monad-peel ==0.2.1.2
@@ -1645,7 +1645,7 @@ default-package-overrides:
   - multi-containers ==0.2
   - multimap ==1.2.1
   - multipart ==0.2.1
-  - MultipletCombiner ==0.0.6
+  - MultipletCombiner ==0.0.7
   - multiset ==0.3.4.3
   - murmur3 ==1.0.5
   - murmur-hash ==0.1.0.10
@@ -1841,7 +1841,7 @@ default-package-overrides:
   - pcg-random ==0.1.4.0
   - pcre2 ==2.2.1
   - pcre-heavy ==1.0.0.3
-  - pcre-light ==0.4.1.0
+  - pcre-light ==0.4.1.2
   - pcre-utils ==0.1.9
   - pdc ==0.1.1
   - pdf-toolbox-content ==0.1.1
@@ -1861,7 +1861,7 @@ default-package-overrides:
   - persistent-mtl ==0.5.0.1
   - persistent-mysql ==2.13.1.4
   - persistent-pagination ==0.1.1.2
-  - persistent-postgresql ==2.13.5.2
+  - persistent-postgresql ==2.13.6.1
   - persistent-qq ==2.12.0.5
   - persistent-redis ==2.13.0.1
   - persistent-refs ==0.4
@@ -1872,7 +1872,7 @@ default-package-overrides:
   - pg-harness-client ==0.6.0
   - pgp-wordlist ==0.1.0.3
   - pg-transact ==0.3.2.0
-  - phantom-state ==0.2.1.3
+  - phantom-state ==0.2.1.4
   - phatsort ==0.6.0.0
   - picosat ==0.1.6
   - pid1 ==0.1.3.1
@@ -1908,9 +1908,9 @@ default-package-overrides:
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.13
-  - polysemy ==1.9.1.1
+  - polysemy ==1.9.1.2
   - polysemy-fs ==0.1.0.0
-  - polysemy-plugin ==0.4.5.0
+  - polysemy-plugin ==0.4.5.1
   - polysemy-webserver ==0.2.1.2
   - pontarius-xmpp ==0.5.6.6
   - pooled-io ==0.0.2.3
@@ -1919,7 +1919,7 @@ default-package-overrides:
   - posix-paths ==0.3.0.0
   - posix-pty ==0.2.2
   - possibly ==1.0.0.0
-  - postgres-options ==0.2.0.0
+  - postgres-options ==0.2.1.0
   - postgresql-binary ==0.13.1
   - postgresql-libpq ==0.9.5.0
   - postgresql-libpq-notify ==0.2.0.0
@@ -2122,10 +2122,10 @@ default-package-overrides:
   - riak-protobuf ==0.25.0.0
   - rio ==0.1.22.0
   - rio-orphans ==0.1.2.0
-  - rio-prettyprint ==0.1.5.0
+  - rio-prettyprint ==0.1.7.0
   - rng-utils ==0.3.1
   - rocksdb-haskell ==1.0.1
-  - rocksdb-haskell-jprupp ==2.1.4
+  - rocksdb-haskell-jprupp ==2.1.6
   - rocksdb-query ==0.4.2
   - roles ==0.2.1.0
   - rollbar ==1.1.3
@@ -2167,11 +2167,11 @@ default-package-overrides:
   - sample-frame-np ==0.0.5
   - sampling ==0.3.5
   - sandi ==0.5
-  - sandwich ==0.1.5.0
+  - sandwich ==0.1.5.2
   - sandwich-hedgehog ==0.1.3.0
   - sandwich-quickcheck ==0.1.0.7
   - sandwich-slack ==0.1.2.0
-  - sandwich-webdriver ==0.2.3.0
+  - sandwich-webdriver ==0.2.3.1
   - say ==0.1.0.1
   - sbp ==4.15.0
   - sbv ==10.2
@@ -2232,7 +2232,7 @@ default-package-overrides:
   - servant-machines ==0.15.1
   - servant-multipart ==0.12.1
   - servant-multipart-api ==0.12.1
-  - servant-multipart-client ==0.12.1
+  - servant-multipart-client ==0.12.2
   - servant-openapi3 ==2.0.1.6
   - servant-pipes ==0.15.3
   - servant-rate-limit ==0.2.0.0
@@ -2260,7 +2260,7 @@ default-package-overrides:
   - SHA ==1.6.4.4
   - shake ==0.19.7
   - shake-plus ==0.3.4.0
-  - shakespeare ==2.1.0
+  - shakespeare ==2.1.0.1
   - shakespeare-text ==1.1.0
   - shared-memory ==0.2.0.1
   - shell-conduit ==5.0.0
@@ -2326,7 +2326,7 @@ default-package-overrides:
   - some-dict-of ==0.1.0.2
   - sop-core ==0.5.0.2
   - sort ==1.0.0.0
-  - sorted-list ==0.2.1.0
+  - sorted-list ==0.2.1.2
   - sound-collage ==0.2.1
   - sourcemap ==0.1.7
   - sox ==0.2.3.2
@@ -2358,7 +2358,7 @@ default-package-overrides:
   - srt ==0.1.2.0
   - srtree ==1.0.0.5
   - stache ==2.3.4
-  - stack-all ==0.4.1
+  - stack-all ==0.4.2
   - stack-clean-old ==0.4.8
   - stack-templatizer ==0.1.1.0
   - state-codes ==0.1.3
@@ -2368,7 +2368,7 @@ default-package-overrides:
   - stateWriter ==0.4.0
   - static-canvas ==0.2.0.3
   - static-text ==0.2.0.7
-  - statistics ==0.16.2.0
+  - statistics ==0.16.2.1
   - statistics-linreg ==0.3
   - status-notifier-item ==0.3.1.0
   - step-function ==0.2.0.1
@@ -2438,7 +2438,7 @@ default-package-overrides:
   - SVGFonts ==1.8.0.1
   - svg-tree ==0.6.2.4
   - swagger2 ==2.8.7
-  - swish ==0.10.5.0
+  - swish ==0.10.6.0
   - syb ==0.7.2.4
   - sydtest ==0.15.1.0
   - sydtest-aeson ==0.1.0.0
@@ -2489,10 +2489,10 @@ default-package-overrides:
   - tar-conduit ==0.3.2.1
   - tardis ==0.4.4.0
   - tasty ==1.4.3
-  - tasty-ant-xml ==1.1.8
+  - tasty-ant-xml ==1.1.9
   - tasty-autocollect ==0.4.1
-  - tasty-bench ==0.3.4
+  - tasty-bench ==0.3.5
-  - tasty-dejafu ==2.1.0.0
+  - tasty-dejafu ==2.1.0.1
   - tasty-discover ==5.0.0
   - tasty-expected-failure ==0.12.3
   - tasty-fail-fast ==0.0.3
@@ -2502,7 +2502,7 @@ default-package-overrides:
   - tasty-hslua ==1.1.0
   - tasty-hspec ==1.2.0.3
   - tasty-html ==0.4.2.1
-  - tasty-hunit ==0.10.0.3
+  - tasty-hunit ==0.10.1
   - tasty-hunit-compat ==0.2.0.1
   - tasty-inspection-testing ==0.2
   - tasty-kat ==0.0.3
@@ -2510,8 +2510,8 @@ default-package-overrides:
   - tasty-lua ==1.1.0
   - tasty-program ==1.1.0
   - tasty-quickcheck ==0.10.2
-  - tasty-rerun ==1.1.18
+  - tasty-rerun ==1.1.19
-  - tasty-silver ==3.3.1.1
+  - tasty-silver ==3.3.1.2
   - tasty-smallcheck ==0.8.2
   - tasty-tap ==0.1.0
   - tasty-th ==0.1.7
@@ -2544,7 +2544,7 @@ default-package-overrides:
   - test-fun ==0.1.0.0
   - testing-feat ==1.1.1.1
   - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.12.8.2
+  - texmath ==0.12.8.3
   - text-ansi ==0.2.1.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.7
@@ -2552,7 +2552,7 @@ default-package-overrides:
   - text-builder-linear ==0.1.1.1
   - text-conversions ==0.3.1.1
   - text-format ==0.3.2.1
-  - text-icu ==0.8.0.2
+  - text-icu ==0.8.0.3
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.14
   - textlocal ==0.1.0.5
@@ -2588,7 +2588,7 @@ default-package-overrides:
   - th-printf ==0.7
   - thread-hierarchy ==0.3.0.2
   - thread-local-storage ==0.2
-  - threads ==0.5.1.7
+  - threads ==0.5.1.8
   - threads-extras ==0.1.0.3
   - thread-supervisor ==0.2.0.0
   - th-reify-compat ==0.0.1.5
@@ -2688,7 +2688,7 @@ default-package-overrides:
   - typst-symbols ==0.1.4
   - tz ==0.1.3.6
   - tzdata ==0.2.20230322.0
-  - tztime ==0.1.0.0
+  - tztime ==0.1.1.0
   - ua-parser ==0.7.7.0
   - uglymemo ==0.1.0.1
   - ulid ==0.3.2.0
@@ -2728,7 +2728,7 @@ default-package-overrides:
   - universum ==1.8.2
   - unix-bytestring ==0.4.0
   - unix-compat ==0.7
-  - unix-time ==0.4.10
+  - unix-time ==0.4.11
   - unjson ==0.15.4
   - unliftio ==0.2.25.0
   - unliftio-core ==0.2.1.0
@@ -2758,7 +2758,6 @@ default-package-overrides:
   - validity-bytestring ==0.4.1.1
   - validity-case-insensitive ==0.0.0.0
   - validity-containers ==0.5.0.4
-  - validity-path ==0.4.0.1
   - validity-persistent ==0.0.0.0
   - validity-primitive ==0.0.0.1
   - validity-scientific ==0.2.0.3
@@ -2809,7 +2808,7 @@ default-package-overrides:
   - wai-enforce-https ==1.0.0.0
   - wai-eventsource ==3.0.0
   - wai-extra ==3.1.13.0
-  - wai-feature-flags ==0.1.0.6
+  - wai-feature-flags ==0.1.0.7
   - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.4.0
   - wai-middleware-bearer ==1.0.3
@@ -2922,13 +2921,13 @@ default-package-overrides:
   - yarn-lock ==0.6.5
   - yeshql-core ==4.2.0.0
   - yesod ==1.6.2.1
-  - yesod-auth ==1.6.11.1
+  - yesod-auth ==1.6.11.2
   - yesod-auth-basic ==0.1.0.3
   - yesod-auth-hashdb ==1.7.1.7
   - yesod-auth-oauth2 ==0.7.1.1
   - yesod-auth-oidc ==0.1.4
   - yesod-bin ==1.6.2.2
-  - yesod-core ==1.6.24.4
+  - yesod-core ==1.6.24.5
   - yesod-eventsource ==1.6.0.1
   - yesod-fb ==0.6.1
   - yesod-form ==1.7.6
@@ -2945,7 +2944,7 @@ default-package-overrides:
   - yesod-routes-flow ==3.0.0.2
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.1.0
-  - yesod-test ==1.6.15
+  - yesod-test ==1.6.16
   - yesod-websockets ==0.3.0.3
   - yes-precure5-command ==5.5.3
   - yi-rope ==0.11

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -33,6 +33,7 @@ dont-distribute-packages:
  - BPS
  - Barracuda
  - BerlekampAlgorithm
+ - BesselJ
  - BioHMM
  - Biobase
  - BiobaseBlast
@@ -113,6 +114,7 @@ dont-distribute-packages:
  - Fin
  - Finance-Treasury
  - FiniteCategories
+ - FiniteCategoriesGraphViz
  - FiniteMap
  - FirstOrderTheory
  - Flippi
@@ -250,6 +252,7 @@ dont-distribute-packages:
  - KiCS-debugger
  - KiCS-prophecy
  - LDAPv3
+ - LPFP
  - LPPaver
  - LambdaHack
  - LambdaINet
@@ -403,6 +406,7 @@ dont-distribute-packages:
  - UTFTConverter
  - UrlDisp
  - ViennaRNA-extras
+ - Vis
  - WEditorBrick
  - WEditorHyphen
  - WL500gPControl
@@ -485,8 +489,6 @@ dont-distribute-packages:
  - amby
  - ampersand
  - amqp-streamly
- - amqp-utils_0_6_4_0
- - amqp_0_22_2
  - analyze-client
  - anatomy
  - animate-example
@@ -599,6 +601,7 @@ dont-distribute-packages:
  - babylon
  - backblaze-b2-hs
  - backdropper
+ - balkon
  - ballast
  - bamboo
  - bamboo-launcher
@@ -747,7 +750,6 @@ dont-distribute-packages:
  - cakyrespa
  - cal3d-examples
  - cal3d-opengl
- - calamity
  - calc
  - calculator
  - caldims
@@ -847,6 +849,8 @@ dont-distribute-packages:
  - clash-vhdl
  - clashilator
  - classify-frog
+ - classy-effects
+ - classy-effects-th
  - classy-miso
  - clckwrks
  - clckwrks-cli
@@ -986,6 +990,7 @@ dont-distribute-packages:
  - craftwerk-cairo
  - craftwerk-gtk
  - craze
+ - credentials-cli
  - crf-chain1
  - crf-chain1-constrained
  - crf-chain2-generic
@@ -1145,10 +1150,12 @@ dont-distribute-packages:
  - distributed-process-systest
  - distributed-process-task
  - distributed-process-tests
+ - distributed-process-zookeeper
  - distributed-static
  - distribution-plot
  - dixi
  - dl-fedora
+ - dl-fedora_1_0
  - dmenu-pkill
  - dmenu-pmount
  - dmenu-search
@@ -1933,7 +1940,6 @@ dont-distribute-packages:
  - haskoin-crypto
  - haskoin-protocol
  - haskoin-script
- - haskoin-store
  - haskoon
  - haskoon-httpspec
  - haskoon-salvia
@@ -2004,6 +2010,8 @@ dont-distribute-packages:
  - hedgehog-checkers-lens
  - hedgehog-gen-json
  - hedis-pile
+ - heftia
+ - heftia-effects
  - heist-aeson
  - heist-async
  - heist-extra
@@ -2027,6 +2035,7 @@ dont-distribute-packages:
  - hesql
  - heterolist
  - hetzner
+ - hetzner_0_4_0_1
  - hevolisa
  - hevolisa-dph
  - hexpat-conduit
@@ -2183,9 +2192,7 @@ dont-distribute-packages:
  - htoml-parse
  - htsn-import
  - http-client-auth
- - http-client-restricted_0_1_0
  - http-client-rustls
- - http-client-tls_0_3_6_3
  - http-enumerator
  - http-exchange
  - http-exchange-instantiations
@@ -2488,6 +2495,7 @@ dont-distribute-packages:
  - ldapply
  - leaky
  - lean
+ - learn-physics_0_6_6
  - learning-hmm
  - legion
  - legion-discovery
@@ -2812,7 +2820,6 @@ dont-distribute-packages:
  - nero-wai
  - nero-warp
  - nested-routes
- - net-mqtt_0_8_6_0
  - net-spider
  - net-spider-cli
  - net-spider-pangraph
@@ -2826,7 +2833,6 @@ dont-distribute-packages:
  - nettle-openflow
  - network-anonymous-i2p
  - network-anonymous-tor
- - network-conduit-tls_1_4_0
  - network-connection
  - network-enumerator
  - network-hans
@@ -3017,6 +3023,7 @@ dont-distribute-packages:
  - phonetic-languages-simplified-common
  - phonetic-languages-simplified-examples-array
  - phonetic-languages-simplified-examples-common
+ - phonetic-languages-simplified-generalized-examples-common
  - phonetic-languages-simplified-lists-examples
  - phonetic-languages-simplified-properties-lists
  - phonetic-languages-simplified-properties-lists-double
@@ -3109,6 +3116,7 @@ dont-distribute-packages:
  - potoki-conduit
  - potoki-hasql
  - potoki-zlib
+ - powerqueue-sqs
  - pqueue-mtl
  - practice-room
  - pred-set
@@ -3339,7 +3347,6 @@ dont-distribute-packages:
  - repo-based-blog
  - repr
  - representable-tries
- - req_3_13_1
  - reserve
  - resin
  - resource-simple
@@ -3739,6 +3746,7 @@ dont-distribute-packages:
  - stackage-sandbox
  - stackage-setup
  - stackage-upload
+ - stackage2nix
  - stackctl
  - starrover2
  - stateful-mtl
@@ -3772,6 +3780,7 @@ dont-distribute-packages:
  - stripe-tests
  - strongswan-sql
  - structural-induction
+ - structured-haskell-mode
  - structured-mongoDB
  - stunts
  - stutter
@@ -3827,7 +3836,6 @@ dont-distribute-packages:
  - tagged-th
  - tagsoup-navigate
  - tagstew
- - tahoe-chk
  - tahoe-directory
  - tahoe-great-black-swamp
  - tahoe-ssk
@@ -4178,7 +4186,6 @@ dont-distribute-packages:
  - workflow-extra
  - workflow-pure
  - workflow-types
- - wraxml
  - wrecker
  - wrecker-ui
  - wright
@@ -4190,7 +4197,6 @@ dont-distribute-packages:
  - wumpus-drawing
  - wumpus-microprint
  - wumpus-tree
- - wuss_2_0_1_4
  - wx
  - wxAsteroids
  - wxFruit
@@ -4310,4 +4316,5 @@ dont-distribute-packages:
  - zoom-cache
  - zoom-cache-pcm
  - zoom-cache-sndfile
+ - zoovisitor
  - zuramaru

pkgs/development/haskell-modules/configuration-nix.nix

@@ -93,13 +93,6 @@ self: super: builtins.intersectAttrs super {
     doCheck = false;
   }) super.ghcide;
 
-  # Test suite needs executable
-  agda2lagda = overrideCabal (drv: {
-    preCheck = ''
-      export PATH="$PWD/dist/build/agda2lagda:$PATH"
-    '' + drv.preCheck or "";
-  }) super.agda2lagda;
-
   hiedb = overrideCabal (drv: {
     preCheck = ''
       export PATH=$PWD/dist/build/hiedb:$PATH
@@ -185,6 +178,14 @@ self: super: builtins.intersectAttrs super {
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
 
+  # Test suite needs executable
+  agda2lagda = overrideCabal (drv: {
+    preCheck = ''
+      export PATH="$PWD/dist/build/agda2lagda:$PATH"
+    '' + drv.preCheck or "";
+  }) super.agda2lagda;
+
+
   audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: {
       executableHaskellDepends = [self.optparse-applicative self.soxlib];
     }) super.audacity);

pkgs/development/haskell-modules/package-list.nix

@@ -10,12 +10,13 @@ let
     let
       version = pkg.version or "";
     in
-    lib.optionalString (isPvpVersion version)
+    lib.optionalString (isPvpVersion version && (pkg.meta.hydraPlatforms or null) != lib.platforms.none)
       ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'';
   all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages)));
 in
 runCommand "hackage-package-list" { }
   # This command will make a join between all packages on hackage and haskellPackages.*.
+  # It ignores packages marked as broken (according to hydraPlatforms)
   # It creates a valid csv file which can be uploaded to hackage.haskell.org.
   # The call is wrapped in echo $(...) to trim trailing newline, which hackage requires.
   ''

pkgs/development/python-modules/formbox/default.nix

@@ -1,26 +1,24 @@
-{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }:
+{ lib, buildPythonPackage, pythonOlder, fetchzip, flit-core, mistune, nh3 }:
 
 buildPythonPackage rec {
   pname = "formbox";
-  version = "0.4.1";
+  version = "0.4.3";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
-  src = fetchFromSourcehut {
+  src = fetchzip {
-    owner = "~cnx";
+    url = "https://trong.loang.net/~cnx/formbox/snapshot/formbox-${version}.tar.gz";
-    repo = pname;
+    hash = "sha256-sRu0otyeYpxot/Fyiz3wyQJsJvl8nsgIVitzT8frxLE=";
-    rev = version;
-    hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk=";
   };
 
   nativeBuildInputs = [ flit-core ];
-  propagatedBuildInputs = [ bleach markdown ];
+  propagatedBuildInputs = [ mistune nh3 ];
   doCheck = false; # there's no test
   pythonImportsCheck = [ "formbox" ];
 
   meta = with lib; {
     description = "A script to format mbox as HTML/XML";
-    homepage = "https://sr.ht/~cnx/formbox";
+    homepage = "https://trong.loang.net/~cnx/formbox";
     license = licenses.agpl3Plus;
     maintainers = [ maintainers.McSinyx ];
   };

pkgs/development/python-modules/oelint-parser/default.nix

@@ -3,22 +3,27 @@
 , fetchPypi
 , buildPythonPackage
 , regex
+, pip
 }:
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "2.11.3";
+  version = "2.11.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "oelint_parser";
-    hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s=";
+    hash = "sha256-r8qpD7UDh8ZfsdwVuv0ipihPEX3263t929mMYf143iA=";
   };
 
+  buildInputs = [ pip ];
   propagatedBuildInputs = [ regex ];
   pythonImportsCheck = [ "oelint_parser" ];
 
+  # Fail to run inside the code the build.
+  doCheck = false;
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

pkgs/test/haskell/upstreamStackHpackVersion/default.nix

@@ -25,7 +25,7 @@ let
   # This is a statically linked version of stack, so it should be usable within
   # the Nixpkgs builder (at least on x86_64-linux).
   stackDownloadUrl =
-    "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64-static.tar.gz";
+    "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64.tar.gz";
 
   # This test code has been explicitly pulled out of the derivation below so
   # that it can be hashed and added to the `name` of the derivation.  This is
@@ -49,10 +49,11 @@ let
     )
 
     # Fetch the statically-linked upstream Stack binary.
+    echo "Trying to download a statically linked stack binary from ${stackDownloadUrl} to ./stack.tar.gz ..."
     "''${curl[@]}" "${stackDownloadUrl}" > ./stack.tar.gz
     tar xf ./stack.tar.gz
 
-    upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64-static/stack --version)"
+    upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64/stack --version)"
     echo "upstream \`stack --version\` output: $upstream_stack_version_output"
 
     nixpkgs_stack_version_output="$(stack --version)"

pkgs/tools/text/nerdfix/default.nix

@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nerdfix";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "loichyan";
     repo = "nerdfix";
     rev = "v${version}";
-    hash = "sha256-cqTaup/MrtLcBIoY+1vQLLlU+Cmu3iODH4jmZImjGrg=";
+    hash = "sha256-V9f39/9k9kYjngYOSXJYblaKDABPCZbVWxD0p3ZWzlY=";
   };
 
-  cargoHash = "sha256-V/M70ARqOyN0f/uudWPHc4bGc3WXK3PpcM8r2MBEWAs=";
+  cargoHash = "sha256-PkUQZPLzvVJ7s1D9TkMmgIVQiR/E79BRCYmjZVcHIv8=";
 
   meta = with lib; {
     description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";

pkgs/top-level/haskell-packages.nix

@@ -24,10 +24,13 @@ let
     "ghc944"
     "ghc945"
     "ghc946"
+    "ghc947"
     "ghc94"
     "ghc96"
     "ghc962"
     "ghc963"
+    "ghc981"
+    "ghc98"
     "ghcHEAD"
   ];
 
@@ -46,9 +49,12 @@ let
     "ghc944"
     "ghc945"
     "ghc946"
+    "ghc947"
     "ghc96"
     "ghc962"
     "ghc963"
+    "ghc98"
+    "ghc981"
     "ghcHEAD"
   ];
 
@@ -333,7 +339,31 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
       llvmPackages = pkgs.llvmPackages_12;
     };
-    ghc94 = compiler.ghc946;
+    ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix {
+      bootPkgs =
+        # Building with 9.2 is broken due to
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
+        # Use 8.10 as a workaround where possible to keep bootstrap path short.
+
+        # On ARM text won't build with GHC 8.10.*
+        if stdenv.hostPlatform.isAarch then
+          # TODO(@sternenseemann): package bindist
+          packages.ghc902
+        # No suitable bindists for powerpc64le
+        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
+          packages.ghc902
+        else
+          packages.ghc8107Binary;
+      inherit (buildPackages.python3Packages) sphinx;
+      # Need to use apple's patched xattr until
+      # https://github.com/xattr/xattr/issues/44 and
+      # https://github.com/xattr/xattr/issues/55 are solved.
+      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
+      # Support range >= 10 && < 14
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
+      llvmPackages = pkgs.llvmPackages_12;
+    };
+    ghc94 = compiler.ghc947;
     ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix {
       bootPkgs =
         # For GHC 9.2 no armv7l bindists are available.
@@ -371,6 +401,19 @@ in {
       llvmPackages = pkgs.llvmPackages_15;
     };
     ghc96 = compiler.ghc963;
+    ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix {
+      # No bindist packaged for 9.4.* yet
+      bootPkgs = packages.ghc947;
+      inherit (buildPackages.python3Packages) sphinx;
+      # Need to use apple's patched xattr until
+      # https://github.com/xattr/xattr/issues/44 and
+      # https://github.com/xattr/xattr/issues/55 are solved.
+      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
+      # Support range >= 11 && < 16
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
+      llvmPackages = pkgs.llvmPackages_15;
+    };
+    ghc98 = compiler.ghc981;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
         # For GHC 9.2 no armv7l bindists are available.
@@ -517,7 +560,12 @@ in {
       ghc = bh.compiler.ghc946;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
     };
-    ghc94 = packages.ghc946;
+    ghc947 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc947;
+      ghc = bh.compiler.ghc947;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
+    };
+    ghc94 = packages.ghc947;
     ghc962 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc962;
       ghc = bh.compiler.ghc962;
@@ -529,6 +577,12 @@ in {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
     ghc96 = packages.ghc963;
+    ghc981 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc981;
+      ghc = bh.compiler.ghc981;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
+    };
+    ghc98 = packages.ghc981;
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;

pkgs/top-level/perl-packages.nix

@@ -10200,6 +10200,21 @@ with self; {
     };
   };
 
+  FutureQueue = buildPerlModule {
+    pname = "Future-Queue";
+    version = "0.51";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-Queue-0.51.tar.gz";
+      hash = "sha256-HVAcOpot3/x8YPlvpmlp1AyykuCSBM9t7NHCuLUAPNY=";
+    };
+    buildInputs = [ Test2Suite ];
+    propagatedBuildInputs = [ Future ];
+    meta = {
+      description = "A FIFO queue of values that uses L<Future>s";
+      license = with lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   GamesSolitaireVerify = buildPerlModule {
     pname = "Games-Solitaire-Verify";
     version = "0.2403";
@@ -20224,7 +20239,7 @@ with self; {
       url = "mirror://cpan/authors/id/M/MR/MREISNER/PLS-0.905.tar.gz";
       hash = "sha256-RVW1J5nBZBXDy/5eMB6gLKDrvDQhTH/lLx19ykUwLik=";
     };
-    propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ];
+    propagatedBuildInputs = [ Future FutureQueue IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ];
     nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
     postInstall = lib.optionalString stdenv.isDarwin ''
       shortenPerlShebang $out/bin/pls

pkgs/top-level/release-haskell.nix

@@ -70,8 +70,10 @@ let
     ghc928
     ghc945
     ghc946
+    ghc947
     ghc962
     ghc963
+    ghc981
   ];
 
   # packagePlatforms applied to `haskell.packages.*`
@@ -482,33 +484,55 @@ let
       # and to confirm that critical packages for the
       # package sets (like Cabal, jailbreak-cabal) are
       # working as expected.
-      cabal-install = released;
+      cabal-install = lib.subtractLists [
-      Cabal_3_10_1_0 = released;
+        compilerNames.ghc981
-      Cabal-syntax_3_10_1_0 = released;
+      ] released;
-      cabal2nix = released;
+      Cabal_3_10_1_0 = lib.subtractLists [
-      cabal2nix-unstable = released;
+        compilerNames.ghc981
+      ] released;
+      Cabal-syntax_3_10_1_0 = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
+      cabal2nix = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
+      cabal2nix-unstable = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
       funcmp = released;
       haskell-language-server = lib.subtractLists [
         # Support ceased as of 1.9.0.0
         compilerNames.ghc884
+        # Support ceased as of 2.3.0.0
+        compilerNames.ghc8107
+        # Not yet supported
+        compilerNames.ghc981
       ] released;
       hoogle = lib.subtractLists [
         compilerNames.ghc962
         compilerNames.ghc963
+        compilerNames.ghc981
       ] released;
       hlint = lib.subtractLists [
         compilerNames.ghc962
         compilerNames.ghc963
+        compilerNames.ghc981
+      ] released;
+      hpack = lib.subtractLists [
+        compilerNames.ghc981
       ] released;
-      hpack = released;
       hsdns = released;
       jailbreak-cabal = released;
-      language-nix = released;
+      language-nix = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
       large-hashable = [
         compilerNames.ghc928
       ];
       nix-paths = released;
-      titlecase = released;
+      titlecase = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
       ghc-api-compat = [
         compilerNames.ghc884
         compilerNames.ghc8107
@@ -518,9 +542,15 @@ let
         compilerNames.ghc884
         compilerNames.ghc8107
       ];
-      ghc-lib = released;
+      ghc-lib = lib.subtractLists [
-      ghc-lib-parser = released;
+        compilerNames.ghc981
-      ghc-lib-parser-ex = released;
+      ] released;
+      ghc-lib-parser = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
+      ghc-lib-parser-ex = lib.subtractLists [
+        compilerNames.ghc981
+      ] released;
       ghc-source-gen = [
         # Feel free to remove these as they break,
         # ghc-source-gen currently doesn't support GHC 9.4
@@ -529,20 +559,13 @@ let
         compilerNames.ghc902
         compilerNames.ghc928
       ];
-      ghc-tags = [
+      ghc-tags = lib.subtractLists [
-        compilerNames.ghc8107
+        compilerNames.ghc884
-        compilerNames.ghc902
+        compilerNames.ghc981
-        compilerNames.ghc924
+      ] released;
-        compilerNames.ghc925
+      hashable = lib.subtractLists [
-        compilerNames.ghc926
+        compilerNames.ghc981
-        compilerNames.ghc927
+      ] released;
-        compilerNames.ghc928
-        compilerNames.ghc945
-        compilerNames.ghc946
-        compilerNames.ghc962
-        compilerNames.ghc963
-      ];
-      hashable = released;
       primitive = released;
       weeder = [
         compilerNames.ghc8107
@@ -554,6 +577,7 @@ let
         compilerNames.ghc928
         compilerNames.ghc945
         compilerNames.ghc946
+        compilerNames.ghc947
         compilerNames.ghc962
         compilerNames.ghc963
       ];