Merge pull request #21962 from Mic92/gemdir

bundleEnv: Used gemdir for most applications now

doc/languages-frameworks/ruby.xml

@@ -26,9 +26,8 @@ bundlerEnv rec {
 
   version = (import gemset).sensu.version;
   inherit ruby;
-  gemfile = ./Gemfile;
+  # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
-  lockfile = ./Gemfile.lock;
+  gemdir = ./.;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "A monitoring framework that aims to be simple, malleable, and scalable";

pkgs/applications/misc/gollum/default.nix

@@ -5,9 +5,7 @@ bundlerEnv rec {
   version = "4.0.1";
 
   ruby = ruby_2_2;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "A simple, Git-powered wiki";

pkgs/applications/misc/jekyll/default.nix

@@ -5,9 +5,7 @@ bundlerEnv rec {
   version = "3.0.1";
 
   ruby = ruby_2_2;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Simple, blog aware, static site generator";

pkgs/applications/misc/pt/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "pt-0.7.3";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Minimalist command-line Pivotal Tracker client";

pkgs/applications/misc/taskjuggler/3.x/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "taskjuggler-3.5.0";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = {
     description = "A modern and powerful project management tool";

pkgs/applications/networking/cluster/panamax/api/default.nix

@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "panamax-api-gems-${version}";
     inherit ruby;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
   };
 
   bundler = args.bundler.override { inherit ruby; };

pkgs/applications/networking/cluster/panamax/ui/default.nix

@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "panamax-ui-gems-${version}";
     inherit ruby;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
   };
 
   bundler = args.bundler.override { inherit ruby; };

pkgs/applications/office/ledger-web/default.nix

@@ -6,11 +6,9 @@
 bundlerEnv rec {
   name = "ledger-web-${version}";
 
-  version = (import gemset).ledger_web.version;
+  version = (import ./gemset.nix).ledger_web.version;
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   buildInputs =    lib.optional withPostgresql postgresql
                 ++ lib.optional withSqlite sqlite;

pkgs/applications/office/ppl-address-book/default.nix

@@ -8,9 +8,7 @@ let
   env = bundlerEnv rec {
     name = "${pname}-env-${version}";
     inherit ruby;
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
 
     gemConfig.rugged = attrs: { buildInputs = [ which ]; };
   };

pkgs/applications/office/timetrap/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "timetrap-1.10.0";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = {
     description = "A simple command line time tracker written in ruby";

pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix

@@ -3,11 +3,9 @@
 bundlerEnv rec {
   name = "bitbucket-server-cli-${version}";
 
-  version = (import gemset).atlassian-stash.version;
+  version = (import ./gemset.nix).atlassian-stash.version;
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   pname = "atlassian-stash";
 

pkgs/applications/version-management/gitlab/default.nix

@@ -9,9 +9,7 @@ let
   env = bundlerEnv {
     name = "gitlab";
     inherit ruby;
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
     meta = with lib; {
       homepage = http://www.gitlab.com/;
       platforms = platforms.linux;

pkgs/development/compilers/matter-compiler/default.nix

@@ -5,9 +5,7 @@ bundlerEnv {
   name = "matter_compiler-0.5.1";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = ''

pkgs/development/tools/build-managers/rake/default.nix

@@ -4,10 +4,8 @@ bundlerEnv {
   name = "rake-11.1.1";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
+
-  gemset = ./gemset.nix;
-  
   meta = with lib; {
     description = "A software task management and build automation tool";
     homepage = https://github.com/ruby/rake;

pkgs/development/tools/chefdk/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "chefdk-0.11.2";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   buildInputs = [ perl autoconf ];
 

pkgs/development/tools/compass/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "compass-1.0.3";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain";

pkgs/development/tools/continuous-integration/cide/default.nix

@@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 
   phases = ["installPhase"];

pkgs/development/tools/redis-dump/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "redis-dump-0.3.5";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   buildInputs = [ perl autoconf ];
 

pkgs/development/tools/rhc/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "rhc-1.36.4";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     homepage = https://github.com/openshift/rhc;

pkgs/development/tools/ronn/default.nix

@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
 
   env = bundlerEnv rec {
     name = "ronn-gems";
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 
   phases = ["installPhase"];

pkgs/development/tools/sass/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "sass-3.4.22";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";

pkgs/servers/consul/ui.nix

@@ -4,9 +4,7 @@ let
   # `sass` et al
   gems = bundlerEnv {
     name = "consul-ui-deps";
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 in
 

pkgs/servers/monitoring/sensu/default.nix

@@ -4,9 +4,7 @@
     name = "sensu-0.17.1";
 
     inherit ruby;
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
 
     meta = with lib; {
       description = "A monitoring framework that aims to be simple, malleable, and scalable";

pkgs/tools/audio/mpdcron/default.nix

@@ -4,9 +4,7 @@
 let
   gemEnv = bundlerEnv {
     name = "mpdcron-bundle";
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 in stdenv.mkDerivation rec {
   version = "20130809";

pkgs/tools/backup/backup/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   name = "backup_v4";
 
   ruby = ruby_2_1;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   buildInputs = [ curl ];
 

pkgs/tools/misc/homesick/default.nix

@@ -2,9 +2,7 @@
 bundlerEnv {
   name = "homesick-1.1.3";
 
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   # Cannot use `wrapProgram` because the the help is aware of the file name.
   postInstall = ''

pkgs/tools/misc/pws/default.nix

@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
 
     inherit ruby;
 
-    gemfile  = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset   = ./gemset.nix;
   };
 
   buildInputs = [ makeWrapper ];

pkgs/tools/networking/maphosts/default.nix

@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "maphosts-gems";
     inherit ruby;
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 
   phases = ["installPhase"];

pkgs/tools/system/r10k/default.nix

@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
     inherit ruby;
   };
 

pkgs/tools/text/reckon/default.nix

@@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
+    gemdir = ./.;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
   };
 
   phases = [ "installPhase" ];

pkgs/tools/text/ruby-zoom/default.nix

@@ -4,9 +4,7 @@ bundlerEnv {
   pname = "ruby-zoom";
 
   inherit ruby;
-  gemfile = ./Gemfile;
+  gemdir = ./.;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
 
   meta = with lib; {
     description = "Quickly open CLI search results in your favorite editor!";