Merge remote-tracking branch 'upstream/master' into HEAD

28 files changed, 188 insertions, 141 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 13063aeb975..020e1d446ca 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -902,4 +902,7 @@ self: super: {
   # happy 1.19.6 and later break some packages.
   Agda = super.Agda.override { happy = self.happy_1_19_5; };
 
+  # https://github.com/jtdaugherty/text-zipper/issues/11
+  text-zipper = dontCheck super.text-zipper;
+
 }
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
new file mode 100644
index 00000000000..fb16c71fd19
--- /dev/null
+++ b/pkgs/development/libraries/aften/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+	name = "aften-${version}";
+	version = "0.0.8";
+	src = fetchurl {
+		url = "mirror://sourceforge/aften/${name}.tar.bz2";
+		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
+	};
+
+	nativeBuildInputs = [ cmake ];
+
+	cmakeFlags = [ "-DSHARED=ON" ];
+
+	meta = {
+		description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
+		homepage = "http://aften.sourceforge.net/";
+		license = stdenv.lib.licenses.lgpl2;
+		platforms = stdenv.lib.platforms.unix;
+	};
+}
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 8addecfa1b4..0b2f0e03cc1 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,10 +1,17 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
 , gtk_doc, autoconf, automake, libtool, libarchive
 , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-, libuuid, json_glib, autoconf-archive, meson, gperf, ninja
+, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf
 }:
-
-stdenv.mkDerivation rec {
+let rpath = stdenv.lib.makeLibraryPath
+      [ libuuid.out
+        glib
+        libsoup
+        gdk_pixbuf
+        libarchive.lib
+        gcab
+      ];
+in stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.2";
 
   src = fetchFromGitHub {
@@ -21,6 +28,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gtk3 ];
   mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
 
+  postFixup = "patchelf --set-rpath ${rpath} $out/lib/libappstream-glib.so";
+
   meta = with stdenv.lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage    = https://github.com/hughsie/appstream-glib;
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index e13796229ce..9aea42082c5 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake
+{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
 , autoreconfHook, zlib
 , enableGrpc ? false
 }:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    protobuf3_2 zlib
+    protobuf zlib
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 69f0ce929d1..f6811b13717 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -8,7 +8,7 @@
 , enableJPEG2K    ? true, jasper
 
 , enableIpp       ? false
-, enableContrib   ? false, protobuf3_1
+, enableContrib   ? false, protobuf
 , enablePython    ? false, pythonPackages
 , enableGtk2      ? false, gtk2
 , enableGtk3      ? false, gtk3
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
     # tesseract & leptonica.
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
-    ++ lib.optional buildContrib protobuf3_1
+    ++ lib.optional buildContrib protobuf
     ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix
deleted file mode 100644
index 9d7bb38cf3c..00000000000
--- a/pkgs/development/libraries/protobuf/2.5.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2.5.0";
-  # make sure you test also -A pythonPackages.protobuf
-  src = fetchurl {
-    url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
-    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
-  };
-})
diff --git a/pkgs/development/libraries/protobuf/2.6.nix b/pkgs/development/libraries/protobuf/2.6.nix
deleted file mode 100644
index 49ed9d9ade1..00000000000
--- a/pkgs/development/libraries/protobuf/2.6.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2.6.1";
-  # make sure you test also -A pythonPackages.protobuf
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "protobuf";
-    rev = "v${version}";
-    sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
-  };
-})
diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
deleted file mode 100644
index 26b829669b8..00000000000
--- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... }:
-
-callPackage ./generic-v3.nix {
-  version = "3.0.0-beta-2";
-  sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
-}
diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
deleted file mode 100644
index 4e77e7f1fbe..00000000000
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... }:
-
-callPackage ./generic-v3.nix {
-  version = "3.0.2";
-  sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09";
-}
diff --git a/pkgs/development/libraries/protobuf/3.2.nix b/pkgs/development/libraries/protobuf/3.2.nix
deleted file mode 100644
index 338156bbdf9..00000000000
--- a/pkgs/development/libraries/protobuf/3.2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, lib, ... }:
-
-lib.overrideDerivation (callPackage ./generic-v3.nix {
-  version = "3.2.0";
-  sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
-}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.3.nix b/pkgs/development/libraries/protobuf/3.4.nix
index e6a8f05cc18..75f1bb22c24 100644
--- a/pkgs/development/libraries/protobuf/3.3.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,6 +1,6 @@
 { callPackage, lib, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
-  version = "3.3.0";
-  sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w";
+  version = "3.4.0";
+  sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix
deleted file mode 100644
index 97fc8642778..00000000000
--- a/pkgs/development/libraries/protobufc/1.1.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.1.1";
-  src = fetchFromGitHub {
-    owner = "protobuf-c";
-    repo = "protobuf-c";
-    rev = "v${version}";
-    sha256 = "0mdl2i87394l4zdvq2npsxq4zs8p7sqhqmbm2r380ngjs6zic6gw";
-  };
-})
diff --git a/pkgs/development/libraries/protobufc/1.0.nix b/pkgs/development/libraries/protobufc/1.3.nix
index d64ea5790c6..803f5a9ba79 100644
--- a/pkgs/development/libraries/protobufc/1.0.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.0.2";
+  version = "1.3.0";
   src = fetchFromGitHub {
     owner = "protobuf-c";
     repo = "protobuf-c";
     rev = "v${version}";
-    sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz";
+    sha256 = "0shk18rjhzn2lqrwk97ks3x8gj77isc8szyb3xsgjrbrvkzjgvaa";
   };
 })
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index b2dfa8884e9..08c95b42277 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace Makefile --replace "/usr/local" "$out"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Fixed in https://github.com/google/re2/commit/b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42
+    substituteInPlace Makefile \
+        --replace '-dynamiclib' '-dynamiclib -Wl,-install_name,$(libdir)/libre2.so.$(SONAME)'
   '';
 
   meta = {
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 05b54542033..1bc1d110db1 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-07-26 17:22:37.387749 with ADRT.-->
+	<!--Generated on 2017-09-08 08:19:28.153828 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>m2repository</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:163087974, branch:perforce-->
+		<!--Generated from bid:167710051, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>57</sdk:major>
+			<sdk:major>58</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jul 25 14:44:09 2017.-->
-				<sdk:size>214565802</sdk:size>
-				<sdk:checksum type="sha1">4bc48d6d4d39944cf2b061e3f618cd9d447c75bb</sdk:checksum>
-				<sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip</sdk:url>
+				<!--Built on: Wed Sep  6 06:12:47 2017.-->
+				<sdk:size>215426029</sdk:size>
+				<sdk:checksum type="sha1">05086add9e3a0eb1b67111108d7757a4337c3f10</sdk:checksum>
+				<sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:163088463, branch:perforce-->
+		<!--Generated from bid:164902609, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>43</sdk:major>
+			<sdk:major>44</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jul 25 14:44:00 2017.-->
-				<sdk:size>21391284</sdk:size>
-				<sdk:checksum type="sha1">6b072d5b96fb8726405d363ccdbb4d26bec0b54f</sdk:checksum>
-				<sdk:url>google_play_services_v11_3_rc05.zip</sdk:url>
+				<!--Built on: Thu Aug 10 14:27:42 2017.-->
+				<sdk:size>13796755</sdk:size>
+				<sdk:checksum type="sha1">d2bb583a3f62b068d448df10544c1852d910526f</sdk:checksum>
+				<sdk:url>google_play_services_v12_1_rc11.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 71ce2c3d079..ab5d570a327 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -296,8 +296,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip;
-      sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f";
+      url = https://dl.google.com/android/repository/google_play_services_v12_1_rc11.zip;
+      sha1 = "d2bb583a3f62b068d448df10544c1852d910526f";
     };
     meta = {
       description = "Google Play services client library and sample code";
@@ -305,4 +305,16 @@ in
     };
   };
 
+  instant_apps = buildGoogleApis {
+    name = "instant_apps_sdk";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/aiasdk-1.0.0.zip;
+      sha1 = "50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53";
+    };
+    meta = {
+      description = "Android Instant Apps Development SDK";
+      url = "https://developer.android.com/";
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 7c4792f560d..b766d9d9c31 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -5,7 +5,8 @@
 , zlib, glxinfo, xkeyboardconfig
 , includeSources
 }:
