ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge #27424: stdenv: Don't put man pages into $doc

Browse Source
This commit is contained in:
Vladimír Čunát 2017-08-13 19:32:51 +02:00
commit 34946256a0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
49 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/multiple-output.xml
View File

@ -73,7 +73,7 @@
<varlistentry><term><varname> <varlistentry><term><varname>
$outputMan</varname></term><listitem><para> $outputMan</varname></term><listitem><para>
is for man pages (except for section 3). They go to <varname>man</varname> or <varname>doc</varname> or <varname>$outputBin</varname> by default. is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry><term><varname> <varlistentry><term><varname>
@ -83,7 +83,7 @@
<varlistentry><term><varname> <varlistentry><term><varname>
$outputInfo</varname></term><listitem><para> $outputInfo</varname></term><listitem><para>
is for info pages. They go to <varname>info</varname> or <varname>doc</varname> or <varname>$outputMan</varname> by default. is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
</para></listitem></varlistentry> </para></listitem></varlistentry>
</variablelist> </variablelist>

2
pkgs/applications/audio/flac/default.nix
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/;

2
pkgs/applications/graphics/meh/default.nix
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 ];

2
pkgs/applications/misc/moonlight-embedded/default.nix
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 = [

2
pkgs/applications/misc/mupdf/default.nix
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

2
pkgs/applications/misc/xrq/default.nix
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 ];

2
pkgs/applications/networking/irc/weechat/default.nix
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; [

2
pkgs/applications/window-managers/ratpoison/default.nix
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

8
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -3,8 +3,8 @@
# assertExecutable FILE # assertExecutable FILE
assertExecutable() { assertExecutable() {
local file="$1" local file="$1"
[[ -f "${file}" && -x "${file}" ]] || \ [[ -f "$file" && -x "$file" ]] || \
die "Cannot wrap ${file} because it is not an executable file" die "Cannot wrap '$file' because it is not an executable file"
} }
# construct an executable file that wraps the actual executable # construct an executable file that wraps the actual executable
@ -33,7 +33,7 @@ makeWrapper() {
local params varName value command separator n fileNames local params varName value command separator n fileNames
local argv0 flagsBefore flags local argv0 flagsBefore flags
assertExecutable "${original}" assertExecutable "$original"
mkdir -p "$(dirname "$wrapper")" mkdir -p "$(dirname "$wrapper")"
@ -131,7 +131,7 @@ wrapProgram() {
local prog="$1" local prog="$1"
local hidden local hidden
assertExecutable "${prog}" assertExecutable "$prog"
hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
while [ -e "$hidden" ]; do while [ -e "$hidden" ]; do

4
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -40,9 +40,9 @@ _overrideFirst outputLib "lib" "out"
_overrideFirst outputDoc "doc" "out" _overrideFirst outputDoc "doc" "out"
_overrideFirst outputDevdoc "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 # man and info pages are small and often useful to distribute with binaries
_overrideFirst outputMan "man" "doc" "$outputBin" _overrideFirst outputMan "man" "$outputBin"
_overrideFirst outputDevman "devman" "devdoc" "$outputMan" _overrideFirst outputDevman "devman" "devdoc" "$outputMan"
_overrideFirst outputInfo "info" "doc" "$outputMan" _overrideFirst outputInfo "info" "$outputBin"
# Add standard flags to put files into the desired outputs. # Add standard flags to put files into the desired outputs.

2
pkgs/data/misc/tzdata/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
"TZDIR=$(out)/share/zoneinfo" "TZDIR=$(out)/share/zoneinfo"
"ETCDIR=$(TMPDIR)/etc" "ETCDIR=$(TMPDIR)/etc"
"LIBDIR=$(dev)/lib" "LIBDIR=$(dev)/lib"
"MANDIR=$(man)/man" "MANDIR=$(man)/share/man"
"AWK=awk" "AWK=awk"
"CFLAGS=-DHAVE_LINK=0" "CFLAGS=-DHAVE_LINK=0"
]; ];

2
pkgs/desktops/gnome-2/platform/GConf/default.nix
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

2
pkgs/development/compilers/ghc/8.0.2.nix
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

2
pkgs/development/compilers/rust/rustc.nix
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.

2
pkgs/development/libraries/aalib/default.nix
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 ];

2
pkgs/development/libraries/acl/default.nix
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 ];

2
pkgs/development/libraries/attr/default.nix
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 ];

2
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
postPatch = ''patchShebangs .''; postPatch = ''patchShebangs .'';
inherit patches; inherit patches;
outputs = [ "bin" "dev" "out" ] outputs = [ "bin" "dev" "out" "man" ]
++ optional (reqMin "1.0") "doc" ; # just dev-doc ++ optional (reqMin "1.0") "doc" ; # just dev-doc
setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!

