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

bup: update to 0.26 and adopt it

Browse Source 
[Bjørn: use patchShebangs to unbreak chroot build (fixes up references
to /usr/bin/env {python,bash}]
This commit is contained in:
muflax 2014-12-26 01:30:21 +00:00 committed by Bjørn Forsman
parent 001f2110bd
commit e5480cab83
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,26 @@
{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper { stdenv, fetchzip, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
, par2cmdline, par2Support ? false }: , par2cmdline, par2Support ? false }:
assert par2Support -> par2cmdline != null; assert par2Support -> par2cmdline != null;
let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in let version = "0.26"; in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; name = "bup-${version}";
src = fetchgit { src = fetchzip {
url = "https://github.com/bup/bup.git"; url = "https://github.com/bup/bup/archive/${version}.tar.gz";
inherit rev; sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d";
sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n";
}; };
buildInputs = [ python git ]; buildInputs = [ python git ];
nativeBuildInputs = [ pandoc perl makeWrapper ]; nativeBuildInputs = [ pandoc perl makeWrapper ];
patchPhase = '' patchPhase = ''
patchShebangs .
substituteInPlace Makefile --replace "-Werror" "" substituteInPlace Makefile --replace "-Werror" ""
for f in "cmd/"* "lib/tornado/"* "lib/tornado/test/"* "t/"* wvtest.py main.py; do
test -f $f || continue
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
done
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
'' + optionalString par2Support '' '' + optionalString par2Support ''
substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
@ -56,5 +52,7 @@ stdenv.mkDerivation {
''; '';
hydraPlatforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ muflax ];
}; };
} }