bup: 0.32 -> 0.33.2
This commit is contained in:
parent
89d3100cb3
commit
9a05dcc078
@ -1,11 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, perl, pandoc, python3Packages, git
|
||||
, perl, pandoc, python3, git
|
||||
, par2cmdline ? null, par2Support ? true
|
||||
}:
|
||||
|
||||
assert par2Support -> par2cmdline != null;
|
||||
|
||||
let version = "0.32"; in
|
||||
let
|
||||
version = "0.33.2";
|
||||
|
||||
pythonDeps = with python3.pkgs; [ setuptools tornado ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bup";
|
||||
@ -15,23 +20,13 @@ stdenv.mkDerivation {
|
||||
repo = "bup";
|
||||
owner = "bup";
|
||||
rev = version;
|
||||
sha256 = "sha256-SWnEJ5jwu/Jr2NLsTS8ajWay0WX/gYbOc3J6w00DndI=";
|
||||
hash = "sha256-DDVCrY4SFqzKukXm8rIq90xAW2U+yYyhyPmUhslMMWI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
git
|
||||
(python3Packages.python.withPackages
|
||||
(p: with p; [ setuptools tornado ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
|
||||
];
|
||||
buildInputs = [ git python3 ];
|
||||
nativeBuildInputs = [ pandoc perl makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace Makefile --replace "-Werror" ""
|
||||
'' + lib.optionalString par2Support ''
|
||||
substituteInPlace cmd/fsck-cmd.py --replace "'par2'" "'${par2cmdline}/bin/par2'"
|
||||
'';
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
@ -44,7 +39,8 @@ stdenv.mkDerivation {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/bup \
|
||||
--prefix PATH : ${git}/bin
|
||||
--prefix PATH : ${lib.makeBinPath [ git par2cmdline ]} \
|
||||
--prefix NIX_PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages pythonDeps}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
Loading…
Reference in New Issue
Block a user