summary refs log tree commit diff
path: root/pkgs/tools/backup
diff options
context:
space:
mode:
authorgoibhniu <cillian.deroiste@gmail.com>2015-10-14 14:11:05 +0200
committergoibhniu <cillian.deroiste@gmail.com>2015-10-14 14:11:05 +0200
commit372e5586b2872de94b657d2386c91464e0671a32 (patch)
treeacdc518a7b213e77e0bd5db3b331485a4ce3274f /pkgs/tools/backup
parenta0d7a458b1bf775f82abbefd68622fd41859545b (diff)
parent20b7d9cbc86a75708b5b01d924864684ecfa25b4 (diff)
downloadnixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar.gz
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar.bz2
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar.lz
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar.xz
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.tar.zst
nixpkgs-372e5586b2872de94b657d2386c91464e0671a32.zip
Merge pull request #10336 from qknight/borgbackup-0.27
borgbackup: bump to 0.27.0 and rename to correct name borgbackup
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r--pkgs/tools/backup/borg/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index f9a949f4d3f..df3523322e8 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchzip, python3Packages, openssl, acl }:
+{ stdenv, fetchurl, python3Packages, openssl, acl, lz4 }:
 
 python3Packages.buildPythonPackage rec {
-  name = "borg-${version}";
-  version = "0.23.0";
+  name = "borgbackup-${version}";
+  version = "0.27.0";
   namePrefix = "";
 
-  src = fetchzip {
-    name = "${name}-src";
-    url = "https://github.com/borgbackup/borg/archive/${version}.tar.gz";
-    sha256 = "1ns00bhrh4zm1s70mm32gnahj7yh4jdpkb8ziarhvcnknz7aga67";
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
+    sha256 = "04iizidag4fwy6kx1747d633s1amr81slgk743qsfbwixaxfjq9b";
   };
 
   propagatedBuildInputs = with python3Packages;
-    [ cython msgpack openssl acl llfuse tox detox ];
+    [ cython msgpack openssl acl llfuse tox detox lz4 setuptools_scm ];
 
   preConfigure = ''
     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; {