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. |
||
|---|---|---|
| .. | ||
| ascii | ||
| catdoc | ||
| cheetah-template | ||
| colordiff | ||
| convertlit | ||
| dadadodo | ||
| diffstat | ||
| diffutils | ||
| dos2unix | ||
| ebook-tools | ||
| enca | ||
| enscript | ||
| gawk | ||
| gnugrep | ||
| gnupatch | ||
| gnused | ||
| groff | ||
| highlight | ||
| html-tidy | ||
| kdiff3 | ||
| mairix | ||
| mpage | ||
| multitran | ||
| namazu | ||
| numdiff | ||
| odt2txt | ||
| patchutils | ||
| podiff | ||
| qshowdiff | ||
| recode | ||
| replace | ||
| sgml | ||
| source-highlight | ||
| uni2ascii | ||
| wdiff | ||
| wgetpaste | ||
| xml | ||