pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #21962 from Mic92/gemdir

bundleEnv: Used gemdir for most applications now

authored by

Jörg Thalheim and committed by
GitHub 3fdde25b 485a1ac9

+35 -96
unified split
+2 -3
doc/languages-frameworks/ruby.xml
··· 26 26 27 27 version = (import gemset).sensu.version; 28 28 inherit ruby; 29 - gemfile = ./Gemfile; 30 - lockfile = ./Gemfile.lock; 31 - gemset = ./gemset.nix; 29 + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory 30 + gemdir = ./.; 32 31 33 32 meta = with lib; { 34 33 description = "A monitoring framework that aims to be simple, malleable, and scalable";
+1 -3
pkgs/applications/misc/gollum/default.nix
··· 5 5 version = "4.0.1"; 6 6 7 7 ruby = ruby_2_2; 8 - gemfile = ./Gemfile; 9 - lockfile = ./Gemfile.lock; 10 - gemset = ./gemset.nix; 8 + gemdir = ./.; 11 9 12 10 meta = with lib; { 13 11 description = "A simple, Git-powered wiki";
+1 -3
pkgs/applications/misc/jekyll/default.nix
··· 5 5 version = "3.0.1"; 6 6 7 7 ruby = ruby_2_2; 8 - gemfile = ./Gemfile; 9 - lockfile = ./Gemfile.lock; 10 - gemset = ./gemset.nix; 8 + gemdir = ./.; 11 9 12 10 meta = with lib; { 13 11 description = "Simple, blog aware, static site generator";
+1 -3
pkgs/applications/misc/pt/default.nix
··· 4 4 name = "pt-0.7.3"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 description = "Minimalist command-line Pivotal Tracker client";
+1 -3
pkgs/applications/misc/taskjuggler/3.x/default.nix
··· 4 4 name = "taskjuggler-3.5.0"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = { 12 10 description = "A modern and powerful project management tool";
+1 -3
pkgs/applications/networking/cluster/panamax/api/default.nix
··· 11 11 env = bundlerEnv { 12 12 name = "panamax-api-gems-${version}"; 13 13 inherit ruby; 14 - gemset = ./gemset.nix; 15 - gemfile = ./Gemfile; 16 - lockfile = ./Gemfile.lock; 14 + gemdir = ./.; 17 15 }; 18 16 19 17 bundler = args.bundler.override { inherit ruby; };
+1 -3
pkgs/applications/networking/cluster/panamax/ui/default.nix
··· 10 10 env = bundlerEnv { 11 11 name = "panamax-ui-gems-${version}"; 12 12 inherit ruby; 13 - gemset = ./gemset.nix; 14 - gemfile = ./Gemfile; 15 - lockfile = ./Gemfile.lock; 13 + gemdir = ./.; 16 14 }; 17 15 18 16 bundler = args.bundler.override { inherit ruby; };
+2 -4
pkgs/applications/office/ledger-web/default.nix
··· 6 6 bundlerEnv rec { 7 7 name = "ledger-web-${version}"; 8 8 9 - version = (import gemset).ledger_web.version; 9 + version = (import ./gemset.nix).ledger_web.version; 10 10 inherit ruby; 11 - gemfile = ./Gemfile; 12 - lockfile = ./Gemfile.lock; 13 - gemset = ./gemset.nix; 11 + gemdir = ./.; 14 12 15 13 buildInputs = lib.optional withPostgresql postgresql 16 14 ++ lib.optional withSqlite sqlite;
+1 -3
pkgs/applications/office/ppl-address-book/default.nix
··· 8 8 env = bundlerEnv rec { 9 9 name = "${pname}-env-${version}"; 10 10 inherit ruby; 11 - gemfile = ./Gemfile; 12 - lockfile = ./Gemfile.lock; 13 - gemset = ./gemset.nix; 11 + gemdir = ./.; 14 12 15 13 gemConfig.rugged = attrs: { buildInputs = [ which ]; }; 16 14 };
+1 -3
pkgs/applications/office/timetrap/default.nix
··· 4 4 name = "timetrap-1.10.0"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = { 12 10 description = "A simple command line time tracker written in ruby";
+2 -4
pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
··· 3 3 bundlerEnv rec { 4 4 name = "bitbucket-server-cli-${version}"; 5 5 6 - version = (import gemset).atlassian-stash.version; 6 + version = (import ./gemset.nix).atlassian-stash.version; 7 7 inherit ruby; 8 - gemfile = ./Gemfile; 9 - lockfile = ./Gemfile.lock; 10 - gemset = ./gemset.nix; 8 + gemdir = ./.; 11 9 12 10 pname = "atlassian-stash"; 13 11
+1 -3
pkgs/applications/version-management/gitlab/default.nix
··· 9 9 env = bundlerEnv { 10 10 name = "gitlab"; 11 11 inherit ruby; 12 - gemfile = ./Gemfile; 13 - lockfile = ./Gemfile.lock; 14 - gemset = ./gemset.nix; 12 + gemdir = ./.; 15 13 meta = with lib; { 16 14 homepage = http://www.gitlab.com/; 17 15 platforms = platforms.linux;
+1 -3
pkgs/development/compilers/matter-compiler/default.nix
··· 5 5 name = "matter_compiler-0.5.1"; 6 6 7 7 inherit ruby; 8 - gemfile = ./Gemfile; 9 - lockfile = ./Gemfile.lock; 10 - gemset = ./gemset.nix; 8 + gemdir = ./.; 11 9 12 10 meta = with lib; { 13 11 description = ''
+2 -4
pkgs/development/tools/build-managers/rake/default.nix
··· 4 4 name = "rake-11.1.1"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 10 - 7 + gemdir = ./.; 8 + 11 9 meta = with lib; { 12 10 description = "A software task management and build automation tool"; 13 11 homepage = https://github.com/ruby/rake;
+1 -3
pkgs/development/tools/chefdk/default.nix
··· 4 4 name = "chefdk-0.11.2"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 buildInputs = [ perl autoconf ]; 12 10
+1 -3
pkgs/development/tools/compass/default.nix
··· 4 4 name = "compass-1.0.3"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain";
+1 -3
pkgs/development/tools/continuous-integration/cide/default.nix
··· 7 7 env = bundlerEnv { 8 8 name = "${name}-gems"; 9 9 10 - gemfile = ./Gemfile; 11 - lockfile = ./Gemfile.lock; 12 - gemset = ./gemset.nix; 10 + gemdir = ./.; 13 11 }; 14 12 15 13 phases = ["installPhase"];
+1 -3
pkgs/development/tools/redis-dump/default.nix
··· 4 4 name = "redis-dump-0.3.5"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 buildInputs = [ perl autoconf ]; 12 10
+1 -3
pkgs/development/tools/rhc/default.nix
··· 4 4 name = "rhc-1.36.4"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 homepage = https://github.com/openshift/rhc;
+1 -3
pkgs/development/tools/ronn/default.nix
··· 6 6 7 7 env = bundlerEnv rec { 8 8 name = "ronn-gems"; 9 - gemfile = ./Gemfile; 10 - lockfile = ./Gemfile.lock; 11 - gemset = ./gemset.nix; 9 + gemdir = ./.; 12 10 }; 13 11 14 12 phases = ["installPhase"];
+1 -3
pkgs/development/tools/sass/default.nix
··· 4 4 name = "sass-3.4.22"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";
+1 -3
pkgs/servers/consul/ui.nix
··· 4 4 # `sass` et al 5 5 gems = bundlerEnv { 6 6 name = "consul-ui-deps"; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 }; 11 9 in 12 10
+1 -3
pkgs/servers/monitoring/sensu/default.nix
··· 4 4 name = "sensu-0.17.1"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 description = "A monitoring framework that aims to be simple, malleable, and scalable";
+1 -3
pkgs/tools/audio/mpdcron/default.nix
··· 4 4 let 5 5 gemEnv = bundlerEnv { 6 6 name = "mpdcron-bundle"; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 }; 11 9 in stdenv.mkDerivation rec { 12 10 version = "20130809";
+1 -3
pkgs/tools/backup/backup/default.nix
··· 4 4 name = "backup_v4"; 5 5 6 6 ruby = ruby_2_1; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 buildInputs = [ curl ]; 12 10
+1 -3
pkgs/tools/misc/homesick/default.nix
··· 2 2 bundlerEnv { 3 3 name = "homesick-1.1.3"; 4 4 5 - gemfile = ./Gemfile; 6 - lockfile = ./Gemfile.lock; 7 - gemset = ./gemset.nix; 5 + gemdir = ./.; 8 6 9 7 # Cannot use `wrapProgram` because the the help is aware of the file name. 10 8 postInstall = ''
+1 -3
pkgs/tools/misc/pws/default.nix
··· 8 8 9 9 inherit ruby; 10 10 11 - gemfile = ./Gemfile; 12 - lockfile = ./Gemfile.lock; 13 - gemset = ./gemset.nix; 11 + gemdir = ./.; 14 12 }; 15 13 16 14 buildInputs = [ makeWrapper ];
+1 -3
pkgs/tools/networking/maphosts/default.nix
··· 6 6 env = bundlerEnv { 7 7 name = "maphosts-gems"; 8 8 inherit ruby; 9 - gemfile = ./Gemfile; 10 - lockfile = ./Gemfile.lock; 11 - gemset = ./gemset.nix; 9 + gemdir = ./.; 12 10 }; 13 11 14 12 phases = ["installPhase"];
+1 -3
pkgs/tools/system/r10k/default.nix
··· 8 8 env = bundlerEnv { 9 9 name = "${name}-gems"; 10 10 11 - gemfile = ./Gemfile; 12 - lockfile = ./Gemfile.lock; 13 - gemset = ./gemset.nix; 11 + gemdir = ./.; 14 12 inherit ruby; 15 13 }; 16 14
+1 -3
pkgs/tools/text/reckon/default.nix
··· 7 7 env = bundlerEnv { 8 8 name = "${name}-gems"; 9 9 10 - gemfile = ./Gemfile; 11 - lockfile = ./Gemfile.lock; 12 - gemset = ./gemset.nix; 10 + gemdir = ./.; 13 11 }; 14 12 15 13 phases = [ "installPhase" ];
+1 -3
pkgs/tools/text/ruby-zoom/default.nix
··· 4 4 pname = "ruby-zoom"; 5 5 6 6 inherit ruby; 7 - gemfile = ./Gemfile; 8 - lockfile = ./Gemfile.lock; 9 - gemset = ./gemset.nix; 7 + gemdir = ./.; 10 8 11 9 meta = with lib; { 12 10 description = "Quickly open CLI search results in your favorite editor!";