Commit graph

102 commits

Author SHA1 Message Date
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
Vladimír Čunát
d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Mateusz Kowalczyk
7e5d0ee0c3 s/dependancy/dependency/ 2014-09-10 00:28:49 +01:00