Commit graph

686 commits

Author SHA1 Message Date
Mario Rodas dd82e5716f opam: 2.1.4 -> 2.1.5
Changelog: https://github.com/ocaml/opam/releases/tag/2.1.5

Diff: https://github.com/ocaml/opam/compare/2.1.4...2.1.5
2023-05-27 04:20:00 +00:00
Vincent Laporte 6c31436baa
ocamlPackages.dot-merlin-reader: add missing input 2023-05-24 07:46:43 +02:00
Vincent Laporte c81792a457
ocamlPackages.ounit2: disable for OCaml < 4.08 2023-05-15 10:10:36 +02:00
Vincent Laporte e7b211e3d2
ocamlPackages: default to version 3 of Dune 2023-05-12 05:50:40 +02:00
Vincent Laporte 0da20416ae
ocamlPackages.cppo: use Dune 3 2023-05-10 20:06:20 +02:00
Vincent Laporte ffcb033f38
ocamlPackages.dot-merlin-reader: use Dune 3 2023-05-10 20:06:09 +02:00
Antonio Nuno Monteiro cf4250bef0 ocamlPackages.findlib: set dontDetectOcamlConflicts to {false,true} 2023-05-09 18:46:02 -07:00
Vincent Laporte 757ec67f02
ocamlPackages.ocp-indent: use Dune 3 2023-05-09 06:51:11 +02:00
Vincent Laporte ac28a8110c
ocamlPackages.ocp-index: use Dune 3 2023-05-09 06:51:11 +02:00
Vincent Laporte 0c36e36533
ocaml-top: use Dune 3 2023-05-09 06:50:58 +02:00
Vincent Laporte d3db6fe015
ocamlPackages.ocaml_oasis: 0.4.10 → 0.4.11 2023-04-21 10:41:36 +02:00
Vincent Laporte 34122f7321
ocamlPackages.ocamlmod: disable for OCaml ≥ 5.0 2023-04-21 10:41:32 +02:00
Ali Caglayan cd1e297b93 dune_3: 3.7.0 -> 3.7.1
Signed-off-by: Ali Caglayan <alizter@gmail.com>
2023-04-04 21:17:25 +02:00
Vincent Laporte 08eb326add
ocamlPackages.ocamlformat: use Dune 3 2023-03-29 06:31:56 +02:00
github-actions[bot] e196e68bee
Merge master into staging-next 2023-03-14 12:01:32 +00:00
superherointj 3c66f2de15
Merge pull request #220209 from vbgl/ocaml-merlin-4.8.0
ocamlPackages.merlin: 4.7 → 4.8
2023-03-14 07:00:52 -03:00
Alyssa Ross 8c70bfb9f2
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/librsvg/default.nix
	pkgs/development/python-modules/r2pipe/default.nix
