haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz",
-  "sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4",
-  "msg": "Update from Hackage at 2022-08-07T14:05:30Z"
+  "commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz",
+  "sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8",
+  "msg": "Update from Hackage at 2022-08-09T06:14:32Z"
 }

pkgs/development/compilers/ghc/9.4.1.nix

@@ -177,32 +177,27 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
 assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
 
 stdenv.mkDerivation (rec {
-  version = "9.4.0.20220721";
+  version = "9.4.1";
   pname = "${targetPrefix}ghc${variantSuffix}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz";
-    sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
   };
 
   enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
+
   patches = [
-    # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
-      sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
-      extraPrefix = "utils/haddock/";
-      stripLen = 1;
-    })
-    # fix race condition in make build system
+    # add missing profiling targets in make build system
     (fetchpatch {
-      name = "ghc-hs-boot-copying-fix.patch";
-      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff";
-      sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx";
+      name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
+      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
+      sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
     })
+    ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
   ];
 
   postPatch = "patchShebangs .";
@@ -240,14 +235,6 @@ stdenv.mkDerivation (rec {
   '' + ''
 
     echo -n "${buildMK}" > mk/build.mk
-    # GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654
-    # TODO(@sternenseemann): make source-dist rules include all boot-generated files
-    ./boot.source
-
-    # Too restrictive upper bound on Cabal the make build system chokes on
-    # XXX(@sternenseemann): this should be upstreamed
-    substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9"
 
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
@@ -277,6 +264,13 @@ stdenv.mkDerivation (rec {
           --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.

pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch

@@ -0,0 +1,18 @@
+diff --git a/ghc.mk b/ghc.mk
+index dd65e7adfe..b91af56078 100644
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra
+ libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+ libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+ libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+
+ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+ libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+
+ ifeq "$(BIGNUM_BACKEND)" "gmp"
+ GMP_ENABLED = YES

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

@@ -237,6 +237,11 @@ self: super: {
   # base bound
   digit = doJailbreak super.digit;
 
+  # matterhorn-50200.17.0 won't work with brick >= 0.71
+  matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
+    brick = self.brick_0_70_1;
+  }));
+
   # 2020-06-05: HACK: does not pass own build suite - `dontCheck`
   # 2022-06-17: Use hnix-store 0.5 until hnix 0.17
   hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
@@ -351,24 +356,6 @@ self: super: {
   lensref = dontCheck super.lensref;
   lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
   matplotlib = dontCheck super.matplotlib;
-
-  brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {
-    vty = self.vty_5_36;
-    text-zipper = self.text-zipper_0_12;
-  }));
-
-  # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
-  matterhorn = doJailbreak (appendPatches [
-    # Fix build with brick 0.73
-    (fetchpatch {
-      name = "matterhorn-brick-0.72.patch";
-      url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";
-      sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";
-    })
-  ] (super.matterhorn.overrideScope (self: super: {
-    brick = self.brick_0_73;
-  })));
-
   memcache = dontCheck super.memcache;
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;

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

@@ -92,13 +92,15 @@ self: super: {
   mime-string = disableOptimization super.mime-string;
 
   # Older compilers need the latest ghc-lib to build this package.
-  hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
-      # Workaround for https://github.com/haskell/haskell-language-server/issues/2728
-      postPatch = ''
-        sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
-      '';
-    })
-     super.hls-hlint-plugin);
+  # Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7
+  # https://github.com/haskell/haskell-language-server/issues/2728
+  hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch {
+    name = "hls-hlint-plugin-workaround.patch";
+    url = "https://github.com/haskell/haskell-language-server/pull/2854.patch";
+    hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong=";
+    stripLen = 2;
+    includes = ["src/Ide/Plugin/Hlint.hs"];
+  }) super.hls-hlint-plugin);
 
   haskell-language-server = appendConfigureFlags [
       "-f-stylishhaskell"

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

@@ -269,6 +269,7 @@ broken-packages:
   - awesomium-raw
   - aws-cloudfront-signer
   - aws-ec2
+  - aws-ec2-knownhosts
   - aws-general
   - aws-lambda-haskell-runtime
   - aws-lambda-runtime
@@ -550,13 +551,15 @@ broken-packages:
   - cabal-upload
   - cabalvchk
   - cabin
+  - cabocha
   - cached
   - cache-polysemy
   - caching
   - cacophony
   - cafeteria-prelude
   - caffegraph
   - cairo-core
+  - cake3
   - cal3d
   - calamity
   - caledon
@@ -1203,6 +1206,7 @@ broken-packages:
   - dump-core
   - dunai-core
   - Dung
+  - duplo
   - dura
   - dvault
   - dvdread
@@ -1957,6 +1961,7 @@ broken-packages:
   - hashtables-plus
   - hasim
   - hask
+  - haskades
   - haskanoid
   - haskarrow
   - haskbot-core
@@ -2138,6 +2143,7 @@ broken-packages:
   - heterogeneous-list-literals
   - hetris
   - heukarya
+  - hevm
   - HExcel
   - hexchat
   - hexif
@@ -2206,6 +2212,7 @@ broken-packages:
   - hinter
   - hinterface
   - hipchat-hs
+  - hipe
   - Hipmunk
   - hipsql-api
   - hircules
@@ -2551,6 +2558,7 @@ broken-packages:
   - hylolib
   - hyperdrive
   - hyperfunctions
+  - hypergeomatrix
   - hyper-haskell-server
   - hyperion
   - hyperloglogplus
@@ -2677,6 +2685,7 @@ broken-packages:
   - ireal
   - iri
   - iridium
+  - iris
   - iron-mq
   - irt
   - isdicom
@@ -2720,6 +2729,7 @@ broken-packages:
   - jinquantities
   - jml-web-service
   - jni
+  - jobqueue
   - join-api
   - joinlist
   - joint
@@ -2780,6 +2790,7 @@ broken-packages:
   - Kalman
   - kangaroo
   - karabiner-config
+  - karps
   - katip-datadog
   - katip-elasticsearch
   - katip-kafka
@@ -2824,6 +2835,7 @@ broken-packages:
   - korea-holidays
   - kraken
   - krank
+  - krapsh
   - Kriens
   - krpc
   - KSP
@@ -2887,6 +2899,7 @@ broken-packages:
   - language-webidl
   - LargeCardinalHierarchy
   - Lastik
+  - latest-npm-version
   - latex-formulae-image
   - latex-svg-image
   - LATS
@@ -3042,6 +3055,7 @@ broken-packages:
   - lojbanParser
   - lojbanXiragan
   - lol
+  - lol-calculus
   - longboi
   - longshot
   - lookup-tables
@@ -3201,6 +3215,7 @@ broken-packages:
   - miconix-test
   - microgroove
   - microlens-each
+  - micrologger
   - micro-recursion-schemes
   - microsoft-translator
   - mida
@@ -3477,6 +3492,7 @@ broken-packages:
   - niagra
   - nibblestring
   - nice-html
+  - nicovideo-translator
   - nitro
   - nix-delegate
   - nix-eval
@@ -3525,7 +3541,7 @@ broken-packages:
   - numhask-histogram
   - numhask-prelude
   - Nutri
-  - nvim-hs-contrib
+  - nvim-hs-ghcid
   - NXTDSL
   - nyan-interpolation-core
   - nylas
@@ -3808,6 +3824,7 @@ broken-packages:
   - phraskell
   - Phsu
   - phybin
+  - pia-forward
   - pi-calculus
   - picedit
   - pickle
@@ -4065,6 +4082,7 @@ broken-packages:
   - pushbullet-types
   - pusher-haskell
   - pusher-ws
+  - pushme
   - push-notifications
   - putlenses
   - puzzle-draw
@@ -4496,6 +4514,7 @@ broken-packages:
   - servant-static-th
   - servant-streaming
   - servant-streamly
+  - servant-util
   - servant-wasm
   - servant-yaml
   - servant-zeppelin
@@ -5037,6 +5056,7 @@ broken-packages:
   - tex2txt
   - texbuilder
   - text1
+  - text-all
   - text-and-plots
   - text-ascii
   - text-builder-linear
@@ -5134,6 +5154,10 @@ broken-packages:
   - tkhs
   - tkyprof
   - tmp-proc-example
+  - tmp-proc-postgres
+  - tmp-proc-rabbitmq
+  - tmp-proc-redis
+  - tmp-proc-zipkin
   - todo
   - tofromxml
   - to-haskell