Merge branch 'master' into staging

pkgs/development/libraries/check/default.nix

@@ -1,4 +1,6 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv
+, CoreServices
+}:
 
 stdenv.mkDerivation rec {
   name = "check-${version}";
@@ -12,6 +14,8 @@ stdenv.mkDerivation rec {
   # Test can randomly fail: http://hydra.nixos.org/build/7243912
   doCheck = false;
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices;
+
   meta = with stdenv.lib; {
     description = "Unit testing framework for C";
 

pkgs/development/libraries/gnutls/generic.nix

@@ -1,5 +1,5 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
 , tpmSupport ? false, trousers
 
 # Version dependent args
@@ -30,6 +30,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = !guileBindings;
 
   buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
+    ++ lib.optional (stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;

pkgs/development/libraries/libidn/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libidn-1.32";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   doCheck = ! stdenv.isDarwin;
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
     description = "Library for internationalized domain names";

pkgs/development/libraries/libmediainfo/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.78";
+  version = "0.7.79";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0ai4al5h3qbfq5f1b24ixk5v1fpln2kw1zmdj4hxjz40rj18qzka";
+    sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

pkgs/development/libraries/libzen/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }:
 
-let version = "0.4.31"; in
+let version = "0.4.32"; in
 
 stdenv.mkDerivation {
   name = "libzen-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z";
+    sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "./ZenLib/Project/GNU/Library/";
 
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Shared library for libmediainfo and mediainfo";

pkgs/development/libraries/openssl/1.0.2.x.nix

@@ -66,11 +66,18 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = {
+    # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
+    postPatch = ''
+       sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
+    '';
     preConfigure=''
       # It's configure does not like --build or --host
       export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
+      # WINDRES and RANLIB need to be prefixed when cross compiling;
+      # the openssl configure script doesn't do that for us
+      export WINDRES=${stdenv.cross.config}-windres
+      export RANLIB=${stdenv.cross.config}-ranlib
     '';
-
     configureScript = "./Configure";
   };
 

pkgs/development/libraries/openssl/default.nix

@@ -69,11 +69,18 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = {
+    # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
+    postPatch = ''
+       sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
+    '';
     preConfigure=''
       # It's configure does not like --build or --host
       export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
+      # WINDRES and RANLIB need to be prefixed when cross compiling;
+      # the openssl configure script doesn't do that for us
+      export WINDRES=${stdenv.cross.config}-windres
+      export RANLIB=${stdenv.cross.config}-ranlib
     '';
-
     configureScript = "./Configure";
   };
 

pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix

@@ -1,4 +1,4 @@
-{ qtSubmodule, qtbase, qtdeclarative
+{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
 }:
 
@@ -6,6 +6,7 @@ qtSubmodule {
   name = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [
-    alsaLib gstreamer gst-plugins-base libpulseaudio
+    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
+  configureFlags = "GST_VERSION=1.0";
 }

pkgs/development/libraries/rabbitmq-c/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-c-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "alanxz";
     repo = "rabbitmq-c";
     rev = "v${version}";
-    sha256 = "1nfb82lbccr46wr4a2fsrkvpvdvmnyx8kn275hvdfz7mxpkd5qy6";
+    sha256 = "084zlir59zc505nxd4m2g9d355m9a8y94gbjaqmjz9kym8lpayd1";
   };
 
   buildInputs = [ cmake openssl popt xmlto ];

pkgs/development/libraries/rdkafka/default.nix

@@ -1,14 +1,13 @@
 { stdenv, fetchFromGitHub, zlib, perl }:
 
 stdenv.mkDerivation rec {
-  name = "rdkafka-${version}";
-  version = "0.8.6";
+  name = "rdkafka-2015-11-03";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
-    rev = version;
-    sha256 = "0iklvslz35dd0lz26ffrbfb20qirl9v5kcdmlcnnzc034hr2zmnv";
+    rev = "3e1babf4f26a7d12bbd272c1cdf4aa6a44000d4a";
+    sha256 = "1vmbbkgdwxr25wz60hi6rhqb843ipz34r9baygv87fwh3lwwkqwl";
   };
 
   buildInputs = [ zlib perl ];

pkgs/development/libraries/signon/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchzip, doxygen, qtbase }:
+{ stdenv, fetchurl, doxygen, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "signon-${version}";
   version = "8.57";
-  src = fetchzip {
-    url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
-    sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
+  src = fetchurl {
+    url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}";
+    sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5";
   };
 
   buildInputs = [ qtbase ];

pkgs/development/libraries/signon/old.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchzip, doxygen, qt5 }:
+{ stdenv, fetchurl, doxygen, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "signon-${version}";
   version = "8.57";
-  src = fetchzip {
-    url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
-    sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
+  src = fetchurl {
+    url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}";
+    sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5";
   };
 
   buildInputs = [ qt5.base ];

pkgs/development/libraries/subunit/default.nix

@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A streaming protocol for test results";
     homepage = https://launchpad.net/subunit;
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }