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

Comment out some obsolete Haskell overrides to fix evaluation.

Browse Source
This commit is contained in:
Peter Simons 2018-12-26 11:23:56 +01:00
parent 46cb1538a1
commit 4f4313046e
2 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ self: super: {
clock = dontCheck super.clock; clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto; Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres; hasql-postgres = dontCheck super.hasql-postgres;
hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
hspec-expectations = dontCheck super.hspec-expectations; hspec-expectations = dontCheck super.hspec-expectations;
HTTP = dontCheck super.HTTP; HTTP = dontCheck super.HTTP;
@ -948,9 +947,9 @@ self: super: {
# hledger needs a newer megaparsec version than we have in LTS 12.x. # hledger needs a newer megaparsec version than we have in LTS 12.x.
hledger-lib = super.hledger-lib.overrideScope (self: super: { hledger-lib = super.hledger-lib.overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0; # cassava-megaparsec = self.cassava-megaparsec_2_0_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0; # hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4; # megaparsec = self.megaparsec_7_0_4;
}); });
# Copy hledger man pages from data directory into the proper place. This code # Copy hledger man pages from data directory into the proper place. This code
@ -979,10 +978,10 @@ self: super: {
cp -v *.info* $out/share/info/ cp -v *.info* $out/share/info/
''; '';
})).overrideScope (self: super: { })).overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0; # cassava-megaparsec = self.cassava-megaparsec_2_0_0;
config-ini = self.config-ini_0_2_4_0; # config-ini = self.config-ini_0_2_4_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0; # hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4; # megaparsec = self.megaparsec_7_0_4;
}); });
hledger-web = overrideCabal super.hledger-web (drv: { hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = '' postInstall = ''
@ -1087,19 +1086,15 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library = doJailbreak (dontCheck super.haddock-library);
# haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
# The tool needs a newer hpack version than the one mandated by LTS-12.x. # Break out of tasty >=0.10 && <1.2.
# Also generate shell completions. aeson-compat = doJailbreak super.aeson-compat;
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix"
(super.cabal2nix.overrideScope (self: super: { # Break out of pretty-show >=1.6 && <1.9
hpack = self.hpack_0_31_1; hedgehog = doJailbreak super.hedgehog;
yaml = self.yaml_0_11_0_0;
})); # Generate shell completion.
stack2nix = super.stack2nix.overrideScope (self: super: { cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
hpack = self.hpack_0_31_1; stack = generateOptparseApplicativeCompletion "stack" super.stack;
yaml = self.yaml_0_11_0_0;
});
# Break out of "aeson <1.3, temporary <1.3".
stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack);
# https://github.com/pikajude/stylish-cabal/issues/11 # https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };

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

@ -45,40 +45,38 @@ self: super: {
hoopl = self.hoopl_3_10_2_2; hoopl = self.hoopl_3_10_2_2;
# 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;
brick = self.brick_0_45; # brick = self.brick_0_45;
cassava-megaparsec = doJailbreak super.cassava-megaparsec; # cassava-megaparsec = doJailbreak super.cassava-megaparsec;
config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 # config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
contravariant = self.contravariant_1_5; # contravariant = self.contravariant_1_5;
fgl = self.fgl_5_7_0_1; # fgl = self.fgl_5_7_0_1;
free = self.free_5_1; # free = self.free_5_1;
haddock-library = dontCheck super.haddock-library_1_7_0; # haddock-library = dontCheck super.haddock-library_1_7_0;
HaTeX = doJailbreak super.HaTeX; # HaTeX = doJailbreak super.HaTeX;
hpack = self.hpack_0_31_1; # hpack = self.hpack_0_31_1;
hslua = self.hslua_1_0_1; # hslua = self.hslua_1_0_1;
hslua-module-text = self.hslua-module-text_0_2_0; # hslua-module-text = self.hslua-module-text_0_2_0;
hspec = self.hspec_2_6_0; # hspec = self.hspec_2_6_0;
hspec-contrib = self.hspec-contrib_0_5_1; # hspec-contrib = self.hspec-contrib_0_5_1;
hspec-core = self.hspec-core_2_6_0; # hspec-core = self.hspec-core_2_6_0;
hspec-discover = self.hspec-discover_2_6_0; # hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x # hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_6_0; # hspec-meta = self.hspec-meta_2_6_0;
JuicyPixels = self.JuicyPixels_3_3_3; # JuicyPixels = self.JuicyPixels_3_3_3;
lens = self.lens_4_17; # lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec); # megaparsec = dontCheck (doJailbreak super.megaparsec);
pandoc = self.pandoc_2_5; # pandoc = self.pandoc_2_5;
pandoc-citeproc = self.pandoc-citeproc_0_15; # pandoc-citeproc = self.pandoc-citeproc_0_15;
pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15; # pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
patience = markBrokenVersion "0.1.1" super.patience; # patience = markBrokenVersion "0.1.1" super.patience;
polyparse = self.polyparse_1_12_1; # polyparse = self.polyparse_1_12_1;
primitive = self.primitive_0_6_4_0; # semigroupoids = self.semigroupoids_5_3_1;
QuickCheck = self.QuickCheck_2_12_6_1; # tagged = self.tagged_0_8_6;
semigroupoids = self.semigroupoids_5_3_1; # vty = self.vty_5_25_1;
tagged = self.tagged_0_8_6; # wizards = doJailbreak super.wizards;
vty = self.vty_5_25_1; # wl-pprint-extras = doJailbreak super.wl-pprint-extras;
wizards = doJailbreak super.wizards; # yaml = self.yaml_0_11_0_0;
wl-pprint-extras = doJailbreak super.wl-pprint-extras;
yaml = self.yaml_0_11_0_0;
# https://github.com/tibbe/unordered-containers/issues/214 # https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers; unordered-containers = dontCheck super.unordered-containers;