public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bup: update to latest git version.

Browse Source 
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.
This commit is contained in:
Mathijs Kwik 2012-07-22 19:50:31 +02:00
parent 2c867c6c04
commit c750a66717
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/backup/bup/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchurl, python, unzip, perl }: { stdenv, fetchgit, python, git, perl, pandoc }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bup-0.24b"; name = "bup-0.25git20120722";
src = fetchurl { src = fetchgit {
url = "https://github.com/apenwarr/bup/zipball/bup-0.24b"; url = "https://github.com/apenwarr/bup.git";
sha256 = "0l50i8mrg43ahd8fn1n6pwa0xslxr07pvkh0r4qyywv55172ip8v"; sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa";
name = "bup-0.24b.zip"; rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a";
}; };
buildInputs = [ unzip python perl ]; buildNativeInputs = [ pandoc perl ];
buildInputs = [ python git ];
patchPhase = '' patchPhase = ''
for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do 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" 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 Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
substituteInPlace lib/bup/csetup.py --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" 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 = { meta = {
description = "Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images."; 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"; homepage = "https://github.com/apenwarr/bup";

4
pkgs/top-level/all-packages.nix
View File

@ -487,7 +487,9 @@ let
btar = callPackage ../tools/backup/btar { }; btar = callPackage ../tools/backup/btar { };
bup = callPackage ../tools/backup/bup { }; bup = callPackage ../tools/backup/bup {
pandoc = haskellPackages.pandoc;
};
bzip2 = callPackage ../tools/compression/bzip2 { }; bzip2 = callPackage ../tools/compression/bzip2 { };