From de9055931b06c30592f512b22b81d02beab8dc49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 02:38:28 +0000 Subject: [PATCH 1/2] fastly: 4.4.0 -> 4.4.1 --- pkgs/misc/fastly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 3fe7295738f3..5a3b7c9d5a1a 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-i3X4VetosUD60QCztJFFRWwHb4kCIaB8MjrT8gA4dYw="; + sha256 = "sha256-82OZwO6r+wPq6AMm27M9U6dQyE3iOpAzW31HzRji5Fo="; # 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, From 925a64a3c92b4d7a1c3af7a922ec52288fd939d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Dec 2022 13:50:06 +0100 Subject: [PATCH 2/2] fastly: add changelog to meta --- pkgs/misc/fastly/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 5a3b7c9d5a1a..843fa781c2e8 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }: +{ lib +, fetchurl +, fetchFromGitHub +, installShellFiles +, buildGoModule +, go +}: buildGoModule rec { pname = "fastly"; @@ -7,8 +13,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "fastly"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-82OZwO6r+wPq6AMm27M9U6dQyE3iOpAzW31HzRji5Fo="; + rev = "refs/tags/v${version}"; + hash = "sha256-82OZwO6r+wPq6AMm27M9U6dQyE3iOpAzW31HzRji5Fo="; # 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, @@ -21,11 +27,15 @@ buildGoModule rec { ''; }; - subPackages = [ "cmd/fastly" ]; + subPackages = [ + "cmd/fastly" + ]; - vendorSha256 = "sha256-zilgzfPD7HmHt0/u94JLaY6NPvn1JjXFu1K2YO0tF9M="; + vendorHash = "sha256-zilgzfPD7HmHt0/u94JLaY6NPvn1JjXFu1K2YO0tF9M="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; # Flags as provided by the build automation of the project: # https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18 @@ -56,8 +66,9 @@ buildGoModule rec { meta = with lib; { description = "Command line tool for interacting with the Fastly API"; - license = licenses.asl20; homepage = "https://github.com/fastly/cli"; + changelog = "https://github.com/fastly/cli/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; maintainers = with maintainers; [ ereslibre shyim ]; }; }