mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
166636 commits 204 branches 125 tags 10 GiB
Commit graph

305 commits

Author SHA1 Message Date
Vincent Laporte cacc9faac7 camlPackages.camlp5: 6.17 -> 7.01 2017-07-08 06:14:43 +00:00
Vincent Laporte 2521af87ad obuild: remove dependency on findlib 2017-07-05 18:05:09 +00:00
Volth 18e3799cd1 ocamlPackages.{benchmark,obuild,ptmap,rope}: init at 1.4, 0.1.8, 2.0.1, 0.5 2017-07-05 17:48:45 +00:00
Vincent Laporte dbe61c96ae ocamlPackages: make lwt-3.0.0 the default 2017-07-02 15:22:04 +00:00
Vincent Laporte 8ad273d4f0 ocamlPackages.lambda-term: 1.10 -> 1.11 2017-07-02 12:56:56 +00:00
Vincent Laporte ea052b6f6b ocamlPackages.js_of_ocaml: 2.8.3 -> 2.8.4 2017-06-30 16:39:09 +00:00
Vincent Laporte 2dae6e0b5f ocamlPackages.findlib: 1.7.1 -> 1.7.3 2017-06-30 07:59:11 +00:00
Jörg Thalheim 10d0213d3f Merge pull request #26599 from Mic92/utop 
ocamlPackages.utop: allow utop to locate topfile
 2017-06-15 19:43:18 +01:00
Jörg Thalheim 9ffbebfeb0 ocamlPackages.camlidl: export c header and libs. 2017-06-15 19:39:49 +01:00
Jörg Thalheim 8ac0e68809 ocamlPackages.utop: allow utop to locate topfile 
fixes #16085
 2017-06-15 15:17:00 +01:00
romildo 7ba979cac3 ocp-indent: readd old version 1.5.2 
Some packages (ocp-index, for instance) are not yet compatible with
newer versions of ocp-indent. So version 1.5.2 is still needed.
 2017-06-01 18:43:27 -03:00
romildo 1c6abe0230 merlin: 2.5.3 -> 2.5.4 
- Update to version 2.5.4.
- Remove dependency on menhir, which seems not needed.
 2017-05-29 09:46:47 +02:00
romildo 97b3def8cf ocp-indent: 1.5.2 -> 1.6.0 2017-05-28 17:39:21 -03:00
Vladimír Čunát 4ea520ce48
ocamlPackages.utop: add missing makeWrapper 
... fixing the build.  No testing otherwise.
 2017-05-03 15:48:21 +02:00
Théo Zimmermann 017a723939 camlp5: fix install with ocaml 4.04 
The problem was that bytecode executables were shrinked.

This closes #25367.
 2017-05-03 11:57:33 +02:00
Michael Raskin 9ae5487b19 Merge branch 'master' into ocaml-utop 2017-05-01 14:38:18 +02:00
Michael Raskin b3e69c08ee Merge pull request #24742 from volth/reason-1.13.3-master 
reason: init at 1.13.3
 2017-05-01 11:20:50 +02:00
Vincent Laporte 1bacfb4637 ocamlPackages.cppo: 1.3.2 -> 1.5.0 2017-04-28 16:19:57 +00:00
Patrick Mahoney 1a7586ce24 ocamlPackages.utop: fix environment variables 
In the wrapper scripts, both OCAMLPATH and CAML_LD_LIBRARY_PATH where
being created with a trailing literal $OCAMLPATH, rather than the
expanded version. Thus if, for example, ocamlPackages.core was present
in OCAMLPATH prior to running utop, the wrapper script would set the
variable to $utop_dependencies:'$OCAMLPATH', and when using utop to
open Core.Std, the following error was reported:

    findlib: [WARNING] cannot read directory $OCAMLPATH: No such file
    or directory

This patch fixes the quoting issue, and further refactors the build to
use standard wrapProgram helper, and uses an "inner derivation" to
re-use the setupHook machinery of buildOCaml and findlib instead of
manually specifying the OCAMLPATH required for utop along with
transitive dependencies.
 2017-04-24 00:12:46 -05:00
Volth aa8d50ce0b reason: init at 1.13.3 2017-04-23 11:23:21 +00:00
Vincent Laporte 59c70e446c jbuilder: 1.0+beta5 -> 1.0+beta7 2017-04-21 07:02:31 +00:00
Vincent Laporte 033c5debbc utop: fix on OCaml 4.04 
Don’t strip the binary
The wrapper directly calls ocamlrun
 2017-04-01 07:39:13 +02:00
