Merge branch 'master.upstream' into staging.upstream

pkgs/development/libraries/CGAL/default.nix

@@ -1,13 +1,12 @@
 { stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.6.1";
-
-  name = "cgal-${version}";
+  version = "4.7";
+  name = "cgal-" + version;
 
   src = fetchurl {
     url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
-    sha256 = "05vk4l62d7g6cz19q36h1an5krxdbgq1fbs5hi0x2l7blsja1z6g";
+    sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -18,9 +17,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
-    homepage = "http://cgal.org/";
+    homepage = http://cgal.org;
     license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };
 }

pkgs/development/libraries/ffmpeg-full/default.nix

@@ -138,6 +138,10 @@
 , optimizationsDeveloper ? true
 , extraWarningsDeveloper ? false
 , strippingDeveloper ? false
+/*
+ *  Darwin frameworks
+ */
+, Cocoa, CoreServices
 }:
 
 /* Maintainer notes:
@@ -405,7 +409,8 @@ stdenv.mkDerivation rec {
     ++ optionals x11grabExtlib [ libXext libXfixes ]
     ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
-    ++ optionals isLinux [ alsaLib libraw1394 libv4l ];
+    ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
+    ++ optionals stdenv.isDarwin [ Cocoa CoreServices ];
 
   # Build qt-faststart executable
   buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';

pkgs/development/libraries/libdc1394/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libraw1394, libusb1 }:
+{ stdenv, fetchurl, libraw1394, libusb1
+, CoreServices
+}:
 
 stdenv.mkDerivation rec {
   name = "libdc1394-2.2.3";
@@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb1 ]
-    ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ];
+    ++ stdenv.lib.optional stdenv.isLinux libraw1394
+    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
   meta = {
     homepage = http://sourceforge.net/projects/libdc1394/;

pkgs/development/libraries/libevdev/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.4";
+  name = "libevdev-1.4.5";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd";
+    sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779";
   };
 
   buildInputs = [ python ];

pkgs/development/libraries/libgksu/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
     # Fix some binary paths
     sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
-    sed -i -e 's|/usr/bin/sudo|${sudo}/bin/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|g' libgksu/libgksu.c
     sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c
 
     touch NEWS README

pkgs/development/libraries/libpsl/default.nix

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

pkgs/development/libraries/libsndfile/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
+{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
+, Carbon
+}:
 
 stdenv.mkDerivation rec {
   name = "libsndfile-1.0.25";
@@ -8,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
   };
 
-  buildInputs = [ pkgconfig flac libogg libvorbis ];
+  buildInputs = [ pkgconfig flac libogg libvorbis ]
+    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
   # need headers from the Carbon.framework in /System/Library/Frameworks to
   # compile this on darwin -- not sure how to handle

pkgs/development/libraries/wavpack/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+
   patches = [
     # backported from
     # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5