docdev -> devdoc

It's "developer documentation", not "documentation developer" after
all.
This commit is contained in:
Eelco Dolstra 2016-09-01 11:07:23 +02:00
parent 838c75398c
commit 8172cd734c
38 changed files with 46 additions and 46 deletions

View File

@ -63,7 +63,7 @@
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry><term><varname> <varlistentry><term><varname>
$outputDocdev</varname></term><listitem><para> $outputDocdev</varname></term><listitem><para>
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and man3 pages in there. It goes to <varname>docdev</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and man3 pages 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> </para></listitem></varlistentry>
<varlistentry><term><varname> <varlistentry><term><varname>
$outputMan</varname></term><listitem><para> $outputMan</varname></term><listitem><para>

View File

@ -76,7 +76,7 @@ in
extraOutputsToInstall = mkOption { extraOutputsToInstall = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [ ];
example = [ "doc" "info" "docdev" ]; example = [ "doc" "info" "devdoc" ];
description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>."; description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";
}; };

View File

@ -37,7 +37,7 @@ _overrideFirst outputInclude "$outputDev"
_overrideFirst outputLib "lib" "out" _overrideFirst outputLib "lib" "out"
_overrideFirst outputDoc "doc" "out" _overrideFirst outputDoc "doc" "out"
_overrideFirst outputDocdev "docdev" REMOVE # documentation for developers _overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers
# man and info pages are small and often useful to distribute with binaries # man and info pages are small and often useful to distribute with binaries
_overrideFirst outputMan "man" "doc" "$outputBin" _overrideFirst outputMan "man" "doc" "$outputBin"
_overrideFirst outputInfo "info" "doc" "$outputMan" _overrideFirst outputInfo "info" "doc" "$outputMan"

View File

