git-annex: updated to version 3.20120418

svn path=/nixpkgs/trunk/; revision=33856
This commit is contained in:
Peter Simons 2012-04-20 11:35:20 +00:00
parent 6242869b9d
commit 4fc0e49bdd
2 changed files with 5 additions and 4 deletions

View File

@ -46,7 +46,7 @@ rec {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils; inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
QuickCheck2 bloomfilter; QuickCheck2 bloomfilter editDistance;
}; };
qgit = import ./qgit { qgit = import ./qgit {

View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils , QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, IfElse, bloomfilter , IfElse, bloomfilter, editDistance
}: }:
let let
version = "3.20120406"; version = "3.20120418";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "git-annex-${version}"; name = "git-annex-${version}";
src = fetchurl { src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
sha256 = "486b35a8dd342681cea6544af9668330739f3a8d40d4a70b9d56f64195f96954"; sha256 = "7e429009006ee00f33224b18392433b5b5e0df92c7c62153415a2cea909144e0";
name = "git-annex-${version}.tar.gz"; name = "git-annex-${version}.tar.gz";
}; };
@ -20,6 +20,7 @@ stdenv.mkDerivation {
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json 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 QuickCheck2
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
editDistance
]; ];
checkTarget = "test"; checkTarget = "test";