Merge pull request #21962 from Mic92/gemdir

bundleEnv: Used gemdir for most applications now
This commit is contained in:
Jörg Thalheim 2017-01-19 09:34:14 +01:00 committed by GitHub
commit 3fdde25b4c
31 changed files with 35 additions and 96 deletions

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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; };

View File

@ -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; };

View File

@ -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;

View File

@ -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 ]; };
};

View File

@ -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";

View File

@ -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";

View File

@ -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;

View File

@ -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 = ''

View File

@ -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;

View File

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

View File

@ -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";

View File

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

View File

@ -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 ];

View File

@ -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;

View File

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

View File

@ -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";

View File

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

View File

@ -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";

View File

@ -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";

View File

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

View File

@ -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 = ''

View File

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

View File

@ -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"];

View File

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

View File

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

View File

@ -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!";