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

pkgs/development/compilers/openjdk/8.nix

@@ -97,6 +97,7 @@ let
       chmod +x configure
       substituteInPlace configure --replace /bin/bash "$shell"
       substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
+      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
     '';
 
     configureFlags = [

pkgs/development/libraries/hspell/dicts.nix

@@ -4,6 +4,7 @@ let
   dict = a: stdenv.mkDerivation ({
     inherit (hspell) src patchPhase nativeBuildInputs;
     meta = hspell.meta // {
+      broken = true;
       description = "${a.buildFlags} Hebrew dictionary";
     } // (if a ? meta then a.meta else {});
   } // (removeAttrs a ["meta"]));

pkgs/development/libraries/opencv/3.x.nix

@@ -90,9 +90,14 @@ stdenv.mkDerivation rec {
       done
     '');
 
-  # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS)
+  # This prevents cmake from using libraries in impure paths (which
+  # causes build failure on non NixOS)
+  # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
+  # what appears to be some stray headers in dnn/misc/tensorflow
+  # in contrib when generating the Python bindings:
   postPatch = ''
     sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+    sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
   '';
 
   preConfigure =

pkgs/development/ruby-modules/bundled-common/default.nix

@@ -61,7 +61,7 @@ let
 
   copyIfBundledByPath = { bundledByPath ? false, ...}@main:
   (if bundledByPath then
-      assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/"
+      assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
     else ""
   );
 
@@ -109,11 +109,10 @@ let
     meta = { platforms = ruby.meta.platforms; } // meta;
 
     passthru = rec {
-      inherit ruby bundler gems mainGem confFiles envPaths;
+      inherit ruby bundler gems confFiles envPaths;
 
-      wrappedRuby =
-      stdenv.mkDerivation {
-        name = "wrapped-ruby-${pname}";
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-ruby-${pname'}";
         nativeBuildInputs = [ makeWrapper ];
         buildCommand = ''
           mkdir -p $out/bin
@@ -137,7 +136,7 @@ let
           require 'bundler/setup'
         '';
         in stdenv.mkDerivation {
-          name = "${pname}-interactive-environment";
+          name = "${pname'}-interactive-environment";
           nativeBuildInputs = [ wrappedRuby basicEnv ];
           shellHook = ''
             export OLD_IRBRC=$IRBRC

pkgs/development/tools/build-managers/sbt/default.nix

@@ -2,11 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.15";
+  version = "0.13.16";
 
   src = fetchurl {
-    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "1vvsxpg1fwfzv3mcin69gnj44v6p7kfx3z9cm761sx01qbbp7q5n";
+    urls = [
+      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+      "https://cocl.us/sbt01316tgz"
+    ];
+    sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
   };
 
   patchPhase = ''