about summary refs log tree commit diff
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-05-12 12:01:24 +0000
committerGitHub <noreply@github.com>2024-05-12 12:01:24 +0000
commit971c61f4d83889bcd3312bd4612dcbe51193da26 (patch)
tree67e9beec9965a651b3c1839c22e9d1ecdb4e0c67 /pkgs/tools/admin
parent1d2dff45d3f3b8820f0f48d162813c128bc9e4df (diff)
parent17a5c56edb84a79db79679071b10cc8b7fe8388f (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index b8e49b37a8d2f..03078392264da 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -13,7 +13,7 @@ let
   pythonEnv = python.withPackages (p: with p; [
     cffi
     cryptography
-    openssl
+    pyopenssl
     crcmod
     numpy
   ] ++ lib.optional (with-gce) google-compute-engine);