Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

google-cloud-sdk: deprecate phases #210431

Merged
merged 1 commit into from
Jan 22, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/tools/admin/google-cloud-sdk/components.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ let
in
mkComponent
{
name = component.id;
pname = component.id;
version = component.version.version_string;
src =
if lib.hasAttrByPath [ "data" "source" ] component
Expand All @@ -120,7 +120,7 @@ let

# Make a google-cloud-sdk component
mkComponent =
{ name
{ pname
, version
# Source tarball, if any
, src ? ""
Expand All @@ -135,15 +135,15 @@ let
# The snapshot corresponding to this component
, snapshot
}: stdenv.mkDerivation {
inherit name version snapshot;
inherit pname version snapshot;
src =
if src != "" then
builtins.fetchurl
{
url = src;
inherit sha256;
} else "";
phases = [ "installPhase" "fixupPhase" ];
dontUnpack = true;
installPhase = ''
mkdir -p $out/google-cloud-sdk/.install

Expand All @@ -159,7 +159,7 @@ let
fi

# Write the snapshot file to the `.install` folder
cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json
cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json
'';
passthru = {
dependencies = filterForSystem dependencies;
Expand Down