nixpkgs/pkgs/development
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
..
arduino
compilers Merge master into stdenv-updates 2014-01-12 12:29:24 +01:00
eclipse
guile-modules
interpreters Merge master into stdenv-updates 2014-01-12 12:29:24 +01:00
libraries Merge master into stdenv-updates 2014-01-12 12:29:24 +01:00
lisp-modules Merge master into stdenv-updates 2014-01-12 12:29:24 +01:00
misc
mobile
ocaml-modules
perl-modules
python-modules pyqt4: update to 4.10.3 and add python3 support 2014-01-11 20:07:29 +01:00
qtcreator
r-modules/generic
ruby-modules
tools Merge master into stdenv-updates 2014-01-12 12:29:24 +01:00
web nodejs: update from 0.10.22 to 0.10.24 2014-01-08 18:44:11 +01:00