diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-05-07 17:07:05 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-05-07 17:07:05 +0100 |
| commit | 077c3c1944e666fb5cc6863f20a18eb6b9a26265 (patch) | |
| tree | 1a6b36b438ef7d35710047d8faed05594111861a /pkgs/servers | |
| parent | 53b72ba7acd535ec4755302bcc89f0f605677367 (diff) | |
| download | nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar.gz nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar.bz2 nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar.lz nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar.xz nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.tar.zst nixpkgs-077c3c1944e666fb5cc6863f20a18eb6b9a26265.zip | |
consul: remove trailing whitespace
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/consul/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 7293618b83a..dd6484344e8 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { 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"; @@ -28,8 +28,11 @@ buildGoModule rec { 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; { |