Merge pull request #197075 from ereslibre/bump-fastly-4-2-0
fastly: 3.2.4 -> 4.3.0
This commit is contained in:
commit
dcea56508a
1 changed files with 11 additions and 5 deletions
|
@ -1,14 +1,14 @@
|
||||||
{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }:
|
{ lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "fastly";
|
pname = "fastly";
|
||||||
version = "3.2.4";
|
version = "4.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fastly";
|
owner = "fastly";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8=";
|
sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo=";
|
||||||
# The git commit is part of the `fastly version` original output;
|
# The git commit is part of the `fastly version` original output;
|
||||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||||
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
subPackages = [ "cmd/fastly" ];
|
subPackages = [ "cmd/fastly" ];
|
||||||
|
|
||||||
vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA=";
|
vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -37,7 +37,13 @@ buildGoModule rec {
|
||||||
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
|
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
|
||||||
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
|
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
|
||||||
];
|
];
|
||||||
preBuild = ''
|
preBuild = let
|
||||||
|
cliConfigToml = fetchurl {
|
||||||
|
url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config";
|
||||||
|
sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg=";
|
||||||
|
};
|
||||||
|
in ''
|
||||||
|
cp ${cliConfigToml} ./pkg/config/config.toml
|
||||||
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue