dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

haskell-Cabal: update overrides for the new 2.4.1.x version

Browse Source
This commit is contained in:
Peter Simons 2018-11-26 11:19:28 +01:00
parent 9ad99b7099
commit b13d8eadaa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -33,7 +33,7 @@ self: super: {
unbuildable = throw "package depends on meta package 'unbuildable'"; unbuildable = throw "package depends on meta package 'unbuildable'";
# Use the latest version of the Cabal library. # Use the latest version of the Cabal library.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_0_1; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; });
# The test suite depends on old versions of tasty and QuickCheck. # The test suite depends on old versions of tasty and QuickCheck.
hackage-security = dontCheck super.hackage-security; hackage-security = dontCheck super.hackage-security;

6
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -62,10 +62,10 @@ self: super: {
# that have it as an actual library dependency. The explicit overrides are # that have it as an actual library dependency. The explicit overrides are
# more verbose but friendlier for Hydra. # more verbose but friendlier for Hydra.
stack = (doJailbreak super.stack).override { stack = (doJailbreak super.stack).override {
Cabal = self.Cabal_2_4_0_1; Cabal = self.Cabal_2_4_1_0;
hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; }; hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_1_0; };
yaml = self.yaml_0_11_0_0; yaml = self.yaml_0_11_0_0;
hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; }; hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; };
}; };
hpack_0_31_1 = super.hpack_0_31_1.override { hpack_0_31_1 = super.hpack_0_31_1.override {
yaml = self.yaml_0_11_0_0; yaml = self.yaml_0_11_0_0;