diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
commit | 7257dedd7cf28634e08fc0458ed34a183065b70e (patch) | |
tree | 53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/tools/backup | |
parent | 7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff) | |
parent | 563b491ce89bafaa928beba19a37f6381bfc60d0 (diff) | |
download | nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2 nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst nixlib-7257dedd7cf28634e08fc0458ed34a183065b70e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/backup/rdedup/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch | 28 |
3 files changed, 43 insertions, 8 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 0c93e183f476..d30eaf12f911 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.8"; + version = "1.1.9"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0b4370480ca0114cb0bb534286241af8a35c6ffb71404dfa409ed06099661b63"; + sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 10cb1edb62a9..2d18fc5832f6 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,21 +1,27 @@ { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium -, llvmPackages, clang_39, lzma }: +, llvmPackages, clang_39, lzma +, Security }: rustPlatform.buildRustPackage rec { name = "rdedup-${version}"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dpc"; repo = "rdedup"; - rev = "e0f26f379a434f76d238c7a5fa6ddd8ae8b32f19"; - sha256 = "1nhf8ap0w99aa1h0l599cx90lcvfvjaj67nw9flq9bmmzpn53kp9"; + rev = "rdedup-v${version}"; + sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; - cargoSha256 = "1x6wchlcxb1frww6y04gfx4idxv9h0g9qfxrhgb6g5qy3bqhqq3p"; + cargoSha256 = "0p19qcz2ph6axfccjwc6z72hrlb48l7sf1n0hc1gfq8hj2s3k2s1"; + + patches = [ + ./v3.1.1-fix-Cargo.lock.patch + ]; nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ]; - buildInputs = [ openssl libsodium lzma ]; + buildInputs = [ openssl libsodium lzma ] + ++ (stdenv.lib.optional stdenv.isDarwin Security); configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang}/lib" @@ -27,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch b/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch new file mode 100644 index 000000000000..7dafc7765b7d --- /dev/null +++ b/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 96be83a..fe07471 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -880,12 +880,12 @@ dependencies = [ + + [[package]] + name = "rdedup" +-version = "3.1.0" ++version = "3.1.1" + dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdedup-lib 3.0.0", ++ "rdedup-lib 3.1.0", + "rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -900,7 +900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "rdedup-lib" +-version = "3.0.0" ++version = "3.1.0" + dependencies = [ + "backblaze-b2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", |