Commit graph

268 commits

Author SHA1 Message Date
Judson 66fed6d28f
Basically working. Checking against actual use cases. 2017-05-03 20:27:42 -07:00
Judson 2b414e1c15
Test harnesses 2017-05-01 09:07:42 -07:00
Judson b2065a2790
Merge remote-tracking branch 'nixos/master' into bundlerenv_usecases 2017-04-30 12:27:52 -07:00
Michael Raskin 4540123a0c Merge pull request #23471 from veprbl/jekyll
jekyll: 3.0.1 -> 3.4.1
2017-04-30 20:41:20 +02:00
Judson 89fda10d31
Starting decomposition of bundlerEnv 2017-04-24 18:45:00 -07:00
Nick Novitski 37b0be688d bundix: 2.0.8 -> 2.1.0 (#25129) 2017-04-23 13:13:50 +01:00
Maximilian Güntner d84029f296
ruby-modules: check tzinfo version
tzinfo 0.3.xx does not contain the file

lib/tzinfo/zoneinfo_data_source.rb

it is only included in the 1.x branch.

closes #24080
closes #24682
2017-04-11 10:44:54 +02:00
Judson ed77e113c5
Merge remote-tracking branch 'nixos/master' 2017-04-09 15:36:03 -07:00
Judson 7f6e8a1cd5
Adding "allBins" flag on bundlerEnv
The bin stubs need to be built where there's access to /nix/store - so
it can't happen in a nix-shell run. Ergo, a shell.nix needs to be able
to signal to the build that all bins need to be built.
2017-03-26 17:32:30 -07:00
Andrzej Trzaska 376d960034 bundler: 1.14.4 -> 1.14.6 (#23930) 2017-03-15 20:34:35 +00:00
Jörg Thalheim b10fb4624b
xapian-ruby: link against correct xapian 2017-03-06 20:24:07 +01:00
Dmitry Kalinkin 212340bc6b
jekyll: set proper permissions on new site
Fixes #22858
2017-03-03 23:05:37 -05:00
Dmitry Kalinkin 0832addf67
jekyll: fix 'jekyll new'
Original error:

$ nix-shell -p jekyll --command "jekyll new test"
Running bundle install in /private/tmp/test...
  Bundler: There was an error while trying to write to
  Bundler:
`/nix/store/l67429rhvrmr7c4c1msb7s8zjq4fx7ad-gemfile-and-lockfile/.bundle/config`.
  Bundler: It is likely that you need to grant write permissions for
that path.
2017-03-03 21:47:58 -05:00
Judson 0481a33d21
Simplifying interface on gemset.nix slightly.
`usesGemspec` no longer required to trigger the "copy everything into
gemfile-and-lock" behavior. If the mainGem is referred to by path,
that's sufficient.
2017-02-20 21:03:44 -08:00
Judson 3c9941114f
Need to handle "null" mainGems
Not every gem package uses pname, nor should it.
2017-02-19 10:51:35 -08:00
Judson 2b9c7b4268
Merge remote-tracking branch 'nixos/master' 2017-02-19 10:22:55 -08:00
Judson c765f680e3
Updates to bundlerEnv 2017-02-19 10:18:54 -08:00
Peter Hoeg facb2c0483 bundler: 1.14.3 -> 1.14.4 2017-02-17 22:48:39 +08:00
Peter Hoeg d1b8b0dd52 bundler: 1.13.7 -> 1.14.3 (#22260) 2017-01-29 22:42:17 +00:00
Ryan Mulligan 605ec66342 bundler: 1.13.6 -> 1.13.7 2017-01-09 10:13:38 -08:00
Maximilian Güntner 4f57a25e62 gem-config: add lxc as a dependency for ruby-lxc
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-12-18 20:10:34 +01:00
Maximilian Güntner dec91d3b19 gem-config: add postgresql buildInput for sequel_pg (#20981)
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-12-16 11:36:05 +01:00
Graham Christensen 5cc4f50442 Merge pull request #20113 from johbo/ruby-scrypt-darwin
Adjust ruby gem defaults for scrypt on darwin
2016-11-27 21:58:17 -05:00
Michael Fellinger 0755d4becb gem-config: add uuid4r (#20603) 2016-11-21 12:41:05 +00:00
Ryan Mulligan 936db422f9 add defaultConfig for mysql ruby gem
The mysql gem needs the same libraries as the mysql2 gem.
2016-11-03 17:19:25 -07:00
Johannes Bornhold 4f01beb531 Adjust ruby gem defaults for scrypt on darwin
Without the adjustment I was not able to build scrypt. It was failing
because of missing symbols due to the parameter '-arch i386' being
appended to the clang calls.
2016-11-03 01:29:03 +01:00
Venkateswara Rao Mandela 219b9d5086 ruby-zoom: init at 4.1.0
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
2016-10-26 17:26:26 +05:30
Peter Hoeg cd11efb651 bundler: 1.13.1 -> 1.13.6 2016-10-24 23:17:23 +08:00
zimbatm 2a194746a5 bundlerEnv: refactor
Add `pname` attribute: if passed, the derivation name defaults to the
gem name + version and only expose the gem's bin.

Add `gemdir` attribute: gives a default lookup path for the Gemfile,
Gemfile.lock and gemset.nix.

Set the `meta.platforms' to `ruby.meta.platforms' by default.
2016-10-08 22:38:56 +01:00
zimbatm b8bcbec5fd ruby: fixes rubygems user installs
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
  point to the wrong directory
* Overhaul ruby version heuristics
2016-10-02 22:07:22 +01:00
zimbatm 659803f8c5 Merge pull request #18920 from peterhoeg/bundler
bundler: 1.12.5 -> 1.13.1
2016-09-24 13:41:16 +01:00
Michael Fellinger c0bb2549b4 gem-config: add snappy 2016-09-21 14:29:12 +02:00
Peter Hoeg 73e4f644d0 bundler: 1.12.5 -> 1.13.1 2016-09-20 15:55:19 +08:00
zimbatm 62df82efcf buildRubyGem: fixes gemspec UTF-8 loading issue
If a gemspec has UTF-8 characters in it, ruby will fail loading it with

    invalid multibyte char (US-ASCII)

This change forces the encoding to be correct, we assume everyone now
uses UTF-8.
2016-09-06 14:42:58 +01:00
Joachim F 01811fe2cd Merge pull request #16276 from manveru/gemconfig-rbnacl
gemconfig: rbnacl needs libsodium
2016-09-05 01:11:57 +02:00
Graham Christensen add3d4d45b Revert "bundix: 2.2.0" 2016-09-02 16:00:45 -04:00
zimbatm f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup
Nokogiri fixup
2016-09-01 10:43:22 +01:00
Michael Fellinger f75e2c8583 bundix: 2.2.0 2016-08-31 11:52:06 +02:00
zimbatm a7cf555e2a buildRubyGem: handle build-time ruby dependencies
For some reason `gem install` unsets the GEM_PATH environment variable
internally unless the install dir is provided. This in turn means that
if it invokes extconf.rb and extconf.rb depends on a gem available on
the GEM_PATH (like pkg-config for nokogiri) then it's not available in
that context.

Proof: d8293c4729/lib/rubygems/commands/install_command.rb (L151)
Blame: 9ea600c9c2

This is a hack that sets the :install_dir to where we would install
anyways (the GEM_HOME is the default installation destination).
2016-08-29 22:17:59 +01:00
zimbatm 6ae57b1b63 bundler: fix usage on nested call
The combination of bundler 1.12.5 and rubygems 1.6.2 doesn't play well
at all when trying to run gems such as foreman where bundler is used to
run bundler.

Just upgrading to the latest bundler rc doesn't fix it and changing rubygems causes a massive rebuild.

Issues:

- https://github.com/bundler/bundler/issues/4402
- https://github.com/bundler/bundler/issues/4576
- https://github.com/bundler/bundler/issues/4602
- https://github.com/docker-library/ruby/issues/73

This PR patches bundler to work around the issue as highlighted here and
unbreaks everything for me:

https://github.com/bundler/bundler/issues/4602#issuecomment-233619696
2016-08-29 17:03:12 +01:00
zimbatm a1460473cb buildRubyGem: don't set the GEM_HOME
bundler for example needs to have the GEM_HOME being passed trough to
function properly.

For gems that are loading content dynamically, or can use plugins, use
buildRubyGem.

For executables that are wrapped in their own sealed thing use
bundlerEnv.
2016-08-23 09:30:49 +01:00
zimbatm 838781ce8a buildRubyGem: fix buildFlags default attribute
lib.escapeShellArgs doesn't work well when a null value is provided.

[] is also the correct value since it's really just an empty list of
arguments that we have.
2016-07-21 11:46:16 +01:00
zimbatm b0f8416c5c Merge pull request #16180 from zimbatm/shell-escaping
Escape all shell arguments uniformly
2016-06-19 23:27:52 +01:00
Aristid Breitkreuz def3ad3eeb Merge pull request #16170 from zimbatm/bundler-1.12.5
bundler: 1.11.2 -> 1.12.5
2016-06-18 17:02:05 +02:00
Michael Fellinger c3df347f7b gemconfig: rbnacl needs libsodium 2016-06-16 19:33:12 +02:00
Michael Fellinger e86e407ce9 gemconfig: typhoeus needs curl 2016-06-16 11:43:21 +02:00
zimbatm 28fa4a2f03 Escape all shell arguments uniformly 2016-06-12 18:11:37 +01:00
zimbatm 3086250ceb bundler: 1.11.2 -> 1.12.5 2016-06-12 13:35:15 +01:00
Graham Christensen bb5faafbca gemconfig: rmagick requires which as of 2.15.4 2016-06-06 16:00:10 -05:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Lane Seppala 8e97c64ffc chefdk: fix build of hitimes on OS X 2016-05-04 16:41:44 -06:00
Eelco Dolstra 21a2f2ba3b nix: Add a "dev" output
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
Michael Fellinger 7d974e7eef
gem-config: fix bundler 2016-04-18 11:12:19 +02:00
Charles Strahan 99fd109a85 Merge pull request #14786 from manveru/gemset-groups
bundlerEnv: filter gemset groups
2016-04-18 02:02:57 -04:00
Michael Fellinger 090da825fe
bundlerEnv: filter gemset groups 2016-04-17 23:07:31 +02:00
Michael Fellinger caadfd53e3
capybara-webkit: qt5Full -> qt48 2016-04-17 22:35:04 +02:00
zimbatm 12e919bb34 Merge pull request #14653 from manveru/bundler-env-frozen
bundler-env: Gemfile.lock is frozen
2016-04-14 10:20:04 +01:00
Michael Fellinger fe87240e68 bundler-env: Gemfile.lock is frozen 2016-04-13 11:25:41 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Michael Fellinger 4873838f75 capybara-webkit: gem needs qt5Full 2016-03-21 12:01:37 +01:00
zimbatm 5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00:00
zimbatm 3547ffa89f ruby: remove unused patches 2016-03-19 22:04:12 +00:00
zimbatm eccad06e23 remove unsed ruby-sqlite3 package 2016-03-19 22:04:12 +00:00
Shea Levy aed1cd3c17 Add patch to fix GET Bucket requests to fake-s3
See https://github.com/jubos/fake-s3/pull/37

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-04 16:42:20 -04:00
Evgeny Egorochkin ddd1f7b52b Get rid of old rake derivation that doesn't build 2013-09-02 23:51:03 +03:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Evgeny Egorochkin 93129530a9 Rake: Fix build. Patch by Ilya Cassina.
svn path=/nixpkgs/trunk/; revision=24480
2010-10-26 01:15:42 +00:00
Pjotr Prins ad3d886489 Two Ruby modules
svn path=/nixpkgs/trunk/; revision=12954
2008-10-05 09:00:56 +00:00