nixpkgs/pkgs/development
Vladimír Čunát 031baae714 Merge branch 'staging' into v/modular
Conflicts (as in p/modular-stdenv):
	pkgs/stdenv/linux/default.nix
2014-08-30 08:33:10 +02:00
..
arduino
compilers Merge branch 'staging' into v/modular 2014-08-30 08:33:10 +02:00
eclipse
guile-modules
interpreters mutiout: make it builtin 2014-08-30 08:27:43 +02:00
libraries mutiout: make it builtin 2014-08-30 08:27:43 +02:00
lisp-modules
misc
mobile
ocaml-modules Merge remote-tracking branch 'origin/staging' into modular-stdenv 2014-08-22 00:07:05 +02:00
perl-modules Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
pharo/vm
python-modules Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
qtcreator
r-modules RcmdrPlugin_ROC: remove broken package 2014-08-15 18:51:47 +02:00
ruby-modules
tools mutiout: make it builtin 2014-08-30 08:27:43 +02:00
web merge the rest of multiple-outputs 2014-08-25 10:41:49 +02:00