Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'

4 files changed, 23 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile
index ac6abd42c895..b2e34d5120e0 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem "riemann-tools", "0.2.13"
+gem "riemann-tools"
diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
index 65057156ad10..881b8aefcdf8 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -4,21 +4,22 @@ GEM
     beefcake (1.0.0)
     json (1.8.6)
     mtrc (0.0.4)
+    optimist (3.0.0)
     riemann-client (0.2.6)
       beefcake (>= 0.3.5, <= 1.0.0)
       mtrc (>= 0.0.4)
       trollop (>= 1.16.2)
-    riemann-tools (0.2.13)
+    riemann-tools (0.2.14)
       json (~> 1.8)
-      riemann-client (>= 0.2.6)
-      trollop (>= 1.16.2)
+      optimist (~> 3.0, >= 3.0.0)
+      riemann-client (~> 0.2, >= 0.2.6)
     trollop (2.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  riemann-tools (= 0.2.13)
+  riemann-tools
 
 BUNDLED WITH
    1.17.2
diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
index 6a3e1f3deb10..a9977aefd66c 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerApp }:
+{ lib, bundlerApp, bundlerUpdateScript }:
 
 bundlerApp {
   pname = "riemann-tools";
@@ -26,10 +26,12 @@ bundlerApp {
     "riemann-zookeeper"
   ];
 
+  passthru.updateScript = bundlerUpdateScript "riemann-tools";
+
   meta = with lib; {
     description = "Tools to submit data to Riemann";
     homepage = "https://riemann.io";
-    maintainers = with maintainers; [ manveru ];
+    maintainers = with maintainers; [ manveru nicknovitski ];
     license = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
index 450fba80b726..e775de987d67 100644
--- a/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/nixpkgs/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -29,6 +29,16 @@
     };
     version = "0.0.4";
   };
+  optimist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
   riemann-client = {
     dependencies = ["beefcake" "mtrc" "trollop"];
     groups = ["default"];
@@ -41,15 +51,15 @@
     version = "0.2.6";
   };
   riemann-tools = {
-    dependencies = ["json" "riemann-client" "trollop"];
+    dependencies = ["json" "optimist" "riemann-client"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa";
+      sha256 = "07w9x3iw32zwpzsm9l63vn0nv1778qls1blqysr45m7l7x6n5wjx";
       type = "gem";
     };
-    version = "0.2.13";
+    version = "0.2.14";
   };
   trollop = {
     groups = ["default"];