diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/tools/backup/rdedup | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/tools/backup/rdedup')
| -rw-r--r-- | nixpkgs/pkgs/tools/backup/rdedup/default.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch | 28 |
2 files changed, 4 insertions, 36 deletions
diff --git a/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 482d1aec8da6..8f3cc71de1bc 100644 --- a/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -4,20 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rdedup"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "dpc"; repo = "rdedup"; - rev = "rdedup-v${version}"; - sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; + rev = "v${version}"; + sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; }; - cargoSha256 = "1k0pl9i7zf1ki5ch2zxc1fqsf94bxjlvjrkh0500cycwqcdys296"; - - cargoPatches = [ - ./v3.1.1-fix-Cargo.lock.patch - ]; + cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium xz ] diff --git a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch b/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch deleted file mode 100644 index 7dafc7765b7d..000000000000 --- a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -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)", |