mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-11 14:43:47 +00:00
Merge pull request #87168 from r-ryantm/auto-update/consul
This commit is contained in:
commit
f5e9e0347a
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "consul";
|
pname = "consul";
|
||||||
version = "1.7.2";
|
version = "1.7.3";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||||
@ -17,17 +17,22 @@ buildGoModule rec {
|
|||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
inherit rev;
|
inherit rev;
|
||||||
sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4";
|
sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
passthru.tests.consul = nixosTests.consul;
|
||||||
|
|
||||||
# This corresponds to paths with package main - normally unneeded but consul
|
# This corresponds to paths with package main - normally unneeded but consul
|
||||||
# has a split module structure in one repo
|
# has a split module structure in one repo
|
||||||
subPackages = ["." "connect/certgen"];
|
subPackages = ["." "connect/certgen"];
|
||||||
|
|
||||||
modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b";
|
modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")
|
buildFlagsArray+=("-ldflags"
|
||||||
|
"-X github.com/hashicorp/consul/version.GitDescribe=v${version}
|
||||||
|
-X github.com/hashicorp/consul/version.Version=${version}
|
||||||
|
-X github.com/hashicorp/consul/version.VersionPrerelease=")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user