nixpkgs - Downstream nixpkgs tree for Spectrum

	Commit message (Expand)	Author	Age
*	Merge branch 'staging' into modular-stdenv	Vladimír Čunát	2014-09-08
\|\
\| *	fix ocsigen expression	Aristid Breitkreuz	2014-09-06
\| *	A description cleanup after merge	Michael Raskin	2014-09-06
\| *	Add a derivation for eliom (ocaml web framework)	Florent Becker	2014-09-06
\| *	Add a derivation for the ocsigen server (ocaml webserver)	Florent Becker	2014-09-06
\| *	Add tyxml (XML library for ocaml)	Florent Becker	2014-09-06
\| *	add ocaml-ipaddr	Florent Becker	2014-09-06
\| *	Add a derivation for deriving (ocaml instance derivation à la Haskell)	Florent Becker	2014-09-06
\| *	Add a derivation for ocaml-optcomp	Florent Becker	2014-09-06
\| *	Add a derivation for ocaml-calendar	Florent Becker	2014-09-06
\| *	Merge pull request #3920 from vbgl/javalib-fix	Michael Raskin	2014-09-04
\| \|\
\| \| *	ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches	Vincent Laporte	2014-09-03
\| \| *	ocaml-javalib, ocaml-sawja: removes wrong path to bash in	vbgl	2014-09-01
\| * \|	ocaml-twt: some fixes	Vincent Laporte	2014-09-03
\| * \|	Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ	Vincent Laporte	2014-09-02
\| \|\ \
\| \| * \	Merge pull request #3849 from vbgl/cmdliner	Michael Raskin	2014-09-02
\| \| \|\ \
\| \| \| * \|	Adds ocaml-cmdliner	Vincent Laporte	2014-08-29
\| \| * \| \|	Merge pull request #3681 from vbgl/merlin-1.7	Michael Raskin	2014-09-02
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	yojson: propagate build inputs (as in PR #3404)	Vincent Laporte	2014-08-19
\| \| * \| \|	add the ocaml 'lambda-term' library (terminal control)	Florent Becker	2014-08-30
\| \| * \| \|	add the 'zed' ocaml editor library	Florent Becker	2014-08-30
\| \| * \| \|	Use propagated inputs in lwt	Florent Becker	2014-08-30
\| \| * \| \|	Update ocaml_lwt to version 2.4.5 (from git)	Florent Becker	2014-08-30
\| \| * \| \|	Update ocaml-react to 1.1.0	Florent Becker	2014-08-30
\| \| * \| \|	Add a derivation for ocaml-text	Florent Becker	2014-08-30
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge pull request #3632 from vbgl/ocaml-csv	Michael Raskin	2014-08-23
\| \| \|\ \
\| \| \| * \|	Adds ocaml library “csv”	Vincent Laporte	2014-08-17
\| \| \| \|/
\| \| * \|	Adds javalib and sawja	Vincent Laporte	2014-08-23
\| \| * \|	Merge pull request #3299 from vbgl/erratique-uu	Michael Raskin	2014-08-23
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Adds OCaml libraries: uucd, uunf, uutf and xmlm	Vincent Laporte	2014-07-16
\| * \| \|	Adds ocaml-sqlite3EZ and its dependency ocaml+twt	Vincent Laporte	2014-08-21
\| \|/ /
* \| \|	merge 'staging' into modular-stdenv	Vladimír Čunát	2014-09-08
\|\\| \|
\| * \|	Merge master into PR	Vladimír Čunát	2014-08-12
\| \|\ \
\| * \| \|	Update ocaml-pcre to version 7.1.1	Florent Becker	2014-07-21
\| \| \|/ \| \|/\|
* \| \|	Cleanup: Use += to append to envHooks	Eelco Dolstra	2014-08-09
\| \|/ \|/\|
* \|	Merge remote-tracking branch 'origin/master' into staging.	Peter Simons	2014-08-04
\|\ \
\| * \|	Turn some license strings into lib.licenses values	Mateusz Kowalczyk	2014-07-28
\| \|/
* \|	Merge remote-tracking branch 'origin/master' into staging	Eelco Dolstra	2014-07-07
\|\\|
\| *	Adds yojson.	Vincent Laporte	2014-07-05
\| *	Clarifies the license; populates meta.platforms	Vincent Laporte	2014-07-03
\| *	Adds biniou	Vincent Laporte	2014-07-03
\| *	Adds easy-format	Vincent Laporte	2014-06-29
* \|	Another attempt to eradicate ensureDir	Eelco Dolstra	2014-06-30
\|/
*	fix evaluation (wrong meta.maintainers field)	Vladimír Čunát	2014-06-09
*	Added llpp, a mupdf based pdf pager written in ocaml.	Pascal Wittmann	2014-06-04
*	zarith: fix perl path	Austin Seipp	2014-05-01
*	ocamlgraph: upgrade to 1.8.5	Austin Seipp	2014-05-01
*	ocaml-packages: add zarith 1.2.1	Austin Seipp	2014-05-01
*	lablgtk: remove old patch	Austin Seipp	2014-05-01
*	Merge pull request #2347 from vbmithr/ocaml-pcre	Oliver Charles	2014-04-25
\|\