lol

Merge pull request #210431 from Stunkymonkey/google-cloud-sdk-phases

google-cloud-sdk: deprecate phases

authored by

Felix Bühler and committed by
GitHub
b21edafe bee40cfe

+5 -5
+5 -5
pkgs/tools/admin/google-cloud-sdk/components.nix
··· 97 97 in 98 98 mkComponent 99 99 { 100 - name = component.id; 100 + pname = component.id; 101 101 version = component.version.version_string; 102 102 src = 103 103 if lib.hasAttrByPath [ "data" "source" ] component ··· 120 120 121 121 # Make a google-cloud-sdk component 122 122 mkComponent = 123 - { name 123 + { pname 124 124 , version 125 125 # Source tarball, if any 126 126 , src ? "" ··· 135 135 # The snapshot corresponding to this component 136 136 , snapshot 137 137 }: stdenv.mkDerivation { 138 - inherit name version snapshot; 138 + inherit pname version snapshot; 139 139 src = 140 140 if src != "" then 141 141 builtins.fetchurl ··· 143 143 url = src; 144 144 inherit sha256; 145 145 } else ""; 146 - phases = [ "installPhase" "fixupPhase" ]; 146 + dontUnpack = true; 147 147 installPhase = '' 148 148 mkdir -p $out/google-cloud-sdk/.install 149 149 ··· 159 159 fi 160 160 161 161 # Write the snapshot file to the `.install` folder 162 - cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json 162 + cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json 163 163 ''; 164 164 passthru = { 165 165 dependencies = filterForSystem dependencies;