From 6ff954a5e8ff7e7cc1c80602cd692c9550e40b4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Mar 2012 18:07:49 +0000 Subject: [PATCH] git-annex: updated to version 3.20120315 svn path=/nixpkgs/trunk/; revision=33116 --- .../version-management/git-and-tools/default.nix | 3 ++- .../git-and-tools/git-annex/default.nix | 12 +++++++----- 2 files changed, 9 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 f2e7b6b98e9..5b53cfce1ce 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,7 +48,8 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils; inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse QuickCheck2; + HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse + QuickCheck2 bloomfilter; }; 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 80307135e9a..ecdb0811996 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,23 +1,25 @@ { 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, IfElse +, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils +, IfElse, bloomfilter }: let - version = "3.20120309"; + version = "3.20120315"; 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 = "54b2d6a9660a700cbe914e8613c1a4bc265f912cf157be774e2b5ea5775a4502"; + url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; + sha256 = "eeefca150f7f86a9373ac60cef9be22fe6fcb03fd13fda54793a4f8d46b747a1"; + name = "git-annex-${version}.tar.gz"; }; 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 liftedBase IfElse + rsync SHA testpack utf8String which liftedBase IfElse bloomfilter ]; checkTarget = "test";