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

ghc-8.6.x: update overrides

Browse Source
This commit is contained in:
Peter Simons 2018-10-18 14:57:00 +02:00
parent d210479e65
commit 95ae25600e
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -47,37 +47,47 @@ self: super: {
# LTS-12.x versions do not compile. # LTS-12.x versions do not compile.
base-orphans = self.base-orphans_0_8; base-orphans = self.base-orphans_0_8;
contravariant = self.contravariant_1_5; contravariant = self.contravariant_1_5;
control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
free = self.free_5_1; free = self.free_5_1;
Glob = self.Glob_0_9_3; haddock-library = dontCheck super.haddock-library_1_7_0;
haddock-library = markBroken super.haddock-library; hpack = self.hpack_0_31_0;
hslogger = self.hslogger_1_2_12;
hspec = self.hspec_2_5_8; hspec = self.hspec_2_5_8;
hspec-core = self.hspec-core_2_5_8; hspec-core = self.hspec-core_2_5_8;
hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
hspec-discover = self.hspec-discover_2_5_8; hspec-discover = self.hspec-discover_2_5_8;
hspec-meta = self.hspec-meta_2_5_6; hspec-meta = self.hspec-meta_2_5_6;
hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; }); JuicyPixels = self.JuicyPixels_3_3_2;
JuicyPixels = self.JuicyPixels_3_3_1;
lens = self.lens_4_17; lens = self.lens_4_17;
polyparse = markBrokenVersion "1.12" super.polyparse; megaparsec = dontCheck super.megaparsec_7_0_1;
neat-interpolation = self.neat-interpolation_0_3_2_4;
patience = markBrokenVersion "0.1.1" super.patience;
primitive = self.primitive_0_6_4_0; primitive = self.primitive_0_6_4_0;
QuickCheck = self.QuickCheck_2_12_6_1;
semigroupoids = self.semigroupoids_5_3_1; semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6; tagged = self.tagged_0_8_6;
unordered-containers = dontCheck super.unordered-containers; yaml = self.yaml_0_11_0_0;
# Over-specified constraints. # https://github.com/tibbe/unordered-containers/issues/214
async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5 unordered-containers = dontCheck super.unordered-containers;
ChasingBottoms = doJailbreak super.ChasingBottoms; # base >=4.2 && <4.12, containers >=0.3 && <0.6
hashable = doJailbreak super.hashable; # base >=4.4 && <4.1
hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12
integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
optparse-applicative = doJailbreak super.optparse-applicative; # https://github.com/pcapriotti/optparse-applicative/issues/319
tar = doJailbreak super.tar; # containers >=0.2 && <0.6
test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6
# https://github.com/haskell/fgl/issues/79 # https://github.com/haskell/fgl/issues/79
# https://github.com/haskell/fgl/issues/81 # https://github.com/haskell/fgl/issues/81
fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch; fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch;
# Test suite does not compile.
cereal = dontCheck super.cereal;
Diff = dontCheck super.Diff;
http-api-data = doJailbreak super.http-api-data;
persistent-sqlite = dontCheck super.persistent-sqlite;
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
unicode-transforms = dontCheck super.unicode-transforms;
# https://github.com/bmillwood/haskell-src-meta/pull/80
haskell-src-meta = doJailbreak super.haskell-src-meta;
# The official 1.12 release is broken and unmaintained.
polyparse = appendPatch (overrideCabal super.polyparse (drv: { editedCabalFile = null; })) (pkgs.fetchpatch {
url = https://github.com/bergmark/polyparse/commit/8a69ee7e57db798c106d8b56dce05b1dfc4fed37.patch;
sha256 = "11r73wx1w6bfrkrnk6r9k7rfzp6qrvkdikb2by37ld06c0w6nn57";
});
} }

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -543,4 +543,8 @@ self: super: builtins.intersectAttrs super {
--set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
''; '';
}); });
# The test suite has undeclared dependencies on git.
githash = dontCheck super.githash;
} }