Merge branch 'master' into staging-next

Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190

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

@@ -5,7 +5,7 @@
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
 # Apple dependencies
-, libcxx, CoreFoundation, CoreServices, Foundation
+, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
 let
@@ -75,7 +75,34 @@ stdenv.mkDerivation rec {
   '';
 
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Disable Bazel's Xcode toolchain detection which would configure compilers
+    # and linkers from Xcode instead of from PATH
+    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+    # Framework search paths aren't added by bintools hook
+    # https://github.com/NixOS/nixpkgs/pull/41914
     export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+
+    # libcxx includes aren't added by libcxx hook
+    # https://github.com/NixOS/nixpkgs/pull/41589
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
+
+    # don't use system installed Xcode to run clang, use Nix clang instead
+    sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
+      scripts/bootstrap/compile.sh \
+      src/tools/xcode/realpath/BUILD \
+      src/tools/xcode/stdredirect/BUILD \
+      tools/osx/BUILD
+
+    # clang installed from Xcode has a compatibility wrapper that forwards
+    # invocations of gcc to clang, but vanilla clang doesn't
+    sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
+
+    sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
+    wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
+    for wrapper in "''${wrappers[@]}"; do
+      sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
+    done
   '' + ''
     find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
       substituteInPlace "$path" \
@@ -119,7 +146,7 @@ stdenv.mkDerivation rec {
     makeWrapper
     which
     customBash
-  ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ];
+  ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ];
 
   # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
   # detector (see com.google.devtools.build.lib.skyframe.FileFunction).

pkgs/development/tools/flootty/default.nix

@@ -1,22 +1,18 @@
-{ stdenv, python }:
+{ stdenv, python3Packages }:
 
-let
-  inherit (python.pkgs) buildPythonApplication fetchPypi;
-in
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "Flootty";
-  version = "3.2.1";
+  version = "3.2.2";
 
-  src = fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs";
+    sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
   };
 
   meta = with stdenv.lib; {
     description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session";
     homepage = "https://floobits.com/help/flootty";
     license = licenses.asl20;
-    maintainers = with maintainers; [ sellout ];
+    maintainers = with maintainers; [ sellout enzime ];
   };
 }

pkgs/development/tools/kubectx/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "kubectx";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "ahmetb";
+    repo = "${name}";
+    rev = "v${version}";
+    sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp kubectx $out/bin
+    cp kubens $out/bin
+
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]}
+    done
+  '';
+
+  meta = {
+    description = "Fast way to switch between clusters and namespaces in kubectl!";
+    license = licenses.asl20;
+    homepage = https://github.com/ahmetb/kubectx;
+    maintainers = with maintainers; [ periklis ];
+    platforms = with platforms; unix;
+  };
+}

pkgs/development/tools/parsing/antlr/2.7.7.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.unix;
   };
 }

pkgs/development/tools/parsing/antlr/3.4.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "true";
- 
+
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
     cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar"
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/development/tools/parsing/antlr/3.5.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "true";
- 
+
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
     cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar"
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
       walk parse trees.
     '';
     homepage = http://www.antlr.org/;
+    license = licenses.bsd3;
     platforms = platforms.linux;
   };
 }

pkgs/development/tools/parsing/antlr/4.7.nix

@@ -28,6 +28,7 @@ let
       meta = with stdenv.lib; {
         description = "C++ target for ANTLR 4";
         homepage = http://www.antlr.org/;
+        license = licenses.bsd3;
         platforms = platforms.unix;
       };
     };
@@ -73,6 +74,7 @@ let
         walk parse trees.
       '';
       homepage = http://www.antlr.org/;
+      license = licenses.bsd3;
       platforms = platforms.unix;
     };
   };