2
pkgs/development/libraries/fftw/default.nix
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 =

2
pkgs/development/libraries/gettext/default.nix
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" ];

2
pkgs/development/libraries/libao/default.nix
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 ] ++

2
pkgs/development/libraries/libffi/default.nix
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;

2
pkgs/development/libraries/libjpeg-turbo/default.nix
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 ];

2
pkgs/development/libraries/libksba/default.nix
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 ];

2
pkgs/development/libraries/libmbim/default.nix
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 .

2
pkgs/development/libraries/libsndfile/default.nix
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

2
pkgs/development/libraries/libtiff/default.nix
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 ];

2
pkgs/development/libraries/libxml2/default.nix
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";

2
pkgs/development/libraries/libxslt/default.nix
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 ];

2
pkgs/development/libraries/mpfr/default.nix
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 ];

2
pkgs/development/libraries/readline/6.3.nix
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];

2
pkgs/development/libraries/readline/7.0.nix
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];

2
pkgs/development/libraries/slang/default.nix
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 = ''

2
pkgs/development/libraries/xapian/default.nix
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 ];

2
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
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/;

2
pkgs/misc/ghostscript/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "man" "doc" ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/os-specific/linux/libcap/default.nix
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 ];

2
pkgs/os-specific/linux/udisks/2-default.nix
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 ];

2
pkgs/servers/http/apache-httpd/2.4.nix
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] ++

6
pkgs/servers/uftp/default.nix
View File

@ -11,16 +11,16 @@ 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
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $doc/share/man/man1 mkdir -p $out/bin $man/share/man/man1
cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/ cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/
cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $doc/share/man/man1 cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $man/share/man/man1
''; '';
meta = { meta = {

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -73,7 +73,7 @@ in
libxcb = attrs : attrs // { libxcb = attrs : attrs // {
nativeBuildInputs = [ args.python ]; nativeBuildInputs = [ args.python ];
configureFlags = "--enable-xkb --enable-xinput"; configureFlags = "--enable-xkb --enable-xinput";
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
}; };
xcbproto = attrs : attrs // { xcbproto = attrs : attrs // {
@ -177,7 +177,7 @@ in
}; };
libXext = attrs: attrs // { libXext = attrs: attrs // {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };
@ -187,7 +187,7 @@ in
}; };
libXi = attrs: attrs // { libXi = attrs: attrs // {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
propagatedBuildInputs = [ xorg.libXfixes ]; propagatedBuildInputs = [ xorg.libXfixes ];
}; };

7
pkgs/shells/bash/4.4.nix
View File

@ -36,10 +36,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
outputs = [ "out" "dev" "doc" "info" ]; outputs = [ "out" "dev" "doc" "info" ]
# the man pages are small and useful enough, so include them in $out in interactive builds
# the man pages are small and useful enough ++ stdenv.lib.optional (!interactive) "man";
outputMan = if interactive then "out" else null;
NIX_CFLAGS_COMPILE = '' NIX_CFLAGS_COMPILE = ''
-DSYS_BASHRC="/etc/bashrc" -DSYS_BASHRC="/etc/bashrc"

6
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libuuid, gettext }: { stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "e2fsprogs-1.43.4"; name = "e2fsprogs-1.43.4";
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
}; };
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" "info" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig texinfo ];
buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
crossAttrs = { crossAttrs = {

2
pkgs/tools/graphics/pfstools/default.nix
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

2
pkgs/tools/networking/dnsperf/default.nix
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 ];

2
pkgs/tools/networking/tinc/pre.nix
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 ];

2
pkgs/tools/text/groff/default.nix
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;

3
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -132,8 +132,7 @@ core = stdenv.mkDerivation rec {
'') '')
+ /* doc location identical with individual TeX pkgs */ '' + /* doc location identical with individual TeX pkgs */ ''
mkdir -p "$doc/doc" mkdir -p "$doc/doc"
mv "$doc"/share/{man,info} "$doc"/doc mv "$out"/share/{man,info} "$doc"/doc
rmdir "$doc"/share
'' + cleanBrokenLinks; '' + cleanBrokenLinks;
setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)

2
pkgs/top-level/perl-packages.nix
View File

@ -30,7 +30,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g"; sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g";
}; };
outputs = ["out" "doc"]; outputs = ["out" "man"];
# use gnused so that the preCheck command passes # use gnused so that the preCheck command passes
buildInputs = stdenv.lib.optional stdenv.isDarwin gnused; buildInputs = stdenv.lib.optional stdenv.isDarwin gnused;
propagatedBuildInputs = [ FileNext ]; propagatedBuildInputs = [ FileNext ];