From e98852cefda2b8428998fb14a485bc5d3df9ecee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:34:38 +0000 Subject: [PATCH] git-annex: updated to version 3.20111011 svn path=/nixpkgs/trunk/; revision=29964 --- .../applications/version-management/git-and-tools/default.nix | 3 +-- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7513a7adbc78..153ff2f03e96 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,8 +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 hS3 mtl network hslogger hxt json; - QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; }; 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 848214b0fb9b..5fdf9f43bb16 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 @@ -4,14 +4,14 @@ }: let - version = "3.20110915"; + version = "3.20111011"; 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 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47"; + sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; }; buildInputs = [