Vladimír Čunát 141b5d961f Merge master into PR ... Conflicts: pkgs/development/compilers/ocaml/4.01.0.nix		2014-08-12 21:52:20 +02:00
..
arduino
compilers	Merge master into PR	2014-08-12 21:52:20 +02:00
eclipse	ecj: Build on Darwin	2014-07-15 11:51:27 +02:00
guile-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
interpreters	Erlang R17: Bump to 17.1.	2014-08-12 13:47:38 +02:00
libraries	haskellPackages.bound: New expression	2014-08-12 18:11:33 +01:00
lisp-modules	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ocaml-modules	Merge master into PR	2014-08-12 21:52:20 +02:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	Merge #3152: add pyqt5	2014-08-12 20:33:34 +02:00
qtcreator	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
r-modules	Added CRAN archive to R package derivation to prevent R expressions from	2014-07-08 11:02:05 +10:00
ruby-modules
tools	haskell-cabal2nix: update to version 1.68	2014-08-12 16:09:22 +02:00
web	Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook	2014-07-26 08:53:52 +02:00