MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Agda: fix build by providing the required older versions of its dependencies

Browse source 
Resolves https://github.com/NixOS/nixpkgs/issues/7201.
This commit is contained in:
Peter Simons 2015-04-06 17:25:02 +02:00
parent d9b67dd5a5
commit 434f129c62
3 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -115,8 +115,10 @@ self: super: {
# Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10.
network-uri = dontCheck super.network-uri;
# Agda-2.4.2.2 needs these overrides to compile.
Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; };
# The Haddock phase fails for one reason or another.
Agda = dontHaddock super.Agda;
attoparsec-conduit = dontHaddock super.attoparsec-conduit;
blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
bytestring-progress = dontHaddock super.bytestring-progress;

1
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View file

@ -71,6 +71,7 @@ self: super: {
# Newer versions require mtl 2.2.x.
mtl-prelude = self.mtl-prelude_1_0_3;
equivalence = super.equivalence_0_2_5; # required by Agda
# The test suite pulls in mtl 2.2.x
command-qq = dontCheck super.command-qq;

33
pkgs/development/haskell-modules/hackage-packages.nix
View file

@ -34248,6 +34248,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cpphs_1_18_9" = callPackage
({ mkDerivation, base, directory, old-locale, old-time, polyparse
}:
mkDerivation {
pname = "cpphs";
version = "1.18.9";
sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6";
isLibrary = true;
isExecutable = true;
buildDepends = [ base directory old-locale old-time polyparse ];
homepage = "http://projects.haskell.org/cpphs/";
description = "A liberalised re-implementation of cpp, the C pre-processor";
license = "LGPL";
}) {};
"cpphs" = callPackage
({ mkDerivation, base, directory, old-locale, old-time, polyparse
}:
@ -43892,6 +43907,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"equivalence_0_2_5" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
, template-haskell, test-framework, test-framework-quickcheck2
}:
mkDerivation {
pname = "equivalence";
version = "0.2.5";
sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3";
buildDepends = [ base containers mtl STMonadTrans ];
testDepends = [
base containers mtl QuickCheck STMonadTrans template-haskell
test-framework test-framework-quickcheck2
];
homepage = "https://bitbucket.org/paba/equivalence/";
description = "Maintaining an equivalence relation implemented as union-find using STT";
license = stdenv.lib.licenses.bsd3;
}) {};
"equivalence" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
, template-haskell, test-framework, test-framework-quickcheck2