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 |
|
Mateusz Kowalczyk
|
007f80c1d0
|
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999, issue #739
|
2014-11-06 00:48:16 +00:00 |
|
|
Charles Strahan
|
11903c4c10
|
ruby: expose RUBY_ENGINE, include teeny version in paths
|
2014-10-27 21:55:11 +00:00 |
|
|
Charles Strahan
|
7231b95f4f
|
Ruby: 2.1.3 and Fiddle support
This packages Ruby 2.1.3, and adds Fiddle support for all 2.x versions.
closes #4656
|
2014-10-26 04:48:09 +00:00 |
|