ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10336 from qknight/borgbackup-0.27

Browse Source 
borgbackup: bump to 0.27.0 and rename to correct name borgbackup
This commit is contained in:
goibhniu 2015-10-14 14:11:05 +02:00
commit 372e5586b2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/backup/borg/default.nix
View File

@ -1,21 +1,23 @@
{ stdenv, fetchzip, python3Packages, openssl, acl }: { stdenv, fetchurl, python3Packages, openssl, acl, lz4 }:
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
name = "borg-${version}"; name = "borgbackup-${version}";
version = "0.23.0"; version = "0.27.0";
namePrefix = ""; namePrefix = "";
src = fetchzip { src = fetchurl {
name = "${name}-src"; url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
url = "https://github.com/borgbackup/borg/archive/${version}.tar.gz"; sha256 = "04iizidag4fwy6kx1747d633s1amr81slgk743qsfbwixaxfjq9b";
sha256 = "1ns00bhrh4zm1s70mm32gnahj7yh4jdpkb8ziarhvcnknz7aga67";
}; };
propagatedBuildInputs = with python3Packages; propagatedBuildInputs = with python3Packages;
[ cython msgpack openssl acl llfuse tox detox ]; [ cython msgpack openssl acl llfuse tox detox lz4 setuptools_scm ];
preConfigure = '' preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl}" export BORG_OPENSSL_PREFIX="${openssl}"
export BORG_LZ4_PREFIX="${lz4}"
# note: fix for this issue already upstream and probably in 0.27.1 (or whatever the next release is called)
substituteInPlace setup.py --replace "possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" "possible_lz4_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -712,7 +712,7 @@ let
bochs = callPackage ../applications/virtualization/bochs { }; bochs = callPackage ../applications/virtualization/bochs { };
borg = callPackage ../tools/backup/borg { }; borgbackup = callPackage ../tools/backup/borg { };
boomerang = callPackage ../development/tools/boomerang { }; boomerang = callPackage ../development/tools/boomerang { };