diff options
| author | Peter Simons <simons@cryp.to> | 2017-12-11 14:34:26 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-12-11 18:46:41 +0100 |
| commit | ee3d43f978693d8438243cc4ae955d60b6185bba (patch) | |
| tree | 0368632c8d369b148c871d928ed61d4df66182b0 /pkgs | |
| parent | b0ca52b24c5c5b6319f46598f56ccf22e01f1a86 (diff) | |
| download | nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar.gz nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar.bz2 nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar.lz nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar.xz nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.tar.zst nixlib-ee3d43f978693d8438243cc4ae955d60b6185bba.zip | |
stack: update default version to 1.6.1
Allow building with either ghc 8.0.x or 8.2.x.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 95feb3e8e91f..0839c9ed95cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1005,4 +1005,15 @@ self: super: { hpack_0_20_0 = dontCheck super.hpack_0_20_0; hpack_0_21_0 = dontCheck super.hpack_0_21_0; + # Stack 1.6.1 needs newer versions than LTS-9 provides. + stack = super.stack.overrideScope (self: super: { + ansi-terminal = self.ansi-terminal_0_7_1_1; + ansi-wl-pprint = self.ansi-wl-pprint_0_6_8_1; + extra = dontCheck super.extra_1_6_2; + hpack = super.hpack_0_20_0; + path = dontCheck super.path_0_6_1; + path-io = self.path-io_1_3_3; + unliftio = self.unliftio_0_2_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 1c141dfaf75e..f625ad5f656c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -62,4 +62,7 @@ self: super: { # This builds needs the latest Cabal version. cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); + # Add appropriate Cabal library to build this code. + stack = addSetupDepend super.stack self.Cabal_2_0_1_1; + } |