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

cabal2nix: fix (and clean up)override for hpack dependency

Browse Source
This commit is contained in:
Peter Simons 2018-09-03 11:38:33 +02:00
parent 11930854a2
commit 1c5d7ad52e
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1074,16 +1074,10 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
# cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
# Lets remove this once the LTS has upraded to 0.29.6.
hpack = super.hpack_0_29_7;
# The test suite does not know how to find the 'cabal2nix' binary.
cabal2nix = overrideCabal super.cabal2nix (drv: {
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
# 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_30_0;
yaml = self.yaml_0_10_1_1;
});
# Break out of "aeson <1.3, temporary <1.3".

5
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -41611,6 +41611,10 @@ self: {
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
description = "Convert Cabal files into Nix build instructions";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@ -202873,7 +202877,6 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
"termplot" = callPackage