Vincent Laporte 646f0c706e jbuilder: 1.0+beta2 -> 1.0+beta5 2017-03-22 22:06:25 +00:00
Vincent Laporte 34809eb214 ocamlPackages.ocamlbuild: 0.9.3 -> 0.11.0 2017-03-21 18:13:32 +00:00
Florent Becker e4d39749f2 ocsigen-i18n: init at 3.1 2017-03-20 08:20:16 +00:00
Vincent Laporte 8498f979a1 ocaml-top: 1.1.2 -> 1.1.3 2017-03-14 07:57:59 +00:00
Vincent Laporte b34b4674d2 jbuilder: init at 1.0+beta2 
jbuilder is a fast, portable and opinionated build system

Homepage: https://github.com/janestreet/jbuilder
 2017-03-10 20:14:09 +00:00
Vincent Laporte ad49932f8a camlp4: init at 4.05+1 2017-03-04 06:51:24 +00:00
Vincent Laporte 52507b3a9b ocamlPackages.ocp-build: 1.99.17-beta -> 1.99.18-beta 2017-02-28 02:38:21 +00:00
Vincent Laporte b2a4eb839a ppx_tools, camlp4, ocamlify, ocamlmod: don’t strip binaries 2017-02-26 21:18:42 +01:00
Vincent Laporte 690968df54 ocamlPackages.utop: 1.19.2 -> 1.19.3 2017-02-24 19:21:29 +00:00
Vincent Laporte 3d10d5ffdc omake: 0.10.1 -> 0.10.2 2017-02-01 19:35:00 +00:00
Vincent Laporte 88e620f587 ocamlPackages.js_of_ocaml: add ocamlbuild as a dependency 2017-01-24 21:14:46 +00:00
Vincent Laporte f697e5ae3b camlp4: init at 4.04+1 2017-01-24 21:13:00 +00:00
Michael Raskin 89278345c2 Merge pull request #22023 from vbgl/apron 
ocamlPackages.apron: init at 20160125
 2017-01-24 17:47:13 +00:00
Vincent Laporte 0121066f5f camlidl: fix build with OCaml 4.03 
by making warning 31 non fatal
 2017-01-14 09:34:34 +00:00
Vincent Laporte 7a31f234e1 js_of_ocaml: 2.7 -> 2.8.3 2017-01-13 06:38:09 +00:00
Michael Raskin 6f12fb7403 Merge pull request #19765 from FlorentBecker/some_buildOcaml 
Update various packages to use buildOcaml, with fixes
 2016-12-30 20:47:50 +00:00
Vincent Laporte e76a1f0e7e Revert "omake: remove 0.9.8.6-rc1" 
This reverts commit e672fbc6f0.
 2016-12-18 09:51:00 +00:00
Vincent Laporte 42a0fc4387 ocamlbuild: 0.9.2 -> 0.9.3 2016-12-12 03:18:48 +00:00
Vincent Laporte 77050a8381 findlib: 1.6.1 -> 1.7.1 2016-12-12 03:18:48 +00:00
Vincent Laporte e672fbc6f0 omake: remove 0.9.8.6-rc1 2016-12-02 19:49:08 +00:00
Vincent Laporte 895d3c8908 omake: 0.9.8.5 -> 0.10.1 2016-12-02 19:49:07 +00:00
Vincent Laporte 9c87884fdf merlin: 2.5.2 -> 2.5.3 2016-12-01 20:14:26 +00:00
Pascal Wittmann ab2185a4b5 Merge pull request #20756 from vbgl/ocp-index-1.1.5 
ocamlPackages.ocp-index: 1.1.4 -> 1.1.5
 2016-11-30 16:34:56 +01:00
Vincent Laporte f0d7e808b2 camlp5: 6.16 -> 6.17 2016-11-29 18:34:21 +00:00
Vincent Laporte 33d49bbfb7 ocamlPackages.ocp-index: 1.1.4 -> 1.1.5 2016-11-28 09:33:28 +01:00
Vincent Laporte 20486458e6 ocamlPackages.merlin: 2.5.1 -> 2.5.2 2016-11-21 19:17:16 +01:00
Vincent Laporte 01597adf07 opam: remove 1.1 2016-11-05 16:28:21 +01:00
Vincent Laporte 22732fc656 opam: remove 1.0.0 2016-11-05 16:28:21 +01:00
Vincent Laporte b7b1e42ea4 ocamlPackages.merlin: 2.5.0 -> 2.5.1 2016-10-23 14:49:17 +02:00
Florent Becker e2bb0c5da8 js_of_ocaml: propagate dependency on ppx_deriving 
ppx_deriving is needed by js_of_ocaml even when it is not used in the code to be compiled
by js_of_ocaml
 2016-10-20 10:19:57 +02:00
