diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-21 20:33:19 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-21 20:33:19 -0500 |
commit | 317d78d145393932042ff7f802655dd1a934a6f8 (patch) | |
tree | d076ae60a065875afb44fecc56724fd9e4d8c26e /pkgs/servers/consul | |
parent | f52c32fcfccbecfc52f68571a3ce866f59e91459 (diff) |
consule: use new bundlerEnv
Diffstat (limited to 'pkgs/servers/consul')
-rw-r--r-- | pkgs/servers/consul/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/consul/gemset.nix | 16 |
2 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f056a8d496e6f..afe4a8e127d64 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,9 +1,15 @@ -{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub -, ruby, nodejs, loadRubyEnv }: +{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub , ruby , nodejs +, bundlerEnv }: let version = "0.4.1"; - rubyEnv = loadRubyEnv { gemset = ./gemset.nix; }; + # `sass` et al + gems = bundlerEnv { + name = "consul-deps"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; in with lib; @@ -14,7 +20,7 @@ stdenv.mkDerivation { inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; }; - buildInputs = [ go ruby rubyEnv.sass rubyEnv.uglifier nodejs ]; + buildInputs = [ go ruby gems nodejs ]; buildPhase = '' # Build consul binary diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix index a31df61554f06..bf417f8c411c5 100644 --- a/pkgs/servers/consul/gemset.nix +++ b/pkgs/servers/consul/gemset.nix @@ -1,42 +1,42 @@ { execjs = { version = "2.0.2"; - src = { + source = { type = "gem"; sha256 = "167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs"; }; }; json = { version = "1.8.1"; - src = { + source = { type = "gem"; sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; }; }; libv8 = { version = "3.16.14.3"; - src = { + source = { type = "gem"; sha256 = "1arjjbmr9zxkyv6pdrihsz1p5cadzmx8308vgfvrhm380ccgridm"; }; }; ref = { version = "1.0.5"; - src = { + source = { type = "gem"; sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; }; }; sass = { version = "3.3.6"; - src = { + source = { type = "gem"; sha256 = "0ra0kxx52cgyrq6db7a1vysk984ilshbx40bcf527k8b3fha6k5r"; }; }; therubyracer = { version = "0.12.1"; - src = { + source = { type = "gem"; sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; }; @@ -47,7 +47,7 @@ }; uglifier = { version = "2.5.0"; - src = { + source = { type = "gem"; sha256 = "0b9kxgyg8cv3g1bp6casndfzfy71jd9xyjxwng0lj90vzqrgjp20"; }; @@ -56,4 +56,4 @@ "json" ]; }; -} \ No newline at end of file +} |