haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "2712aaf8b4e5941ccc467326be418c19f4192703",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2712aaf8b4e5941ccc467326be418c19f4192703.tar.gz",
-  "sha256": "0gsy99iqazv1cg0vznvdzf8q3zm5flv5645jx3q78fmq1rdzqwny",
-  "msg": "Update from Hackage at 2022-09-25T05:09:53Z"
+  "commit": "7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349.tar.gz",
+  "sha256": "0zlqb1s7cyrnl2dmasv2h8lbjxmb27vzlac2adkcnd9r0zfgxl1p",
+  "msg": "Update from Hackage at 2022-09-28T11:00:39Z"
 }

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

@@ -99,7 +99,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 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r";
+      sha256 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p";
       # 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
@@ -1020,6 +1020,15 @@ self: super: {
           (super.stack.overrideScope (self: super: {
             # Needs Cabal-3.6
             Cabal = self.Cabal_3_6_3_0;
+            # Official stack ships with hpack-0.35.0.  Nixpkgs uses the same
+            # version of hpack so that users who get stack from Nixpkgs
+            # generate the same .cabal files as users who download official binaries
+            # of stack.
+            #
+            # dontCheck is used because one of the hpack tests appears to be
+            # incorrectly(?) failing:
+            # https://github.com/sol/hpack/issues/528
+            hpack = dontCheck self.hpack_0_35_0;
           })));
 
   # Too strict version bound on hashable-time.

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

@@ -1138,6 +1138,7 @@ broken-packages:
   - disjoint-containers
   - disjoint-set
   - disjoint-set-stateful
+  - disk-bytes
   - Dist
   - distance
   - distributed-closure
@@ -2103,6 +2104,7 @@ broken-packages:
   - HDBC-postgresql-hstore
   - hdevtools
   - hdf
+  - hdf5
   - hDFA
   - hdigest
   - hdis86
@@ -5294,6 +5296,7 @@ broken-packages:
   - twine
   - twirp
   - twisty
+  - twitchapi
   - twitter
   - twitter-feed
   - twitter-types
@@ -5325,6 +5328,7 @@ broken-packages:
   - type-of-html-static
   - typeparams
   - type-prelude
+  - type-reflection
   - type-rig
   - types-compat
   - type-settheory

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

@@ -105,14 +105,20 @@ extra-packages:
   - aeson < 2                           # required by pantry-0.5.2
   - attoparsec == 0.13.*                # 2022-02-23: Needed to compile elm for now
   - base16-bytestring < 1               # required for cabal-install etc.
+  - basement < 0.0.15                   # 2022-08-30: last version to support GHC < 8.10
   - bower-json == 1.0.0.1               # 2022-05-21: Needed for spago 0.20.9
+  - brick == 0.70.*                     # 2022-08-13: needed by matterhorn-50200.17.0
+  - brittany == 0.13.1.2                # 2022-09-20: needed for hls on ghc 8.8
+  - cabal-install-parsers < 0.5         # 2022-08-31: required by haskell-ci 0.14.3
   - clay < 0.14                         # 2022-03-20: Needed for neuron 1.0.0.0
   - crackNum < 3.0                      # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
   - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
   - dhall == 1.29.0                     # required for ats-pkg
   - dhall == 1.38.1                     # required for spago
   - doctest == 0.18.*                   # 2021-11-19: closest to stackage version for GHC 9.*
+  - foundation < 0.0.29                 # 2022-08-30: last version to support GHC < 8.10
+  - fourmolu == 0.3.0.0                 # 2022-09-21: needed for hls on ghc 8.8
   - ghc-api-compat == 8.10.7            # 2022-02-17: preserve for GHC 8.10.7
   - ghc-api-compat == 8.6               # 2021-09-07: preserve for GHC 8.8.4
   - ghc-lib == 8.10.7.*                 # 2022-02-17: preserve for GHC 8.10.7
@@ -127,39 +133,34 @@ extra-packages:
   - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
   - happy == 1.19.12                    # for ghcjs
   - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
+  - hlint == 3.2.8                      # 2022-09-21: needed for hls on ghc 8.8
+  - hlint == 3.4.1                      # 2022-09-21: needed for hls with ghc-lib-parser 9.2
   - hnix-store-core == 0.5.0.0          # 2022-06-17: Until hnix 0.17
   - hnix-store-remote == 0.5.0.0        # 2022-06-17: Until hnix 0.17
+  - hpack == 0.35.0                     # 2022-09-29: Needed for stack-2.9.1
   - hspec < 2.8                         # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-core < 2.8                    # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-golden == 0.1.*               # 2022-04-07: Needed for elm-format
   - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
   - language-javascript == 0.7.0.0      # required by purescript
