Merge pull request #87168 from r-ryantm/auto-update/consul
This commit is contained in:
commit
f5e9e0347a
|
@ -1,33 +1,38 @@
|
|||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
# vendored. See
|
||||
# https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
|
||||
# If you want to use a non-release commit as `src`, you probably want to improve
|
||||
# this derivation so that it can build the UI's JavaScript from source.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
|
||||
# Or, if you want to patch something that doesn't touch the UI, you may want
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
# vendored. See
|
||||
# https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
|
||||
# If you want to use a non-release commit as `src`, you probably want to improve
|
||||
# this derivation so that it can build the UI's JavaScript from source.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
|
||||
# Or, if you want to patch something that doesn't touch the UI, you may want
|
||||
# to apply your changes as patches on top of a release commit.
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4";
|
||||
sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
||||
# This corresponds to paths with package main - normally unneeded but consul
|
||||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b";
|
||||
modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr";
|
||||
|
||||
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=")
|
||||
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=")
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
Loading…
Reference in a new issue