nixpkgs/pkgs/development
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
compilers svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
eclipse update ecj version 2010-11-22 14:50:52 +00:00
guile-modules Drop 'gnomevfs = gnome_vfs;' alias 2011-10-08 12:06:03 +00:00
interpreters svn merge ^/nixpkgs/trunk 2012-01-04 09:54:17 +00:00
libraries svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
misc Updating avr-gcc and avr-libc (old link is inaccessible) 2011-08-23 07:56:34 +00:00
ocaml-modules Add ocamlnat (native toplevel for OCaml) 2011-12-16 09:35:13 +00:00
perl-modules * DBD::SQLite updated to 1.35. 2012-01-04 14:23:41 +00:00
python-modules * PIL updated to 1.1.7. 2011-12-29 16:53:14 +00:00
ruby-modules Rake: Fix build. Patch by Ilya Cassina. 2010-10-26 01:15:42 +00:00
tools svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
web upgraded nodejs 2011-12-11 19:38:57 +00:00