+  - lsp == 1.4.0.0                      # 2022-09-18: need for dhall-lsp-server 1.1.2
+  - lsp-types == 1.4.0.1                # 2022-09-18: need for dhall-lsp-server 1.1.2
   - 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.1.4.1                   # 2022-09-21: needed for hls on ghc 8.8
   - ormolu == 0.2.*                     # 2022-02-21: For ghc 8.8 and 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
   - relude == 0.7.0.0                   # 2022-02-25: Needed for ema 0.6
   - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
   - sbv == 7.13                         # required for pkgs.petrinizer
+  - stylish-haskell == 0.13.0.0         # 2022-09-19: needed for hls on ghc 8.8
   - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
   - vty == 5.35.1                       # 2022-07-08: needed for glirc-2.39.0.1
   - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
   - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
-  - brick == 0.70.*                     # 2022-08-13: needed by matterhorn-50200.17.0
-  - basement < 0.0.15                   # 2022-08-30: last version to support GHC < 8.10
-  - foundation < 0.0.29                 # 2022-08-30: last version to support GHC < 8.10
-  - cabal-install-parsers < 0.5         # 2022-08-31: required by haskell-ci 0.14.3
-  - lsp == 1.4.0.0                      # 2022-09-18: need for dhall-lsp-server 1.1.2
-  - lsp-types == 1.4.0.1                # 2022-09-18: need for dhall-lsp-server 1.1.2
-  - stylish-haskell == 0.13.0.0         # 2022-09-19: needed for hls on ghc 8.8
-  - brittany == 0.13.1.2                # 2022-09-20: needed for hls on ghc 8.8
-  - fourmolu == 0.3.0.0                 # 2022-09-21: needed for hls on ghc 8.8
-  - ormolu == 0.1.4.1                   # 2022-09-21: needed for hls on ghc 8.8
-  - hlint == 3.2.8                      # 2022-09-21: needed for hls on ghc 8.8
-  - hlint == 3.4.1                      # 2022-09-21: needed for hls with ghc-lib-parser 9.2
 
 package-maintainers:
   abbradar:

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

@@ -3045,6 +3045,7 @@ dont-distribute-packages:
  - product
  - prof2dot
  - progressbar
+ - project-forge
  - project-m36
  - prolog-graph
  - prolog-graph-lib
@@ -3054,7 +3055,6 @@ dont-distribute-packages:
  - propane
  - proplang
  - prosidyc
- - proteome
  - proto-lens-descriptors
  - proto3-suite
  - proto3-wire
@@ -3295,6 +3295,7 @@ dont-distribute-packages:
  - ruler
  - ruler-core
  - runtime-arbitrary
+ - runtime-instances
  - rv
  - s-expression
  - safe-coloured-text-gen

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

@@ -738,12 +738,33 @@ self: super: builtins.intersectAttrs super {
     testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or [];
   }) super.retrie_1_2_0_0;
 
-  haskell-language-server = overrideCabal (drv: {
+  haskell-language-server = let
+    # This wrapper will be included in the sdist in the next release, then we can remove this custom fetch.
+    abi-compat-check-wrapper = assert super.haskell-language-server.version == "1.8.0.0"; pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/haskell/haskell-language-server/c12379c57ab8f0abd606e9f397de54e508d024a0/bindist/wrapper.in";
+      sha256 = "sha256-vHi6+s8/V4WJSCxIqjP+thumEpttokpCc+a823WEPPk=";
+    }; in
+      overrideCabal (drv: {
     # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
     # by default. Unless we reflect this in the generic builder, GHC is going to
     # produce some illegal references to /build/.
     enableSharedExecutables = true;
-    postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}";
+    # The shell script wrapper checks that the runtime ghc and its boot packages match the ghc hls was compiled with.
+    # This prevents linking issues when running TH splices.
+    postInstall = ''
+      mv "$out/bin/haskell-language-server" "$out/bin/.haskell-language-server-${self.ghc.version}-unwrapped"
+      BOOT_PKGS=`ghc-pkg-${self.ghc.version} --global list --simple-output`
+      ${pkgs.buildPackages.gnused}/bin/sed \
+        -e "s!@@EXE_DIR@@!$out/bin!" \
+        -e "s/@@EXE_NAME@@/.haskell-language-server-${self.ghc.version}-unwrapped/" \
+        -e "s/@@GHC_VERSION@@/${self.ghc.version}/" \
+        -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \
+        -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \
+        -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
+        ${abi-compat-check-wrapper} > "$out/bin/haskell-language-server"
+      ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}"
+      chmod +x "$out/bin/haskell-language-server"
+      '';
     testToolDepends = [ self.cabal-install pkgs.git ];
     testTarget = "func-test"; # wrapper test accesses internet
     preCheck = ''