From 3243c4f2722f1fa55f31247f8c8f16216fe8b95f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 24 Aug 2016 19:54:30 +0300 Subject: treewide: Make explicit that 'dev' output of SDL is used --- pkgs/tools/video/mjpegtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 0e90a5071b75..ebfff5dbabcd 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -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 -- cgit 1.4.1 From a17216af4c82dbeb33030355664d96875558f7ac Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 29 Aug 2016 03:30:01 +0300 Subject: treewide: Shuffle outputs Make either 'bin' or 'out' the first output. --- pkgs/applications/audio/flac/default.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/applications/misc/djvulibre/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- .../version-management/subversion/default.nix | 2 +- pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 2 +- .../gnome-2/platform/gnome-vfs/default.nix | 2 +- .../gnome-2/platform/libbonobo/default.nix | 2 +- .../desktops/gnome-2/platform/libglade/default.nix | 2 +- .../desktops/gnome-2/platform/libgnome/default.nix | 2 +- .../gnome-2/platform/libgnomecanvas/default.nix | 2 +- .../gnome-3/3.20/core/libcroco/default.nix | 2 +- pkgs/desktops/xfce/core/exo.nix | 2 +- pkgs/desktops/xfce/core/garcon.nix | 2 +- pkgs/desktops/xfce/core/libxfce4ui.nix | 2 +- pkgs/desktops/xfce/core/libxfce4util.nix | 2 +- pkgs/desktops/xfce/core/libxfcegui4.nix | 2 +- pkgs/desktops/xfce/core/tumbler.nix | 2 +- pkgs/desktops/xfce/core/xfce4-panel.nix | 2 +- pkgs/desktops/xfce/core/xfconf.nix | 2 +- pkgs/development/compilers/orc/default.nix | 2 +- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- .../development/interpreters/spidermonkey/17.0.nix | 2 +- .../development/interpreters/spidermonkey/24.2.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/aalib/default.nix | 2 +- pkgs/development/libraries/acl/default.nix | 2 +- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/development/libraries/apr/default.nix | 2 +- .../development/libraries/at-spi2-core/default.nix | 2 +- pkgs/development/libraries/atk/default.nix | 2 +- pkgs/development/libraries/attr/default.nix | 2 +- pkgs/development/libraries/boehm-gc/default.nix | 2 +- pkgs/development/libraries/boost/generic.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/cyrus-sasl/default.nix | 2 +- pkgs/development/libraries/dbus-glib/default.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 2 +- pkgs/development/libraries/epoxy/default.nix | 2 +- pkgs/development/libraries/exiv2/default.nix | 2 +- pkgs/development/libraries/expat/default.nix | 2 +- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- pkgs/development/libraries/fftw/default.nix | 2 +- pkgs/development/libraries/fontconfig/2.10.nix | 2 +- pkgs/development/libraries/fontconfig/default.nix | 2 +- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/gd/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +- .../libraries/glib-networking/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/glibmm/default.nix | 2 +- pkgs/development/libraries/gmime/default.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnutls/generic.nix | 2 +- .../libraries/gobject-introspection/default.nix | 2 +- pkgs/development/libraries/gpgme/default.nix | 2 +- .../libraries/gstreamer/bad/default.nix | 2 +- .../libraries/gstreamer/base/default.nix | 2 +- .../libraries/gstreamer/core/default.nix | 2 +- .../libraries/gstreamer/ges/default.nix | 2 +- .../libraries/gstreamer/gnonlin/default.nix | 2 +- .../libraries/gstreamer/good/default.nix | 2 +- .../libraries/gstreamer/gstreamermm/default.nix | 2 +- .../libraries/gstreamer/libav/default.nix | 2 +- .../libraries/gstreamer/python/default.nix | 2 +- .../libraries/gstreamer/qt-gstreamer/default.nix | 2 +- .../libraries/gstreamer/ugly/default.nix | 2 +- .../libraries/gstreamer/vaapi/default.nix | 2 +- .../libraries/gstreamer/validate/default.nix | 2 +- pkgs/development/libraries/gtk+/2.x.nix | 2 +- pkgs/development/libraries/gtk+/3.x.nix | 2 +- pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/development/libraries/hunspell/default.nix | 2 +- pkgs/development/libraries/icu/default.nix | 2 +- pkgs/development/libraries/jasper/default.nix | 2 +- pkgs/development/libraries/json-c/default.nix | 2 +- pkgs/development/libraries/lcms/default.nix | 2 +- pkgs/development/libraries/lcms2/default.nix | 2 +- pkgs/development/libraries/libao/default.nix | 2 +- pkgs/development/libraries/libassuan/default.nix | 2 +- pkgs/development/libraries/libav/default.nix | 2 +- pkgs/development/libraries/libcaca/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- pkgs/development/libraries/libdynd/default.nix | 2 +- pkgs/development/libraries/libevent/default.nix | 2 +- pkgs/development/libraries/libffi/default.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 2 +- .../libraries/libgnome-keyring/default.nix | 2 +- .../development/libraries/libgpg-error/default.nix | 2 +- pkgs/development/libraries/libidn/default.nix | 2 +- pkgs/development/libraries/libinput/default.nix | 2 +- .../development/libraries/libjpeg-drop/default.nix | 2 +- .../libraries/libjpeg-turbo/default.nix | 2 +- pkgs/development/libraries/libjpeg/default.nix | 2 +- pkgs/development/libraries/libmbim/default.nix | 2 +- .../libraries/libmicrohttpd/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 2 +- pkgs/development/libraries/libmp3splt/default.nix | 2 +- pkgs/development/libraries/libmtp/default.nix | 2 +- pkgs/development/libraries/libogg/default.nix | 2 +- pkgs/development/libraries/liboil/default.nix | 2 +- pkgs/development/libraries/libopus/default.nix | 2 +- pkgs/development/libraries/libpng/12.nix | 2 +- pkgs/development/libraries/libpng/default.nix | 2 +- pkgs/development/libraries/libproxy/default.nix | 2 +- pkgs/development/libraries/libqmi/default.nix | 2 +- pkgs/development/libraries/libressl/2.3.nix | 2 +- pkgs/development/libraries/libressl/2.4.nix | 2 +- pkgs/development/libraries/librsvg/default.nix | 2 +- .../libraries/libsamplerate/default.nix | 2 +- pkgs/development/libraries/libsndfile/default.nix | 2 +- pkgs/development/libraries/libsodium/default.nix | 2 +- pkgs/development/libraries/libsoup/default.nix | 2 +- pkgs/development/libraries/libssh/default.nix | 2 +- pkgs/development/libraries/libssh2/default.nix | 2 +- pkgs/development/libraries/libtasn1/default.nix | 2 +- pkgs/development/libraries/libtheora/default.nix | 2 +- pkgs/development/libraries/libtiff/default.nix | 2 +- pkgs/development/libraries/libunwind/default.nix | 2 +- pkgs/development/libraries/libusb/default.nix | 2 +- pkgs/development/libraries/libusb1/default.nix | 2 +- pkgs/development/libraries/libva/default.nix | 2 +- pkgs/development/libraries/libvdpau/default.nix | 2 +- pkgs/development/libraries/libvorbis/default.nix | 2 +- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 2 +- pkgs/development/libraries/libwnck/3.x.nix | 2 +- pkgs/development/libraries/libwnck/default.nix | 2 +- .../development/libraries/libxkbcommon/default.nix | 2 +- pkgs/development/libraries/libxklavier/default.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/libxslt/default.nix | 2 +- pkgs/development/libraries/libzip/default.nix | 2 +- pkgs/development/libraries/mapnik/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/libraries/ming/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 2 +- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/libraries/nettle/generic.nix | 2 +- pkgs/development/libraries/nghttp2/default.nix | 2 +- pkgs/development/libraries/nspr/default.nix | 2 +- pkgs/development/libraries/nss/default.nix | 2 +- pkgs/development/libraries/openjpeg/generic.nix | 2 +- pkgs/development/libraries/openldap/default.nix | 2 +- pkgs/development/libraries/openssl/chacha.nix | 2 +- pkgs/development/libraries/openssl/default.nix | 2 +- pkgs/development/libraries/osm-gps-map/default.nix | 2 +- pkgs/development/libraries/p11-kit/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/development/libraries/pcre/default.nix | 2 +- pkgs/development/libraries/polkit-qt-1/qt-5.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/development/libraries/poppler/default.nix | 2 +- .../libraries/qt-5/5.5/qtbase/default.nix | 2 +- .../libraries/qt-5/5.6/qtbase/default.nix | 2 +- .../libraries/qt-5/5.7/qtbase/default.nix | 2 +- pkgs/development/libraries/readline/6.3.nix | 2 +- .../development/libraries/schroedinger/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- pkgs/development/libraries/speex/default.nix | 2 +- pkgs/development/libraries/speexdsp/default.nix | 2 +- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/development/libraries/wolfssl/default.nix | 2 +- .../development/libraries/xcb-util-cursor/HEAD.nix | 2 +- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/tools/misc/autogen/default.nix | 2 +- pkgs/misc/cups/default.nix | 2 +- pkgs/os-specific/linux/alsa-lib/default.nix | 2 +- pkgs/os-specific/linux/bluez/bluez5.nix | 2 +- pkgs/os-specific/linux/libcap/default.nix | 2 +- pkgs/os-specific/linux/libnl/default.nix | 2 +- pkgs/os-specific/linux/systemd/libudev.nix | 2 +- pkgs/os-specific/linux/v4l-utils/default.nix | 2 +- pkgs/servers/computing/slurm/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 72 +++++++++++----------- pkgs/tools/compression/bzip2/default.nix | 2 +- pkgs/tools/compression/xz/default.nix | 2 +- pkgs/tools/filesystems/xfsprogs/default.nix | 2 +- pkgs/tools/graphics/pfstools/default.nix | 2 +- pkgs/tools/graphics/pstoedit/default.nix | 2 +- pkgs/tools/networking/curl/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/security/tcpcrypt/default.nix | 2 +- pkgs/tools/system/awstats/default.nix | 2 +- 192 files changed, 227 insertions(+), 227 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 80e4e49fb183..e571758fabb3 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { #doCheck = true; # takes lots of time - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; meta = with stdenv.lib; { homepage = http://xiph.org/flac/; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 793940a88784..6d507c5d227a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./imagetragick.patch ] ++ cfg.patches; - outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big + outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny enableParallelBuilding = true; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 910b24358b48..093382e13e6a 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; }; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index e6a515606759..ac5fb5085994 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; - outputs = [ "out" "bin" "doc" ]; + outputs = [ "bin" "out" "doc" ]; preConfigure = '' # Don't remove mujs because upstream version is incompatible diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fcd95a1acfa5..223a10fb983c 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -27,7 +27,7 @@ let }; # Can't do separate $lib and $bin, as libs reference bins - outputs = [ "dev" "out" "man" ]; + outputs = [ "out" "dev" "man" ]; buildInputs = [ zlib apr aprutil sqlite ] ++ stdenv.lib.optional httpSupport serf diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 30f92e4e054e..b848296d5f0f 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 27233f4993cd..b8a41a529b05 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preBuild = '' sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 340c14e914f6..76c2f8c0d409 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index af1960af36ac..d93ef73ca986 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preConfigure = # still using stuff deprecated in new glib versions "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index ce1da95762ff..a20c419fe0fb 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig gtk python gettext ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index d0a4d1787c6c..1bffa6211dca 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./new-glib.patch ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 5b5e7af5431a..2be8c29e4931 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ libglade ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix index 563a18e510f1..a4c46ef85d4c 100644 --- a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 4d3f09105433..8b1797e33416 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 4fffc9e1ec9f..67c92dae5e88 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 09b400cfceb8..bb9babd6e190 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index cab904f55107..1ee8929ec4cb 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; buildInputs = [ pkgconfig glib intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index bab89e7d9ec5..0182a7ffd4e6 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; #TODO: gladeui # By default, libxfcegui4 tries to install into libglade's prefix. diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 132003d3fc92..21744897cdbf 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 816bbc05735f..be9b592cf72e 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-panel-datadir.patch ]; patchFlags = "-p1"; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 13902fa4428c..6817c0e49cc1 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) buildInputs = [ pkgconfig intltool glib libxfce4util ]; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 057b51ce80c3..83a6e4482b89 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lak3hyvvb0w9avzmf0a8vayb7vqhj4m709q1czlhvgjb15dbcf1"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; # compilation tools postInstall = '' diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 5abcf42efd98..f72dd4c99569 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g"; }; - outputs = [ "dev" "out" "bin" "static" ]; + outputs = [ "bin" "dev" "out" "static" ]; postPatch = '' substituteInPlace Makefile --replace \ diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 87e09e3231f2..446db73bacc1 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ perl texinfo ]; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 330d8e334acc..d9cc7775d090 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; }; - outputs = [ "dev" "out" "lib" ]; + outputs = [ "out" "dev" "lib" ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 13257a3eb338..d207fbd10704 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"; }; - outputs = [ "dev" "out" "lib" ]; + outputs = [ "out" "dev" "lib" ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index ca0bbd6a01cf..de699e2c6ac6 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 0d6986727210..2615cac7b90c 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; setOutputFlags = false; # Doesn't support all the flags patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 29b31a8b492c..b29a12e6f412 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; nativeBuildInputs = [ gettext ]; buildInputs = [ attr ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b0d75d37e08f..81e8a8a52f9f 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; buildInputs = optional stdenv.isFreeBSD autoreconfHook; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index c6e505f43d23..329cd77ad267 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; preConfigure = diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 20e18747e67b..52459f853747 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ python pkgconfig popt intltool dbus_glib diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index d75fd2353013..34d6f23699f7 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 2bb5b2d25807..7cab14a8e10c 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 4839bedd8bb0..b0eec4e130b6 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; configureFlags = [ "--enable-cplusplus" ] diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f2da2624755f..6adcce45d808 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation { postFixup = fixup; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; crossAttrs = rec { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 1f38f69eb0ce..b5a57adbe0e7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" ''; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; # very small nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 9573358a22f5..b283ca242019 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; - outputs = [ "dev" "bin" "out" "man" "docdev" ]; + outputs = [ "bin" "dev" "out" "man" "docdev" ]; buildInputs = [ openssl db gettext kerberos ] diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 3ee1edf519cd..dc5a97782106 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index dd86ca540815..4e6fa238bfbb 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -32,7 +32,7 @@ self = stdenv.mkDerivation { --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' ''; - outputs = [ "dev" "out" "lib" "doc" ]; + outputs = [ "out" "dev" "lib" "doc" ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ expat ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 009624096605..18ce05af07a8 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; buildInputs = [ mesa libX11 ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index af17c9ae0f0f..a11be14df109 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; postPatch = "patchShebangs ./src/svn_version.sh"; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ zlib expat ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index be5772798b4c..1001afff0d48 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr"; }; - outputs = [ "dev" "out" ]; # TODO: fix referrers + outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 33ee2f80a6ed..f6c40fa5dd00 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { postPatch = ''patchShebangs .''; inherit patches; - outputs = [ "dev" "out" "bin" ] + outputs = [ "bin" "dev" "out" ] ++ optional (reqMin "1.0") "doc" ; # just dev-doc setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 6e92f2bd3845..e6c55ed15755 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf"; }; - outputs = [ "dev" "out" "doc" ]; # it's dev-doc only + outputs = [ "out" "dev" "doc" ]; # it's dev-doc only outputBin = "dev"; # fftw-wisdom configureFlags = diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index fea9efde1cfd..2705339adbfb 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { } ; - outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config + outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 74048afe731e..fa418af56016 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config + outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8ef51172f948..adf48df2494e 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)" ''; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 06da5d4264de..724888b3b824 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ]; propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; postFixup = ''moveToOutput "bin/gdlib-config" $dev''; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1487d92dada0..fc03b7d7a2d6 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fc4707aedb75..5c7b3123cb6f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"; }; - outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs + outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e82b4385a9c5..1d8d1ea08aad 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3ee9d2289acd..e079721271bc 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ installFlags = [ "sysconfdir=$(out)/etc" ]; - outputs = [ "dev" "out" "bin" "static" ]; + outputs = [ "bin" "dev" "out" "static" ]; buildInputs = lib.optionals (cross != null) [ gccCross ] ++ lib.optionals withGd [ gd libpng ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index e96665dbccb4..ba26a9a58515 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index c9e78a9d56c0..4239b4458b8f 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 32009406a738..f40885c860a6 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -13,7 +13,7 @@ let self = stdenv.mkDerivation rec { #outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5; # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added # - see #5855 for related discussion - outputs = [ "dev" "out" "info" ]; + outputs = [ "out" "dev" "info" ]; passthru.static = self.out; nativeBuildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 8d3ef3f4c777..f13e1fdc81cd 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit src patches; - outputs = [ "dev" "out" "bin" "man" "docdev" ]; + outputs = [ "bin" "dev" "out" "man" "docdev" ]; outputInfo = "docdev"; postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 0b48ef076b1f..57c42ee21efe 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; outputMan = "dev"; # tiny pages diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c60311423233..53acdfed3ba2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"; }; - outputs = [ "dev" "out" "info" ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index ffe21d437922..de421df127f7 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 76f2662ec43c..00aa893bd33e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python gobjectIntrospection diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 43aec752054f..da15755355d3 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 836bcb6ce668..5f60b9c03a31 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index db29413476f6..90d4ec458a93 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1bd80cfa1c7b..cf96eacd3181 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 9b7db6d47324..176e19000e91 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 312a8a1d394f..788aacf03ec6 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; configureFlags = stdenv.lib.optionalString withSystemLibav "--with-system-libav"; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 53e094f7ce75..842dd0df0fc7 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./different-path-with-pygobject.patch ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 675fdf322e87..72068bb1f7bc 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 65490c7db244..ab6e1f9f4f17 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 18394193706a..9972468f1b7f 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index a837a94eac7a..2de3955ab06a 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig gobjectIntrospection diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index faaff415f5f8..f0ff4ec0336f 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 249f2651517f..1ac006b21617 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 131dbbfd09cf..d1c41c9ea808 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "09lh8x6qj0cd950whgaqqi3c4pqbl6z7aw9ddm73i14bw056185v"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; configureFlags = [ diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index d48c598dd92d..c33434d202f5 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7"; }; - outputs = [ "dev" "out" "bin" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; buildInputs = [ ncurses readline ]; configureFlags = [ "--with-ui" "--with-readline" ]; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 2f7c42c72b7c..a7bf4af99fb3 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation ({ sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; makeFlags = stdenv.lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 2dca5fa22406..586cd9ed43f6 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-shared"; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index d5e0694e0516..da12b732d00a 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./unused-variable.patch ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 4a0852f6a064..1decde64e972 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; - outputs = [ "dev" "out" "bin" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = { description = "Color management engine"; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 7dea029491aa..f4923a4e6bd1 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index b2404d4ef7f3..f7261e117389 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildInputs = [ pkgconfig ] ++ diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 43cfd316b5ca..bad2a060cdca 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112"; }; - outputs = [ "dev" "out" "info" ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config buildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index e3aec98a8dbe..b3836435e615 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -85,7 +85,7 @@ let enableParallelBuilding = true; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index ad93ebd3a464..ee76b79ced8c 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; }; - outputs = [ "dev" "bin" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 13a7cfe0fb9f..3d54a24b9f35 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess ] diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 119c92d690de..8deec094866c 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ cmake ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputDoc = "dev"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index b0b537ddb175..f273a511aafc 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; postPatch = "patchShebangs event_rpcgen.py"; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 962f716c120a..b203f6346476 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildInputs = stdenv.lib.optional doCheck dejagnu; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 237a7ff0094f..8b7f48967e03 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wbh6fq5zi9wg2xcfvfpwh7dv52jihivx1vm4h91c2kx0w8n3b6x"; }; - outputs = [ "dev" "out" "info" ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; buildInputs = diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 95de49186685..b2a0021d53b5 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1238fc760883..d81a59a5c621 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; - outputs = [ "dev" "out" "info" ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # deps want just the lib, most likely # If architecture-dependent MO files aren't available, they're generated diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 52b74c54d99f..f8cf554c1ba1 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4"; }; - outputs = [ "dev" "out" "bin" "info" "docdev" ]; + outputs = [ "bin" "dev" "out" "info" "docdev" ]; doCheck = ! stdenv.isDarwin; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0efee5b94f7f..afc8a44397d8 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1kmiv1mcrxniigdcs65w23897mczsx0hasxc6p13hjk58zzfvj1h"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; configureFlags = [ (mkFlag documentationSupport "documentation") diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index ed1b5f5bdb0e..0f2c9dce28a2 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [] ++ optional static [ "--enable-static" "--disable-shared" ]; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = { homepage = http://jpegclub.org/jpegtran/; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 7d8de0b40af2..0bbdcae3af10 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") ./mingw-boolean.patch; - outputs = [ "dev" "out" "doc" "bin" ]; + outputs = [ "bin" "dev" "out" "doc" ]; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 1529daa77bf0..8b0a4ec98eda 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = optional static "--enable-static --disable-shared"; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = { homepage = http://www.ijg.org/; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 8baf4a77c362..aa5d858d82cf 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index af1be85f592b..4465feb63ed8 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; buildInputs = [ libgcrypt curl gnutls pkgconfig ]; preCheck = '' diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 931db8bdf422..120ee0bcc5ae 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputMan= "docdev"; propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 08882291d1f7..54cef0c4f5c3 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ libtool ]; buildInputs = [ libmad libid3tag ]; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index bdf1da498493..361966379c0b 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m"; }; - outputs = [ "dev" "bin" "out" ]; + outputs = [ "bin" "dev" "out" ]; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 1aa4b8ad0453..15f58135040d 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 754e308ac15b..6910a733c45d 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./x86_64-cpuid.patch ]; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; # oil-bugreport nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 20101fe6fe31..07a95887ab40 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index e181d680eff9..8e17c44fa636 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ghd03p353x0vi4dk83n1nlldg11w7vqdk3f99rkgfb82ic59ki4"; }; - outputs = [ "dev" "out" "man" ]; + outputs = [ "out" "dev" "man" ]; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 9c4a1b13e018..ea6e1e50035d 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; - outputs = [ "dev" "out" "man" ]; + outputs = [ "out" "dev" "man" ]; outputBin = "dev"; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 76452af0c475..4c9733c6a5e5 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; }; - outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs + outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; propagatedBuildInputs = [ zlib ] diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 82768cd350dd..9086fdc017c6 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; preBuild = '' patchShebangs . diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index fed460a134be..6009a44dcd21 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index 332102658f9a..43f9244d7a80 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d6a527ea3153..7a0112e15cab 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 771e31f7b79b..d7cb741a042a 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper - outputs = [ "dev" "bin" "out" ]; + outputs = [ "bin" "dev" "out" ]; postConfigure = optionalString stdenv.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 85d30fdd79b6..73bf9e4da74e 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e8b3bc1cebc9..b0bef6149d55 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 05026a06c613..66cc07207999 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] ++ stdenv.lib.optionals valaSupport [ vala_0_23 ]; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index adfd11d9b197..0c1c92a0f6fd 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ zlib openssl libsodium ]; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 855e57c0550a..f910d27d6c4c 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; buildInputs = [ openssl zlib ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index f8e7908314f9..b028b1643da2 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; buildInputs = [ perl texinfo ]; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 129dface2d93..e8f78d808348 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputDoc = "docdev"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index a506279c2a4a..373405432c8e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 7eea905f64af..6ed29a8abc3f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure ''; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ xz ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index d5f08537e5be..1fd3cb39bbff 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libusb-compat-0.1.5"; - outputs = [ "dev" "out" ]; # get rid of propagating systemd closure + outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index fe920bba411f..93846c00d074 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; }; - outputs = [ "dev" "out" ]; # get rid of propagating systemd closure + outputs = [ "out" "dev" ]; # get rid of propagating systemd closure buildInputs = [ pkgconfig ]; propagatedBuildInputs = diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 44db602f1eba..425eef001859 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0py9igf4kicj7ji22bjawkpd6my013qpg0s4ir2np9l1rk5vr2d6"; }; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 3337a89dd1ce..79863f40dffb 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 0022799c88fe..682fcca98a36 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 278679698c63..7d37393d4333 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; configureFlags = [ diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 1893d73401a8..1dafd4a124dc 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; configureFlags = [ diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 20502e297bf8..1fd8e9b43461 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; patches = [ ./install_introspection_to_prefix.patch ]; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index bb5258120494..8cc1978133fa 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 205ebc85a121..173e1814aeab 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 46fe515faafa..ce00c950a9a8 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 45ce1b555925..ab3654cb626b 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn"; }; - outputs = [ "dev" "out" "bin" "doc" ] + outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional supportPython "py"; propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index c76f28246047..f1b69447fac5 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; buildInputs = [ libxml2 ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 714745c432eb..d1f2e633a0c5 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 122fb710e739..de8cc1e49cc2 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0fda6syrfb81930sf7rgw1qmpnik8k1ngrjkh43ywd3s37nbqh1n"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ python scons ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8f037d239d04..ee6b441d2b06 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"' ''; - outputs = [ "dev" "out" "drivers" "osmesa" ]; + outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index ba512ec5d8cb..e9777fe5635e 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # We don't currently build the Python, Perl, PHP, etc. bindings. # Perl is needed for the test suite, though. - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook flex bison perl ]; buildInputs = [ freetype zlib libpng giflib ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 882e0ec4faaf..8dbe150e2cb3 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./upstream.patch ]; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index c1037a81c85e..3eff1f3d5bbd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; - outputs = [ "dev" "out" "man" ]; + outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported configureFlags = [ diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 1bfb739712f4..9633dacd68f2 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { inherit src; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; buildInputs = [ gnum4 ]; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index b690a55bb928..2eff4b3b5a41 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print" '' else null; - outputs = [ "dev" "out" "lib" ]; + outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libev zlib ]; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8ba9c7ec54f..30339cfdae9b 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; preConfigure = '' diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 008494818e54..841795383805 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { INSTALL_TARGET ''; - outputs = [ "dev" "out" "tools" ]; + outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index b01ff527d8cd..03b6faed2679 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 00b4139dc7cb..23342d326fea 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # TODO: separate "out" and "bin" - outputs = [ "dev" "out" "man" "docdev" ]; + outputs = [ "out" "dev" "man" "docdev" ]; buildInputs = [ openssl cyrus_sasl db groff ]; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 8187fcedabf1..91cd8c6bcac6 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj"; }; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; nativeBuildInputs = [ perl zlib ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0c32bf034387..c023965c0f63 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -24,7 +24,7 @@ let (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch; - outputs = [ "dev" "out" "man" "bin" ]; + outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 7dc8b8c6112d..63c882076b9d 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e08e7c06815e..6ba99948f7c6 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; outputBin = "dev"; buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 105bfa1627be..7ad2e4a24090 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"; }; - outputs = [ "dev" "out" "bin" "docdev" ]; + outputs = [ "bin" "dev" "out" "docdev" ]; buildInputs = [ gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7b43845d23f7..7e2bec80c3ca 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ./CVE-2016-1283.patch ]; - outputs = [ "dev" "out" "bin" "doc" "man" ]; + outputs = [ "bin" "dev" "out" "doc" "man" ]; configureFlags = [ "--enable-jit" diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index 3c69c71d017f..f6cbf7e972b3 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation { name = "polkit-qt-1-qt5-0.112.0"; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 5744460008fd..ab1943b85909 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; - outputs = [ "dev" "out" "bin" ]; # small man pages in $bin + outputs = [ "bin" "dev" "out" ]; # small man pages in $bin buildInputs = [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 207b7a2ffab1..be38d0cd47e6 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 43eb71ede18f..b80b8a1e7611 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; - outputs = [ "dev" "out" "gtk" ]; + outputs = [ "out" "dev" "gtk" ]; postUnpack = '' mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 6c52b29b35ec..2f414efc3142 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { name = "qtbase-${srcs.qtbase.version}"; inherit (srcs.qtbase) src version; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index f9d56612375c..a31452e6d9bb 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { name = "qtbase-${version}"; inherit src version; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 11d4271b168b..80cc7e923b83 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; propagatedBuildInputs = [ncurses]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 2df7d0518942..49c8ac013c2a 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ orc ]; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index df2b5db89a74..a55173a62b3c 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; # Fix some wrong hardcoded paths preConfigure = '' diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index ce313e351686..199c0d007344 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac ''; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw speexdsp ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index e31c793a7d7a..dc87c939278d 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch ]; postPatch = "sed '3i#include ' -i ./include/speex/speexdsp_config_types.h.in"; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c834c47ba947..38eb1a06284f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw"; }; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; buildInputs = lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index ca883cc79e73..7ddd56541aa2 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0b1a9rmzpzjblj0gsrzas2aljivd0gfimcsj8gjl80ng25zgmaxr"; }; - outputs = [ "dev" "out" "doc" "lib" ]; + outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 1b6d07bfc341..af1a3b4e095e 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ autoconf diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 77f576239a97..e61001e7d6db 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - outputs = [ "dev" "out" "static" ]; + outputs = [ "out" "dev" "static" ]; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 8170fc46f340..251387e7bd51 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"; }; - outputs = [ "dev" "bin" "lib" "out" "man" "info" ]; + outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ which pkgconfig perl ]; buildInputs = [ guile libxml2 ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6c7170377777..38a22a01d955 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; # FIXME: the cups libraries contains some $out/share strings so can't be split. - outputs = [ "dev" "out" "man" ]; # TODO: above + outputs = [ "out" "dev" "man" ]; # TODO: above buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 985d04299dbd..a839158d0cfd 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h ''; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; crossAttrs = { patchPhase = '' diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index c08a04ae5f53..22b6f5d6354c 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gstreamer gst_plugins_base ]; - outputs = [ "dev" "out" "test" ]; + outputs = [ "out" "dev" "test" ]; patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 13d2fb7f5c5a..088d2ae234c2 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; }; - outputs = [ "dev" "lib" "doc" "out" ] + outputs = [ "out" "dev" "lib" "doc" ] ++ stdenv.lib.optional (pam != null) "pam"; nativeBuildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 7e6fd1d19909..481d134b4610 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "thom311"; }; - outputs = [ "dev" "bin" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; diff --git a/pkgs/os-specific/linux/systemd/libudev.nix b/pkgs/os-specific/linux/systemd/libudev.nix index a22ff806a0e7..401e1ba68050 100644 --- a/pkgs/os-specific/linux/systemd/libudev.nix +++ b/pkgs/os-specific/linux/systemd/libudev.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libudev-${systemd.version}"; unpackPhase = ":"; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; installPhase = '' mkdir -p "$out/lib" "$dev/lib/pkgconfig" "$dev/include" cp -P "${systemd}"/lib/libudev.* "$out/lib/" diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index dbb3e60c3357..11a9808392aa 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1h1nhg5cmmzlbipak526nk4bm6d0yb217mll75f3rpg7kz1cqiv1"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; configureFlags = [ "--enable-libv4l" diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 5d65e707fd58..6ae8e410bf21 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bb0928fa1ee3..8663c2632237 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q"; }; - outputs = [ "dev" "bin" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 0bde9baa4bf2..8cab241f85c0 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # FIXME: -dev depends on -doc - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index f73ca2add068..5e87164c1b14 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; # FIXME: -dev depends on -doc - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [perl] ++ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b6ac7f9475b1..efa5d71a76f1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./caps-fix.patch ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 97b7a90892a7..699520a2df55 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -87,7 +87,7 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; - outputs = [ "dev" "out" "bin" ]; + outputs = [ "bin" "dev" "out" ]; propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 10b0b3ce2ad6..fab4380ced6d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,7 +73,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; }; xcbproto = attrs : attrs // { @@ -81,7 +81,7 @@ in }; libX11 = attrs: attrs // { - outputs = [ "dev" "out" "man" ]; + outputs = [ "out" "dev" "man" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling + '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; @@ -101,15 +101,15 @@ in }; libXau = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; libXdmcp = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; }; libXfont = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2 # prevents "misaligned_stack_error_entering_dyld_stub_binder" configureFlags = lib.optionals isDarwin [ @@ -118,7 +118,7 @@ in }; libXxf86vm = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -131,7 +131,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -145,29 +145,29 @@ in }; libICE = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; }; libXcomposite = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ xorg.libXfixes ]; }; libXaw = attrs: attrs // { - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; propagatedBuildInputs = [ xorg.libXmu ]; }; libXcursor = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; libXdamage = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; libXft = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; # the include files need ft2build.h, and Requires.private isn't enough for us @@ -177,59 +177,59 @@ in }; libXext = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXfixes = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; libXi = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; }; libXinerama = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; libXmu = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"''; }; libXrandr = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; propagatedBuildInputs = [xorg.libXrender]; }; libSM = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; propagatedBuildInputs = [ xorg.libICE ]; }; libXrender = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXres = attrs: attrs // { - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; }; libXv = attrs: attrs // { - outputs = [ "dev" "out" "docdev" ]; + outputs = [ "out" "dev" "docdev" ]; }; libXvMC = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildInputs = attrs.buildInputs ++ [xorg.renderproto]; }; libXpm = attrs: attrs // { - outputs = [ "dev" "out" "bin" ]; # tiny man in $bin + outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; @@ -237,11 +237,11 @@ in // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; }; libxkbfile = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to avoid propagation + outputs = [ "out" "dev" ]; # mainly to avoid propagation }; libxshmfence = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to avoid propagation + outputs = [ "out" "dev" ]; # mainly to avoid propagation }; libpciaccess = attrs: attrs // { @@ -265,32 +265,32 @@ in }; xcbutil = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; }; xcbutilcursor = attrs: attrs // { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; }; xcbutilimage = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + outputs = [ "out" "dev" ]; # mainly to get rid of propagating others }; xcbutilkeysyms = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + outputs = [ "out" "dev" ]; # mainly to get rid of propagating others }; xcbutilrenderutil = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + outputs = [ "out" "dev" ]; # mainly to get rid of propagating others }; xcbutilwm = attrs: attrs // { - outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + outputs = [ "out" "dev" ]; # mainly to get rid of propagating others }; xf86inputevdev = attrs: attrs // { - outputs = [ "dev" "out" ]; # to get rid of xorgserver.dev; man is tiny + outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ]; @@ -310,7 +310,7 @@ in }; xf86inputsynaptics = attrs: attrs // { - outputs = [ "dev" "out" ]; # *.pc pulls xorgserver.dev + outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; @@ -420,7 +420,7 @@ in in if (!isDarwin) then { - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ makeWrapper ] ++ commonBuildInputs; propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index d12169a0fd9a..cabd412fe65d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -i -e '//s|\\|/|' bzip2.c ''; - outputs = [ "dev" "bin" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 64571e24d9a3..3092bd840c4f 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; }; - outputs = [ "dev" "out" "bin" "man" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; doCheck = true; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 96e7931f14c8..ed41470f6001 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -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")" diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 90072373124e..076f20c95c42 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9"; }; - outputs = [ "dev" "out" "doc"]; + outputs = [ "out" "dev" "doc"]; cmakeFlags = '' -DWITH_MATLAB=false diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 094d9deadbf1..93fc901aacfd 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5e7010def541..e5c1326ba56d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; }; - outputs = [ "dev" "out" "bin" "man" "docdev" ]; + outputs = [ "bin" "dev" "out" "man" "docdev" ]; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bf3f8aed712b..0efb208ad0dd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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 ]; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 48eefcb0f187..222b861f937c 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -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 ]; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 2883a364548d..ecf31d6c9d6e 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -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 -- cgit 1.4.1 From b2e701cb1d3642751533723490918c047f4fcd1a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 29 Aug 2016 21:30:52 +0300 Subject: nix-repl: Use 'dev' output of nix --- pkgs/tools/package-management/nix-repl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index 43d0d60ac311..facf47ebca67 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -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}\" ''; -- cgit 1.4.1 From 048a30e4e4930d91c167242e3268d4f21676716e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Aug 2016 02:57:21 +0300 Subject: treewide: Fix dev references to libxml2 --- pkgs/applications/misc/pgadmin/default.nix | 2 +- pkgs/applications/version-management/redmine/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/tools/misc/snapper/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/security/modsecurity/default.nix | 2 +- pkgs/tools/text/xml/xmlstarlet/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 1358e1f195a7..fba7b6371f67 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-libxml2=${libxml2}" + "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index b81808edc224..0cb498fec069 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - 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}" bundle install --verbose --local --deployment diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8663c2632237..58f1ee6a3167 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-libtool" - "--with-libxml2=${libxml2}" + "--with-libxml2=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--without-atf" "--without-dlopen" diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index faf79c29e778..5f482d68dd9a 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; NIX_CFLAGS_COMPILE = [ - "-I${libxml2}/include/libxml2" + "-I${libxml2.dev}/include/libxml2" ]; postInstall = '' diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 881362e4acb4..0cb34b2e73c9 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -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}" diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 0b6900fb214d..a5e03eb3fe16 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -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"]; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 24303da40695..5ad62cd7140b 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -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) ''; -- cgit 1.4.1 From c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Aug 2016 03:11:09 +0300 Subject: treewide: Use explicit 'dev' references to glibc --- pkgs/applications/audio/ardour/ardour3.nix | 2 +- pkgs/applications/science/math/calc/default.nix | 2 +- pkgs/development/interpreters/python/cpython/3.6/default.nix | 2 +- pkgs/servers/monitoring/longview/default.nix | 4 ++-- pkgs/tools/admin/daemontools/default.nix | 4 ++-- pkgs/tools/misc/calamares/default.nix | 2 +- pkgs/tools/networking/tgt/default.nix | 4 ++-- pkgs/top-level/lua-packages.nix | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index bad4a255d3c5..d9614d10d327 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { patchPhase = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript + sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ ''; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 8673d7debd9d..b9db4174c094 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let makeFlags = '' - INCDIR=${glibc}/include \ + INCDIR=${glibc.dev}/include \ BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ TERMCONTROL=-DUSE_TERMIOS \ diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index a337b28859b7..3269a3c9684f 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.6 ''} - substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc}/include + substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index f657ccdcd55b..71095ce3583b 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { mv Linode $out ln -s ../Linode/Longview.pl $out/bin/longview 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 - ${perl}/bin/h2ph -d $out ${glibc}/include/$h + ${perl}/bin/h2ph -d $out ${glibc.dev}/include/$h mkdir -p $out/usr/include/$(dirname $h) - mv $out${glibc}/include/''${h%.h}.ph $out/usr/include/$(dirname $h) + mv $out${glibc.dev}/include/''${h%.h}.ph $out/usr/include/$(dirname $h) done wrapProgram $out/Linode/Longview.pl --prefix PATH : ${perl}/bin:$out/bin \ --suffix PERL5LIB : $out/Linode --suffix PERL5LIB : $PERL5LIB \ diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 08f21dc62622..5594368b04f4 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -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 = '' diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 7c7c0b0a5ec3..9356eb365497 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -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,' \ diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index bd4be0f1b867..2a6de71a0072 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -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 = '' diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e652bf2d5901..c065ac8290a3 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -280,7 +280,7 @@ let onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; treVariable = "TRE_DIR=${tre}"; - posixVariable = "POSIX_DIR=${glibc}"; + posixVariable = "POSIX_DIR=${glibc.dev}"; in '' sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \ -i Makefile -- cgit 1.4.1