Merge branch 'master' into staging-next

2018-08-31 17:32:48 +02:00
parent a9780a095b dde959a896
commit 93550cbddf
497 changed files with 2235 additions and 1360 deletions
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
  version = "0.8.0";

  src =
-    if stdenv.system == "i686-linux" then
+    if stdenv.hostPlatform.system == "i686-linux" then
      fetchurl {
        name = "linux32-${version}.tar.gz";
        url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux32";
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
  name = "google-cloud-sdk-${version}";
  version = "206.0.0";

-  src = fetchurl (sources name stdenv.system);
+  src = fetchurl (sources name stdenv.hostPlatform.system);

  buildInputs = [ python makeWrapper ];