Vincent Laporte 5a5d051ed0 ocamlPackages.js_of_ocaml: link to ppx_deriving 2016-10-15 17:59:29 +02:00
Vincent Laporte cc272dc996 OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-10 19:18:07 +02:00
Vincent Laporte b7cb8f3da7 ocaml-camlidl: fix build on darwin 2016-10-10 19:16:32 +02:00
Vincent Laporte 4168706d4f OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-09 11:55:19 +02:00
Vincent Laporte 731b616fdb camlp4: fix for OCaml-4.03 2016-10-09 11:55:19 +02:00
Kirill Boltaev 3e646865f4 treewide: use ocaml.version (#19192) 2016-10-05 09:32:30 +02:00
Joachim F 0973ee51e4 Merge pull request #18987 from maurer/oasis_typo 
oasis: fix typo
 2016-09-27 00:15:45 +02:00
Matthew Maurer 047f105bd1 oasis: fix typo 
The URL uses the filename of 0.4.6 in the 0.4.7 package.
The package still works currently and provides 0.4.7, because ocamlforge
dispatches entirely based on the number before that, the filename is just
sugar.
 2016-09-26 18:05:08 -04:00
Kirill Boltaev 8447340904 omake: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev a8da2da780 ocamlmod: 0.0.7 -> 0.0.8 2016-09-26 02:36:49 +03:00
Kirill Boltaev e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Matthew Maurer 6f5d3bec32 oasis: 0.4.6 -> 0.4.7 2016-09-23 19:58:47 -04:00
Joachim F ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates 
ocamlPackages : update some packages
 2016-09-23 19:55:10 +02:00
Jesse Haber-Kucharsky 99e06fe771 opam, aspcud: init packages for external solver (#16938) 
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
 2016-09-12 10:44:50 +02:00
Théophane Hufschmitt 2cb301d143 ocamlPackages.ocp-index : 1.1.2 -> 1.1.4 
And split according to ocaml version
 2016-08-04 14:44:35 +02:00
Théophane Hufschmitt ce90c90274 ocamlPackages.ocamlbuild : init at 0.9.2 2016-08-04 14:44:35 +02:00
Théophane Hufschmitt 7c2ecbe921 ocamlPackages.camlp4 : add version for ocaml_4_03 2016-08-04 14:44:34 +02:00
Théophane Hufschmitt 7bb3a04064 ocamlPackages.merlin : 2.3.1 -> 2.5.0 
For ocaml > 4.02 only
 2016-08-04 14:44:33 +02:00
Théophane Hufschmitt 80078966ca ocamlPackages.ocp-build : 0.99.16-beta -> 0.99.17-beta 2016-08-04 14:44:02 +02:00
vbgl d271db550e ocp-build: 1.99.9-beta -> 1.99.16-beta (#15553) 2016-07-22 09:46:40 +02:00
Vincent Laporte 64674d24c3 utop: 1.17 -> 1.19.2 2016-06-06 19:13:18 +02:00
Florent Becker 527c1cba37 js_of_ocaml: 2.6 -> 2.7 2016-05-31 19:10:07 +02:00
Vincent Laporte ce147f9a0d cppo: 1.1.2 -> 1.3.2 2016-05-22 17:22:25 +02:00
vbgl 2c021bdbba ocaml-oasis: 0.4.5 -> 0.4.6 (#15209) 2016-05-04 19:12:20 +02:00
Vincent Laporte 3a6c85da65 camlp5: 6.14 -> 6.16 2016-05-01 16:10:10 +02:00
Nicolas B. Pierron 72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
vbgl b05708ba0e Merge pull request #12741 from regnat/ocamlUpdates 
ocamlPackages.findlib: 1.5.3 -> 1.6.1
 2016-02-24 12:00:25 +01:00
Valérian Galliat 2678f36884 Fix OMake source URL 
Current source is 404, moving to pkgs.fedoraproject.org mirror.

Should fix current aborted jobs on Hydra: http://hydra.nixos.org/eval/1237311#tabs-aborted
 2016-02-16 10:34:21 -05:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Théophane Hufschmitt 5b28d3f1eb ocamlPackages.findlib: 1.5.3 -> 1.6.1 2016-02-01 09:12:40 +01:00
vbgl c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42 
Eliom42
 2016-01-18 09:32:48 +01:00
Florent Becker a14c867d62 js_of_ocaml: Allow caml >= 4.02 to find camlp4 2016-01-08 16:06:00 +01:00
Benjamin Staffin 4a69e5ae85 omake: Fix broken download URL 
All the download links on http://omake.metaprl.org/ seem to be dead.
 2016-01-02 18:21:48 +01:00
Florent Becker 44931d4293 js_of_ocaml: 2.5 -> 2.6 2016-01-01 19:04:40 +01:00
Vincent Laporte 6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Vincent Laporte 7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00
Vincent Laporte 37d731790b ocp-index: requires OCaml >= 4 2015-10-14 19:27:33 +02:00
Vincent Laporte 92e2e18fbb ocaml-ocp-indent: 1.4.2b -> 1.5.2 2015-10-14 19:26:38 +02:00
Vincent Laporte 621b66c3df js_of_ocaml: fix for OCaml < 4.0 2015-10-14 19:25:58 +02:00
Vincent Laporte de84782ded ocaml-deriving: drop legacy package 2015-10-03 08:26:42 +02:00
Vincent Laporte 399a9da2ae camlp5: 6.12 -> 6.14 2015-09-23 19:05:02 +02:00
ts468 054be41e04 Revert "ocaml-modules: fix naming: "_" -> "-"" 2015-09-06 21:15:10 +02:00
Thomas Strobel 616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Samuel Rivas 37d0d8ac74 utop: 1.15 -> 1.17 
Version 1.18 doesn't compile cleanly currently, I need to debug what is going on
there
 2015-08-06 08:06:51 +02:00
Samuel Rivas d516f12dba camlp4: 4.02.0+1 -> 4.02+6 
* Remove unneeded substitution in postConfigure
   This was fixed here: 81ed5cf2e8

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
 2015-08-06 08:06:16 +02:00
Vincent Laporte 2663f24a48 ocp-index: 1.1.1 -> 1.1.2 2015-07-01 20:23:19 +02:00
Vincent Laporte 2727ecec37 js_of_ocaml: propagate camlp4 dependency 2015-06-25 08:55:30 +02:00
Eric Merritt dcffd28527 ocp-build: upgrade to 1.99.9-beta 
This also allows ocp-build to build for ocaml 4.02 and greater
 2015-06-14 13:33:18 -07:00
Vincent Laporte 142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
Eric Merritt 8751d1ea1a rename ocaml_typeconv to type_conv 
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
 2015-05-24 12:32:45 -07:00
Eric Merritt 56627d5444 ocaml-opam: the sha hash of 1.2.2 changed 
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
 2015-05-24 12:31:44 -07:00
Vincent Laporte 1c19f91dd7 opam: update from 1.2.1 to 1.2.2 2015-05-14 09:32:32 +02:00
Joachim Fasting bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Henry Till a5fb20d65a opam: update to 1.2.1 2015-03-22 16:33:15 -04:00
Vincent Laporte 07536bd1fe merlin: update from 2.1.1 to 2.1.2 2015-03-09 12:07:08 +01:00
Vincent Laporte f31d4b6adb Adds ocaml-top 
OCaml-Top is a simple cross-platform OCaml code editor built for
top-level evaluation.

Homepage: http://www.typerex.org/ocaml-top.html
 2015-02-16 13:31:13 +01:00
Vincent Laporte 3a17654b71 ocp-build: update source and website URLs 2015-02-12 06:59:28 +01:00
Vincent Laporte db75b5d052 merlin: update from 2.1 to 2.1.1 2015-01-29 08:43:15 +01:00
Vincent Laporte 54c8a82818 utop: wrap all installed programs 2015-01-29 08:43:15 +01:00
Vincent Laporte 8e77300cc1 Adds ocp-index 
ocp-index is a simple and light-weight documentation extractor for OCaml.

Homepage: http://typerex.ocamlpro.com/ocp-index.html
 2015-01-28 12:03:25 +01:00
Benno Fünfstück be58ce4815 google-drive-ocamlfuse: new expression 2015-01-25 22:10:09 +01:00
Vincent Laporte 763b2a7718 merlin: update from 2.0 to 2.1 2015-01-19 12:07:00 +01:00
Vincent Laporte 0a0b46a9b0 ocp-indent: fix installation 2015-01-14 10:22:35 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Vincent Laporte cb3f9bf160 omake: add meta.platforms 2014-12-11 09:19:30 +01:00
Vincent Laporte 54d206e5cc cppo: update from 1.0.1 to 1.1.2 2014-11-23 17:34:07 +00:00
Vincent Laporte 1be6e7c60f js_of_ocaml: propagate lwt dependency 2014-11-23 12:37:00 +00:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vincent Laporte ff86c33f1d Fixes camlp4 2014-11-09 01:49:37 +00:00
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Vincent Laporte aa2fd47e9d Fixes ocamlscript 2014-11-08 14:28:38 +00:00
Vincent Laporte 3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Michael Raskin c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom 
ocsigen 2014-10
 2014-11-04 12:41:59 +03:00
Vincent Laporte be8209b93f ocaml-oasis: update from 0.4.4 to 0.4.5 2014-11-04 00:08:58 +00:00
Arseniy Seroka 0c7a0f31f9 Merge pull request #4810 from vbgl/merlin 
merlin: update from 1.7.1 to 2.0
 2014-11-03 20:04:10 +03:00
Henry Till 5f2e7c71a4 opam: update to 1.2.0 2014-11-03 11:55:33 -05:00
Vincent Laporte 68b959d655 merlin: update from 1.7.1 to 2.0 
Also adds an option to compile the emacs mode at install time.
 2014-11-03 13:41:46 +00:00
Vincent Laporte 16150e1f1e ocamlscript: new derivation 
Ocamlscript compiles scripts, i.e. one-file programs, into
natively-compiled binaries, and executes them.

Homepage: http://mjambon.com/ocamlscript.html
 2014-11-02 21:41:24 +00:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Vincent Laporte 58101991f7 cppo: update from 0.9.4 to 1.0.1 2014-10-29 17:43:05 +00:00
Jirka Marsik 0f1ada577c Added ocp-indent-1.4.2b 2014-10-28 18:09:42 +01:00
Jirka Marsik 0de41a6871 Added ocp-build-1.99.8-beta 2014-10-28 18:05:53 +01:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Florent Becker 91fe0ddc62 Build js_of_ocaml with tyxml support 2014-10-15 11:13:58 +02:00
Florent Becker bb2a9941e5 add version number to the name of the js_of_ocaml package 2014-10-14 13:10:08 +02:00
Florent Becker 9c441c41d7 update js_of_ocaml to 2.5 2014-10-14 13:05:53 +02:00
Vincent Laporte 4f0bc8e060 ocaml-oasis: adds missing dependency to caml4 2014-10-10 17:00:30 +01:00
Florent Becker e7f712e2a2 Update ocamlfind to version 1.5.3 2014-10-08 20:37:30 +02:00
Aristid Breitkreuz 3f2a64d132 ocamlPackages.utop: update from 1.14 to 1.15 2014-10-08 20:23:29 +02:00
Aristid Breitkreuz 7476b76d1d ocamlPackages.ocaml_oasis: update from 0.4.1 to 0.4.4 2014-10-08 20:23:29 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Vincent Laporte a6af1e96de Updates camlp5 6.11 -> 6.12 2014-10-01 00:44:15 +01:00
Vincent Laporte d274ee3f80 Adds camlp4 
Camlp4 is a software system for writing extensible parsers for
programming languages.

Camlp4 was part of the official OCaml distribution until its version
4.01.0.

Homepage: https://github.com/ocaml/camlp4
 2014-09-23 09:34:13 +01:00
Vincent Laporte 857c13e1af Minor modifications of some ocaml packages: 
adds myself as a maintainer
adds assertions to have evaluation errors rather than build errors
moves opam out of ocamlPackages, as it does not provide a library
 2014-09-21 11:02:55 +01:00
Domen Kožar 9cad5e755f Merge pull request #4170 from vbgl/ocaml-sexplib-camlp5 
Updates ocaml-sexplib and ocaml-typeconv
 2014-09-19 20:45:14 +02:00
Vincent Laporte 8febae5dfd Updates ocaml-sexplib and ocaml-typeconv 
Fixes OCaml / camlp5 version mismatch
 2014-09-19 19:09:37 +01:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00