6b1ebeccf2
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though. |
||
---|---|---|
.. | ||
analysis | ||
boomerang | ||
build-managers | ||
casperjs | ||
cdecl | ||
documentation | ||
gnulib | ||
guile | ||
haskell | ||
java | ||
jq | ||
literate-programming/noweb | ||
misc | ||
neoload | ||
ocaml | ||
parsing | ||
phantomjs | ||
profiling | ||
pydb | ||
selenium |