diff options
author | Niklas Hambüchen <mail@nh2.me> | 2018-10-26 18:07:56 +0200 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2018-11-03 18:39:46 +0100 |
commit | 2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0 (patch) | |
tree | 85d6d24513e1f5f696ac60448134c9cbfc99a31c /pkgs/servers/consul/ui.nix | |
parent | df28b4b6e5a996a4971a0b32a98e654e4c44a54a (diff) |
consul: 0.9.3 -> 1.3.0.
Removes the old UI build tooling; it is no longer necessary because as of 1.2.0 it's bundled into the server binary. It doesn't even need to have JS built, because it's bundled into the release commit's source tree (see #48714). The UI is enabled by default, so the NixOS service is updated to directly use `ui = webUi;` now. Fixes #48714. Fixes #44192. Fixes #41243. Fixes #35602. Signed-off-by: Niklas Hambüchen <mail@nh2.me>
Diffstat (limited to 'pkgs/servers/consul/ui.nix')
-rw-r--r-- | pkgs/servers/consul/ui.nix | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix deleted file mode 100644 index da9b518bad734..0000000000000 --- a/pkgs/servers/consul/ui.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }: - -let - # `sass` et al - gems = bundlerEnv { - name = "consul-ui-deps"; - gemdir = ./.; - }; -in - -stdenv.mkDerivation { - name = "consul-ui-${consul.version}"; - - src = consul.src; - - buildInputs = [ ruby gems zip nodejs ]; - - patches = [ ./ui-no-bundle-exec.patch ]; - - postPatch = "patchShebangs ./ui/scripts/dist.sh"; - - buildPhase = '' - # Build ui static files - cd ui - make dist - ''; - - installPhase = '' - # Install ui static files - mkdir -p $out - mv ../pkg/web_ui/* $out - ''; - - meta = with stdenv.lib; { - homepage = https://www.consul.io/; - description = "A tool for service discovery, monitoring and configuration"; - maintainers = with maintainers; [ cstrahan wkennington ]; - license = licenses.mpl20 ; - platforms = platforms.unix; - }; -} |