From 8172cd734c9d738e1ae24ffe2e4bc550ac64e0aa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2016 11:07:23 +0200 Subject: [PATCH 1/4] docdev -> devdoc It's "developer documentation", not "documentation developer" after all. --- doc/multiple-output.xml | 2 +- nixos/modules/config/system-path.nix | 2 +- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +- pkgs/data/documentation/man-pages/default.nix | 4 ++-- pkgs/desktops/xfce/core/exo.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/interpreters/perl/default.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/gdk-pixbuf/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/gnutls/generic.nix | 4 ++-- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- pkgs/development/libraries/libidn/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 4 ++-- pkgs/development/libraries/liboil/default.nix | 2 +- pkgs/development/libraries/libqmi/default.nix | 2 +- pkgs/development/libraries/libssh2/default.nix | 2 +- pkgs/development/libraries/libtasn1/default.nix | 2 +- pkgs/development/libraries/libtheora/default.nix | 4 ++-- pkgs/development/libraries/libwnck/3.x.nix | 2 +- pkgs/development/libraries/libwnck/default.nix | 2 +- pkgs/development/libraries/libxklavier/default.nix | 2 +- pkgs/development/libraries/openldap/default.nix | 2 +- pkgs/development/libraries/p11-kit/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/development/libraries/schroedinger/default.nix | 2 +- pkgs/development/perl-modules/generic/default.nix | 2 +- pkgs/development/python-modules/pygobject/default.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 8 ++++---- pkgs/tools/networking/curl/default.nix | 2 +- 38 files changed, 46 insertions(+), 46 deletions(-) diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 309254f76aa..0bbb9ef8be3 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -63,7 +63,7 @@ $outputDocdev - is for developer documentation. Currently we count gtk-doc and man3 pages in there. It goes to docdev or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for developer documentation. Currently we count gtk-doc and man3 pages in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. $outputMan diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 9708b5d9fe3..169c86a2eae 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -76,7 +76,7 @@ in extraOutputsToInstall = mkOption { type = types.listOf types.str; default = [ ]; - example = [ "doc" "info" "docdev" ]; + example = [ "doc" "info" "devdoc" ]; description = "List of additional package outputs to be symlinked into /run/current-system/sw."; }; diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 2a0ebd52355..189c98cdfa7 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -37,7 +37,7 @@ _overrideFirst outputInclude "$outputDev" _overrideFirst outputLib "lib" "out" _overrideFirst outputDoc "doc" "out" -_overrideFirst outputDocdev "docdev" REMOVE # documentation for developers +_overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "doc" "$outputBin" _overrideFirst outputInfo "info" "doc" "$outputMan" diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b02c9162c1c..0268aeb79d8 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; # keep developer docs separately (man2 and man3) - outputs = [ "out" "docdev" ]; + outputs = [ "out" "devdoc" ]; makeFlags = [ "MANDIR=$(out)/share/man" ]; postFixup = '' - moveToOutput share/man/man2 "$docdev" + moveToOutput share/man/man2 "$devdoc" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 8b1797e3341..a213b27a761 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index bb9babd6e19..58fc6c3fe4b 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 1ee8929ec4c..1c473b42d60 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ pkgconfig glib intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 0182a7ffd4e..106cda6b975 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; #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 21744897cdb..9b29835cdc9 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; 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 be9b592cf72..dde8481b519 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 6817c0e49cc..3696cb6ed88 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) buildInputs = [ pkgconfig intltool glib libxfce4util ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 04d6c706b46..f013f6ec372 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -28,7 +28,7 @@ let }; # TODO: Add a "dev" output containing the header files. - outputs = [ "out" "man" "docdev" ]; + outputs = [ "out" "man" "devdoc" ]; setOutputFlags = false; patches = diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index b5a57adbe0e..fc3b060b35e 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index b283ca24201..5bbfd6e375e 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 = [ "bin" "dev" "out" "man" "docdev" ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; buildInputs = [ openssl db gettext kerberos ] diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index dc5a9778210..c3386d3e1a6 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index fc03b7d7a2d..85446aae8ca 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1d8d1ea08aa..c678309e90a 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index f13e1fdc81c..f031cb93c98 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { inherit src patches; - outputs = [ "bin" "dev" "out" "man" "docdev" ]; - outputInfo = "docdev"; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + outputInfo = "devdoc"; postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index f0ff4ec0336..ec37e74bd09 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; enableParallelBuilding = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { else "--with-xinput=yes"; postInstall = '' - moveToOutput share/gtk-2.0/demo "$docdev" + moveToOutput share/gtk-2.0/demo "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index f8cf554c1ba..3de9cf1e0db 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 = [ "bin" "dev" "out" "info" "docdev" ]; + outputs = [ "bin" "dev" "out" "info" "devdoc" ]; doCheck = ! stdenv.isDarwin; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 4465feb63ed..3b4e5858746 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ libgcrypt curl gnutls pkgconfig ]; preCheck = '' diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 120ee0bcc5a..103595bc035 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; }; - outputs = [ "out" "dev" "docdev" ]; - outputMan= "docdev"; + outputs = [ "out" "dev" "devdoc" ]; + outputMan= "devdoc"; propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 6910a733c45..a8d2953cad0 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # oil-bugreport nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 9086fdc017c..cfce5e0fd71 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; preBuild = '' patchShebangs . diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index f910d27d6c4..89e402d2416 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ openssl zlib ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index b028b1643da..1e45f07a22f 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; buildInputs = [ perl texinfo ]; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index e8f78d80834..375c59f7763 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; - outputs = [ "out" "dev" "docdev" ]; - outputDoc = "docdev"; + outputs = [ "out" "dev" "devdoc" ]; + outputDoc = "devdoc"; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg libvorbis ]; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 1fd8e9b4346..094edc36bbb 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; 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 8cc1978133f..a5f52beed54 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index ce00c950a9a..1150d04e1b4 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; # 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/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 70089a74625..45436376a33 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 = [ "out" "dev" "man" "docdev" ]; + outputs = [ "out" "dev" "man" "devdoc" ]; buildInputs = [ openssl cyrus_sasl db groff ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 6ba99948f7c..fc63c1942c2 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 = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 7ad2e4a2409..da9d6694ab2 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 = [ "bin" "dev" "out" "docdev" ]; + outputs = [ "bin" "dev" "out" "devdoc" ]; buildInputs = [ gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 49c8ac013c2..c826123174b 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ orc ]; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 91a004a7f68..9e21a141c72 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -4,7 +4,7 @@ perl: perl.stdenv.mkDerivation ( { - outputs = [ "out" "docdev" ]; + outputs = [ "out" "devdoc" ]; doCheck = true; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 3faba55d6a8..217d40c4cec 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; - outputs = [ "out" "docdev" ]; + outputs = [ "out" "devdoc" ]; patches = [ # Fix warning spam diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b9ba8f54325..d011391da3f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -135,7 +135,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -158,7 +158,7 @@ in }; libXaw = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ xorg.libXmu ]; }; @@ -220,11 +220,11 @@ in }; libXres = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; libXv = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; libXvMC = attrs: attrs // { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e5c1326ba56..58f72615e8e 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 = [ "bin" "dev" "out" "man" "docdev" ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; nativeBuildInputs = [ pkgconfig perl ]; From 1e370d7de4599a1828b2a45f414e9abf416156fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2016 18:58:09 +0200 Subject: [PATCH 2/4] Revert "Python 2.7: add less" This reverts commit bce5a51a9f33a16bf91e7d72a927c3382f333442. --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 96c098c82dc..5f15db26ebc 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, self, callPackage, python27Packages , bzip2, openssl, gettext -, less , includeModules ? false @@ -109,7 +108,7 @@ let ++ optional zlibSupport zlib ++ optional stdenv.isDarwin CF; - propagatedBuildInputs = [ less ] ++ optional stdenv.isDarwin configd; + propagatedBuildInputs = optional stdenv.isDarwin configd; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; From 7f520bdad8d480727e48f6c33ef053f07574b0ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2016 18:58:14 +0200 Subject: [PATCH 3/4] Revert "Python 2.6: add less" This reverts commit 6b11c96c86e907e9c2e107cf54133223c32dc009. --- .../interpreters/python/cpython/2.6/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index e5c33cd7b2b..5311be697af 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage , python26Packages }: @@ -53,8 +53,6 @@ let [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; - propagatedBuildInputs = [ less ]; - mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; LIBRARY_PATH = makeLibraryPath paths; @@ -66,8 +64,8 @@ let name = "python${if includeModules then "" else "-minimal"}-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs propagatedBuildInputs - preConfigure configureFlags; + inherit majorVersion version src patches buildInputs preConfigure + configureFlags; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; From adaee7352bcbcaafaddf7f0a5ef8b65099e06f6e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 1 Sep 2016 22:50:08 +0400 Subject: [PATCH 4/4] stdenv: leave SSL_CERT_FILE in shells (#15571) --- pkgs/stdenv/generic/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c478c375323..feb82fd9226 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -376,7 +376,8 @@ export NIX_BUILD_CORES # Prevent OpenSSL-based applications from using certificates in # /etc/ssl. -if [ -z "$SSL_CERT_FILE" ]; then +# Leave it in shells for convenience. +if [ -z "$SSL_CERT_FILE" ] && [ -z "$IN_NIX_SHELL" ]; then export SSL_CERT_FILE=/no-cert-file.crt fi