summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-20 16:51:51 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-20 17:44:48 +0200
commit5f8a330d40008ec6457f96a07cdebe95deb1bdaf (patch)
tree7c2b853b451221c7cab4f84d179ddfa474bb4496
parent594c47e5eb8a1589008a372d9b40e0bab2121c56 (diff)
downloadnixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar.gz
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar.bz2
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar.lz
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar.xz
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.tar.zst
nixpkgs-5f8a330d40008ec6457f96a07cdebe95deb1bdaf.zip
outputDocdev -> outputDevdoc
For consistency with the devdoc output.
-rw-r--r--doc/multiple-output.xml2
-rw-r--r--pkgs/build-support/setup-hooks/multiple-outputs.sh4
-rw-r--r--pkgs/data/documentation/std-man-pages/default.nix2
-rw-r--r--pkgs/data/documentation/stdman/default.nix2
-rw-r--r--pkgs/development/libraries/udns/default.nix2
-rw-r--r--pkgs/development/tools/documentation/gtk-doc/default.nix2
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index c4e92c7e79a..b7a363c750e 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -68,7 +68,7 @@
       </para></listitem></varlistentry>
 
       <varlistentry><term><varname>
-        $outputDocdev</varname></term><listitem><para>
+        $outputDevdoc</varname></term><listitem><para>
         is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc in there.  It goes to <varname>devdoc</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
       </para></listitem></varlistentry>
 
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 2e853ac4078..ae491e8a7ef 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -38,7 +38,7 @@ _overrideFirst outputInclude "$outputDev"
 _overrideFirst outputLib "lib" "out"
 
 _overrideFirst outputDoc "doc" "out"
-_overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers
+_overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers
 # man and info pages are small and often useful to distribute with binaries
 _overrideFirst outputMan "man" "doc" "$outputBin"
 _overrideFirst outputDevman "devman" "devdoc" "$outputMan"
@@ -138,7 +138,7 @@ _multioutDocs() {
 
     moveToOutput share/info "${!outputInfo}"
     moveToOutput share/doc "${!outputDoc}"
-    moveToOutput share/gtk-doc "${!outputDocdev}"
+    moveToOutput share/gtk-doc "${!outputDevdoc}"
 
     # the default outputMan is in $bin
     moveToOutput share/man "${!outputMan}"
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index ce38dd9c61a..04683ceddb3 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
   };
 
-  outputDocdev = "out";
+  outputDevdoc = "out";
 
   installPhase = ''
     mkdir -p $out/share/man
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 249e5b6841b..cc6f871cded 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
   };
 
-  outputDocdev = "out";
+  outputDevdoc = "out";
 
   preConfigure = "
     patchShebangs ./configure
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix
index 9d781b301a0..9c899eb21ba 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/pkgs/development/libraries/udns/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   # keep man3
-  outputDocdev = "out";
+  outputDevdoc = "out";
 
   meta = with stdenv.lib; {
     homepage = http://www.corpit.ru/mjt/udns.html;
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index b080be846cd..b46b0be748a 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y";
   };
 
-  outputDocdev = "out";
+  outputDevdoc = "out";
 
   # maybe there is a better way to pass the needed dtd and xsl files
   # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"