diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix index ab059b518e74..86da469e3468 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeymarker"; inherit version; vendorSha256 = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU="; - src = fetchurl { - url = "https://github.com/honeycombio/honeymarker/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix index c7fde50e15d0..60e6a537e42e 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix @@ -1,6 +1,6 @@ generic: { v0_2_1 = generic { version = "0.2.1"; - sha256 = "0gp427bsc1y7k6j1sqgl8r3kng5b0qhmqd4bpfb9139ivmp2sykk"; + sha256 = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix index cbe901f2859a..b5c21ed1d94a 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeytail"; inherit version; vendorSha256 = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; - src = fetchurl { - url = "https://github.com/honeycombio/honeytail/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix index 370d645ab626..295cc7c6353e 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix @@ -1,6 +1,6 @@ generic: { v1_6_0 = generic { version = "1.6.0"; - sha256 = "039svpvqjck7s3rq86s29xgcyxl1wr0zj90s3jsyp058zk1dgwdy"; + sha256 = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index 839b8ec053f7..e1009c35a882 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; vendorSha256 = null; - src = fetchurl { - url = "https://github.com/honeycombio/honeyvent/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix index 831de6c93372..1bf2443aa183 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix @@ -1,6 +1,6 @@ generic: { v1_1_0 = generic { version = "1.1.0"; - sha256 = "0ar2m25ngdd1wk7d70j2781wbrvhjhf9cj9qvp24jjrhqng6hvn7"; + sha256 = "sha256-yFQEOshjaH6fRCQ7IZChANI9guZlTXk35p1NzQvxUdI="; }; }