Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'

3 files changed, 45 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
index 9fc17ccea56a..65057156ad10 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
       json (~> 1.8)
       riemann-client (>= 0.2.6)
       trollop (>= 1.16.2)
-    trollop (2.1.2)
+    trollop (2.9.9)
 
 PLATFORMS
   ruby
@@ -21,4 +21,4 @@ DEPENDENCIES
   riemann-tools (= 0.2.13)
 
 BUNDLED WITH
-   1.14.6
+   1.17.2
diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
index 92e347a044ca..6a3e1f3deb10 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
@@ -1,14 +1,35 @@
-{ stdenv, bundlerEnv }:
+{ lib, bundlerApp }:
 
-bundlerEnv {
-  name = "riemann-tools-0.2.13";
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+bundlerApp {
+  pname = "riemann-tools";
+  gemdir = ./.;
+  exes = [
+    "riemann-apache-status"
+    "riemann-bench"
+    "riemann-cloudant"
+    "riemann-consul"
+    "riemann-dir-files-count"
+    "riemann-dir-space"
+    "riemann-diskstats"
+    "riemann-fd"
+    "riemann-freeswitch"
+    "riemann-haproxy"
+    "riemann-health"
+    "riemann-kvminstance"
+    "riemann-memcached"
+    "riemann-net"
+    "riemann-nginx-status"
+    "riemann-ntp"
+    "riemann-portcheck"
+    "riemann-proc"
+    "riemann-varnish"
+    "riemann-zookeeper"
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Tools to submit data to Riemann";
     homepage = "https://riemann.io";
-    license = stdenv.lib.licenses.mit;
+    maintainers = with maintainers; [ manveru ];
+    license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
index a57139d2f7ca..450fba80b726 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -1,5 +1,7 @@
 {
   beefcake = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "10gid0a7pdllh3qmjiqkqxgfqvd7m1f2dmcm4gcd19s63pv620gv";
@@ -8,6 +10,8 @@
     version = "1.0.0";
   };
   json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
@@ -16,6 +20,8 @@
     version = "1.8.6";
   };
   mtrc = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz";
@@ -25,6 +31,8 @@
   };
   riemann-client = {
     dependencies = ["beefcake" "mtrc" "trollop"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "02rp8x2y8h61x8mx9c8kwgm2yyvgg63g8km93zmwmkpp5fyi3fi8";
@@ -34,6 +42,8 @@
   };
   riemann-tools = {
     dependencies = ["json" "riemann-client" "trollop"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa";
@@ -42,11 +52,13 @@
     version = "0.2.13";
   };
   trollop = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+      sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.9.9";
   };
 }
\ No newline at end of file