Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
arduino
compilers	openjdk: add platforms on darwin to fix #5634	2015-01-13 16:42:32 +01:00
coq-modules	coqPackages.fiat: enable building the examples as a test	2015-01-09 15:20:17 -06:00
eclipse
guile-modules
haskell-modules	idris: fix build with GHC 7.8.x	2015-01-13 15:21:51 +01:00
interpreters	Merge branch 'master' into staging	2015-01-13 18:07:11 +01:00
libraries	Merge branch 'master' into staging	2015-01-13 18:07:11 +01:00
lisp-modules
lua-modules
misc
mobile
ocaml-modules	Adds ocaml-gtktop	2015-01-13 14:17:56 +01:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules
qtcreator
r-modules	r-modules: update list of broken packages	2015-01-13 12:44:11 +01:00
ruby-modules
tools	Merge pull request #5722 from nckx/coan	2015-01-13 14:14:07 +01:00
web