diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2fb2ad431ce8..e0c5400d2a98 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,7 +48,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl; + HTTP testpack monadControl hS3 mtl network hslogger hxt json; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; 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 d72b1868b039..5ef5cd98cb15 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,20 +1,24 @@ -{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String -, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which -, monadControl }: +{ 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 +}: let - version = "3.20110819"; + version = "3.20110902"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943"; + sha256 = "1flw3472g19v6ins1nv66m51w15131013077yvfh2blywm0pqrl0"; }; - buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight - SHA dataenc HTTP testpack git ikiwiki which monadControl]; + buildInputs = [ + curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json + libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 + rsync SHA testpack utf8String which + ]; checkTarget = "test"; doCheck = true;