diff options
| author | Peter Simons <simons@cryp.to> | 2018-11-04 12:24:39 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-11-05 14:06:28 +0100 |
| commit | db203c84e3cdb2be97f94659c09cb05312f14c1e (patch) | |
| tree | 48814d600cdf6a1a23c7bf31246df91c38c16410 /pkgs/development | |
| parent | d15d64352acc01f7d7774983141d13b274ea204a (diff) | |
| download | nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar.gz nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar.bz2 nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar.lz nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar.xz nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.tar.zst nixlib-db203c84e3cdb2be97f94659c09cb05312f14c1e.zip | |
haskell-hpack: update overrides for the new version
Diffstat (limited to 'pkgs/development')
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 56ffd6ee54ee..a34f510ccb9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1065,11 +1065,11 @@ self: super: { # The tool needs a newer hpack version than the one mandated by LTS-12.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_0; + hpack = self.hpack_0_31_1; yaml = self.yaml_0_11_0_0; }); stack2nix = super.stack2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_0; + hpack = self.hpack_0_31_1; yaml = self.yaml_0_11_0_0; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 213651405f35..226b437d58b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -63,11 +63,11 @@ self: super: { # more verbose but friendlier for Hydra. stack = (doJailbreak super.stack).override { Cabal = self.Cabal_2_4_0_1; - hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; }; + hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; }; yaml = self.yaml_0_11_0_0; hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; }; }; - hpack_0_31_0 = super.hpack_0_31_0.override { + hpack_0_31_1 = super.hpack_0_31_1.override { yaml = self.yaml_0_11_0_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bf021956593c..ea1ca1175f4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -56,7 +56,7 @@ self: super: { hledger = doJailbreak super.hledger; hledger-lib = doJailbreak super.hledger-lib; hledger-ui = doJailbreak super.hledger-ui; - hpack = self.hpack_0_31_0; + hpack = self.hpack_0_31_1; hslua = self.hslua_1_0_1; hslua-module-text = self.hslua-module-text_0_2_0; hspec = self.hspec_2_5_8; |