From 7d4bfcae9aa898c7672652e42c9605942e5ef778 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 28 May 2019 20:39:19 -0500
Subject: [PATCH 1/2] dedup: 1.0 -> 2.0

Update deps, enable tests.
---
 pkgs/tools/backup/dedup/default.nix | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix     |  4 +---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix
index fdeacf91dd0..c6615f95f05 100644
--- a/pkgs/tools/backup/dedup/default.nix
+++ b/pkgs/tools/backup/dedup/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, lz4, snappy, openmp }:
+{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium
+# For testing
+, coreutils, gawk
+}:
 
 stdenv.mkDerivation rec {
   pname = "dedup";
-  version = "1.0";
+  version = "2.0";
 
   src = fetchurl {
     url = "https://dl.2f30.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "0wd4cnzhqk8l7byp1y16slma6r3i1qglwicwmxirhwdy1m7j5ijy";
+    sha256 = "0n5kkni4d6blz3s94y0ddyhijb74lxv7msr2mvdmj8l19k0lrfh1";
   };
 
   makeFlags = [
     "CC:=$(CC)"
     "PREFIX=${placeholder "out"}"
     "MANPREFIX=${placeholder "out"}/share/man"
-    # These are likely wrong on some platforms, please report!
-    "OPENMPCFLAGS=-fopenmp"
-    "OPENMPLDLIBS=-lgomp"
   ];
 
-  buildInputs = [ lz4 snappy openmp ];
+  buildInputs = [ lz4 snappy libsodium ];
+
+  doCheck = true;
+
+  checkInputs = [ coreutils gawk ];
+  checkTarget = "test";
 
   meta = with stdenv.lib; {
     description = "data deduplication program";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86a023fb8c6..f05126ef594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1362,9 +1362,7 @@ in
 
   ddate = callPackage ../tools/misc/ddate { };
 
-  dedup = callPackage ../tools/backup/dedup {
-    inherit (llvmPackages) openmp;
-  };
+  dedup = callPackage ../tools/backup/dedup { };
 
   dehydrated = callPackage ../tools/admin/dehydrated { };
 

From 63fd414b6e94bca7a12a170edae22352fe3f6250 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 May 2019 10:02:26 +0200
Subject: [PATCH 2/2] dedup: capitalize description as described in the
 contribution guidelines

https://github.com/NixOS/nixpkgs/pull/62199#discussion_r288411450
---
 pkgs/tools/backup/dedup/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix
index c6615f95f05..de2a7370c3f 100644
--- a/pkgs/tools/backup/dedup/default.nix
+++ b/pkgs/tools/backup/dedup/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
 
   meta = with stdenv.lib; {
-    description = "data deduplication program";
+    description = "Data deduplication program";
     homepage = https://git.2f30.org/dedup/file/README.html;
     license = with licenses; [ bsd0 isc ];
     maintainers = with maintainers; [ dtzWill ];