public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging

Browse Source 
https://github.com/NixOS/nixpkgs/pull/14766
This commit is contained in:
Tuomas Tynkkynen
2016-08-30 12:43:37 +03:00
parent e6f1028340 03fb2c1f32
commit d3dc3d4130
239 changed files with 339 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/daemontools/default.nix
View File

@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
configurePhase = ''
cd ${name}
sed -ie '1 s_$_ -include ${glibc}/include/errno.h_' src/conf-cc
sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
substituteInPlace src/Makefile \
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
cat ${glibc}/include/errno.h
cat ${glibc.dev}/include/errno.h
'';
buildPhase = ''

2
pkgs/tools/compression/bzip2/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
'';
outputs = [ "dev" "bin" "out" "man" ];
outputs = [ "bin" "dev" "out" "man" ];
configureFlags =
stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];

2
pkgs/tools/compression/xz/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg";
};
outputs = [ "dev" "out" "bin" "man" "doc" ];
outputs = [ "bin" "dev" "out" "man" "doc" ];
doCheck = true;

2
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libuuid ];
buildInputs = [ gettext readline ];
outputs = [ "dev" "out" "bin" ]; # TODO: review xfs
outputs = [ "bin" "dev" "out" ]; # TODO: review xfs
preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"

2
pkgs/tools/graphics/pfstools/default.nix
View File

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

2
pkgs/tools/graphics/pstoedit/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06";
};
outputs = [ "dev" "out" ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ];

2
pkgs/tools/misc/calamares/default.nix
View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
-i src/modules/locale/timezonewidget/localeconst.h \
-i src/modules/locale/SetTimezoneJob.cpp
sed -e 's,/usr/share/i18n/locales,${glibc}/share/i18n/locales,' \
sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \
-i src/modules/locale/timezonewidget/localeconst.h
sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \

2
pkgs/tools/misc/snapper/default.nix
View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [
"-I${libxml2}/include/libxml2"
"-I${libxml2.dev}/include/libxml2"
];
postInstall = ''

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

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

4
pkgs/tools/networking/tgt/default.nix
View File

@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's|/usr/bin/||' doc/Makefile
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
sed -i 's|/usr/include/sys/|${stdenv.glibc}/include/sys/|' usr/Makefile
sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile
sed -i 's|/usr/include/sys/|${stdenv.glibc.dev}/include/sys/|' usr/Makefile
sed -i 's|/usr/include/linux/|${stdenv.glibc.dev}/include/linux/|' usr/Makefile
'';
postInstall = ''

2
pkgs/tools/package-management/nix-repl/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
$CXX -O3 -Wall -std=c++0x \
-o $out/bin/nix-repl nix-repl.cc \
-I${nix}/include/nix \
-I${nix.dev}/include/nix \
-lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
-DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"
'';

2
pkgs/tools/package-management/nix/default.nix
View File

@@ -9,7 +9,7 @@ let
common = { name, src }: stdenv.mkDerivation rec {
inherit name src;
outputs = [ "dev" "out" "man" "doc" ];
outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs = [ perl pkgconfig ];

2
pkgs/tools/security/clamav/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
"--with-zlib=${zlib.dev}"
"--with-libbz2-prefix=${bzip2.dev}"
"--with-iconv-dir=${libiconv}"
"--with-xml=${libxml2}"
"--with-xml=${libxml2.dev}"
"--with-openssl=${openssl.dev}"
"--with-libncurses-prefix=${ncurses.dev}"
"--with-libcurl=${curl.dev}"

2
pkgs/tools/security/modsecurity/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
"--with-pcre=${pcre.dev}"
"--with-apr=${apr.dev}"
"--with-apu=${aprutil.dev}/bin/apu-1-config"
"--with-libxml=${libxml2}"
"--with-libxml=${libxml2.dev}"
];
outputs = ["out" "nginx"];

2
pkgs/tools/security/tcpcrypt/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
postUnpack = ''mkdir -vp $sourceRoot/m4'';
outputs = [ "dev" "out" "bin" ];
outputs = [ "bin" "dev" "out" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl ]
++ optionals stdenv.isLinux [ libcap libpcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ];

2
pkgs/tools/system/awstats/default.nix
View File

@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
--replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/"
'';
outputs = [ "out" "bin" "doc" ]; # bin just links the user-run executable
outputs = [ "bin" "out" "doc" ]; # bin just links the user-run executable
propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
buildInputs = with perlPackages; [ ]; # plugins will need some

2
pkgs/tools/text/xml/xmlstarlet/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
preConfigure =
''
export LIBXSLT_PREFIX=${libxslt.dev}
export LIBXML_PREFIX=${libxml2}
export LIBXML_PREFIX=${libxml2.dev}
export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt)
export LIBXML_LIBS=$(pkg-config --libs libxml-2.0)
'';

2
pkgs/tools/video/mjpegtools/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libdv libjpeg libpng pkgconfig ]
++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ];
NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL}/include/SDL";
NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL";
postPatch = ''
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure