diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-06 18:31:54 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-06 18:34:54 +0100 |
| commit | 4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f (patch) | |
| tree | 3b1e6b43e2d10595ef01fb7f8a79c253d7732935 | |
| parent | f20b21ad1e0f3b164942d5d2de4a870b05fd08e5 (diff) | |
| download | nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar.gz nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar.bz2 nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar.lz nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar.xz nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.tar.zst nixlib-4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f.zip | |
Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell Platform 2012.4.0.0. The testpack library appears to be unmaintained, so there is probably no quick solution for this issue. For the time being, we compile git-annex with GHC 7.4.1.
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e12d4157ec23..98468e32bac1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,12 +44,11 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl - network pcreLight QuickCheck SHA stm utf8String networkInfo dbus - clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet - httpTypes networkMulticast text time transformers transformersBase wai - waiLogger warp yesod yesodDefault yesodStatic testpack; + network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault + extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers + transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck; }; qgit = import ./qgit { |