summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-07 13:38:44 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-07 13:38:44 +0000
commitf21f531e4eada63726f3e3e71cdb685d8c4b64d2 (patch)
tree120d68e874d3000569f7ebc5cf7395645583f5d5
parent3918ffc86d4d6d67aac0265d66a0349783b012de (diff)
downloadnixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar.gz
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar.bz2
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar.lz
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar.xz
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.tar.zst
nixpkgs-f21f531e4eada63726f3e3e71cdb685d8c4b64d2.zip
* man -> man-db.
svn path=/nixpkgs/trunk/; revision=10543
-rw-r--r--pkgs/tools/misc/man-db/default.nix (renamed from pkgs/tools/misc/man/default.nix)0
-rw-r--r--pkgs/tools/misc/man-db/share.patch (renamed from pkgs/tools/misc/man/share.patch)0
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/build-for-release.nix2
4 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man-db/default.nix
index 54367e671ea..54367e671ea 100644
--- a/pkgs/tools/misc/man/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
diff --git a/pkgs/tools/misc/man/share.patch b/pkgs/tools/misc/man-db/share.patch
index 95582a50269..95582a50269 100644
--- a/pkgs/tools/misc/man/share.patch
+++ b/pkgs/tools/misc/man-db/share.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 030feebdd77..6be567e1fba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -627,7 +627,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  man = import ../tools/misc/man {
+  man_db = import ../tools/misc/man-db {
      inherit fetchurl stdenv db4 groff;
   };
 
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 4963a97b91c..ecd6263f347 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -102,7 +102,7 @@ let {
     libxslt
     lvm2
     lynx
-    man
+    man_db
     mdadm
     mesa
     mingetty