Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Brad Ediger
6e353bb17f
ruby: update 2.3 series to 2.3.1
2016-05-02 15:49:05 -05:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00: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
06e4186f4e
Merge pull request #14061 from zimbatm/bundler-env-fix
...
bundlerEnv: fix wrapping of programs
2016-03-19 22:03:12 +00:00
zimbatm
53c9edef34
bundlerEnv: fix wrapping of programs
...
Setting the GEM_PATH after ruby is started is not reliable enough. In
some cases rubygems would have already loaded and ignore these settings.
Fixes #14048
2016-03-19 20:25:34 +00:00
Charles Strahan
2802785675
Merge pull request #13975 from aespinosa/proper-script-gempaths
...
buildRubyGem: use Gem.use_paths to load gems
2016-03-19 16:15:50 -04:00
zimbatm
9c4b45fafe
Merge pull request #13601 from zimbatm/ruby-dev
...
ruby.dev
2016-03-18 19:05:45 +00:00
Michael Fellinger
bb59ba117d
bundix: 2.0.6 -> 2.0.8
2016-03-17 18:12:38 +01:00
Allan Espinosa
52b61dce47
buildRubyGem: use Gem.use_paths to load gems
...
After ruby initializes, rubygems no longer reads the GEM_PATH. Before,
we have the following scenario:
Gem.path # => ["a"]
ENV['GEM_PATH'] = ["b"]
Gem.path # => ["a"] # Still returns the same
Gem.use_paths is the documented way to create isolated environments as
documented in [1].
[1] http://www.rubydoc.info/github/rubygems/rubygems/Gem.use_paths
2016-03-16 17:28:02 -05:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
zimbatm
d9cf99225b
rubygems: 2.4.8 -> 2.6.2
2016-03-14 23:46:01 +00:00
zimbatm
19820e9a96
ruby: add a new .dev output to ruby derivations
...
The idea is to bundle ruby, bundler and bundix together. I was
having issues where bundler was installed with ruby 2.3.0 and I wanted to use
ruby 2.0.0.
With this change all the developer has to do is install `ruby_2_0_0.dev`
either in his environment or in a nix-shell.
2016-03-14 22:25:48 +00:00
zimbatm
4637cfa51f
bundler: 1.10.6 -> 1.11.2
2016-03-14 22:25:19 +00:00
zimbatm
86f1579266
ruby: install rubygems directly into the derivation
...
Having a separate rubygems package can lead to split-brain scenarios.
Since rubygems is designed to replace himself on a ruby installation,
let's do that.
2016-03-14 22:23:25 +00:00
Michael Fellinger
075b3b449d
bundix: 2.0.5 -> 2.0.6
...
Fixes issue caused by changed nix-prefetch-git output.
2016-03-13 13:59:38 +01:00
Franz Pletz
e9fc4e7db6
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-07 22:08:27 +01:00
zimbatm
7c4c151a94
ruby: only keep the latest tiny per major.minor
...
Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
2016-03-04 14:24:37 +00:00
Robin Gloster
fed49425c5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-03 16:11:55 +00:00
Robin Gloster
5936d6dbbb
Revert "rubygems: 2.4.8 -> 2.5.2"
...
This reverts commit 7e8faf022f
.
This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
2016-03-02 15:25:35 +00:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
zimbatm
7e8faf022f
rubygems: 2.4.8 -> 2.5.2
...
Closes #11950
2016-02-26 18:02:24 +00:00
zimbatm
cdbaee7d4b
Merge pull request #12866 from nathan7/rubygem-drvname-fix
...
buildRubyGem: ensure gem versions don't get misparsed
2016-02-23 23:13:12 +00:00
zimbatm
49217b724f
Merge pull request #12786 from phunehehe/unused-bundler-head
...
remove unused file bundler-head.nix
2016-02-23 22:39:55 +00:00
Robin Gloster
bb2639aafc
Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv
2016-02-22 01:14:22 +00:00
Charles Strahan
123a9104e4
Merge pull request #13109 from zimbatm/ruby-fixes
...
Ruby fixes
2016-02-20 20:29:25 -05:00
Robin Gloster
bc21db3692
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-19 21:16:14 +00:00
zimbatm
a92c609ec6
gemconfig: add eventmachine and msgpack
2016-02-18 23:44:50 +00:00
zimbatm
24e0fc99f9
buildRubyGem: remove unecessary duplication
2016-02-18 23:44:49 +00:00
Vladimír Čunát
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
Franz Pletz
41698c9efa
Merge branch 'master' into hardened-stdenv
2016-02-15 20:05:29 +01:00
zimbatm
9acbb9021b
bundix: cleaner substitution
...
Use the builtin substituteInPlace instead of sed
2016-02-14 17:57:18 +00:00
Michael Fellinger
b9c13dcbc7
bundix: 2.0.4 -> 2.0.5
...
Fixes issue with the -d flag creating duplicated `dependencies` properties.
2016-02-12 09:56:02 +01:00
Michael Fellinger
db6f59619d
bundix: 1.0.4 -> 2.0.4
2016-02-10 23:27:33 +00:00
Arseniy Seroka
3b1d18ff48
Merge pull request #12919 from zimbatm/new-bundix2
...
bundix: 1.0.4 -> 2.0.4
2016-02-10 16:04:31 +03:00
Michael Fellinger
112476ec96
bundix: 1.0.4 -> 2.0.4
2016-02-10 12:02:10 +00:00
Nathan Zadoks
c998447a13
buildRubyGem: pass the gem version through into the derivation name
2016-02-07 16:53:31 +01:00
Nathan Zadoks
b4da3bb88b
buildRubyGem: ensure gem versions don't get misparsed
...
Without this, every nix-env --upgrade replaces ruby with an
arbitrary gem, which makes Ruby unusuable from user environments.
2016-02-07 16:53:27 +01:00
Vladimír Čunát
a115bff08c
Merge branch 'master' into staging
2016-02-07 13:52:42 +01:00
Robin Gloster
9229e9c656
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-07 11:17:57 +00:00
Hoang Xuan Phu
cb7b811c43
remove unused file bundler-head.nix (bundler_HEAD is now just an alias for bundler)
2016-02-03 11:26:40 +07:00
Robin Gloster
e96ea9712c
ruby: add patch for RAND_egd
2016-01-30 16:36:57 +00:00
Michael Fellinger
c24c153743
Add Ruby 2.3.0 package
2016-01-27 09:28:59 +01:00
Vladimír Čunát
2af19df364
Merge branch 'master' into staging
2016-01-25 10:02:25 +01:00
zimbatm
e9eda43928
buildRubyGem: fix missing libobjc in darwin
...
This was preventing any ruby gem with a c extension to build.
mkmf would fail with a misleading error:
/nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
You have to install development tools first.
2016-01-24 23:15:40 +00:00
zimbatm
9a55295c49
buildRubyGem: fix NoMethodError
...
generate_stub doesn't exist and the output is not used in the code so I just
removed the line.
This was preventing the binstubs from generating properly.
2016-01-24 23:14:00 +00:00
Nikolay Amiantov
9b980baa9d
bundlerEnv.wrapper: rename to wrappedRuby
2016-01-24 15:59:31 +03:00
Rok Garbas
dd9bad4aa4
rubygems: 2.4.1 -> 2.4.8, fixes #8492
2016-01-20 03:36:36 +01:00