2023-03-10 18:46:21 +00:00
Vincent Laporte 1480cd4098
ocamlPackages.merlin: 4.7 → 4.8 2023-03-08 21:10:22 +01:00
Weijia Wang 8d42f2aa9d opam_1_2: drop 2023-03-08 10:31:56 +02:00
github-actions[bot] fa94414f70
Merge master into staging-next 2023-03-07 00:02:41 +00:00
Vincent Laporte d934806f62
omake: 0.10.5 → 0.10.6 2023-03-06 18:23:29 +01:00
Martin Weinelt b04848e5fe Merge remote-tracking branch 'origin/master' into staging-next 2023-03-06 08:21:14 +01:00
Mario Rodas fc01626762 dune_3: add ocaml-lsp as reverse dependency to passthru.tests 2023-03-03 04:20:00 +00:00
Guillaume Girol 72d9c8354d
Merge pull request #214239 from symphorien/ocaml-conflict-verbose
ocamlPackages.findlib: explain how to bypass the dep conflict detection
2023-02-18 20:50:52 +00:00
Mario Rodas e68c7797ab dune_3: 3.6.2 -> 3.7.0
https://github.com/ocaml/dune/releases/tag/3.7.0
2023-02-17 04:20:00 +00:00
Vincent Laporte 9435a8f48e
ocaml-top: 1.2.0-rc → 1.2.0 2023-02-13 07:21:16 +01:00
Weijia Wang b6eac37960
Merge pull request #213932 from vbgl/ocaml-dune3
ocamlPackages.dune_3: enable for OCaml < 4.08
2023-02-07 07:30:22 +01:00
Ulrik Strid c53a63adf1 ocamlPackages treewide: strictDeps all packages 2023-02-03 08:59:34 +01:00
Guillaume Girol 72e0ac1bb8 ocamlPackages.findlib: explain how to bypass the dep conflict detection
Inspired by https://github.com/NixOS/nixpkgs/pull/205646#issuecomment-1412713324
2023-02-02 12:00:00 +00:00
Vincent Laporte 98f36b2d74
ocamlPackages.dune_3: enable for OCaml < 4.08 2023-02-01 09:20:48 +01:00
Guillaume Girol b55a8d3ad6
Merge pull request #205646 from symphorien/ocamlconflict
ocamlPackages.findlib: detect conflicts of version early
2023-01-27 20:18:39 +00:00
Weijia Wang c23ac513f7 ocamlPackages.ocp-indent: update homepage 2023-01-24 01:26:59 +01:00
Weijia Wang c5460eb4de
Merge pull request #210884 from vbgl/beluga-dune-3
Use dune 3 for a few OCaml tools
2023-01-22 02:22:57 +01:00
Sandro c93f87e3c9
Merge pull request #208957 from marsam/update-opam 2023-01-21 18:36:38 +01:00
Guillaume Girol 33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Vincent Laporte 689c7010de
ocamlPackages.ocaml-recovery-parser: use Dune 3
And disable for OCaml ≥ 5.0
2023-01-15 12:13:07 +01:00
Vincent Laporte 97ea0e7236
opam-installer: use Dune 3 2023-01-15 12:13:07 +01:00
Vincent Laporte f3f8ae2fa2
obelisk: use Dune 3 2023-01-15 12:13:06 +01:00
Ben Darwin de0a7795c3 omake_rc1: remove 2023-01-14 13:11:59 -05:00
Vincent Laporte 0c17d9acac ocamlPackages.dune-release: use dune 3 2023-01-12 17:56:25 +01:00
Vincent Laporte 54d363b012 ocamlPackages.js_of_ocaml-toplevel: init at 4.1.0 2023-01-07 13:51:10 +01:00
Guillaume Girol 6043e3af4e ocamlPackages.findlib: detect conflicts of version early
just like pythonCatchConflictHook
2023-01-03 20:30:34 +01:00
Mario Rodas e831a72558
Merge pull request #207514 from r-ryantm/auto-update/dune
dune_3: 3.6.1 -> 3.6.2
2023-01-03 08:53:13 -05:00
Mario Rodas b3f148a4d0 opam: 2.1.3 -> 2.1.4
https://github.com/ocaml/opam/releases/tag/2.1.4
2023-01-03 04:20:00 +00:00
Thiago Kenji Okada cb823870cd
Merge pull request #207437 from r-ryantm/auto-update/omake
omake: 0.10.3 -> 0.10.5
2022-12-24 12:09:11 +00:00
R. Ryantm 7bf40ca140 dune_3: 3.6.1 -> 3.6.2 2022-12-24 03:43:19 +00:00
R. Ryantm dedd108507 omake: 0.10.3 -> 0.10.5 2022-12-23 17:16:46 +00:00
Alexander Bantyev 6a96a8cb20
opam2json: v0.2 -> v0.4 2022-12-20 16:40:43 +04:00
Vincent Laporte f0dda807b2 ocamlPackages.merlin: 4.6 → 4.7 2022-12-13 07:55:34 +01:00
Vincent Laporte ea05022a19 ocamlPackages.js_of_ocaml: 4.0.0 → 4.1.0 2022-12-06 16:48:42 +01:00