5 commits

Author	SHA1	Message	Date
James Cook	576092eec4	Revert "ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix." ... This reverts commit d2c0011c2f. c04e492898 gives a cleaner solution that's not specific to ruby.	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
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