Merge branch 'master.upstream' into staging.upstream

pkgs/development/libraries/cracklib/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchurl, libintlOrEmpty, zlib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.9.4";
+  name = "cracklib-2.9.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "0n49prh5rffl33bxy8qf46cqm6mswdlqpmm6iqi490w0p6s6da7j";
+    url = "https://github.com/cracklib/cracklib/releases/download/${name}/${name}.tar.gz";
+    sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp";
   };
 
   buildInputs = [ libintlOrEmpty zlib gettext ];
 
   meta = with stdenv.lib; {
-    homepage    = http://sourceforge.net/projects/cracklib;
+    homepage    = https://github.com/cracklib/cracklib;
     description = "A library for checking the strength of passwords";
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;

pkgs/development/libraries/git2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
+{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser}:
 
 stdenv.mkDerivation rec {
   version = "0.23.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DTHREADSAFE=ON";
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake python pkgconfig ];
   buildInputs = [ zlib libssh2 openssl http-parser ];
 
   meta = {

pkgs/development/libraries/hivex/default.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     homepage = https://github.com/libguestfs/hivex;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/development/libraries/libcli/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = http://sites.dparrish.com/libcli;
     license = licenses.lgpl21Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

pkgs/development/libraries/libfreefare/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     homepage = http://code.google.com/p/libfreefare/;
     maintainers = with maintainers; [bobvanderlinden];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libguestfs/default.nix

@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://libguestfs.org/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     hydraPlatforms = [];
   };
 }

pkgs/development/libraries/libkeyfinder/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     description = "Musical key detection for digital audio (C++ library)";
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 

pkgs/development/libraries/libnfc/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     homepage = http://code.google.com/p/libnfc/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libpng/12.nix

@@ -3,11 +3,11 @@
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.53";
+  name = "libpng-1.2.54";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml";
+    sha256 = "0wnjy7gqn0f24qrlggs7kl0ij59by413j1xmqp12n3vqh9j531fg";
   };
 
   propagatedBuildInputs = [ zlib ];
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-static";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = stdenv.lib.licenses.libpng;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.libpng;
+    maintainers = [ maintainers.fuuzetsu ];
     branch = "1.2";
   };
 }

pkgs/development/libraries/libpsl/default.nix

@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-11-12";
+  listVersion = "2015-11-13";
   listSources = fetchFromGitHub {
-    sha256 = "1cwzazhvgzcp6xapk3d11ssfkq9cxmwljfd7bys7w15jfsn6r8d1";
-    rev = "2adac6ff0f612543c4e8bf9a7219d52b0386870e";
+    sha256 = "1l60mrrhrafpiga56h3j2x3vsx2607lih2vmjx1gx16g2j89gbmq";
+    rev = "edf1735751c24e736018dc51f1be7dea686b6304";
     repo = "list";
     owner = "publicsuffix";
   };

pkgs/development/libraries/libssh2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurlBoot, openssl, zlib}:
+{stdenv, fetchurlBoot, openssl, zlib, windows}:
 
 stdenv.mkDerivation rec {
   name = "libssh2-1.6.0";
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl zlib ];
 
+  crossAttrs = {
+    # link against cross-built libraries
+    configureFlags = [
+      "--with-openssl"
+      "--with-libssl-prefix=${openssl.crossDrv}"
+      "--with-libz"
+      "--with-libz-prefix=${zlib.crossDrv}"
+    ];
+  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+    # mingw needs import library of ws2_32 to build the shared library
+    preConfigure = ''
+      export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS"
+    '';
+  };
+
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = http://www.libssh2.org;

pkgs/development/libraries/libxcomp/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 

pkgs/development/libraries/neardal/default.nix

@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     homepage = https://01.org/linux-nfc;
     maintainers = with maintainers; [ tstrobel ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/quesoglc/default.nix

@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://quesoglc.sourceforge.net/;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ astsmtl ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/development/libraries/rocksdb/default.nix

@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "0zm4165h5fklcf4n8dar6mdj36g2kzp2pwf7fqnify1r48xwm8hx";
+    sha256 = "1q1h2n3v02zg711vk56rc9v54f5i31w684wqag4xcr2dv1glw0r0";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

pkgs/development/libraries/science/math/openblas/default.nix

@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ ttuegel ];
   };
 }

pkgs/development/libraries/taglib/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, cmake}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-1.9.1";
+  name = "taglib-1.10";
 
   src = fetchurl {
-    url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
-    sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
+    url = "http://taglib.github.io/releases/${name}.tar.gz";
+    sha256 = "1alv6vp72p0x9i9yscmz2a71anjwqy53y9pbcbqxvc1c0i82vhr4";
   };
 
   cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";

pkgs/development/libraries/v8/4.5.nix

@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Google's open source JavaScript engine";
     maintainers = with maintainers; [ cstrahan ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     license = licenses.bsd3;
   };
 }

pkgs/development/libraries/v8/generic.nix

@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Google's open source JavaScript engine";
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     license = licenses.bsd3;
   };
 }

pkgs/development/libraries/webkitgtk/default.nix

@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.10.0";
+  version = "2.10.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0vb8ca6dd9hxb5ycp54bdyykp10blbq5b6qkbak4yf9mxwi5ccj2";
+    sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];