From 90ec6a32ba089b0d7fb02a5e45765ca9116bec5a Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Tue, 30 Apr 2019 16:22:26 +0200
Subject: drake: use bundlerApp

---
 pkgs/development/tools/build-managers/drake/Gemfile.lock |  2 +-
 pkgs/development/tools/build-managers/drake/default.nix  | 15 ++++++---------
 pkgs/development/tools/build-managers/drake/gemset.nix   |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'pkgs/development/tools')

diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock
index cf8900a30eed..52060a0e6254 100644
--- a/pkgs/development/tools/build-managers/drake/Gemfile.lock
+++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock
@@ -12,4 +12,4 @@ DEPENDENCIES
   drake
 
 BUNDLED WITH
-   1.13.7
+   1.17.2
diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix
index 15a88b1fc312..a7bb93d52ed1 100644
--- a/pkgs/development/tools/build-managers/drake/default.nix
+++ b/pkgs/development/tools/build-managers/drake/default.nix
@@ -1,18 +1,15 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp }:
 
-bundlerEnv {
-  name = "drake-0.9.2.0.3.1";
+bundlerApp {
+  pname = "drake";
+  gemdir = ./.;
+  exes = [ "drake" ];
 
-  inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
-  
   meta = with lib; {
     description = "A branch of Rake supporting automatic parallelizing of tasks";
     homepage = http://quix.github.io/rake/;
+    maintainers = with maintainers; [ romildo manveru ];
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/development/tools/build-managers/drake/gemset.nix
index fd5a6f06a2a8..061ed5d973ab 100644
--- a/pkgs/development/tools/build-managers/drake/gemset.nix
+++ b/pkgs/development/tools/build-managers/drake/gemset.nix
@@ -1,5 +1,7 @@
 {
   comp_tree = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0dj9lkfxcczn67l1j12dcxswrfxxd1zgxa344zk6vqs2gwwhy9m9";
@@ -8,6 +10,9 @@
     version = "1.1.3";
   };
   drake = {
+    dependencies = ["comp_tree"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "09gkmdshwdmdnkdxi03dv4rk1dip0wdv6dx14wscrmi0jyk86yag";
-- 
cgit 1.4.1