From 4fc0e49bdd235d74ed71afe3331aa6a75246a37b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 11:35:20 +0000
Subject: [PATCH] git-annex: updated to version 3.20120418

svn path=/nixpkgs/trunk/; revision=33856
---
 .../version-management/git-and-tools/default.nix           | 2 +-
 .../version-management/git-and-tools/git-annex/default.nix | 7 ++++---
 2 files changed, 5 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 034d0254c63..6d69c9f8131 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
     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 bloomfilter;
+      QuickCheck2 bloomfilter editDistance;
   };
 
   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 1e4ee72e3ff..af5927fd598 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,18 +1,18 @@
 { 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, bloomfilter
+, IfElse, bloomfilter, editDistance
 }:
 
 let
-  version = "3.20120406";
+  version = "3.20120418";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     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";
   };
 
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
     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 bloomfilter
+    editDistance
   ];
 
   checkTarget = "test";