625f40151b
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix |
||
---|---|---|
.. | ||
arduino | ||
compilers | ||
eclipse | ||
guile-modules | ||
interpreters | ||
libraries | ||
misc | ||
mobile | ||
ocaml-modules | ||
perl-modules | ||
python-modules | ||
qtcreator | ||
ruby-modules | ||
tools | ||
web |