Commit graph

518 commits

Author SHA1 Message Date
Sandro Jäckel 94f66d6b9f
dune-release: remove -f from rm -rf 2021-08-02 10:58:47 +02:00
Ben Siraphob e0cef70443
Merge pull request #131572 from marsam/update-opam
opam: 2.0.8 -> 2.1.0
2021-08-01 12:32:59 +07:00
Ben Siraphob 2f94991628 treewide: fix redirected URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2021-08-01 00:01:50 +07:00
sternenseemann 6f460f1127 dune-release: apply yes broken pipe fix in additional places
Seems the use of yes increased and we need to fix it in additional
places. Alternatively we could ofcourse find out why SIGHUP is trapped
somewhere?!
2021-07-29 14:14:15 +02:00
sternenseemann 0876c079f7 dune-release: remove now unnecessary test fixes
We've upstreamed those git fixes.
2021-07-29 14:13:51 +02:00
Mario Rodas 707f6106fe ocamlformat: 0.18.0 -> 0.19.0
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.19.0
2021-07-29 05:00:19 +02:00
Felix Buehler 327cb2e9f0 ocamlPackages.utop: deprecate phases 2021-07-27 14:11:06 +02:00
Mario Rodas bef038a486 dune-release: 1.4.0 -> 1.5.0
https://github.com/ocamllabs/dune-release/releases/tag/1.5.0
2021-07-26 04:20:00 +00:00
Mario Rodas 5a7e27afe1 opam: 2.0.8 -> 2.1.0
https://github.com/ocaml/opam/releases/tag/2.1.0
2021-07-26 04:20:00 +00:00
github-actions[bot] f2eada4ab8
Merge master into staging-next 2021-07-18 06:01:33 +00:00
Felix Buehler 87316d778b various: cleanup of "inherit version;" 2021-07-18 00:19:24 +02:00
Sandro 1619046572
Merge pull request #126894 from Stunkymonkey/pname&version 2021-07-05 18:52:04 +02:00
Mario Rodas 246f3da399 dune_2: 2.8.5 -> 2.9.0
https://github.com/ocaml/dune/releases/tag/2.9.0
2021-07-02 00:42:09 +02:00
Felix Buehler 6f04cd0e69 application/development: /s/name/pname&version/ 2021-06-30 09:55:22 +02:00
Felix Buehler 1e7f88a523 camlp5: replace fetchzip with fetchFromGitHub 2021-06-30 09:53:51 +02:00
Vincent Laporte 4f3bc6aa7f ocamlPackages.utop: 2.7.0 → 2.8.0 2021-06-28 08:48:48 +02:00
Vincent Laporte a29a3981ef ocamlPackages.ocaml-migrate-parsetree: 2.1.0 → 2.2.0 2021-06-26 17:07:42 +02:00
Vincent Laporte 5ca9831cb1 ocamlPackages.menhir: 20190626 → 20210419
ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419
2021-06-05 13:38:01 +02:00
Joachim Breitner 41b485f7c4 dune.nix: Include dune version in warning when dune is not supported
as dune 1 and dune 2 have different version ranges here
2021-05-19 14:07:20 +02:00
Vincent Laporte 44339cc0b0 ocamlPackages.ocp-build: fix compilation with OCaml 4.12 2021-04-27 08:42:50 +02:00
Vincent Laporte 9ffb287d75 ocamlformat: build versions < 0.17 with OCaml 4.10 2021-04-27 08:42:50 +02:00
Mario Rodas 212adc0c99 ocamlformat: 0.17.0 -> 0.18.0
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.18.0
2021-04-01 04:20:00 +00:00
Vincent Laporte b729d4080a
ocamlPackages.ocp-indent: use Dune 2 2021-04-11 14:32:14 +02:00
github-actions[bot] 01b3d1558f
Merge staging-next into staging 2021-03-30 18:15:09 +00:00
Mario Rodas d1ccfb3d18 dune_2: 2.8.4 -> 2.8.5
https://github.com/ocaml/dune/releases/tag/2.8.5
2021-03-30 16:46:15 +02:00
github-actions[bot] bef3b9438a
Merge staging-next into staging 2021-03-27 18:14:11 +00:00
sternenseemann ef6450411f ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1
Add nix expression for the OCaml-version specific versions of merlin
4.1 and conditionally call it in ocaml-packages.nix.
2021-03-27 17:26:12 +01:00
sternenseemann 29d77c57ed dot-merlin-reader: 3.4.2 -> 4.1
4.1 uncoupled the versions between merlin and dot-merlin-reader which
means we can and must update them independently of each other since
merlin 4.1 is only available in specific versions for OCaml 4.11 and
4.12 respectively.

Therefore merlin now fetches its own source instead of inheriting it
from dot-merlin-reader.
2021-03-27 17:26:12 +01:00
github-actions[bot] 219312a10b
Merge staging-next into staging 2021-03-26 12:06:44 +00:00
sternenseemann cf83099225 ocamlPackages.js_of_ocaml: 3.8.0 -> 3.9.1
Apply patch from eliom's master to fix build with the new js_of_ocaml
version.
2021-03-26 08:43:14 +01:00
R. RyanTM 274fc0f668 ocamlPackages.findlib: 1.8.1 -> 1.9.1 2021-03-22 20:42:50 +00:00
Symphorien Gibol d08e1d78e7 ocamlPackages.ocaml-lsp: wrap with dot-merlin-reader
this requires that dot-merlin-reader be built with the same ocaml version as
ocaml-lsp
2021-03-21 22:09:52 +01:00
github-actions[bot] 3b97019142
Merge master into staging-next 2021-03-14 06:17:28 +00:00
Jules Aguillon 3bece16153 ocamlformat: 0.16.0 -> 0.17.0
Adds 'ocamlformat_0_17_0' and update 'ocamlformat'.
2021-03-12 16:29:02 +01:00
github-actions[bot] 5d13702776
Merge master into staging-next 2021-03-09 12:25:54 +00:00
Mario Rodas a262124577 dune_2: 2.8.2 -> 2.8.4
https://github.com/ocaml/dune/releases/tag/2.8.3
https://github.com/ocaml/dune/releases/tag/2.8.4
2021-03-09 12:34:56 +01:00
github-actions[bot] dcea8212b5
Merge staging-next into staging 2021-03-07 12:20:40 +00:00
Vincent Laporte a104d2b18c ocamlPackages.dune_1: disable for OCaml ≥ 4.12 2021-03-07 12:07:14 +01:00
Vincent Laporte 60785fe4db ocamlPackages.dune: rename into dune_1 2021-03-07 12:07:14 +01:00
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Mario Rodas 7043f00adc ocamlPackages.ocp-index: 1.2.1 -> 1.2.2 2021-02-26 04:20:00 +00:00
R. RyanTM eddb81ccd8 ocsigen-i18n: 3.5.0 -> 3.7.0 2021-02-25 22:21:30 -05:00
Vincent Laporte 0f24f12bb4
ocamlPackages.crunch: use Dune 2 2021-02-25 22:12:12 +01:00
github-actions[bot] 54795a5689
Merge staging-next into staging 2021-02-21 12:19:46 +00:00
github-actions[bot] cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
sternenseemann cdb97ba523 ocamlPackages.ocamlmod: disable tests if ounit is not available
When we redid ounit and ounit2, the minimumOCamlVersion was also pushed
to OCaml 4.04. ocamlmod builds on earlier versions as well, but doesn't
evaluate if we pull in ounit.

Therefore we conditionally disable tests for OCaml < 4.04 which means
for example oasis is available for those versions again as well.
2021-02-21 10:12:22 +01:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00