Merge remote-tracking branch 'upstream/master' into hardened-stdenv

4 files changed, 9 insertions, 7 deletions

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 3248ac63bf79..ce9f17b1a517 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -6,7 +6,7 @@ buildPythonApplication rec {
   version = "0.4.4";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/c/cli53/${name}.tar.gz";
+    url = "mirror://pypi/c/cli53/${name}.tar.gz";
     sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
   };
 
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 75860bc27d34..5d314b732021 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
+with python27Packages;
+
 stdenv.mkDerivation rec {
-  version = "0.9.82";
+  version = "106.0.0";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20151008123015.tar.gz";
-    sha256 = "11gnhgjj4y4dzi3wfdpnz918m7xraz1k3ady1d6y446hmc5q2512";
+    url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-106.0.0-linux-x86_64.tar.gz";
+    sha256 = "00jhpx32sfxcgl404plmb8122bs0ijl2rv25h17mnjn067nhz7nn";
   };
 
   buildInputs = [python27 makeWrapper];
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
         wrapper="$out/bin/$program"
         makeWrapper "$programPath" "$wrapper" \
             --set CLOUDSDK_PYTHON "${python27}/bin/python" \
-            --prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})"
+            --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
     done
 
     # install man pages
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 254b7b9374eb..0cd10fcab92a 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
   disabled = pythonPackages.isPy3k;
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz";
+    url = "mirror://pypi/s/salt/${name}.tar.gz";
     sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j";
   };
 
diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix
index 8c65defcab58..14105dc2f98c 100644
--- a/pkgs/tools/admin/salt/testing.nix
+++ b/pkgs/tools/admin/salt/testing.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz";
+    url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
     sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h";
   };