colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
598,983 Commits 125 Branches 0 Tags 3.4 GiB
ff1a94e523
Commit Graph

584 Commits

Author SHA1 Message Date
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