From 2085adc322a27d352bd2d2f4801c5a6bc0b0cf54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 14:30:53 +0000 Subject: [PATCH 1/3] benthos: 4.11.0 -> 4.12.1 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 13e2effec5af..c85514b5e911 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.11.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "v${version}"; - sha256 = "sha256-1pzyrXJgVN8kO3BHr/7LMpDvtnLcdioaxoRgKv/46v4="; + sha256 = "sha256-6qBeMQSBleZTsq6sExIqkkyxJUx1yt2YhUogKYEWii0="; }; - vendorSha256 = "sha256-SfgdSPJ8Blra+KVWtKSjWfXmAm02tULwuYHNPbyJVpI="; + vendorHash = "sha256-sNqWTgVgcjYEzFlneQaV3g80NTrVKeKz+mtahEOdyIw="; doCheck = false; From 030638a3620c9bf9fc3565096d1666ca93e5c724 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 23:00:48 +0100 Subject: [PATCH 2/3] benthos: add changelog to meta --- pkgs/development/tools/benthos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index c85514b5e911..366630d473f3 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -7,8 +7,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; - rev = "v${version}"; - sha256 = "sha256-6qBeMQSBleZTsq6sExIqkkyxJUx1yt2YhUogKYEWii0="; + rev = "refs/tags/v${version}"; + hash = "sha256-6qBeMQSBleZTsq6sExIqkkyxJUx1yt2YhUogKYEWii0="; }; vendorHash = "sha256-sNqWTgVgcjYEzFlneQaV3g80NTrVKeKz+mtahEOdyIw="; @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Fancy stream processing made operationally mundane"; homepage = "https://www.benthos.dev"; + changelog = "https://github.com/benthosdev/benthos/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sagikazarmark ]; }; From 3436e4b1eeab4a7d90b5b83198bca19a1fd9b1f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 23:01:40 +0100 Subject: [PATCH 3/3] benthos: equalize --- pkgs/development/tools/benthos/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 366630d473f3..57235c3085ae 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "benthos"; @@ -19,7 +22,11 @@ buildGoModule rec { "cmd/benthos" ]; - ldflags = [ "-s" "-w" "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" + ]; meta = with lib; { description = "Fancy stream processing made operationally mundane";