diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2023-07-07 09:11:53 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2023-07-07 13:02:11 +0200 |
| commit | 9a05dcc0785fb98e63a10eb0f263c3c80305e848 (patch) | |
| tree | 5db577bbed9c0a98498ccbcdd89ab62a9ef19a48 /pkgs/tools/backup | |
| parent | 89d3100cb3c8989f373c4f82f974f6f21f6ac118 (diff) | |
| download | nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar.gz nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar.bz2 nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar.lz nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar.xz nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.tar.zst nixpkgs-9a05dcc0785fb98e63a10eb0f263c3c80305e848.zip | |
bup: 0.32 -> 0.33.2
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/bup/default.nix | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 86e598ff600..1ff7295df55 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -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; { |