From 4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:31:54 +0100 Subject: [PATCH] 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. --- .../version-management/git-and-tools/default.nix | 9 ++++----- 1 file 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 e12d4157ec2..98468e32bac 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 {