diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2012-07-22 19:50:31 +0200 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2012-07-22 19:53:35 +0200 |
commit | c750a667176aa6121c4910ef5e68b1d3a6e73595 (patch) | |
tree | 37408b2dd093a280f3ac0d43016a8fcc8f6bed11 /pkgs/tools/backup/bup | |
parent | 2c867c6c04a614ce413dc192fc3f0c4c9c1977d2 (diff) |
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.
Diffstat (limited to 'pkgs/tools/backup/bup')
-rw-r--r-- | pkgs/tools/backup/bup/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e08ea1e03f4bb..6d4555d34e56a 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"; |