From c750a667176aa6121c4910ef5e68b1d3a6e73595 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 22 Jul 2012 19:50:31 +0200
Subject: [PATCH] bup: update to latest git version.

why the git version? 0.24b (in nixpkgs) was broken.
using 0.25rc1 gave the same error (gcc 4.6 related)
Both these versions are over a year old and lots of
commits were made after that, including something
that fixed building on nix.
---
 pkgs/tools/backup/bup/default.nix | 17 +++++++++--------
 pkgs/top-level/all-packages.nix   |  4 +++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index e08ea1e03f4..6d4555d34e5 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, python, unzip, perl }:
+{ stdenv, fetchgit, python, git, perl, pandoc }:
 
 stdenv.mkDerivation {
-  name = "bup-0.24b";
-  src = fetchurl {
-    url = "https://github.com/apenwarr/bup/zipball/bup-0.24b";
-    sha256 = "0l50i8mrg43ahd8fn1n6pwa0xslxr07pvkh0r4qyywv55172ip8v";
-    name = "bup-0.24b.zip";
+  name = "bup-0.25git20120722";
+  src = fetchgit {
+    url = "https://github.com/apenwarr/bup.git";
+    sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa";
+    rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a";
   };
-  buildInputs = [ unzip python perl ];
+  buildNativeInputs = [ pandoc perl ];
+  buildInputs = [ python git ];
   patchPhase = ''
     for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do
       substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
     substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
     substituteInPlace lib/bup/csetup.py --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])"
   '';
-  makeFlags = "MANDIR=$(out)/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup";
+  makeFlags = "MANDIR=$(out)/share/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup";
   meta = {
     description = "Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images.";
     homepage = "https://github.com/apenwarr/bup";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a79bb045aa..7498fb7638c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -487,7 +487,9 @@ let
 
   btar = callPackage ../tools/backup/btar { };
 
-  bup = callPackage ../tools/backup/bup { };
+  bup = callPackage ../tools/backup/bup {
+    pandoc = haskellPackages.pandoc;
+  };
 
   bzip2 = callPackage ../tools/compression/bzip2 { };