diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index fdeacf91dd0..de2a7370c3f 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -1,27 +1,32 @@ -{ 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"; + description = "Data deduplication program"; homepage = https://git.2f30.org/dedup/file/README.html; license = with licenses; [ bsd0 isc ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf2b668c016..241d5fe629e 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 { };