diff options
| author | Peter Simons <simons@cryp.to> | 2018-01-29 12:20:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-01-31 16:03:59 +0100 |
| commit | 866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa (patch) | |
| tree | c6f3c08ddecd98a12f39e699282ac8b78568462d /pkgs/development/haskell-modules | |
| parent | 94b6357dc5906910a4da0ab64c415ae5b73b590a (diff) | |
| download | nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar.gz nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar.bz2 nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar.lz nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar.xz nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.tar.zst nixlib-866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa.zip | |
cabal2nix: build with hpack 0.23
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index acae897609b2..746c00b037dc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -606,7 +606,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_22_0; }; + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_23_0; }; hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ecb22c15dfa9..b0d7c77dd320 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2695,7 +2695,6 @@ extra-packages: - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hoogle == 5.0.14 # required by hie-hoogle - - hpack == 0.20.* # required by stack-1.6.1 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. |