diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
commit | e2c6740c37428f8d8185fcc907e9e619df50be85 (patch) | |
tree | 13ed3247bd3f8d63305badcdf36557704e663478 /pkgs/development/libraries | |
parent | a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15 (diff) | |
parent | adaee7352bcbcaafaddf7f0a5ef8b65099e06f6e (diff) | |
download | nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.gz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.bz2 nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.lz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.xz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.zst nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.zip |
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
Diffstat (limited to 'pkgs/development/libraries')
22 files changed, 26 insertions, 26 deletions
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 0e4d60062e4..a99cc51de4a 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" ]; enableParallelBuilding = true; 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 ]; |