Author: eelco
Date: Sun Mar 4 15:50:03 2012
New Revision: 32772
URL: https://nixos.org/websvn/nix/?rev=32772&sc=1
Log:
* No longer needed.
Modified:
nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Sun Mar 4
15:48:58 2012 (r32771)
+++ nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Sun Mar 4
15:50:03 2012 (r32772)
@@ -1,8 +1,6 @@
-{stdenv, fetchurl, withMan ? false, help2man ? null}:
+{ stdenv, fetchurl }:
-assert withMan -> help2man != null;
-
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "gnutar-1.25";
src = fetchurl {
@@ -34,10 +32,4 @@
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
-} // (if withMan then {
- buildInputs = [ help2man ];
- postInstall = ''
- ensureDir $out/share/man/man1
- help2man $out/bin/tar > $out/share/man/man1/tar.1
- '';
-} else {}))
+}
\ No newline at end of file
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Mar 4 15:48:58
2012 (r32771)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Mar 4 15:50:03
2012 (r32772)
@@ -776,11 +776,7 @@
gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { };
- gnutar = lowPrio (callPackage ../tools/archivers/gnutar { });
-
- gnutarWithMan = callPackage ../tools/archivers/gnutar {
- withMan = true;
- };
+ gnutar = callPackage ../tools/archivers/gnutar { };
gnuvd = callPackage ../tools/misc/gnuvd { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
