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. |
||
|---|---|---|
| .. | ||
| all-packages.nix | ||
| guile-2-test.nix | ||
| haskell-defaults.nix | ||
| haskell-packages.nix | ||
| make-tarball.nix | ||
| mingw.nix | ||
| node-packages-generated.nix | ||
| node-packages.json | ||
| node-packages.nix | ||
| perl-packages.nix | ||
| platforms.nix | ||
| python-packages.nix | ||
| release-cross.nix | ||
| release-haskell.nix | ||
| release-lib.nix | ||
| release-python.nix | ||
| release-small.nix | ||
| release.nix | ||