treewide: Add man & info outputs where necessary (instead of doc)

Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
This commit is contained in:
Tuomas Tynkkynen 2017-07-11 12:14:14 +03:00
parent 03d37dc388
commit 1ff422aa23
39 changed files with 39 additions and 39 deletions

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
#doCheck = true; # takes lots of time #doCheck = true; # takes lots of time
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://xiph.org/flac/; homepage = http://xiph.org/flac/;

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
make PREFIX=$out install make PREFIX=$out install
''; '';
outputs = [ "out" "doc" ]; outputs = [ "out" "man" ];
buildInputs = [ libXext libX11 libjpeg libpng giflib ]; buildInputs = [ libXext libX11 libjpeg libpng giflib ];

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" ];
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ buildInputs = [

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = '' preConfigure = ''
# Don't remove mujs because upstream version is incompatible # Don't remove mujs because upstream version is incompatible

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
make PREFIX=$out install make PREFIX=$out install
''; '';
outputs = [ "out" "doc" ]; outputs = [ "out" "man" ];
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc"; sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc";
}; };
outputs = [ "out" ]; # "doc" was here but was not produced outputs = [ "out" "man" ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = with stdenv.lib; [ cmakeFlags = with stdenv.lib; [

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
}; };
outputs = [ "out" "contrib" "doc" "info" ]; outputs = [ "out" "contrib" "man" "doc" "info" ];
configureFlags = [ configureFlags = [
# >=1.4.9 requires this even with readline in inputs # >=1.4.9 requires this even with readline in inputs

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" ];
buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
# polkit requires pam, which requires shadow.h, which is not available on # polkit requires pam, which requires shadow.h, which is not available on

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" ];
preConfigure = '' preConfigure = ''
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

View File

@ -124,7 +124,7 @@ stdenv.mkDerivation {
buildInputs = [ ncurses ] ++ targetToolchains buildInputs = [ ncurses ] ++ targetToolchains
++ optional (!forceBundledLLVM) llvmShared; ++ optional (!forceBundledLLVM) llvmShared;
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" ];
setOutputFlags = false; setOutputFlags = false;
# Disable codegen units for the tests. # Disable codegen units for the tests.

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
}; };
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "info" ];
setOutputFlags = false; # Doesn't support all the flags setOutputFlags = false; # Doesn't support all the flags
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"; sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p";
}; };
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
buildInputs = [ attr ]; buildInputs = [ attr ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5";
}; };
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y"; sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y";
}; };
outputs = [ "out" "dev" "doc" ]; # it's dev-doc only outputs = [ "out" "dev" "man" "info" ]; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom outputBin = "dev"; # fftw-wisdom
configureFlags = configureFlags =

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
patches = [ ./absolute-paths.diff ]; patches = [ ./absolute-paths.diff ];
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" "info" ];
# FIXME stackprotector needs gcc 4.9 in bootstrap tools # FIXME stackprotector needs gcc 4.9 in bootstrap tools
hardeningDisable = [ "format" "stackprotector" ]; hardeningDisable = [ "format" "stackprotector" ];

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
buildInputs = buildInputs =
[ pkgconfig ] ++ [ pkgconfig ] ++

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch; patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch;
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "info" ];
buildInputs = stdenv.lib.optional doCheck dejagnu; buildInputs = stdenv.lib.optional doCheck dejagnu;

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional (hostPlatform.libc or null == "msvcrt") stdenv.lib.optional (hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch; ./mingw-boolean.patch;
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ nasm ]; nativeBuildInputs = [ nasm ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "info" ];
propagatedBuildInputs = [ libgpgerror ]; propagatedBuildInputs = [ libgpgerror ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" ];
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
# need headers from the Carbon.framework in /System/Library/Frameworks to # need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle # compile this on darwin -- not sure how to handle

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
''; '';
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
}) })
]; ];
outputs = [ "bin" "dev" "out" "doc" ] outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"; ++ lib.optional pythonSupport "py";
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
--replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)' --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)'
''; '';
outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./upstream.patch ]; patches = [ ./upstream.patch ];
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" "info" ];
# mpfr.h requires gmp.h # mpfr.h requires gmp.h
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" "info" ];
propagatedBuildInputs = [ncurses]; propagatedBuildInputs = [ncurses];

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"; sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" "info" ];
propagatedBuildInputs = [ncurses]; propagatedBuildInputs = [ncurses];

View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l"; sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
# Fix some wrong hardcoded paths # Fix some wrong hardcoded paths
preConfigure = '' preConfigure = ''

View File

@ -11,7 +11,7 @@ let
inherit sha256; inherit sha256;
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" ];
buildInputs = [ libuuid zlib ]; buildInputs = [ libuuid zlib ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation {
configureFlags = stdenv.lib.optional guileSupport "--with-guile"; configureFlags = stdenv.lib.optional guileSupport "--with-guile";
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "info" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/make/; homepage = http://www.gnu.org/software/make/;

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39";
}; };
outputs = [ "out" "dev" "lib" "doc" ] outputs = [ "out" "dev" "lib" "man" "doc" ]
++ stdenv.lib.optional (pam != null) "pam"; ++ stdenv.lib.optional (pam != null) "pam";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" ];
patches = [ ./force-path.patch ]; patches = [ ./force-path.patch ];

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
}; };
# FIXME: -dev depends on -doc # FIXME: -dev depends on -doc
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc. setOutputFlags = false; # it would move $out/modules, etc.
buildInputs = [perl] ++ buildInputs = [perl] ++

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
outputs = [ "out" "doc" ]; outputs = [ "out" "man" ];
patchPhase = '' patchPhase = ''
substituteInPlace makefile --replace gcc cc substituteInPlace makefile --replace gcc cc

View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
outputs = [ "out" "dev" "doc" "info" ]; outputs = [ "out" "dev" "man" "doc" "info" ];
# the man pages are small and useful enough # the man pages are small and useful enough
outputMan = if interactive then "out" else null; outputMan = if interactive then "out" else null;

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9"; sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9";
}; };
outputs = [ "out" "dev" "doc"]; outputs = [ "out" "dev" "man"];
cmakeFlags = '' cmakeFlags = ''
-DWITH_MATLAB=false -DWITH_MATLAB=false

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" ];
buildInputs = [ bind libseccomp zlib ]; buildInputs = [ bind libseccomp zlib ];

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc"; sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "info" ];
nativeBuildInputs = [ autoreconfHook texinfo ]; nativeBuildInputs = [ autoreconfHook texinfo ];
buildInputs = [ ncurses readline zlib lzo openssl ]; buildInputs = [ ncurses readline zlib lzo openssl ];

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" "info" ];
enableParallelBuilding = false; enableParallelBuilding = false;