Ryan Trinkle 92f8d68b99 Merge branch 'master' of https://github.com/NixOS/nixpkgs ... Conflicts: pkgs/development/libraries/haskell/ghcjs-dom/default.nix pkgs/top-level/haskell-packages.nix		2014-10-06 13:12:58 -04:00
..
arduino
compilers	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
coq-modules	coq-containers: package is broken	2014-10-01 18:39:31 +01:00
eclipse
guile-modules
interpreters	Fix the version	2014-10-06 02:43:57 +04:00
libraries	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
lisp-modules
lua-modules	lua: Fixed luasql.patch	2014-10-01 06:00:06 +01:00
misc
mobile	Make path to Xcode configurable	2014-10-02 15:49:33 +02:00
ocaml-modules
perl-modules
pharo	Merge pull request #4274 from DamienCassou/pharo-vm-update	2014-09-30 13:42:45 +02:00
python-modules
qtcreator	qtcreator: Update from 3.1.0 to 3.2.0	2014-10-05 21:23:00 +02:00
r-modules	Merge pull request #4368 from michelk/r-XML	2014-10-04 19:56:18 +02:00
ruby-modules
tools	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
web