From 098e8500d4b00066813f0c9dbbd49eadb87b8030 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 15 Jun 2016 20:47:54 -0400 Subject: riemann-dash: Wrap to keep bundler and sass out of user env --- pkgs/servers/monitoring/riemann-dash/default.nix | 30 +++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix index 1afcd81d9be..32f543fbf2f 100644 --- a/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/pkgs/servers/monitoring/riemann-dash/default.nix @@ -1,8 +1,26 @@ -{ bundlerEnv }: +{ bundlerEnv, lib, stdenv }: -bundlerEnv { - name = "riemann-dash-0.2.9"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; +let + name = "riemann-dash-${env.gems.riemann-dash.version}"; + + env = bundlerEnv { + inherit name; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + +in stdenv.mkDerivation { + inherit name; + buildCommand = '' + mkdir -p $out/bin + ln -s ${env}/bin/riemann-dash $out/bin/riemann-dash + ''; + + meta = with lib; { + description = "A javascript, websockets-powered dashboard for Riemann"; + homepage = https://github.com/riemann/riemann-dash; + license = licenses.mit; + platforms = platforms.unix; + }; } -- cgit 1.4.1 From b6c6763dab660265bd033faf6adb4c05cbc49360 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 15 Jun 2016 20:52:41 -0400 Subject: riemann-dash: 0.2.11 -> 0.2.12 --- pkgs/servers/monitoring/riemann-dash/Gemfile | 2 +- pkgs/servers/monitoring/riemann-dash/Gemfile.lock | 17 ++--- pkgs/servers/monitoring/riemann-dash/gemset.nix | 75 ++++++++++------------- 3 files changed, 44 insertions(+), 50 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile index 6b770b70818..aecd1b9508c 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-dash", "0.2.11" +gem "riemann-dash", "0.2.12" diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index a5445b953c4..1bfd80a897d 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -3,25 +3,28 @@ GEM specs: erubis (2.7.0) multi_json (1.3.6) - rack (1.6.1) + rack (1.6.4) rack-protection (1.5.3) rack - riemann-dash (0.2.11) + riemann-dash (0.2.12) erubis (>= 2.7.0) multi_json (= 1.3.6) sass (>= 3.1.14) sinatra (~> 1.4.5) webrick (~> 1.3.1) - sass (3.4.14) - sinatra (1.4.6) - rack (~> 1.4) + sass (3.4.22) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - tilt (2.0.1) + tilt (2.0.5) webrick (1.3.1) PLATFORMS ruby DEPENDENCIES - riemann-dash (= 0.2.11) + riemann-dash (= 0.2.12) + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix index b98fd452f1a..8a4d3ba58cb 100644 --- a/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -1,80 +1,71 @@ { - "erubis" = { - version = "2.7.0"; + erubis = { source = { - type = "gem"; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; }; + version = "2.7.0"; }; - "multi_json" = { - version = "1.3.6"; + multi_json = { source = { - type = "gem"; sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr"; + type = "gem"; }; + version = "1.3.6"; }; - "rack" = { - version = "1.6.1"; + rack = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; type = "gem"; - sha256 = "0f73v6phkwczl1sfv0wgdwsnlsg364bhialbnfkg2dnxhh57l0gl"; }; + version = "1.6.4"; }; - "rack-protection" = { - version = "1.5.3"; + rack-protection = { + dependencies = ["rack"]; source = { - type = "gem"; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + type = "gem"; }; - dependencies = [ - "rack" - ]; + version = "1.5.3"; }; - "riemann-dash" = { - version = "0.2.11"; + riemann-dash = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y2vh9vcl21b6k2wqgz1y8bbcrl07r43s6q2vkgp35z1b28xcszy"; type = "gem"; - sha256 = "1vzb75hf1xy7ssil7fp9z7z51vh79ba22x56ific7f1kcb21lzk7"; }; - dependencies = [ - "erubis" - "multi_json" - "sass" - "sinatra" - "webrick" - ]; + version = "0.2.12"; }; - "sass" = { - version = "3.4.14"; + sass = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; type = "gem"; - sha256 = "0x2mg6pid87s4ddvv6xnxfzwgy72pjmkm461pav92ngqnngx2ggk"; }; + version = "3.4.22"; }; - "sinatra" = { - version = "1.4.6"; + sinatra = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; type = "gem"; - sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7"; }; - dependencies = [ - "rack" - "rack-protection" - "tilt" - ]; + version = "1.4.7"; }; - "tilt" = { - version = "2.0.1"; + tilt = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; type = "gem"; - sha256 = "1qc1k2r6whnb006m10751dyz3168cq72vj8mgp5m2hpys8n6xp3k"; }; + version = "2.0.5"; }; - "webrick" = { - version = "1.3.1"; + webrick = { source = { - type = "gem"; sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g"; + type = "gem"; }; + version = "1.3.1"; }; } \ No newline at end of file -- cgit 1.4.1