diff options
| author | Nahum Shalman <nshalman@omniti.com> | 2016-05-17 13:52:09 +0000 |
|---|---|---|
| committer | Nahum Shalman <nshalman@omniti.com> | 2016-05-17 20:22:30 +0000 |
| commit | fe07537efb37f194783ab963b3b74c43d088976f (patch) | |
| tree | 3199c8effa1d7cbee9364b6484d5d65bf2cda953 /pkgs/servers/consul | |
| parent | a01b6a0d074dcc81e5a04b79da3f9a02fbb00499 (diff) | |
| download | nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar.gz nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar.bz2 nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar.lz nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar.xz nixlib-fe07537efb37f194783ab963b3b74c43d088976f.tar.zst nixlib-fe07537efb37f194783ab963b3b74c43d088976f.zip | |
consul: 0.5.2 -> 0.6.4 (using go 1.6)
consul: 0.5.2 -> 0.6.4 (using go 1.6) consul-ui: 0.5.2 -> 0.6.4 (using go 1.6) consul-alerts: 2015-08-09 -> 0.3.3 (using go 1.6) consul-template: 0.9.0 -> 0.14.0 (using go 1.6) vault: 0.2.0 -> 0.5.2 (using go 1.6)
Diffstat (limited to 'pkgs/servers/consul')
| -rw-r--r-- | pkgs/servers/consul/ui.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index 2aaa7b4a1319..deadd6404eae 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, goPackages, ruby, bundlerEnv }: +{ stdenv, go16Packages, ruby, bundlerEnv, zip }: let # `sass` et al @@ -11,11 +11,11 @@ let in stdenv.mkDerivation { - name = "consul-ui-${goPackages.consul.rev}"; + name = "consul-ui-${go16Packages.consul.rev}"; - src = goPackages.consul.src; + src = go16Packages.consul.src; - buildInputs = [ ruby gems ]; + buildInputs = [ ruby gems zip ]; buildPhase = '' # Build ui static files @@ -26,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' # Install ui static files mkdir -p $out - mv dist/* $out + mv ../pkg/web_ui/* $out ''; meta = with stdenv.lib; { |