cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #182979 from ereslibre/fastly-remove-go-version

Browse source
This commit is contained in:
Sandro 2022-07-28 17:57:51 +02:00 committed by GitHub
commit fae22496a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/misc/fastly/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, installShellFiles, buildGoModule }: { lib, fetchFromGitHub, installShellFiles, buildGoModule, go }:
buildGoModule rec { buildGoModule rec {
pname = "fastly"; pname = "fastly";
@ -34,10 +34,11 @@ buildGoModule rec {
"-w" "-w"
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${version}" "-X github.com/fastly/cli/pkg/revision.AppVersion=v${version}"
"-X github.com/fastly/cli/pkg/revision.Environment=release" "-X github.com/fastly/cli/pkg/revision.Environment=release"
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
]; ];
preBuild = '' preBuild = ''
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)" ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
ldflags+=" -X 'github.com/fastly/cli/pkg/revision.GoVersion=$(go version)'"
''; '';
postInstall = '' postInstall = ''

4
pkgs/top-level/all-packages.nix
View file

@ -3709,7 +3709,9 @@ with pkgs;
extrude = callPackage ../tools/security/extrude { }; extrude = callPackage ../tools/security/extrude { };
fastly = callPackage ../misc/fastly {}; fastly = callPackage ../misc/fastly {
# If buildGoModule is overriden, provide a matching version of the go attribute
};
f2 = callPackage ../tools/misc/f2 {}; f2 = callPackage ../tools/misc/f2 {};