diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/tools/filesystems/duff | |
parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
download | nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.zip |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/tools/filesystems/duff')
-rw-r--r-- | pkgs/tools/filesystems/duff/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 31015334166..1c4d068c4c1 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: -let version = "0.5.2"; in +# The last release (0.5.2) is more than 2 years old and lacks features like -D, +# limiting its usefulness. Upstream appears comatose if not dead. +let version = "2014-07-03"; in stdenv.mkDerivation { name = "duff-${version}"; src = fetchFromGitHub { - sha256 = "0yfm910wjj6z0f0cg68x59ykf4ql5m49apzy8sra00f8kv4lpn53"; - rev = version; + sha256 = "1k2dx38pjzc5d624vw1cs5ipj9fprsm5vqv55agksc29m63lswnx"; + rev = "f26d4837768b062a3f98fa075c791d9c8a0bb75c"; repo = "duff"; owner = "elmindreda"; }; @@ -14,10 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook gettext ]; preAutoreconf = '' - # duff is currently badly packaged, requiring us to do extra work here that - # should be done upstream. If that is ever fixed, this entire phase can be - # removed along with all buildInputs. - # gettexttize rightly refuses to run non-interactively: cp ${gettext}/bin/gettextize . substituteInPlace gettextize \ @@ -30,14 +28,15 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { + inherit version; description = "Quickly find duplicate files"; - homepage = http://duff.dreda.org/; - license = licenses.zlib; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. ''; + homepage = http://duff.dreda.org/; + license = licenses.zlib; + platforms = platforms.all; maintainers = with maintainers; [ nckx ]; - platforms = with platforms; all; }; } |