diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fa5a4a80cd71..5945737a1530 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3a974e930058..a871d99cc9ab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -137,6 +137,7 @@ extra-packages: - 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