William A. Kennington III
7cda24c01e
Merge branch 'master.upstream' into staging.upstream
2015-07-08 14:11:16 -07:00
Charles Strahan
357324df26
ruby: add 2.2.2, bump patch levels
...
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
2015-07-07 17:45:33 -04:00
Jude Taylor
80c62d1325
darwin purity: ruby-1.9.3
2015-06-25 16:36:04 -07:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Charles Strahan
ad026dab98
ruby: don't reference baseruby
2015-01-23 21:22:34 -05:00
Charles Strahan
8d49e87dec
Merge pull request #4677 from cstrahan/pleasant-ruby
...
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan
115c299ea0
ruby: enable curses support by default
2015-01-21 15:22:21 -05:00
Charles Strahan
145733c479
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/redmine/default.nix
pkgs/development/interpreters/ruby/gem.nix
pkgs/development/interpreters/ruby/generated.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/tools/vagrant/default.nix
pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
James Cook
576092eec4
Revert "ruby: Fix build on systems with store optimisation. Closes #4273 . #4266 promises a better fix."
...
This reverts commit d2c0011c2fc04e492898
2014-11-06 09:22:20 -08:00
Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Charles Strahan
11903c4c10
ruby: expose RUBY_ENGINE, include teeny version in paths
2014-10-27 21:55:11 +00:00
James Cook
d2c0011c2f
ruby: Fix build on systems with store optimisation. Closes #4273 . #4266 promises a better fix.
...
(The build process attempted to copy file a overwriting file b, where a
and b are hard-linked, which results in cp returning a non-zero exit
code.)
https://github.com/NixOS/nixpkgs/issues/4266
2014-10-25 06:13:16 +03:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Charles Strahan
c27a653bba
improve ruby support
...
* add the 2.1.x versions
* include teeny version in passthru
* by default, apply the same patches used by RVM
* clean up file names and attribute names
2014-09-15 23:54:17 -04:00
