3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

192 commits

Author SHA1 Message Date
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