diff options
31 files changed, 35 insertions, 96 deletions
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 15c0802ad694..b52361212f3a 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -26,9 +26,8 @@ bundlerEnv rec { version = (import gemset).sensu.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1c58aec02332..1f3cc9e27c0c 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "4.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "A simple, Git-powered wiki"; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index e9536055ca3b..b06a28513b82 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "3.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Simple, blog aware, static site generator"; diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index d85a3266bdf8..a400bb04da43 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "pt-0.7.3"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix index eaca537356b3..23252d0c4807 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "taskjuggler-3.5.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A modern and powerful project management tool"; diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 2b801ec1acf3..3347af83585f 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/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; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index fbeb3de810f3..4a6481e3e5ee 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/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; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 6be5ad525db4..6f571bd2a1b0 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/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; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix index 1c48fc50842d..f15affaa8d67 100644 --- a/pkgs/applications/office/ppl-address-book/default.nix +++ b/pkgs/applications/office/ppl-address-book/default.nix @@ -8,9 +8,7 @@ let env = bundlerEnv rec { name = "${pname}-env-${version}"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; gemConfig.rugged = attrs: { buildInputs = [ which ]; }; }; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index f6a408d03842..e68c753750f5 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "timetrap-1.10.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A simple command line time tracker written in ruby"; diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index a3cf434360b9..341b50f0ef22 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/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; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; pname = "atlassian-stash"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 6c2b42ddbc51..659e002dfb6e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -9,9 +9,7 @@ let env = bundlerEnv { name = "gitlab"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index 12da620fe5bd..58fb0ca22d7c 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -5,9 +5,7 @@ bundlerEnv { name = "matter_compiler-0.5.1"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = '' diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix index 3cf85b5fcb51..db7c987465ad 100644 --- a/pkgs/development/tools/build-managers/rake/default.nix +++ b/pkgs/development/tools/build-managers/rake/default.nix @@ -4,10 +4,8 @@ bundlerEnv { name = "rake-11.1.1"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - + gemdir = ./.; + meta = with lib; { description = "A software task management and build automation tool"; homepage = https://github.com/ruby/rake; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 80f9ef56abce..880d0ddcc743 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "chefdk-0.11.2"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = [ perl autoconf ]; diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index 9b21ec48c1c6..f96d3e810ca5 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "compass-1.0.3"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain"; diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index 1ed752fb393c..932a02cf2bcf 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "${name}-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = ["installPhase"]; diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index bc1adf730a35..054517ea547c 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "redis-dump-0.3.5"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = [ perl autoconf ]; diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index e9efdb9f423c..e6b342dd7b62 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "rhc-1.36.4"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { homepage = https://github.com/openshift/rhc; diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 7720c4f2bf2b..5f20e89d4083 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { env = bundlerEnv rec { name = "ronn-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = ["installPhase"]; diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix index a291ca2de5d0..cfeb3ccc0f9d 100644 --- a/pkgs/development/tools/sass/default.nix +++ b/pkgs/development/tools/sass/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "sass-3.4.22"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index a61b8baac867..caf3792e9831 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -4,9 +4,7 @@ let # `sass` et al gems = bundlerEnv { name = "consul-ui-deps"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; in diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 2bb81d833372..ecc1d4109843 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -4,9 +4,7 @@ name = "sensu-0.17.1"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index a8556c4ada12..49425cf65b77 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -4,9 +4,7 @@ let gemEnv = bundlerEnv { name = "mpdcron-bundle"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; in stdenv.mkDerivation rec { version = "20130809"; diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix index 1890e8121c18..20c96b65a624 100644 --- a/pkgs/tools/backup/backup/default.nix +++ b/pkgs/tools/backup/backup/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "backup_v4"; ruby = ruby_2_1; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = [ curl ]; diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index da167026ade5..81e417ee5abd 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -2,9 +2,7 @@ bundlerEnv { name = "homesick-1.1.3"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; # Cannot use `wrapProgram` because the the help is aware of the file name. postInstall = '' diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index ac4f4524b992..7294c61da8fa 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 08c56574dcf7..3a48814928e5 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "maphosts-gems"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = ["installPhase"]; diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 0695504cc012..95462e2c0035 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "${name}-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; inherit ruby; }; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b6340fd2df46..de03963a4128 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "${name}-gems"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index eb3968a0db93..b939e1500e49 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -4,9 +4,7 @@ bundlerEnv { pname = "ruby-zoom"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; |