Commit Graph

76 Commits

Author SHA1 Message Date
Vincent Laporte
ff86c33f1d Fixes camlp4 2014-11-09 01:49:37 +00: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
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
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
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
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
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
Florent Becker
02a4e40474 Reexport ocaml data notation in the ocaml-oasis derivation 2014-09-06 12:44:33 +04:00
Florent Becker
3245b97000 Add a derivation for js_of_ocaml 2014-09-06 12:44:32 +04:00
Michael Raskin
4e3ee27060 Merge pull request #3681 from vbgl/merlin-1.7
Merlin: update to 1.7
2014-09-02 02:07:27 +04:00
Florent Becker
d7b67d8cfa add utop (improved ocaml toplevel) 2014-08-30 19:37:15 +04:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Vincent Laporte
e2db82874c Updates merlin to 1.7.1 2014-08-22 14:56:33 +02:00
Vincent Laporte
e8d2f8f109 merlin: update to 1.7 2014-08-19 18:43:41 +02:00
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
Pascal Wittmann
0baac649aa Merge pull request #3188 from vbgl/merlin
Adds merlin
2014-08-01 13:39:27 +02:00
Vincent Laporte
81f258e7bf merlin: some cleaning of the derivation 2014-08-01 09:42:37 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vincent Laporte
f16124d521 Adds merlin
Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
2014-07-05 17:33:55 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
2014-06-30 14:56:10 +02:00
Vincent Laporte
e7df430d91 Adds cppo 2014-06-25 10:25:14 +02:00
Vincent Bernardoff
ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Malcolm Matalka
83c5d12d4c Add opam 1.1.1 2014-02-22 19:08:54 +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
389da8b64c Update camlp5 to version 6.11 2014-01-18 20:56:44 +00:00
Marco Maggesi
cf6ac40585 Update OCaml findlib to version 1.4 2014-01-18 20:56:44 +00:00
Moritz Ulrich
e87515e519 Opam 1.1: Constrain supported ocaml versions.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka
545216ee02 Opam: Update to 1.1.0
Also keeps 1.0 for backwards compatibility.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Evgeny Egorochkin
f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00