@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
}; };
# keep developer docs separately (man2 and man3) # keep developer docs separately (man2 and man3)
outputs = [ "out" "docdev" ]; outputs = [ "out" "devdoc" ];
makeFlags = [ "MANDIR=$(out)/share/man" ]; makeFlags = [ "MANDIR=$(out)/share/man" ];
postFixup = '' postFixup = ''
moveToOutput share/man/man2 "$docdev" moveToOutput share/man/man2 "$devdoc"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
name = "${p_name}-${ver_maj}.${ver_min}"; name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
# lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"; sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = [ pkgconfig glib intltool ]; buildInputs = [ pkgconfig glib intltool ];

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
#TODO: gladeui #TODO: gladeui
# By default, libxfcegui4 tries to install into libglade's prefix. # By default, libxfcegui4 tries to install into libglade's prefix.

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = [ buildInputs = [
pkgconfig intltool dbus_glib gdk_pixbuf curl freetype pkgconfig intltool dbus_glib gdk_pixbuf curl freetype

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./xfce4-panel-datadir.patch ]; patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1"; patchFlags = "-p1";
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = buildInputs =
[ pkgconfig intltool gtk libxfce4util exo libwnck [ pkgconfig intltool gtk libxfce4util exo libwnck

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
buildInputs = [ pkgconfig intltool glib libxfce4util ]; buildInputs = [ pkgconfig intltool glib libxfce4util ];

View File

@ -28,7 +28,7 @@ let
}; };
# TODO: Add a "dev" output containing the header files. # TODO: Add a "dev" output containing the header files.
outputs = [ "out" "man" "docdev" ]; outputs = [ "out" "man" "devdoc" ];
setOutputFlags = false; setOutputFlags = false;
patches = patches =

View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
''; '';
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; # very small outputBin = "dev"; # very small
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
}; };
outputs = [ "bin" "dev" "out" "man" "docdev" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
buildInputs = buildInputs =
[ openssl db gettext kerberos ] [ openssl db gettext kerberos ]

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"; sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"; sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

View File

@ -17,8 +17,8 @@ stdenv.mkDerivation {
inherit src patches; inherit src patches;
outputs = [ "bin" "dev" "out" "man" "docdev" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
outputInfo = "docdev"; outputInfo = "devdoc";
postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50"; sha256 = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
else "--with-xinput=yes"; else "--with-xinput=yes";
postInstall = '' postInstall = ''
moveToOutput share/gtk-2.0/demo "$docdev" moveToOutput share/gtk-2.0/demo "$devdoc"
''; '';
passthru = { passthru = {

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4"; sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4";
}; };
outputs = [ "bin" "dev" "out" "info" "docdev" ]; outputs = [ "bin" "dev" "out" "info" "devdoc" ];
doCheck = ! stdenv.isDarwin; doCheck = ! stdenv.isDarwin;

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni"; sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = [ libgcrypt curl gnutls pkgconfig ]; buildInputs = [ libgcrypt curl gnutls pkgconfig ];
preCheck = '' preCheck = ''

View File

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputMan= "docdev"; outputMan= "devdoc";
propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ];

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./x86_64-cpuid.patch ]; patches = [ ./x86_64-cpuid.patch ];
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; # oil-bugreport outputBin = "dev"; # oil-bugreport
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
preBuild = '' preBuild = ''
patchShebangs . patchShebangs .

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4"; sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = [ openssl zlib ]; buildInputs = [ openssl zlib ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s"; sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
buildInputs = [ perl texinfo ]; buildInputs = [ perl texinfo ];

View File

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputDoc = "docdev"; outputDoc = "devdoc";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ libogg libvorbis ]; propagatedBuildInputs = [ libogg libvorbis ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723"; sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
patches = [ ./install_introspection_to_prefix.patch ]; patches = [ ./install_introspection_to_prefix.patch ];

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ];

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
# TODO: enable xmodmap support, needs xmodmap DB # TODO: enable xmodmap support, needs xmodmap DB
propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
# TODO: separate "out" and "bin" # TODO: separate "out" and "bin"
outputs = [ "out" "dev" "man" "docdev" ]; outputs = [ "out" "dev" "man" "devdoc" ];
buildInputs = [ openssl cyrus_sasl db groff ]; buildInputs = [ openssl cyrus_sasl db groff ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms"; sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; buildInputs = [ pkgconfig libffi libtasn1 libiconv ];

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"; sha256 = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40";
}; };
outputs = [ "bin" "dev" "out" "docdev" ]; outputs = [ "bin" "dev" "out" "devdoc" ];
buildInputs = [ gobjectIntrospection ]; buildInputs = [ gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
}; };
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ orc ]; buildInputs = [ orc ];

View File

@ -4,7 +4,7 @@ perl:
perl.stdenv.mkDerivation ( perl.stdenv.mkDerivation (
{ {
outputs = [ "out" "docdev" ]; outputs = [ "out" "devdoc" ];
doCheck = true; doCheck = true;

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
}; };
outputs = [ "out" "docdev" ]; outputs = [ "out" "devdoc" ];
patches = [ patches = [
# Fix warning spam # Fix warning spam

View File

@ -135,7 +135,7 @@ in
''; '';
propagatedBuildInputs = [ xorg.libSM ]; propagatedBuildInputs = [ xorg.libSM ];
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
}; };
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792 # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
@ -158,7 +158,7 @@ in
}; };
libXaw = attrs: attrs // { libXaw = attrs: attrs // {
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
propagatedBuildInputs = [ xorg.libXmu ]; propagatedBuildInputs = [ xorg.libXmu ];
}; };
@ -220,11 +220,11 @@ in
}; };
libXres = attrs: attrs // { libXres = attrs: attrs // {
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
}; };
libXv = attrs: attrs // { libXv = attrs: attrs // {
outputs = [ "out" "dev" "docdev" ]; outputs = [ "out" "dev" "devdoc" ];
}; };
libXvMC = attrs: attrs // { libXvMC = attrs: attrs // {

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw";
}; };
outputs = [ "bin" "dev" "out" "man" "docdev" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
nativeBuildInputs = [ pkgconfig perl ]; nativeBuildInputs = [ pkgconfig perl ];