Merge commit 'adaee73' from staging into master

This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00 · 2016-09-03 01:02:51 +03:00 · e2c6740c37
commit e2c6740c37
parent a1c24ab976 adaee7352b
40 changed files with 50 additions and 52 deletions
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@ -63,7 +63,7 @@
        </para></listitem></varlistentry>
      <varlistentry><term><varname>
        $outputDocdev</varname></term><listitem><para>
-        is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc and man3 pages in there.  It goes to <varname>docdev</varname> 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 <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc and man3 pages in there.  It goes to <varname>devdoc</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
        </para></listitem></varlistentry>
      <varlistentry><term><varname>
        $outputMan</varname></term><listitem><para>
--- 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 <filename>/run/current-system/sw</filename>.";
      };

--- 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"
--- 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 ];
--- 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 ];

--- 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 ];

--- 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.
--- 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
--- 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
--- 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 ];
--- 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 =
--- 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;

--- 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;
--- 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 = [
--- 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 ]
--- 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 ];
--- 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;
--- 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;
--- 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' \
--- 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 = {
--- 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;

--- 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 = ''
--- 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 ];

--- 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 ];
--- 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 .
--- 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 ];

--- 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 ];
--- 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 ];
--- 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 ];
--- 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 ];
--- 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 ];
--- 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" ];

  enableParallelBuilding = true;

--- 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 ];
--- 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 ];
--- 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 ];
--- 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;

--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@ -8,7 +8,7 @@ mkPythonDerivation rec {
    sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
  };

-  outputs = [ "out" "docdev" ];
+  outputs = [ "out" "devdoc" ];

  patches = [
    # Fix warning spam
--- 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 // {
--- 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

--- 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 ];