From 6a20958e75b1364dffa88082da94ba401d44d1a4 Mon Sep 17 00:00:00 2001 From: Rafael Fernández López Date: Fri, 21 Oct 2022 17:01:26 +0200 Subject: fastly: 3.2.4 -> 4.3.0 --- pkgs/misc/fastly/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'pkgs/misc/fastly') diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 64e39319b2f2..1c653327e717 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }: +{ lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }: buildGoModule rec { pname = "fastly"; - version = "3.2.4"; + version = "4.3.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8="; + sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -23,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/fastly" ]; - vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA="; + vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc="; 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.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)" ''; -- cgit 1.4.1