MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

$docdev fixups: mostly to avoid empty output

Browse source 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
This commit is contained in:
Vladimír Čunát 2015-10-28 18:56:00 +01:00
parent 17b86fef1e
commit 787f322540
33 changed files with 37 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/xfce/core/exo.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
name = "${p_name}-${ver_maj}.${ver_min}"; name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "dev" "out" "doc" ]; # dev-doc only outputs = [ "dev" "out" "docdev" ];
# 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 ];

2
pkgs/desktops/xfce/core/garcon.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
}; };
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];

2
pkgs/desktops/xfce/core/libxfce4ui.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"; sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
}; };
outputs = [ "dev" "out" "doc" ]; # dev-doc only outputs = [ "dev" "out" "docdev" ];
buildInputs = buildInputs =
[ pkgconfig intltool gtk libxfce4util xfconf libglade [ pkgconfig intltool gtk libxfce4util xfconf libglade

2
pkgs/desktops/xfce/core/libxfce4util.nix
View file

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

2
pkgs/desktops/xfce/core/libxfcegui4.nix
View file

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

2
pkgs/desktops/xfce/core/tumbler.nix
View file

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

2
pkgs/desktops/xfce/core/xfce4-panel.nix
View file

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

2
pkgs/desktops/xfce/core/xfconf.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
}; };
outputs = [ "dev" "out" "doc" ]; # TODO: dev-doc only outputs = [ "dev" "out" "docdev" ];
#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 ];

2
pkgs/development/compilers/orc/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn"; sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
}; };
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
outputBin = "dev"; # compilation tools outputBin = "dev"; # compilation tools
postInstall = '' postInstall = ''

2
pkgs/development/libraries/SDL/default.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
}; };
outputs = [ "dev" "out" "man" ]; outputs = [ "dev" "out" ];
outputBin = "dev"; # sdl-config outputBin = "dev"; # sdl-config
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/at-spi2-core/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs"; sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs";
}; };
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
buildInputs = [ buildInputs = [
python pkgconfig popt intltool dbus_glib python pkgconfig popt intltool dbus_glib

2
pkgs/development/libraries/atk/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
buildInputs = libintlOrEmpty; buildInputs = libintlOrEmpty;

2
pkgs/development/libraries/dbus-glib/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
}; };
outputs = [ "dev" "out" "doc" ]; # "dev-doc" only outputs = [ "dev" "out" "docdev" ];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];

2
pkgs/development/libraries/gmime/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0";
}; };
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib zlib libgpgerror ]; propagatedBuildInputs = [ glib zlib libgpgerror ];

4
pkgs/development/libraries/gtk+/2.x.nix
View file

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

2
pkgs/development/libraries/harfbuzz/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b"; sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
}; };
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" ];
outputBin = "dev"; outputBin = "dev";
configureFlags = [ configureFlags = [

4
pkgs/development/libraries/libidn/default.nix
View file

@ -8,12 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds"; sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
}; };
outputs = [ "dev" "out" "bin" "info" "doc" ]; # $doc has just man3 outputs = [ "dev" "out" "bin" "info" "docdev" ];
doCheck = ! stdenv.isDarwin; doCheck = ! stdenv.isDarwin;
postFixup = ''_moveToOutput share/man/man1 "$bin" '';
meta = { meta = {
homepage = http://www.gnu.org/software/libidn/; homepage = http://www.gnu.org/software/libidn/;
description = "Library for internationalized domain names"; description = "Library for internationalized domain names";

2
pkgs/development/libraries/libmicrohttpd/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1"; sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1";
}; };
outputs = [ "dev" "out" "doc" ]; # dev-doc only, I think outputs = [ "dev" "out" "docdev" ];
buildInputs = [ libgcrypt ]; buildInputs = [ libgcrypt ];

2
pkgs/development/libraries/liboil/default.nix
View file

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

2
pkgs/development/libraries/libqmi/default.nix
View file

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

2
pkgs/development/libraries/libssh2/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s"; sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
}; };
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only outputs = [ "dev" "out" "docdev" ];
buildInputs = [ openssl zlib ]; buildInputs = [ openssl zlib ];

2
pkgs/development/libraries/libtasn1/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4"; sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4";
}; };
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only, lots of it outputs = [ "dev" "out" "docdev" ];
outputBin = "dev"; outputBin = "dev";
buildInputs = [ perl texinfo ]; buildInputs = [ perl texinfo ];

3
pkgs/development/libraries/libtheora/default.nix
View file

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

2
pkgs/development/libraries/libxklavier/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
}; };
outputs = [ "dev" "out" "doc" ]; # dev-doc only outputs = [ "dev" "out" "docdev" ];
# 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 ];

2
pkgs/development/libraries/p11-kit/default.nix
View file

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

2
pkgs/development/libraries/pango/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx"; sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx";
}; };
outputs = [ "dev" "out" "bin" "doc" ]; outputs = [ "dev" "out" "bin" "docdev" ];
buildInputs = [ gobjectIntrospection ]; buildInputs = [ gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/poppler/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
outputs = [ "out" ] ++ lib.optional (!minimal) "doc"; outputs = [ "dev" "out" ];
patches = [ ./datadir_env.patch ]; patches = [ ./datadir_env.patch ];

2
pkgs/development/libraries/schroedinger/default.nix
View file

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

6
pkgs/development/perl-modules/generic/builder.sh
View file

@ -28,12 +28,6 @@ preConfigure() {
perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags
} }
preFixup() {
if [ -n "$man" ]; then
mkdir -p $man/share
if [ -d $out/man ]; then mv $out/man $man/share/; fi
fi
}
postFixup() { postFixup() {
# If a user installs a Perl package, she probably also wants its # If a user installs a Perl package, she probably also wants its

2
pkgs/development/perl-modules/generic/default.nix
View file

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

2
pkgs/development/python-modules/pygobject/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "docdev" ];
configureFlags = "--disable-introspection"; configureFlags = "--disable-introspection";

8
pkgs/servers/x11/xorg/overrides.nix
View file

@ -128,7 +128,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 = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages) outputs = [ "dev" "out" "docdev" ];
}; };
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792 # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
@ -151,7 +151,7 @@ in
}; };
libXaw = attrs: attrs // { libXaw = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc outputs = [ "dev" "out" "docdev" ];
propagatedBuildInputs = [ xorg.libXmu ]; propagatedBuildInputs = [ xorg.libXmu ];
}; };
@ -213,11 +213,11 @@ in
}; };
libXres = attrs: attrs // { libXres = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc outputs = [ "dev" "out" "docdev" ];
}; };
libXv = attrs: attrs // { libXv = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc outputs = [ "dev" "out" "docdev" ];
}; };
libXvMC = attrs: attrs // { libXvMC = attrs: attrs // {

2
pkgs/tools/networking/curl/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y"; sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
}; };
outputs = [ "dev" "out" "bin" "doc" ]; # man3 is "dev-doc" outputs = [ "dev" "out" "bin" "man" "docdev" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains # Zlib and OpenSSL must be propagated because `libcurl.la' contains