BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move 'cryptol' and 'darcs' from the generic Haskell package set into all-packages.nix.

Browse source 
These packages need very a version of GHC to compile.
This commit is contained in:
Peter Simons 2014-08-20 11:57:38 +02:00
parent d95ae1cc89
commit c25d90de7b
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/top-level/all-packages.nix
View file

@ -2622,7 +2622,11 @@ let
compcert = callPackage ../development/compilers/compcert {};
cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release
cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix {
Cabal = Cabal_1_18_1_3;
cabalInstall = cabalInstall_1_18_0_3;
process = process_1_2_0_0;
};
cython = pythonPackages.cython;
cython3 = python3Packages.cython;
@ -8342,11 +8346,8 @@ let
d4x = callPackage ../applications/misc/d4x { };
darcs = haskellPackages_ghc763.darcs.override {
# A variant of the Darcs derivation that containts only the executable and
# thus has no dependencies on other Haskell packages. We have to use the older
# GHC 7.6.3 package set because darcs won't compile with 7.8.x.
cabal = haskellPackages_ghc763.cabal.override {
darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs {
cabal = cabal.override {
extension = self : super : {
isLibrary = false;
configureFlags = "-f-library " + super.configureFlags or "";

8
pkgs/top-level/haskell-packages.nix
View file

@ -2937,14 +2937,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
arbtt = callPackage ../applications/misc/arbtt {};
cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix {
Cabal = self.Cabal_1_18_1_3;
cabalInstall = self.cabalInstall_1_18_0_3;
process = self.process_1_2_0_0;
};
darcs = callPackage ../applications/version-management/darcs {};
idris_plain = callPackage ../development/compilers/idris {
llvmGeneral = self.llvmGeneral_3_3_8_2;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;