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

..

bitperfect-rdoc.patch

Make most of Ruby Gem builds repeatable

2013-06-21 18:22:07 +03:00

bundler.nix

more cleanup

2014-10-31 01:44:57 +00:00

config.nix

Fix the new Ruby interpreters (fixes #3509).

2014-09-18 11:43:16 -04:00

fixes.nix

various fixes

2014-10-29 23:14:19 +00:00

gem_hook.patch

Rework ruby gems

2011-01-21 08:24:52 +00:00

gem.nix

ruby gems: propagate ruby because it contains the hooks to add gem search paths, needed by nix-shell-created environments

2014-12-20 01:01:39 +02:00

generated.nix

Add rubyLibs.redis

2014-12-16 13:10:35 -05:00

load-ruby-env.nix

add path fetcher

2014-11-08 23:46:34 +00:00

packages.nix

rename rubyLibs to rubyPackages

2014-11-09 22:16:58 +00:00

patches.nix

nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux

2014-11-22 21:13:22 +01:00

ruby19-parallel-install.patch

Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed.

2013-06-11 00:59:26 +03:00

ruby-1.8.7.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-1.9.3.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-2.0.0.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-2.1.0.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-2.1.1.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-2.1.2.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

ruby-2.1.3.nix

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2014-12-28 14:29:52 -05:00

rubygems.nix

more cleanup

2014-10-31 01:44:57 +00:00

rvm-patchsets.nix

Ruby: 2.1.3 and Fiddle support

2014-10-26 04:48:09 +00:00