Shea Levy 66ad165829 Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs ... This adds the opam ocaml package, and also adds orbitz as a maintainer. I've tested that it builds, nothing more. Signed-off-by: Shea Levy <shea@shealevy.com>		2013-03-08 17:10:54 -05:00
..
arduino	inotool: add avr-gcc-libc to inputs	2012-12-23 18:21:51 +02:00
compilers	SBCL: patch for new Glibc no longer needed	2013-03-08 17:55:11 +04:00
eclipse	update ecj to 3.7.2	2012-08-25 19:39:19 +02:00
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
libraries	Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs	2013-03-08 17:03:22 -05:00
misc	AVR GCC: enable C++ support (makes it usable with Arduino)	2012-12-23 18:20:34 +02:00
mobile	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
ocaml-modules	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
perl-modules	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
python-modules	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
qtcreator	qtcreator: Build QmlDesigner Plugin	2012-11-27 23:13:18 +01:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tools	Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs	2013-03-08 17:10:54 -05:00
web	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00