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

Merge pull request #15778 from joachifm/bup-refactor

Browse Source 
bup: refactorings
This commit is contained in:
Joachim Fasting 2016-05-28 23:03:46 +02:00
commit 73e0c95288
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
{ stdenv, fetchzip, fetchurl, python, pyxattr, pylibacl, setuptools { stdenv, fetchFromGitHub, fetchurl, makeWrapper
, fuse, git, perl, pandoc, makeWrapper, par2cmdline, par2Support ? false }: , perl, pandoc, pythonPackages, git
, par2cmdline ? null, par2Support ? false
}:
assert par2Support -> par2cmdline != null; assert par2Support -> par2cmdline != null;
@ -10,27 +12,28 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bup-${version}"; name = "bup-${version}";
src = fetchzip { src = fetchFromGitHub {
url = "https://github.com/bup/bup/archive/${version}.tar.gz"; repo = "bup";
owner = "bup";
rev = version;
sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d";
}; };
buildInputs = [ python git ]; buildInputs = [ git pythonPackages.python ];
nativeBuildInputs = [ pandoc perl makeWrapper ]; nativeBuildInputs = [ pandoc perl makeWrapper ];
darwin_10_10_patch = fetchurl { patches = optional stdenv.isDarwin (fetchurl {
url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff"; url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff";
sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails"; sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails";
}; name = "darwin_10_10.patch";
});
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
substituteInPlace Makefile --replace "-Werror" "" substituteInPlace Makefile --replace "-Werror" ""
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" substituteInPlace Makefile --replace "./format-subst.pl" "${perl}/bin/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'"
'' + optionalString (elem stdenv.system platforms.darwin) ''
patch -p1 < ${darwin_10_10_patch}
''; '';
dontAddPrefix = true; dontAddPrefix = true;
@ -42,24 +45,24 @@ stdenv.mkDerivation rec {
"LIBDIR=$(out)/lib/bup" "LIBDIR=$(out)/lib/bup"
]; ];
postInstall = ''wrapProgram $out/bin/bup --prefix PATH : ${git}/bin '' postInstall = ''
+ optionalString (elem stdenv.system platforms.linux) '' --prefix PYTHONPATH : \ wrapProgram $out/bin/bup \
${stdenv.lib.concatStringsSep ":" --prefix PATH : ${git}/bin \
(map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})")
(with pythonPackages; [ pyxattr pylibacl setuptools fuse tornado ]))}
''; '';
meta = { meta = {
homepage = "https://github.com/bup/bup"; homepage = "https://github.com/bup/bup";
description = "efficient file backup system based on the git packfile format"; description = "Efficient file backup system based on the git packfile format";
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
longDescription = '' longDescription = ''
Highly efficient file backup system based on the git packfile format. Highly efficient file backup system based on the git packfile format.
Capable of doing *fast* incremental backups of virtual machine images. Capable of doing *fast* incremental backups of virtual machine images.
''; '';
hydraPlatforms = stdenv.lib.platforms.linux; hydraPlatforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ muflax ]; maintainers = with maintainers; [ muflax ];
}; };
} }

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

@ -959,8 +959,7 @@ in
}; };
bup = callPackage ../tools/backup/bup { bup = callPackage ../tools/backup/bup {
inherit (pythonPackages) pyxattr pylibacl setuptools fuse; par2Support = config.bup.par2Support or false;
par2Support = (config.bup.par2Support or false);
}; };
burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { }; burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };