diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 965e3e884c8..7cda4cffd71 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,9 +44,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; - inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc + inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse - QuickCheck2 bloomfilter editDistance; + QuickCheck bloomfilter editDistance; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index c50999e41a4..6385834ff52 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl -, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils +, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils , IfElse, bloomfilter, editDistance, openssh }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json - libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 + libuuid MissingH monadControl mtl network pcreLight perl QuickCheck rsync SHA testpack utf8String which liftedBase IfElse bloomfilter editDistance openssh ];