diff options
author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-04 20:40:56 +0200 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:22:02 +0200 |
commit | 5db153b7a15a528c5c8269c78bafac1b2c8094f1 (patch) | |
tree | ed7f3e553d48194bfd9617a029845a4f2e84e86e /pkgs/servers/consul | |
parent | abcec97b1ec898ce336bc333da4efce97c5c4a16 (diff) |
consul: extracted from goPackages
Diffstat (limited to 'pkgs/servers/consul')
-rw-r--r-- | pkgs/servers/consul/default.nix | 21 | ||||
-rw-r--r-- | pkgs/servers/consul/ui.nix | 8 |
2 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix new file mode 100644 index 0000000000000..d5b4e12697e11 --- /dev/null +++ b/pkgs/servers/consul/default.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with go16Packages; + +buildGoPackage rec { + name = "consul-${version}"; + version = "0.6.4"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/consul"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashicorp/consul"; + sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a"; + }; + + # Keep consul.ui for backward compatability + passthru.ui = pkgs.consul-ui; +} diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index 684412846f01e..a61b8baac8677 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, goPackages, ruby, bundlerEnv, zip }: +{ stdenv, consul, ruby, bundlerEnv, zip }: let # `sass` et al @@ -11,12 +11,14 @@ let in stdenv.mkDerivation { - name = "consul-ui-${goPackages.consul.rev}"; + name = "consul-ui-${consul.version}"; - src = goPackages.consul.src; + src = consul.src; buildInputs = [ ruby gems zip ]; + patchPhase = "patchShebangs ./ui/scripts/dist.sh"; + buildPhase = '' # Build ui static files cd ui |