-{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
+{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false
+, useGooglePlayServices ? false, useInstantApps ? false }:
 
 let inherit (stdenv.lib) makeLibraryPath; in
 
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
     ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     ''
       # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
-      
+
       for i in mksdcard
       do
           patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
@@ -55,29 +56,29 @@ stdenv.mkDerivation rec {
 
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
         # We must also patch the 64-bit emulator instances, if needed
-        
+
         for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service emulator-check qemu/linux-x86_64/qemu-system-*
         do
             patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
             patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i
         done
       ''}
-      
+
       # The following scripts used SWT and wants to dynamically load some GTK+ stuff.
       # Creating these wrappers ensure that they can be found:
-      
+
       wrapProgram `pwd`/android \
         --prefix PATH : ${jdk}/bin \
         --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]}
-    
+
       wrapProgram `pwd`/uiautomatorviewer \
         --prefix PATH : ${jdk}/bin \
         --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
-    
+
       wrapProgram `pwd`/hierarchyviewer \
         --prefix PATH : ${jdk}/bin \
         --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
-      
+
       # The emulators need additional libraries, which are dynamically loaded => let's wrap them
 
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
@@ -92,15 +93,15 @@ stdenv.mkDerivation rec {
     ''}
 
     patchShebangs .
-    
+
     ${if stdenv.system == "i686-linux" then
       ''
         # The monitor requires some more patching
-        
+
         cd lib/monitor-x86
         patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor
         patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
-        
+
         wrapProgram `pwd`/monitor \
           --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
 
@@ -109,30 +110,30 @@ stdenv.mkDerivation rec {
       else if stdenv.system == "x86_64-linux" then
       ''
         # The monitor requires some more patching
-        
+
         cd lib/monitor-x86_64
         patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
         patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
-        
+
         wrapProgram `pwd`/monitor \
           --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
 
         cd ../..
       ''
       else ""}
-    
+
     # Symlink the other sub packages
-    
+
     cd ..
     ln -s ${platformTools}/platform-tools
     ln -s ${buildTools}/build-tools
     ln -s ${support}/support
-    
+
     # Symlink required Google API add-ons
-    
+
     mkdir -p add-ons
     cd add-ons
-    
+
     ${if useGoogleAPIs then
         stdenv.lib.concatMapStrings (platformVersion:
         if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then
@@ -142,7 +143,7 @@ stdenv.mkDerivation rec {
           "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n"
         else "") platformVersions
       else ""}
-      
+
     cd ..
 
     # Symlink required extras
@@ -163,7 +164,10 @@ stdenv.mkDerivation rec {
     ${if useGooglePlayServices then
        "ln -s ${addons.google_play_services}/google-play-services google_play_services"
      else ""}
-      
+
+    ${stdenv.lib.optionalString useInstantApps
+       "ln -s ${addons.instant_apps}/whsdk instantapps"}
+
     cd ../..
 
     # Symlink required sources
@@ -183,10 +187,10 @@ stdenv.mkDerivation rec {
     cd ..
 
     # Symlink required platforms
-   
+
     mkdir -p platforms
     cd platforms
-    
+
     ${stdenv.lib.concatMapStrings (platformVersion:
       if (builtins.hasAttr ("platform_"+platformVersion) platforms) then
         let
@@ -195,14 +199,14 @@ stdenv.mkDerivation rec {
         "ln -s ${platform}/* android-${platformVersion}\n"
       else ""
     ) platformVersions}
-    
+
     cd ..
-    
+
     # Symlink required system images
-  
+
     mkdir -p system-images
     cd system-images
-    
+
     ${stdenv.lib.concatMapStrings (abiVersion:
       stdenv.lib.concatMapStrings (platformVersion:
         if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then
@@ -218,9 +222,9 @@ stdenv.mkDerivation rec {
         else ""
       ) platformVersions
     ) abiVersions}
-    
+
     # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
-    
+
     mkdir -p $out/bin
 
     for i in $out/libexec/tools/*
@@ -230,7 +234,7 @@ stdenv.mkDerivation rec {
             ln -sf $i $out/bin/$(basename $i)
         fi
     done
-    
+
     for i in $out/libexec/platform-tools/*
     do
         if [ ! -d $i ] && [ -x $i ]
@@ -247,7 +251,7 @@ stdenv.mkDerivation rec {
         fi
     done
   '';
-  
+
   buildInputs = [ unzip makeWrapper ];
 
   meta = {
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 56c810dfc54..470fb31b03b 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -165,6 +165,7 @@ rec {
     useGoogleAPIs = true;
     useExtraSupportLibs = true;
     useGooglePlayServices = true;
+    useInstantApps = true;
   };
 
   androidsdk_7_0 = androidsdk {
@@ -179,6 +180,7 @@ rec {
     useGoogleAPIs = true;
     useExtraSupportLibs = true;
     useGooglePlayServices = true;
+    useInstantApps = true;
   };
 
   androidsdk_7_1_1 = androidsdk {
@@ -193,6 +195,7 @@ rec {
     useGoogleAPIs = true;
     useExtraSupportLibs = true;
     useGooglePlayServices = true;
+    useInstantApps = true;
   };
 
   androidsdk_8_0 = androidsdk {
@@ -207,6 +210,7 @@ rec {
     useGoogleAPIs = true;
     useExtraSupportLibs = true;
     useGooglePlayServices = true;
+    useInstantApps = true;
   };
 
   androidndk = import ./androidndk.nix {
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
index 175fc0531b4..d32ad717cd7 100644
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -60,6 +60,22 @@ in
     };
   };
 </xsl:for-each>
+
+<!-- Instant apps -->
+<xsl:for-each select="sdk:extra[sdk:path='instantapps']">
+  instant_apps = buildGoogleApis {
+    name = "instant_apps_sdk";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
+    };
+    meta = {
+      description = "Android Instant Apps Development SDK";
+      url = "https://developer.android.com/";
+    };
+  };
+</xsl:for-each>
+
 }
 </xsl:template>
 
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index 6d2c87178a6..3924d6ddd3b 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-07-26 17:22:12.162164 with ADRT.-->
+	<!--Generated on 2017-09-08 08:20:34.788412 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:4119039, branch:aosp-ndk-r15-release-->
+		<!--Generated from bid:4203891, branch:aosp-ndk-r15-release-->
 		<sdk:description>NDK</sdk:description>
 		<sdk:revision>15</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun 21 12:06:49 2017.-->
-				<sdk:size>959321525</sdk:size>
-				<sdk:checksum type="sha1">05e3eec7e9ce1d09bb5401b41cf778a2ec19c819</sdk:checksum>
-				<sdk:url>android-ndk-r15b-darwin-x86_64.zip</sdk:url>
+				<!--Built on: Mon Jul 24 11:35:28 2017.-->
+				<sdk:size>960251267</sdk:size>
+				<sdk:checksum type="sha1">ea4b5d76475db84745aa8828000d009625fc1f98</sdk:checksum>
+				<sdk:url>android-ndk-r15c-darwin-x86_64.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 21 12:07:17 2017.-->
-				<sdk:size>974035125</sdk:size>
-				<sdk:checksum type="sha1">2690d416e54f88f7fa52d0dcb5f539056a357b3b</sdk:checksum>
-				<sdk:url>android-ndk-r15b-linux-x86_64.zip</sdk:url>
+				<!--Built on: Mon Jul 24 11:35:55 2017.-->
+				<sdk:size>974976754</sdk:size>
+				<sdk:checksum type="sha1">0bf02d4e8b85fd770fd7b9b2cdec57f9441f27a2</sdk:checksum>
+				<sdk:url>android-ndk-r15c-linux-x86_64.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 21 12:05:55 2017.-->
-				<sdk:size>783838327</sdk:size>
-				<sdk:checksum type="sha1">74e45891d0cc99b077b3951aeba87d9c91df20a8</sdk:checksum>
-				<sdk:url>android-ndk-r15b-windows-x86.zip</sdk:url>
+				<!--Built on: Mon Jul 24 11:34:34 2017.-->
+				<sdk:size>784778144</sdk:size>
+				<sdk:checksum type="sha1">f2e47121feb73ec34ced5e947cbf1adc6b56246e</sdk:checksum>
+				<sdk:url>android-ndk-r15c-windows-x86.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>32</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 21 12:06:20 2017.-->
-				<sdk:size>848796389</sdk:size>
-				<sdk:checksum type="sha1">126a1cd8985132c0383ab96579feed09ba402e22</sdk:checksum>
-				<sdk:url>android-ndk-r15b-windows-x86_64.zip</sdk:url>
+				<!--Built on: Mon Jul 24 11:35:03 2017.-->
+				<sdk:size>849733996</sdk:size>
+				<sdk:checksum type="sha1">970bb2496de0eada74674bb1b06d79165f725696</sdk:checksum>
+				<sdk:url>android-ndk-r15c-windows-x86_64.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 06754b25076..2a720918c23 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-07-26 17:22:12.517198 with ADRT.-->
+	<!--Generated on 2017-08-28 14:42:29.488243 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 9a4a19d5961..1333c4b59a4 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   # XXX: in the Libs.private field of python3.pc
   buildInputs = [ ncurses ];
 
-  preConfigure = ''
-    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides"
-  '';
+  configureFlags = [
+    "--with-pygi-overrides-dir=$(out)/${python.sitePackages}/gi/overrides"
+  ];
 
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index e54ed52d9c5..3e58e9e3e03 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, ecdsa
-, mnemonic, protobuf3_2, hidapi }:
+, mnemonic, protobuf, hidapi }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
   };
 
-  propagatedBuildInputs = [ protobuf3_2 hidapi ];
+  propagatedBuildInputs = [ protobuf hidapi ];
 
   buildInputs = [ ecdsa mnemonic ];
 
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix
new file mode 100644
index 00000000000..16a39713672
--- /dev/null
+++ b/pkgs/development/python-modules/linuxfd/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "linuxfd";
+  version = "1.4.4";
+
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b8bf6847b5c8e50e0842024d2911bfc1048db9abf37582a310cd57070971d692";
+  };
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls";
+    homepage = https://github.com/FrankAbelbeck/linuxfd;
+    license = with lib.licenses; [ lgpl3 ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index bee5d760c0c..0a98ee02e58 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
+{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite, PCSC }:
 
 buildPythonPackage rec {
   version = "1.9.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = "-isystem ${pcsclite}/include/PCSC/";
 
   propagatedBuildInputs = [ pcsclite ];
-  buildInputs = [ swig ];
+  buildInputs = [ swig ] ++ stdenv.lib.optional stdenv.isDarwin PCSC;
 
   meta = {
     homepage = https://pyscard.sourceforge.io/;
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 388d27e0686..b8fb107968b 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -8,7 +8,7 @@
 , linuxPackages ? null
 , numpy
 , six
-, protobuf3_2
+, protobuf
 , swig
 , werkzeug
 , mock
@@ -94,7 +94,7 @@ buildPythonPackage rec {
     );
 
   propagatedBuildInputs = with stdenv.lib;
-    [ numpy six protobuf3_2 swig werkzeug mock ]
+    [ numpy six protobuf swig werkzeug mock ]
     ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
 
   # Note that we need to run *after* the fixup phase because the
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 72d73022cab..c473403f53d 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic
+{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic
 , requests
 }:
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314";
   };
 
-  propagatedBuildInputs = [ protobuf3_2 hidapi requests ];
+  propagatedBuildInputs = [ protobuf hidapi requests ];
 
   buildInputs = [ ecdsa mnemonic ];
 
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 27d7cb30658..e9d7f4ea194 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }:
+{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }:
 
 stdenv.mkDerivation rec {
-  version = "4.5.0";
+  version = "5.0.0";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "114g1yhpjfyxcn0fkvnfi03lhrs11pj0a1945j2j8z90hx4dwba8";
+    sha256 = "1cc1dbq129qlmrysk7cmaihcd9c93csi79dv3kqsnnprbz480z9i";
   };
 
   postPatch = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb
+    cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb capnproto
   ];
   cmakeFlags = [
     "-DCMAKE_C_FLAGS_RELEASE:STRING="