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 13:46:12 +01:00
parent 46cb1538a1
commit 4f4313046e
2 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+16 -21
View File
@@ -51,7 +51,6 @@ self: super: {
clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto;
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-expectations = dontCheck super.hspec-expectations;
HTTP = dontCheck super.HTTP;
@@ -948,9 +947,9 @@ self: super: {
# hledger needs a newer megaparsec version than we have in LTS 12.x.
hledger-lib = super.hledger-lib.overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4;
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});
# 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/
'';
})).overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0;
config-ini = self.config-ini_0_2_4_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4;
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# config-ini = self.config-ini_0_2_4_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});
hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = ''
@@ -1087,19 +1086,15 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
# 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.
# Also generate shell completions.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix"
(super.cabal2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
}));
stack2nix = super.stack2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});
# Break out of "aeson <1.3, temporary <1.3".
stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack);
# Break out of tasty >=0.10 && <1.2.
aeson-compat = doJailbreak super.aeson-compat;
# Break out of pretty-show >=1.6 && <1.9
hedgehog = doJailbreak super.hedgehog;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
# 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; };