3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

315 commits

Author SHA1 Message Date
xeji af5b858825
Merge pull request #41591 from vbgl/opaline
ocamlPackages: use opaline instead of opam-installer
2018-06-09 01:34:02 +02:00
James Deikun 1fa9e7defb fix opam tool support 2018-06-08 15:23:49 -04:00
Vincent Laporte 94445ed4bc
ocamlPackages.findlib: fix stublibs 2018-06-06 07:14:26 +00:00
Vincent Laporte 29a6ca660a
jbuilder: use opaline 2018-06-06 07:14:22 +00:00
Vincent Laporte 33a418e2e6 opaline: init at 0.3.1 (#41346)
Opaline is a lightweight replacement for opam-installer.

Homepage: https://github.com/jaapb/opaline
2018-06-01 21:29:53 +02:00
Ryan Mulligan af9d10a91b treewide: fix derivation names 2018-05-28 05:59:57 -07:00
Vincent Laporte abea0c6eeb jbuilder: 1.0+beta17 -> 1.0+beta20 2018-05-07 07:13:03 +02:00
Léo Gaspard 06c7d4d40d
opam: propagate curl and unzip dependencies
These are required for `opam init` to succeed.

Closes #14466
Cc @henrytill
2018-04-27 20:42:09 +02:00
Vincent Laporte c4b7bbf77e ocamlPackages.findlib: 1.7.3 -> 1.8.0 2018-04-25 18:19:27 +02:00
Vincent Laporte 20c035b906 ocamlPackages.js_of_ocaml-tyxml: init at 3.1.0 2018-04-18 09:38:23 +02:00
Vincent Laporte 48ee88c7f8 ocamlPackages.js_of_ocaml-camlp4: add deriving support 2018-04-12 10:15:57 +02:00
Jörg Thalheim e6f8b6b897
Merge pull request #38637 from vbgl/js_of_ocaml-lwt
ocamlPackages.js_of_ocaml-lwt: init at 3.1.0
2018-04-10 09:17:18 +01:00
Matthew Justin Bauer aaee915889
Merge pull request #37533 from ryantm/auto-update/ocamlbuild
ocamlPackages.ocamlbuild: 0.11.0 -> 0.12.0
2018-04-08 23:07:17 -05:00
Vincent Laporte a09c39f80c
ocamlPackages.js_of_ocaml-lwt: init at 3.1.0 2018-04-08 17:38:14 +00:00
Jörg Thalheim b897bf4f3c
Merge pull request #38373 from vbgl/ocamlify
ocamlPackages.ocamlify: fix build with OCaml 4.06
2018-04-08 14:27:14 +01:00
Vincent Laporte 6c3186848d ocamlPackages.js_of_ocaml-ppx_deriving_json: init at 3.1.0 2018-04-07 13:24:22 +02:00
Vincent Laporte d0072be8cd
ocamlPackages.ocamlify: fix build with OCaml 4.06 2018-04-03 05:55:59 +00:00
Ryan Mulligan 5cb865e100 ocamlPackages.js_of_ocaml: 3.0.0 -> 3.1.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.I0xNTw0Lrg /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.1.0 with grep in /nix/store/rg3dh55klmmy5gffvv353nbgwjg0mh11-js_of_ocaml-3.1.0
- directory tree listing: https://gist.github.com/4afbe9caa678f6e8124185a1cc5d2a9c
2018-03-31 12:19:28 +02:00
Vincent Laporte 387d791663 ocamlPackages.findlib: automatically populate the CAML_LD_LIBRARY_PATH env. variable
With directories of the form:
  lib/ocaml/${ocaml.version}/site-lib/stubslibs
2018-03-25 18:33:13 +02:00
Vincent Laporte 2455478754 ocamlPackages.findlib: fix META for library threads 2018-03-25 18:33:13 +02:00
Ryan Mulligan 7312e850c1 ocamlPackages.ocamlbuild: 0.11.0 -> 0.12.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild --help` got 0 exit code
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild --version` and found version 0.12.0
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild --help` and found version 0.12.0
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild.native --help` got 0 exit code
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild.native --version` and found version 0.12.0
- ran `/nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0/bin/ocamlbuild.native --help` and found version 0.12.0
- found 0.12.0 with grep in /nix/store/b1b0f9iyawv0rm483q2fbbfhgjgpjdik-ocamlbuild-0.12.0
- directory tree listing: https://gist.github.com/3b75d2c602f455856f9642228b53d2e7
2018-03-20 22:23:17 -07:00
Matthew Maurer 48cc8c2fff jbuilder: 1.0+beta18 -> 1.0+beta17
jbuilder beta 18 introduces a regression on the final link.
This is reflected in BAP 1.4
Rolling back one version until it's fixed.
2018-03-01 12:12:29 -05:00
Vincent Laporte a3c143c39c ocamlPackages.camlp5: 7.03 -> 7.05 2018-02-28 19:08:40 +01:00
Masayuki Takeda e066751227 jbuilder: 1.0+beta14 -> 1.0+beta18 2018-02-23 11:07:33 +01:00
Dan Peebles dfd300c81d treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/
Upstream killed the pkgs server but src continues to serve up the exact
same content, so we can just point there and all hashes should be unchanged.
2018-02-08 16:38:08 -05:00
Samuel Dionne-Riel 7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
John Ericson 4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
FlorentBecker f1bbc67b50 ocsigen-i18n: do not strip (#32758)
The executables generated by ocamlc were not functional.
2017-12-21 18:23:25 +01:00
Vincent Laporte 594b7be89d
ocp-indent: 1.6.0 -> 1.6.1 2017-12-11 13:38:39 +00:00
Maxime Dénès ec28cab25f ocamlPackages.merlin: 3.0.3 -> 3.0.5 2017-12-11 14:35:00 +01:00
Vincent Laporte a1449ea180
omake: 0.10.2 -> 0.10.3 2017-11-06 06:47:48 +00:00
Vincent Laporte dd0cdc2fb4
ocamlPackages.camlp5: 7.02 -> 7.03 2017-10-30 11:58:05 +00:00
Vincent Laporte 43d3b9d74c
jbuilder: 1.0+beta12 -> 1.0+beta14 2017-10-26 00:38:54 +00:00
Vincent Laporte fe41e17631
ocamlPackages.merlin: fix homepage URL 2017-10-22 22:14:38 +00:00
Vincent Laporte d6e423c400
ocamlPackages.merlin: 3.0.2 -> 3.0.3 2017-10-22 13:25:46 +00:00
Vincent Laporte 182b357c9d ocamlPackages.camlp5: 7.01 -> 7.02 2017-10-17 09:01:22 +02:00
Vincent Laporte 0bd108d2ce
ocamlmod: 0.0.8 -> 0.0.9 2017-10-14 07:31:13 +00:00
Vincent Laporte cb61845c4a
ocamlbuild: remove unused arguments 2017-10-14 06:40:21 +00:00
Vincent Laporte cdd3b97d15
camlp4: init at 4.06+1 2017-10-13 17:42:56 +00:00
Vincent Laporte 701316450c ocamlPackages.oasis: remove unneeded dependencies 2017-10-09 05:34:02 +00:00
Vincent Laporte c06e5a8d64 ocamlPackages.react: 1.2.0 -> 1.2.1 2017-10-05 08:39:50 +00:00
ibor 00422b2279 js_of_ocaml: fix jbuild (explicitly call bash) (#29749)
* js_of_ocaml: fix jbuild (explicitly call bash)

* js_of_ocaml: Use patchShebangs instead of manual patch
2017-09-25 08:32:19 +08:00
Winnie Quinn 331f5a75ce opam: use aspcud on darwin
aspcud is the recommended solver for OPAM and the `aspcud` package is
now building properly on Darwin. As such, we can remove the special case
for Darwin that required OPAM to fall back to the built-in solver.
2017-09-23 16:47:24 -04:00
Jake Waksbaum a3ba600366 ocamlPackages.merlin: 2.5.4 -> 3.0.2 (#29337) 2017-09-21 19:39:36 +01:00
Théo Zimmermann a9be3c20d1 ocamlPackages.ppx_deriving: 4.1 -> 4.2
This fixes compilation of ppx_deriving with OCaml 4.05.

js_of_ocaml_2: mark as broken with OCaml 4.05

ocamlPackages.cohttp: propagates ppx_deriving
2017-08-30 02:33:23 +00:00
Vincent Laporte 935e991b72 js_of_ocaml: 2.8.4 -> 3.0.0
js_of_ocaml-camlp4: init at 3.0.0

js_of_ocaml-ppx: init at 3.0.0
2017-08-27 14:55:12 +00:00
Vincent Laporte 4b1a1c1846 js_of_ocaml-ocamlbuild: init at 3.0.0 2017-08-27 14:36:25 +00:00
Vincent Laporte ef2c0f317a js_of_ocaml-compiler: move 2017-08-27 14:29:57 +00:00
Vincent Laporte 4c23d059f5 obelisk: fix hash 2017-08-27 10:20:41 +02:00
Vincent Laporte b07d148e1d obelisk: 0.2.0 -> 0.3.0 2017-08-27 06:56:35 +00:00
Vincent Laporte 77404dbf37 jbuilder: 1.0+beta7 -> 1.0+beta12
ocamlPackages.sexplib: 0.9.1 -> 0.9.2

ocamlPackages.base: 0.9.1 -> 0.9.3

ocamlPackages.ppx_driver: 0.9.0 -> 0.9.1

ocamlPackages.bin_prot: 0.9.0 -> 0.9.1

ocamlPackages.ppx_inline_test: 0.9.0 -> 0.9.2
2017-08-24 17:53:55 +00:00
Vincent Laporte 01495f3255 ocamlPackages.js_of_ocaml-compiler: init at 0.3.0 2017-08-24 17:49:05 +00:00
Vincent Laporte c7c24740a9 obelisk: fix hash 2017-08-05 13:29:00 +02:00
Vincent Laporte ef7f980954 obelisk: init at 0.2.0
Obelisk is a simple tool which produces pretty-printed output from a Menhir
parser file (.mly).

Homepage: https://github.com/Lelio-Brun/Obelisk
2017-08-04 05:46:07 +00:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Vincent Laporte b57bf746a1 ocaml-top: 1.1.3 -> 1.1.4
ocamlPackages.ocp-build: 1.99.18-beta -> 1.99.19-beta
2017-07-16 12:43:35 +02:00
Vincent Laporte 412da3210b ocamlPackages.oasis: remove 0.4.6 2017-07-11 02:46:32 +00:00
Vincent Laporte 3095a46bfc ocamlPackages.oasis: 0.4.7 -> 0.4.10 2017-07-11 03:40:07 +02:00
Vincent Laporte 676156a658 obuild: fix build 2017-07-08 12:22:55 +02:00
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