+3
-3
doc/multiple-output.xml
+3
-3
doc/multiple-output.xml
···<para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>-<para>When a multiple-output derivation gets into a build input of another derivation, the first output is added (<varname>.dev</varname> by convention) and also <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname>. (See <xref linkend="multiple-output-file-type-groups" />.)</para>+<para>When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)</para><para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>>; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>-<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should usually be <varname>dev</varname>; typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>+<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like <literal>${pkgs.perl}/bin/perl</literal> to always work. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para><note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>
+2
lib/attrsets.nix
+2
lib/attrsets.nix
···+chooseDevOutputs = drvs: builtins.map (drv: if drv.outputUnspecified or false then drv.dev or drv else drv) drvs;
+16
nixos/doc/manual/release-notes/rl-1609.xml
+16
nixos/doc/manual/release-notes/rl-1609.xml
···+Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions+late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)···
+1
-1
nixos/modules/config/fonts/fonts.nix
+1
-1
nixos/modules/config/fonts/fonts.nix
+12
-4
nixos/modules/security/audit.nix
+12
-4
nixos/modules/security/audit.nix
············
+1
-1
pkgs/applications/audio/ardour/ardour3.nix
+1
-1
pkgs/applications/audio/ardour/ardour3.nix
···printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
+1
-1
pkgs/applications/audio/flac/default.nix
+1
-1
pkgs/applications/audio/flac/default.nix
+1
-1
pkgs/applications/graphics/ImageMagick/default.nix
+1
-1
pkgs/applications/graphics/ImageMagick/default.nix
+1
-1
pkgs/applications/misc/djvulibre/default.nix
+1
-1
pkgs/applications/misc/djvulibre/default.nix
+1
-1
pkgs/applications/misc/golden-cheetah/default.nix
+1
-1
pkgs/applications/misc/golden-cheetah/default.nix
···
+2
-2
pkgs/applications/misc/mupdf/default.nix
+2
-2
pkgs/applications/misc/mupdf/default.nix
···buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];···
+1
-1
pkgs/applications/misc/pgadmin/default.nix
+1
-1
pkgs/applications/misc/pgadmin/default.nix
+2
-2
pkgs/applications/misc/taskjuggler/default.nix
+2
-2
pkgs/applications/misc/taskjuggler/default.nix
+1
-1
pkgs/applications/misc/xxkb/default.nix
+1
-1
pkgs/applications/misc/xxkb/default.nix
+2
-2
pkgs/applications/science/electronics/tkgate/1.x.nix
+2
-2
pkgs/applications/science/electronics/tkgate/1.x.nix
···--e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \--e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \+-e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \+-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \
+1
-1
pkgs/applications/science/math/calc/default.nix
+1
-1
pkgs/applications/science/math/calc/default.nix
···BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
+1
-1
pkgs/applications/science/misc/root/default.nix
+1
-1
pkgs/applications/science/misc/root/default.nix
···+++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include";
+1
-1
pkgs/applications/version-management/redmine/default.nix
+1
-1
pkgs/applications/version-management/redmine/default.nix
···-bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}"+bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2.dev}"
+1
-1
pkgs/applications/version-management/subversion/default.nix
+1
-1
pkgs/applications/version-management/subversion/default.nix
+1
-1
pkgs/applications/virtualization/virtualbox/default.nix
+1
-1
pkgs/applications/virtualization/virtualbox/default.nix
···-NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${stdenv.cc.libc}/include,,g')+NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g')
+2
-1
pkgs/build-support/grsecurity/default.nix
+2
-1
pkgs/build-support/grsecurity/default.nix
······+nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
+8
-5
pkgs/build-support/setup-hooks/multiple-outputs.sh
+8
-5
pkgs/build-support/setup-hooks/multiple-outputs.sh
············
+6
pkgs/data/fonts/dejavu-fonts/default.nix
+6
pkgs/data/fonts/dejavu-fonts/default.nix
······
+1
-1
pkgs/desktops/gnome-2/platform/GConf/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/GConf/default.nix
···
+1
-1
pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
···
+1
-1
pkgs/desktops/gnome-2/platform/libglade/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libglade/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libgnome/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libgnome/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+1
-1
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+1
-1
pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
+1
-1
pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
···-NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";+NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
+1
-1
pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
+1
-1
pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
···-NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";+NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
+1
-1
pkgs/desktops/gnome-3/3.20/core/folks/default.nix
+1
-1
pkgs/desktops/gnome-3/3.20/core/folks/default.nix
···
+1
-1
pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
+1
-1
pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
+1
-1
pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+1
-1
pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
···
+1
-1
pkgs/desktops/xfce/core/exo.nix
+1
-1
pkgs/desktops/xfce/core/exo.nix
+1
-1
pkgs/desktops/xfce/core/garcon.nix
+1
-1
pkgs/desktops/xfce/core/garcon.nix
+1
-1
pkgs/desktops/xfce/core/libxfce4ui.nix
+1
-1
pkgs/desktops/xfce/core/libxfce4ui.nix
+1
-1
pkgs/desktops/xfce/core/libxfce4util.nix
+1
-1
pkgs/desktops/xfce/core/libxfce4util.nix
+1
-1
pkgs/desktops/xfce/core/libxfcegui4.nix
+1
-1
pkgs/desktops/xfce/core/libxfcegui4.nix
+1
-1
pkgs/desktops/xfce/core/tumbler.nix
+1
-1
pkgs/desktops/xfce/core/tumbler.nix
+1
-1
pkgs/desktops/xfce/core/xfce4-panel.nix
+1
-1
pkgs/desktops/xfce/core/xfce4-panel.nix
+1
-1
pkgs/desktops/xfce/core/xfconf.nix
+1
-1
pkgs/desktops/xfce/core/xfconf.nix
···
+6
-5
pkgs/development/compilers/gcc/6/default.nix
+6
-5
pkgs/development/compilers/gcc/6/default.nix
···············
+1
-1
pkgs/development/compilers/neko/default.nix
+1
-1
pkgs/development/compilers/neko/default.nix
···
+1
-1
pkgs/development/compilers/orc/default.nix
+1
-1
pkgs/development/compilers/orc/default.nix
+1
-1
pkgs/development/compilers/terra/default.nix
+1
-1
pkgs/development/compilers/terra/default.nix
+1
-1
pkgs/development/compilers/tinycc/default.nix
+1
-1
pkgs/development/compilers/tinycc/default.nix
+1
-1
pkgs/development/go-modules/generic/default.nix
+1
-1
pkgs/development/go-modules/generic/default.nix
···
+2
-2
pkgs/development/haskell-modules/configuration-common.nix
+2
-2
pkgs/development/haskell-modules/configuration-common.nix
···
+1
-1
pkgs/development/interpreters/erlang/R14.nix
+1
-1
pkgs/development/interpreters/erlang/R14.nix
+5
-5
pkgs/development/interpreters/php/default.nix
+5
-5
pkgs/development/interpreters/php/default.nix
······
+1
-1
pkgs/development/interpreters/python/cpython/3.6/default.nix
+1
-1
pkgs/development/interpreters/python/cpython/3.6/default.nix
···
+1
-1
pkgs/development/interpreters/ruby/default.nix
+1
-1
pkgs/development/interpreters/ruby/default.nix
+1
-1
pkgs/development/interpreters/spidermonkey/17.0.nix
+1
-1
pkgs/development/interpreters/spidermonkey/17.0.nix
+1
-1
pkgs/development/interpreters/spidermonkey/24.2.nix
+1
-1
pkgs/development/interpreters/spidermonkey/24.2.nix
+1
-1
pkgs/development/libraries/SDL/default.nix
+1
-1
pkgs/development/libraries/SDL/default.nix
+1
-1
pkgs/development/libraries/aalib/default.nix
+1
-1
pkgs/development/libraries/aalib/default.nix
···
+1
-1
pkgs/development/libraries/acl/default.nix
+1
-1
pkgs/development/libraries/acl/default.nix
+1
-1
pkgs/development/libraries/agg/default.nix
+1
-1
pkgs/development/libraries/agg/default.nix
+1
-1
pkgs/development/libraries/apr-util/default.nix
+1
-1
pkgs/development/libraries/apr-util/default.nix
+1
-1
pkgs/development/libraries/apr/default.nix
+1
-1
pkgs/development/libraries/apr/default.nix
+1
-1
pkgs/development/libraries/at-spi2-core/default.nix
+1
-1
pkgs/development/libraries/at-spi2-core/default.nix
+1
-1
pkgs/development/libraries/atk/default.nix
+1
-1
pkgs/development/libraries/atk/default.nix
+1
-1
pkgs/development/libraries/attr/default.nix
+1
-1
pkgs/development/libraries/attr/default.nix
+1
-1
pkgs/development/libraries/boehm-gc/default.nix
+1
-1
pkgs/development/libraries/boehm-gc/default.nix
+1
-1
pkgs/development/libraries/boost/generic.nix
+1
-1
pkgs/development/libraries/boost/generic.nix
+1
-1
pkgs/development/libraries/cairo/default.nix
+1
-1
pkgs/development/libraries/cairo/default.nix
+1
-1
pkgs/development/libraries/cyrus-sasl/default.nix
+1
-1
pkgs/development/libraries/cyrus-sasl/default.nix
+1
-1
pkgs/development/libraries/dbus-glib/default.nix
+1
-1
pkgs/development/libraries/dbus-glib/default.nix
+1
-1
pkgs/development/libraries/dbus/default.nix
+1
-1
pkgs/development/libraries/dbus/default.nix
+1
-1
pkgs/development/libraries/epoxy/default.nix
+1
-1
pkgs/development/libraries/epoxy/default.nix
+1
-1
pkgs/development/libraries/exiv2/default.nix
+1
-1
pkgs/development/libraries/exiv2/default.nix
+1
-1
pkgs/development/libraries/expat/default.nix
+1
-1
pkgs/development/libraries/expat/default.nix
+1
-1
pkgs/development/libraries/ffmpeg/generic.nix
+1
-1
pkgs/development/libraries/ffmpeg/generic.nix
+1
-1
pkgs/development/libraries/fftw/default.nix
+1
-1
pkgs/development/libraries/fftw/default.nix
+1
-1
pkgs/development/libraries/fontconfig/2.10.nix
+1
-1
pkgs/development/libraries/fontconfig/2.10.nix
+5
-5
pkgs/development/libraries/fontconfig/default.nix
+5
-5
pkgs/development/libraries/fontconfig/default.nix
············
+1
-1
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+1
-1
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+3
-3
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+3
-3
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
···
+2
-2
pkgs/development/libraries/frame/default.nix
+2
-2
pkgs/development/libraries/frame/default.nix
······
+1
-1
pkgs/development/libraries/freetype/default.nix
+1
-1
pkgs/development/libraries/freetype/default.nix
···
+1
-1
pkgs/development/libraries/gd/default.nix
+1
-1
pkgs/development/libraries/gd/default.nix
+1
-1
pkgs/development/libraries/gdal/default.nix
+1
-1
pkgs/development/libraries/gdal/default.nix
···
+1
-1
pkgs/development/libraries/gdal/gdal-1_11.nix
+1
-1
pkgs/development/libraries/gdal/gdal-1_11.nix
···
+1
-1
pkgs/development/libraries/gdk-pixbuf/default.nix
+1
-1
pkgs/development/libraries/gdk-pixbuf/default.nix
+1
-1
pkgs/development/libraries/glib-networking/default.nix
+1
-1
pkgs/development/libraries/glib-networking/default.nix
···
+1
-1
pkgs/development/libraries/glib/default.nix
+1
-1
pkgs/development/libraries/glib/default.nix
+1
-1
pkgs/development/libraries/glibc/common.nix
+1
-1
pkgs/development/libraries/glibc/common.nix
+3
-3
pkgs/development/libraries/glibc/multi.nix
+3
-3
pkgs/development/libraries/glibc/multi.nix
······
+1
-1
pkgs/development/libraries/glibmm/default.nix
+1
-1
pkgs/development/libraries/glibmm/default.nix
+1
-1
pkgs/development/libraries/gmime/default.nix
+1
-1
pkgs/development/libraries/gmime/default.nix
+9
-2
pkgs/development/libraries/gmp/4.3.2.nix
+9
-2
pkgs/development/libraries/gmp/4.3.2.nix
······
+8
-3
pkgs/development/libraries/gmp/5.1.x.nix
+8
-3
pkgs/development/libraries/gmp/5.1.x.nix
·········
+2
-2
pkgs/development/libraries/gmp/6.x.nix
+2
-2
pkgs/development/libraries/gmp/6.x.nix
···
+1
-1
pkgs/development/libraries/gnutls/generic.nix
+1
-1
pkgs/development/libraries/gnutls/generic.nix
+1
-1
pkgs/development/libraries/gobject-introspection/default.nix
+1
-1
pkgs/development/libraries/gobject-introspection/default.nix
+1
-1
pkgs/development/libraries/gpgme/default.nix
+1
-1
pkgs/development/libraries/gpgme/default.nix
···
+3
-2
pkgs/development/libraries/grail/default.nix
+3
-2
pkgs/development/libraries/grail/default.nix
···-++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];+++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];···
+1
-1
pkgs/development/libraries/gstreamer/bad/default.nix
+1
-1
pkgs/development/libraries/gstreamer/bad/default.nix
+1
-1
pkgs/development/libraries/gstreamer/base/default.nix
+1
-1
pkgs/development/libraries/gstreamer/base/default.nix
+1
-1
pkgs/development/libraries/gstreamer/core/default.nix
+1
-1
pkgs/development/libraries/gstreamer/core/default.nix
+1
-1
pkgs/development/libraries/gstreamer/ges/default.nix
+1
-1
pkgs/development/libraries/gstreamer/ges/default.nix
+1
-1
pkgs/development/libraries/gstreamer/gnonlin/default.nix
+1
-1
pkgs/development/libraries/gstreamer/gnonlin/default.nix
+1
-1
pkgs/development/libraries/gstreamer/good/default.nix
+1
-1
pkgs/development/libraries/gstreamer/good/default.nix
+1
-1
pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+1
-1
pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+1
-1
pkgs/development/libraries/gstreamer/libav/default.nix
+1
-1
pkgs/development/libraries/gstreamer/libav/default.nix
+1
-1
pkgs/development/libraries/gstreamer/python/default.nix
+1
-1
pkgs/development/libraries/gstreamer/python/default.nix
+1
-1
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+1
-1
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+1
-1
pkgs/development/libraries/gstreamer/ugly/default.nix
+1
-1
pkgs/development/libraries/gstreamer/ugly/default.nix
+1
-1
pkgs/development/libraries/gstreamer/vaapi/default.nix
+1
-1
pkgs/development/libraries/gstreamer/vaapi/default.nix
+1
-1
pkgs/development/libraries/gstreamer/validate/default.nix
+1
-1
pkgs/development/libraries/gstreamer/validate/default.nix
+1
-1
pkgs/development/libraries/gtk+/2.x.nix
+1
-1
pkgs/development/libraries/gtk+/2.x.nix
+1
-1
pkgs/development/libraries/gtk+/3.x.nix
+1
-1
pkgs/development/libraries/gtk+/3.x.nix
+1
-1
pkgs/development/libraries/harfbuzz/default.nix
+1
-1
pkgs/development/libraries/harfbuzz/default.nix
+1
-1
pkgs/development/libraries/hunspell/default.nix
+1
-1
pkgs/development/libraries/hunspell/default.nix
+1
-1
pkgs/development/libraries/icu/default.nix
+1
-1
pkgs/development/libraries/icu/default.nix
+2
-2
pkgs/development/libraries/imlib/default.nix
+2
-2
pkgs/development/libraries/imlib/default.nix
+1
-1
pkgs/development/libraries/jasper/default.nix
+1
-1
pkgs/development/libraries/jasper/default.nix
+3
-5
pkgs/development/libraries/java/swt/default.nix
+3
-5
pkgs/development/libraries/java/swt/default.nix
······
+1
-1
pkgs/development/libraries/json-c/default.nix
+1
-1
pkgs/development/libraries/json-c/default.nix
+2
-2
pkgs/development/libraries/kde-frameworks/default.nix
+2
-2
pkgs/development/libraries/kde-frameworks/default.nix
······
+1
-1
pkgs/development/libraries/lcms/default.nix
+1
-1
pkgs/development/libraries/lcms/default.nix
+1
-1
pkgs/development/libraries/lcms2/default.nix
+1
-1
pkgs/development/libraries/lcms2/default.nix
+1
-1
pkgs/development/libraries/libao/default.nix
+1
-1
pkgs/development/libraries/libao/default.nix
+1
-1
pkgs/development/libraries/libassuan/default.nix
+1
-1
pkgs/development/libraries/libassuan/default.nix
+1
-1
pkgs/development/libraries/libav/default.nix
+1
-1
pkgs/development/libraries/libav/default.nix
+7
-5
pkgs/development/libraries/libb2/default.nix
+7
-5
pkgs/development/libraries/libb2/default.nix
···
+1
-1
pkgs/development/libraries/libcaca/default.nix
+1
-1
pkgs/development/libraries/libcaca/default.nix
+1
-1
pkgs/development/libraries/libdrm/default.nix
+1
-1
pkgs/development/libraries/libdrm/default.nix
+1
-1
pkgs/development/libraries/libdynd/default.nix
+1
-1
pkgs/development/libraries/libdynd/default.nix
+1
-1
pkgs/development/libraries/libevent/default.nix
+1
-1
pkgs/development/libraries/libevent/default.nix
+1
-1
pkgs/development/libraries/libffi/default.nix
+1
-1
pkgs/development/libraries/libffi/default.nix
+1
-1
pkgs/development/libraries/libgcrypt/default.nix
+1
-1
pkgs/development/libraries/libgcrypt/default.nix
+1
-1
pkgs/development/libraries/libgnome-keyring/default.nix
+1
-1
pkgs/development/libraries/libgnome-keyring/default.nix
+1
-1
pkgs/development/libraries/libgpg-error/default.nix
+1
-1
pkgs/development/libraries/libgpg-error/default.nix
···
+1
-1
pkgs/development/libraries/libidn/default.nix
+1
-1
pkgs/development/libraries/libidn/default.nix
+1
-1
pkgs/development/libraries/libinput/default.nix
+1
-1
pkgs/development/libraries/libinput/default.nix
+1
-1
pkgs/development/libraries/libjpeg-drop/default.nix
+1
-1
pkgs/development/libraries/libjpeg-drop/default.nix
+1
-1
pkgs/development/libraries/libjpeg-turbo/default.nix
+1
-1
pkgs/development/libraries/libjpeg-turbo/default.nix
+1
-1
pkgs/development/libraries/libjpeg/default.nix
+1
-1
pkgs/development/libraries/libjpeg/default.nix
+1
-1
pkgs/development/libraries/libmbim/default.nix
+1
-1
pkgs/development/libraries/libmbim/default.nix
+1
-1
pkgs/development/libraries/libmicrohttpd/default.nix
+1
-1
pkgs/development/libraries/libmicrohttpd/default.nix
+1
-1
pkgs/development/libraries/libmng/default.nix
+1
-1
pkgs/development/libraries/libmng/default.nix
+1
-1
pkgs/development/libraries/libmp3splt/default.nix
+1
-1
pkgs/development/libraries/libmp3splt/default.nix
+1
-1
pkgs/development/libraries/libmtp/default.nix
+1
-1
pkgs/development/libraries/libmtp/default.nix
+1
-1
pkgs/development/libraries/libogg/default.nix
+1
-1
pkgs/development/libraries/libogg/default.nix
+1
-1
pkgs/development/libraries/liboil/default.nix
+1
-1
pkgs/development/libraries/liboil/default.nix
+1
-1
pkgs/development/libraries/libopus/default.nix
+1
-1
pkgs/development/libraries/libopus/default.nix
···
+1
-1
pkgs/development/libraries/libpng/12.nix
+1
-1
pkgs/development/libraries/libpng/12.nix
+1
-1
pkgs/development/libraries/libpng/default.nix
+1
-1
pkgs/development/libraries/libpng/default.nix
+1
-1
pkgs/development/libraries/libproxy/default.nix
+1
-1
pkgs/development/libraries/libproxy/default.nix
···
+1
-1
pkgs/development/libraries/libqmi/default.nix
+1
-1
pkgs/development/libraries/libqmi/default.nix
+1
-1
pkgs/development/libraries/libre/default.nix
+1
-1
pkgs/development/libraries/libre/default.nix
···
+1
-1
pkgs/development/libraries/libressl/2.3.nix
+1
-1
pkgs/development/libraries/libressl/2.3.nix
+1
-1
pkgs/development/libraries/libressl/2.4.nix
+1
-1
pkgs/development/libraries/libressl/2.4.nix
+1
-1
pkgs/development/libraries/librsvg/default.nix
+1
-1
pkgs/development/libraries/librsvg/default.nix
+1
-1
pkgs/development/libraries/libsamplerate/default.nix
+1
-1
pkgs/development/libraries/libsamplerate/default.nix
···
+3
-3
pkgs/development/libraries/libsndfile/default.nix
+3
-3
pkgs/development/libraries/libsndfile/default.nix
······
+1
-1
pkgs/development/libraries/libsodium/default.nix
+1
-1
pkgs/development/libraries/libsodium/default.nix
+4
-5
pkgs/development/libraries/libsoup/default.nix
+4
-5
pkgs/development/libraries/libsoup/default.nix
······substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"···
+1
-1
pkgs/development/libraries/libssh/default.nix
+1
-1
pkgs/development/libraries/libssh/default.nix
+1
-1
pkgs/development/libraries/libssh2/default.nix
+1
-1
pkgs/development/libraries/libssh2/default.nix
+1
-1
pkgs/development/libraries/libtasn1/default.nix
+1
-1
pkgs/development/libraries/libtasn1/default.nix
+1
-1
pkgs/development/libraries/libtheora/default.nix
+1
-1
pkgs/development/libraries/libtheora/default.nix
+1
-1
pkgs/development/libraries/libtiff/default.nix
+1
-1
pkgs/development/libraries/libtiff/default.nix
+1
-1
pkgs/development/libraries/libunwind/default.nix
+1
-1
pkgs/development/libraries/libunwind/default.nix
+1
-1
pkgs/development/libraries/libusb/default.nix
+1
-1
pkgs/development/libraries/libusb/default.nix
+1
-1
pkgs/development/libraries/libusb1/default.nix
+1
-1
pkgs/development/libraries/libusb1/default.nix
···
+1
-1
pkgs/development/libraries/libva/default.nix
+1
-1
pkgs/development/libraries/libva/default.nix
+1
-1
pkgs/development/libraries/libvdpau/default.nix
+1
-1
pkgs/development/libraries/libvdpau/default.nix
+1
-1
pkgs/development/libraries/libvorbis/default.nix
+1
-1
pkgs/development/libraries/libvorbis/default.nix
+1
-1
pkgs/development/libraries/libvpx/default.nix
+1
-1
pkgs/development/libraries/libvpx/default.nix
+1
-1
pkgs/development/libraries/libvpx/git.nix
+1
-1
pkgs/development/libraries/libvpx/git.nix
+1
-1
pkgs/development/libraries/libwnck/3.x.nix
+1
-1
pkgs/development/libraries/libwnck/3.x.nix
+1
-1
pkgs/development/libraries/libwnck/default.nix
+1
-1
pkgs/development/libraries/libwnck/default.nix
+1
-1
pkgs/development/libraries/libxkbcommon/default.nix
+1
-1
pkgs/development/libraries/libxkbcommon/default.nix
+1
-1
pkgs/development/libraries/libxklavier/default.nix
+1
-1
pkgs/development/libraries/libxklavier/default.nix
···
+1
-1
pkgs/development/libraries/libxml2/default.nix
+1
-1
pkgs/development/libraries/libxml2/default.nix
···
+1
-1
pkgs/development/libraries/libxslt/default.nix
+1
-1
pkgs/development/libraries/libxslt/default.nix
+1
-1
pkgs/development/libraries/libzip/default.nix
+1
-1
pkgs/development/libraries/libzip/default.nix
+1
-1
pkgs/development/libraries/mapnik/default.nix
+1
-1
pkgs/development/libraries/mapnik/default.nix
+1
-1
pkgs/development/libraries/mesa/default.nix
+1
-1
pkgs/development/libraries/mesa/default.nix
···
+1
-1
pkgs/development/libraries/ming/default.nix
+1
-1
pkgs/development/libraries/ming/default.nix
···
+1
-1
pkgs/development/libraries/mpfr/default.nix
+1
-1
pkgs/development/libraries/mpfr/default.nix
+1
-1
pkgs/development/libraries/ncurses/default.nix
+1
-1
pkgs/development/libraries/ncurses/default.nix
+1
-1
pkgs/development/libraries/nettle/generic.nix
+1
-1
pkgs/development/libraries/nettle/generic.nix
+1
-1
pkgs/development/libraries/nghttp2/default.nix
+1
-1
pkgs/development/libraries/nghttp2/default.nix
+1
-1
pkgs/development/libraries/nspr/default.nix
+1
-1
pkgs/development/libraries/nspr/default.nix
+1
-1
pkgs/development/libraries/nss/default.nix
+1
-1
pkgs/development/libraries/nss/default.nix
+1
-1
pkgs/development/libraries/openjpeg/generic.nix
+1
-1
pkgs/development/libraries/openjpeg/generic.nix
+7
-7
pkgs/development/libraries/openldap/default.nix
+7
-7
pkgs/development/libraries/openldap/default.nix
······
+1
-1
pkgs/development/libraries/openssl/chacha.nix
+1
-1
pkgs/development/libraries/openssl/chacha.nix
+1
-1
pkgs/development/libraries/openssl/default.nix
+1
-1
pkgs/development/libraries/openssl/default.nix
···(versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
+1
-1
pkgs/development/libraries/osm-gps-map/default.nix
+1
-1
pkgs/development/libraries/osm-gps-map/default.nix
+1
-1
pkgs/development/libraries/p11-kit/default.nix
+1
-1
pkgs/development/libraries/p11-kit/default.nix
+1
-1
pkgs/development/libraries/pango/default.nix
+1
-1
pkgs/development/libraries/pango/default.nix
+1
-1
pkgs/development/libraries/pcre/default.nix
+1
-1
pkgs/development/libraries/pcre/default.nix
+1
-1
pkgs/development/libraries/polkit-qt-1/qt-5.nix
+1
-1
pkgs/development/libraries/polkit-qt-1/qt-5.nix
+1
-1
pkgs/development/libraries/polkit/default.nix
+1
-1
pkgs/development/libraries/polkit/default.nix
···
+1
-1
pkgs/development/libraries/poppler/default.nix
+1
-1
pkgs/development/libraries/poppler/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.5/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.5/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+2
-2
pkgs/development/libraries/qt-5/5.6/default.nix
+2
-2
pkgs/development/libraries/qt-5/5.6/default.nix
······
+1
-1
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+2
-2
pkgs/development/libraries/qt-5/5.7/default.nix
+2
-2
pkgs/development/libraries/qt-5/5.7/default.nix
······
+1
-1
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+1
-1
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+1
-1
pkgs/development/libraries/readline/6.3.nix
+1
-1
pkgs/development/libraries/readline/6.3.nix
+1
-1
pkgs/development/libraries/schroedinger/default.nix
+1
-1
pkgs/development/libraries/schroedinger/default.nix
+1
-1
pkgs/development/libraries/slang/default.nix
+1
-1
pkgs/development/libraries/slang/default.nix
+1
-1
pkgs/development/libraries/speex/default.nix
+1
-1
pkgs/development/libraries/speex/default.nix
+1
-1
pkgs/development/libraries/speexdsp/default.nix
+1
-1
pkgs/development/libraries/speexdsp/default.nix
···
+1
-1
pkgs/development/libraries/sqlite/default.nix
+1
-1
pkgs/development/libraries/sqlite/default.nix
+12
-10
pkgs/development/libraries/tcltls/default.nix
+12
-10
pkgs/development/libraries/tcltls/default.nix
···
+1
-1
pkgs/development/libraries/webkitgtk/2.10.nix
+1
-1
pkgs/development/libraries/webkitgtk/2.10.nix
···
+1
-1
pkgs/development/libraries/webkitgtk/2.12.nix
+1
-1
pkgs/development/libraries/webkitgtk/2.12.nix
···
+1
-1
pkgs/development/libraries/wolfssl/default.nix
+1
-1
pkgs/development/libraries/wolfssl/default.nix
+1
-1
pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+1
-1
pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+1
-1
pkgs/development/libraries/zlib/default.nix
+1
-1
pkgs/development/libraries/zlib/default.nix
+1
-1
pkgs/development/tools/build-managers/cmake/2.8.nix
+1
-1
pkgs/development/tools/build-managers/cmake/2.8.nix
···
+1
-1
pkgs/development/tools/misc/autogen/default.nix
+1
-1
pkgs/development/tools/misc/autogen/default.nix
+1
-1
pkgs/development/tools/misc/binutils/default.nix
+1
-1
pkgs/development/tools/misc/binutils/default.nix
+1
-1
pkgs/misc/cups/default.nix
+1
-1
pkgs/misc/cups/default.nix
···
+2
-2
pkgs/os-specific/darwin/binutils/default.nix
+2
-2
pkgs/os-specific/darwin/binutils/default.nix
······
+1
-1
pkgs/os-specific/linux/alsa-lib/default.nix
+1
-1
pkgs/os-specific/linux/alsa-lib/default.nix
+2
pkgs/os-specific/linux/audit/default.nix
+2
pkgs/os-specific/linux/audit/default.nix
+1
-1
pkgs/os-specific/linux/bluez/bluez5.nix
+1
-1
pkgs/os-specific/linux/bluez/bluez5.nix
+1
-1
pkgs/os-specific/linux/kernel/manual-config.nix
+1
-1
pkgs/os-specific/linux/kernel/manual-config.nix
···
+1
-1
pkgs/os-specific/linux/libcap/default.nix
+1
-1
pkgs/os-specific/linux/libcap/default.nix
+1
-1
pkgs/os-specific/linux/libnl/default.nix
+1
-1
pkgs/os-specific/linux/libnl/default.nix
+1
-1
pkgs/os-specific/linux/systemd/libudev.nix
+1
-1
pkgs/os-specific/linux/systemd/libudev.nix
+1
-1
pkgs/os-specific/linux/v4l-utils/default.nix
+1
-1
pkgs/os-specific/linux/v4l-utils/default.nix
+1
-1
pkgs/servers/computing/slurm/default.nix
+1
-1
pkgs/servers/computing/slurm/default.nix
+2
-2
pkgs/servers/dns/bind/default.nix
+2
-2
pkgs/servers/dns/bind/default.nix
······
+1
-1
pkgs/servers/http/apache-httpd/2.2.nix
+1
-1
pkgs/servers/http/apache-httpd/2.2.nix
+1
-1
pkgs/servers/http/apache-httpd/2.4.nix
+1
-1
pkgs/servers/http/apache-httpd/2.4.nix
+2
-2
pkgs/servers/monitoring/longview/default.nix
+2
-2
pkgs/servers/monitoring/longview/default.nix
···for h in syscall.h sys/syscall.h asm/unistd.h asm/unistd_32.h asm/unistd_64.h bits/wordsize.h bits/syscall.h; do
+1
-1
pkgs/servers/monitoring/zabbix/2.0.nix
+1
-1
pkgs/servers/monitoring/zabbix/2.0.nix
···
+1
-1
pkgs/servers/monitoring/zabbix/2.2.nix
+1
-1
pkgs/servers/monitoring/zabbix/2.2.nix
···
+1
-1
pkgs/servers/monitoring/zabbix/default.nix
+1
-1
pkgs/servers/monitoring/zabbix/default.nix
···
+1
-1
pkgs/servers/pulseaudio/default.nix
+1
-1
pkgs/servers/pulseaudio/default.nix
+1
-1
pkgs/servers/sql/mariadb/default.nix
+1
-1
pkgs/servers/sql/mariadb/default.nix
+41
-37
pkgs/servers/x11/xorg/overrides.nix
+41
-37
pkgs/servers/x11/xorg/overrides.nix
·······································propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
+1
-1
pkgs/servers/x11/xorg/xcb-util-xrm.nix
+1
-1
pkgs/servers/x11/xorg/xcb-util-xrm.nix
-1
pkgs/servers/x11/xquartz/default.nix
-1
pkgs/servers/x11/xquartz/default.nix
+13
-9
pkgs/stdenv/generic/default.nix
+13
-9
pkgs/stdenv/generic/default.nix
···(if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []);···-lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);+lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs');-lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);+lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs');-lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs));+lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs'));-lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));+lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs'));···
+2
-2
pkgs/tools/admin/daemontools/default.nix
+2
-2
pkgs/tools/admin/daemontools/default.nix
···
+1
-1
pkgs/tools/compression/bzip2/default.nix
+1
-1
pkgs/tools/compression/bzip2/default.nix
+1
-1
pkgs/tools/compression/xz/default.nix
+1
-1
pkgs/tools/compression/xz/default.nix
+7
-7
pkgs/tools/filesystems/ceph/generic.nix
+7
-7
pkgs/tools/filesystems/ceph/generic.nix
···
+1
-1
pkgs/tools/filesystems/xfsprogs/default.nix
+1
-1
pkgs/tools/filesystems/xfsprogs/default.nix
···
+1
-1
pkgs/tools/graphics/pfstools/default.nix
+1
-1
pkgs/tools/graphics/pfstools/default.nix
+1
-1
pkgs/tools/graphics/pstoedit/default.nix
+1
-1
pkgs/tools/graphics/pstoedit/default.nix
+1
-1
pkgs/tools/misc/calamares/default.nix
+1
-1
pkgs/tools/misc/calamares/default.nix
···
+1
-2
pkgs/tools/misc/fontforge/default.nix
+1
-2
pkgs/tools/misc/fontforge/default.nix
···
+1
-1
pkgs/tools/misc/snapper/default.nix
+1
-1
pkgs/tools/misc/snapper/default.nix
+1
-1
pkgs/tools/networking/curl/default.nix
+1
-1
pkgs/tools/networking/curl/default.nix
+1
-1
pkgs/tools/networking/shadowsocks-libev/default.nix
+1
-1
pkgs/tools/networking/shadowsocks-libev/default.nix
···
+2
-2
pkgs/tools/networking/tgt/default.nix
+2
-2
pkgs/tools/networking/tgt/default.nix
···
+1
-1
pkgs/tools/package-management/nix-repl/default.nix
+1
-1
pkgs/tools/package-management/nix-repl/default.nix
···
+1
-1
pkgs/tools/package-management/nix/default.nix
+1
-1
pkgs/tools/package-management/nix/default.nix
+1
-1
pkgs/tools/security/clamav/default.nix
+1
-1
pkgs/tools/security/clamav/default.nix
+1
-1
pkgs/tools/security/modsecurity/default.nix
+1
-1
pkgs/tools/security/modsecurity/default.nix
+2
-2
pkgs/tools/security/pinentry/qt5.nix
+2
-2
pkgs/tools/security/pinentry/qt5.nix
+1
-1
pkgs/tools/security/tcpcrypt/default.nix
+1
-1
pkgs/tools/security/tcpcrypt/default.nix
···
+1
-1
pkgs/tools/system/awstats/default.nix
+1
-1
pkgs/tools/system/awstats/default.nix
···
+1
-1
pkgs/tools/text/xml/xmlstarlet/default.nix
+1
-1
pkgs/tools/text/xml/xmlstarlet/default.nix
+1
-1
pkgs/tools/video/mjpegtools/default.nix
+1
-1
pkgs/tools/video/mjpegtools/default.nix
···
+11
-13
pkgs/top-level/all-packages.nix
+11
-13
pkgs/top-level/all-packages.nix
···-platinum-searcher = (callPackage ../tools/text/platinum-searcher { }).bin // { outputs = [ "bin" ]; };plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; };···-remarshal = (callPackage ../development/tools/remarshal { }).bin // { outputs = [ "bin" ]; };············-influxdb = (callPackage ../servers/nosql/influxdb/v0.nix { }).bin // { outputs = [ "bin" ]; };-influxdb10 = (callPackage ../servers/nosql/influxdb/v1.nix { }).bin // { outputs = [ "bin" ]; };·········
+1
-1
pkgs/top-level/lua-packages.nix
+1
-1
pkgs/top-level/lua-packages.nix
···sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \