git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #62199 from dtzWill/update/dedup-2.0

dedup: 1.0 -> 2.0

commit65a73e0f94665d7c082b63220104dc2913379920 authorMaximilian Bosch <maximilian@mbosch.me> dateThu 30 May 2019, 10:35 (7 years ago) parent3213c6c63fd414
2 files changed+14−11
pkgs/tools/backup/dedup/default.nix+13−8 pkgs/top-level/all-packages.nix+1−3
pkgs/tools/backup/dedup/default.nix+13−8
@@ -1,27 +1,32 @@
1−{ stdenv, fetchurl, lz4, snappy, openmp }:
1+{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium
2+# For testing
3+, coreutils, gawk
4+}:
25
36stdenv.mkDerivation rec {
47 pname = "dedup";
5− version = "1.0";
8+ version = "2.0";
69
710 src = fetchurl {
811 url = "https://dl.2f30.org/releases/${pname}-${version}.tar.gz";
9− sha256 = "0wd4cnzhqk8l7byp1y16slma6r3i1qglwicwmxirhwdy1m7j5ijy";
12+ sha256 = "0n5kkni4d6blz3s94y0ddyhijb74lxv7msr2mvdmj8l19k0lrfh1";
1013 };
1114
1215 makeFlags = [
1316 "CC:=$(CC)"
1417 "PREFIX=${placeholder "out"}"
1518 "MANPREFIX=${placeholder "out"}/share/man"
16− # These are likely wrong on some platforms, please report!
17− "OPENMPCFLAGS=-fopenmp"
18− "OPENMPLDLIBS=-lgomp"
1919 ];
2020
21− buildInputs = [ lz4 snappy openmp ];
21+ buildInputs = [ lz4 snappy libsodium ];
22+
23+ doCheck = true;
24+
25+ checkInputs = [ coreutils gawk ];
26+ checkTarget = "test";
2227
2328 meta = with stdenv.lib; {
24− description = "data deduplication program";
29+ description = "Data deduplication program";
2530 homepage = https://git.2f30.org/dedup/file/README.html;
2631 license = with licenses; [ bsd0 isc ];
2732 maintainers = with maintainers; [ dtzWill ];
pkgs/top-level/all-packages.nix+1−3
@@ -1362,9 +1362,7 @@ in
13621362
13631363 ddate = callPackage ../tools/misc/ddate { };
13641364
1365− dedup = callPackage ../tools/backup/dedup {
1366− inherit (llvmPackages) openmp;
1367− };
1365+ dedup = callPackage ../tools/backup/dedup { };
13681366
13691367 dehydrated = callPackage ../tools/admin/dehydrated { };
13701368