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

consul: extracted from goPackages

Browse Source
This commit is contained in:
Kamil Chmielewski 2016-06-04 20:40:56 +02:00
parent abcec97b1e
commit 5db153b7a1
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

8
pkgs/servers/consul/ui.nix
View File

@ -1,4 +1,4 @@
{ stdenv, goPackages, ruby, bundlerEnv, zip }: { stdenv, consul, ruby, bundlerEnv, zip }:
let let
# `sass` et al # `sass` et al
@ -11,12 +11,14 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "consul-ui-${goPackages.consul.rev}"; name = "consul-ui-${consul.version}";
src = goPackages.consul.src; src = consul.src;
buildInputs = [ ruby gems zip ]; buildInputs = [ ruby gems zip ];
patchPhase = "patchShebangs ./ui/scripts/dist.sh";
buildPhase = '' buildPhase = ''
# Build ui static files # Build ui static files
cd ui cd ui

2
pkgs/top-level/all-packages.nix
View File

@ -702,7 +702,7 @@ in
clib = callPackage ../tools/package-management/clib { }; clib = callPackage ../tools/package-management/clib { };
consul = goPackages.consul.bin // { outputs = [ "bin" ]; }; consul = callPackage ../servers/consul { };
consul-ui = callPackage ../servers/consul/ui.nix { }; consul-ui = callPackage ../servers/consul/ui.nix { };

22
pkgs/top-level/go-packages.nix
View File

@ -513,28 +513,6 @@ let
sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
}; };
consul = buildFromGitHub {
rev = "v0.6.4";
owner = "hashicorp";
repo = "consul";
sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
buildInputs = [
circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
ugorji.go go-multierror go-syslog golang-lru hcl logutils memberlist
net-rpc-msgpackrpc raft raft-boltdb raft-mdb scada-client serf yamux
muxado dns cli mapstructure columnize crypto
];
# Keep consul.ui for backward compatability
passthru.ui = pkgs.consul-ui;
};
consul-api = buildFromGitHub {
inherit (consul) rev owner repo sha256;
subPackages = [ "api" ];
};
consul-alerts = buildFromGitHub { consul-alerts = buildFromGitHub {
rev = "v0.3.3"; rev = "v0.3.3";
owner = "AcalephStorage"; owner = "AcalephStorage";