Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

batteries

…

biniou

Clarifies the license; populates meta.platforms

2014-07-03 15:23:38 +02:00

camlimages

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

camlzip

…

camomile

…

cryptgps

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

cryptokit

…

dypgen

…

easy-format

Adds easy-format

2014-06-29 15:37:46 +02:00

expat

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

extlib

…

gmetadom

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

http

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lablgl

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lablgtk

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lablgtkmathview

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lwt

…

menhir

…

mlgmp

…

mysql

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

ocaml-cairo

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

ocamlgraph

ocamlgraph: upgrade to 1.8.5

2014-05-01 02:30:39 -05:00

ocamlmake

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

ocamlnat

…

ocamlnet

…

ocamlsdl

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

odn

…

ounit

…

pcre

…

pycaml

…

react

Updated react to 1.0.1

2014-04-23 17:02:46 +02:00

sexplib

…

sqlite3

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

ssl

…

typeconv

…

ulex

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

yojson

Adds yojson.

2014-07-05 09:00:12 +02:00

zarith

zarith: fix perl path

2014-05-01 09:14:16 -05:00