public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consul: remove trailing whitespace

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-07 17:07:05 +01:00
parent 53b72ba7ac
commit 077c3c1944
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/servers/consul/default.nix
View File

@ -5,13 +5,13 @@ buildGoModule rec {
version = "1.7.3"; 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
# vendored. See # vendored. See
# https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 # 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 # 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. # 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. # 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 # 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. # to apply your changes as patches on top of a release commit.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
@ -28,8 +28,11 @@ buildGoModule rec {
modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr"; 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; {