Commit graph

83 commits

Author SHA1 Message Date
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
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Vincent Laporte 9256136635 Adds yojson.
Yojson is an optimized parsing and printing OCaml library for the JSON
format, contributed by Martin Jambon.

Webpage: http://mjambon.com/yojson.html
2014-07-05 09:00:12 +02:00
Vincent Laporte e4216eddda Clarifies the license; populates meta.platforms 2014-07-03 15:23:38 +02:00
Vincent Laporte 543f355883 Adds biniou 2014-07-03 11:09:47 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Vincent Laporte b598497da9 Adds easy-format 2014-06-29 15:37:46 +02:00
Vladimír Čunát 35f47bcfd8 fix evaluation (wrong meta.maintainers field) 2014-06-09 19:12:17 +02:00
Pascal Wittmann 86b7cf8bb4 Added llpp, a mupdf based pdf pager written in ocaml.
Updated lablgl to 1.05 and mupdf to 1.4.
Added myself as maintainer for lablgl.
2014-06-04 22:15:06 +02:00
Austin Seipp 4fe2f98051 zarith: fix perl path
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 09:14:16 -05:00
Austin Seipp 5f702d52f4 ocamlgraph: upgrade to 1.8.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:39 -05:00
Austin Seipp 02351691ba ocaml-packages: add zarith 1.2.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:28 -05:00
Austin Seipp 2d7fe68212 lablgtk: remove old patch
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:25:45 -05:00
Oliver Charles f7de4f099f Merge pull request #2347 from vbmithr/ocaml-pcre
Updated OCaml package pcre
2014-04-25 10:31:18 +01:00
Vincent Bernardoff b0a6bb414d Updated react to 1.0.1 2014-04-23 17:02:46 +02:00
Vincent Bernardoff 123ef8a57b Updated OCaml package pcre 2014-04-22 00:31:27 +02:00
Marco Maggesi 42b070527c Update ocamlnet to version 3.7.3
Also remove dependency to lablgkt which is not used and prevent
building on darwin.
2014-03-20 14:54:54 +01:00
Shea Levy 80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Marco Maggesi 210a9db16f Update OCaml ExtLib to version 1.6.1 2014-01-31 13:59:44 +01:00
Marco Maggesi e1df6c2162 Update OCaml react to version 2.4.3 2014-01-31 12:01:32 +01:00
Marco Maggesi f3a49abf08 Add OCaml Oasis
OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
2014-01-31 12:01:32 +01:00
Marco Maggesi ec1b40be87 Update OCaml Batteries to version 2.2.0 2014-01-31 12:01:32 +01:00
Marco Maggesi 841a02cabb Update OCaml Type_conv to version 109.60.01.
Also keep the old version 3.0.5 around for compatibility with OCaml 3.12.1.
2014-01-31 12:01:31 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Marco Maggesi e634e4ae6b Update OCaml library Camomile to version 0.8.5 2014-01-18 20:56:45 +00:00
Marco Maggesi c54a9276ba Update menhir to version 20130115 2014-01-18 20:56:44 +00:00
Marco Maggesi cd2fd2a401 Update cryptokit to version 1.9 2014-01-18 20:56:44 +00:00
Marco Maggesi 663845fc9e Update OCaml OUnit to version 2.0.0 2014-01-18 20:56:44 +00:00
David Cadé 9bda7275ce added OCaml package ocamlsdl 2013-12-05 16:20:32 +01:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Evgeny Egorochkin 5d56681505 extlib: fix version to match tarball 2013-07-14 02:08:51 +03:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik 7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Christophe Raffalli 101aad1467 camlimages ... still wasn't ok. Now better. 2013-06-19 04:39:55 +02:00
Christophe Raffalli ce2efd0b5b fixed dependencies of camlimages 2013-06-16 22:33:44 +02:00
Christophe Raffalli 27bf590d3c upgraded ocaml-mysql to 1.1.1 2013-06-16 22:33:38 +02:00
Christophe Raffalli fc36c19834 Added OCaml gmp bindings mlgmp 2013-06-16 22:33:33 +02:00
Christophe Raffalli 270d929089 New ocaml packages:
- ocaml-cairo
- camlimages
- dypgen
- patoline
2013-06-07 21:40:38 +02:00
Christophe Raffalli 43faad8063 Upgraded ocamlnet to 3.6.3. Also enabled mot functionality of ocamlnet like nethttp 2013-06-07 21:40:38 +02:00
Christophe Raffalli 5765e186d2 upgraded ocaml/sqlite3 to 2.0.4 2013-06-07 21:40:37 +02:00
Christophe Raffalli b3fa714f1f upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli 59877bd1ad upgraded camlzip to version 1.05 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli af7fd67e43 upgraded ocaml/cryptokit to 1.7 2013-06-07 21:40:37 +02:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Marco Maggesi a090424115 Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.) 2012-10-09 14:03:12 -04:00
Marco Maggesi 3989f09ae6 Update ounit to version 1.1.2 2012-10-09 14:03:11 -04:00
Marco Maggesi c3e12acb5a Update extlib to version 1.5.2 2012-10-09 14:03:11 -04:00
Arie Middelkoop 26b4e2a286 compatibility fix of ocaml-extlib for ocaml 4.00.0. 2012-07-31 14:10:11 +02:00
Arie Middelkoop 2d09dbf8fc update of ocaml-makefile to version 6.37.0. 2012-07-31 14:09:49 +02:00