From 6d80ede6a51a7397bf5472b901989a075d53189e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 13 Mar 2020 11:44:35 +0100
Subject: [PATCH] nix/pkgs: remove rdedup as it's on stable now

---
 nix/pkgs/default.nix                        |  2 --
 nix/pkgs/rdedup/default.nix                 | 35 ---------------------
 nix/pkgs/rdedup/v3.1.1-fix-Cargo.lock.patch | 28 -----------------
 3 files changed, 65 deletions(-)
 delete mode 100644 nix/pkgs/rdedup/default.nix
 delete mode 100644 nix/pkgs/rdedup/v3.1.1-fix-Cargo.lock.patch

diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index fabac52..2a7f4d2 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -35,8 +35,6 @@ in rec {
       pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_sgx);
   linuxPackages_sgx_latest = linuxPackages_sgx_540rc3;
 
-  rdedup = pkgs.callPackages ../pkgs/rdedup {};
-
   busyboxStatic =  pkgs.busybox.override {
     enableStatic = true;
     extraConfig = ''
diff --git a/nix/pkgs/rdedup/default.nix b/nix/pkgs/rdedup/default.nix
deleted file mode 100644
index 6ac542e..0000000
--- a/nix/pkgs/rdedup/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
-, llvmPackages, clang_39, lzma }:
-
-rustPlatform.buildRustPackage rec {
-  name = "rdedup-${version}";
-  version = "3.1.1";
-
-  src = fetchFromGitHub {
-    owner = "dpc";
-    repo = "rdedup";
-    rev = "rdedup-v${version}";
-    sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7";
-  };
-
-  patches = [
-    ./v3.1.1-fix-Cargo.lock.patch
-  ];
-
-  cargoSha256 = "0p19qcz2ph6axfccjwc6z72hrlb48l7sf1n0hc1gfq8hj2s3k2s1";
-
-  nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ];
-  buildInputs = [ openssl libsodium lzma ];
-
-  configurePhase = ''
-    export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Data deduplication with compression and public key encryption";
-    homepage = https://github.com/dpc/rdedup;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nix/pkgs/rdedup/v3.1.1-fix-Cargo.lock.patch b/nix/pkgs/rdedup/v3.1.1-fix-Cargo.lock.patch
deleted file mode 100644
index 7dafc77..0000000
--- a/nix/pkgs/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)",