diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-07 23:48:22 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-07 23:48:22 +0000 |
| commit | 0ec6325b87e5eec95067762f61670e1a4a084a58 (patch) | |
| tree | fa2dd64b6f4143a4980fabb1b070f7fcd8504efa /pkgs/applications/version-management | |
| parent | 20ba4e9296eedea1bebdcfd947e9ce91036b9f01 (diff) | |
| download | nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar.gz nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar.bz2 nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar.lz nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar.xz nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.tar.zst nixlib-0ec6325b87e5eec95067762f61670e1a4a084a58.zip | |
git-annex: updated to version 3.20110705
svn path=/nixpkgs/trunk/; revision=27661
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6271ab408eff..69134f33cc31 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,8 +46,9 @@ rec { }; gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl libuuid rsync findutils curl perl; - inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc; + inherit stdenv fetchurl libuuid rsync findutils curl perl git; + inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc + HTTP testpack; }; 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 8fa4cba9a240..4d5feb941715 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,17 +1,22 @@ -{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2, pcreLight, SHA, dataenc }: +{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String +, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git }: let - version = "0.20110427"; + version = "3.20110705"; 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 = "1vbmkvf9hlnfcaqsyi1ay2rr835j49bxqyfdi3v3373pdfd6195z"; + sha256 = "781b0c02f992e46f3c2555db803caed2a9bbd274a62fcebab3f596bfd7888c9a"; }; - buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight SHA dataenc]; + buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight + SHA dataenc HTTP testpack git]; + + checkTarget = "test"; + doCheck = true; preConfigure = '' makeFlagsArray=( PREFIX=$out ) |