Compare commits

..

140 commits

Author SHA1 Message Date
Richard W.M. Jones
06a86cad81 OCaml 5.4.0 rebuild 2025-10-13 13:08:55 +01:00
Jerry James
146142d656 Version 3.20.2 2025-09-16 08:36:28 -06:00
Jerry James
836822abda Version 3.20.1 2025-08-25 08:16:16 -06:00
Jerry James
2f3375545a Version 3.20.0
- Add BSD-2-Clause to License for bundled ocaml-blake3-mini
- Add LGPL-2.1-or-later to License for code copied from 0install
- Recompute Requires between subpackages
2025-08-22 09:45:02 -06:00
Jerry James
890a33a2d0 Migrate tests from STI to TMT (rhbz#2382985) 2025-07-23 10:59:57 -06:00
Jerry James
493ce7b7ef Remove old obsoletes 2025-07-11 10:36:08 -06:00
Jerry James
fdd91af0d8 Version 3.19.1 2025-06-11 09:56:01 -06:00
Jerry James
f7bd4f2975 Version 3.19.0 2025-05-23 10:30:54 -06:00
Jerry James
85859ce6f2 Version 3.18.2 2025-05-02 09:50:02 -06:00
Jerry James
44d69f6b11 Version 3.18.1 2025-04-18 10:17:40 -06:00
Jerry James
3025091edc Version 3.18.0
- ocaml-fmt is no longer bundled
2025-04-03 11:55:45 -06:00
Jerry James
bdff9da145 Add forgotten changelog entry 2025-02-15 09:09:26 -07:00
Jerry James
5e00b46ccb Version 3.17.2 2025-01-23 12:11:26 -07:00
Fedora Release Engineering
65b81cbfb7 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 20:48:17 +00:00
Jerry James
8a80202e94 Version 3.17.1
- Update License field for changes in vendored dependencies
- Drop upstreamed furo theme patch
2024-12-26 20:01:26 -07:00
Jerry James
30f268210d Version 3.16.1 2024-10-31 14:48:48 -06:00
Charalampos Stratakis
e8b7e3898e Use the furo theme for docs build 2024-10-11 00:04:37 +02:00
Richard W.M. Jones
7eb99c9abe Rebuild for ocaml-lwt 5.8.0 2024-10-08 09:44:33 +01:00
Fedora Release Engineering
0f09d23f58 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 20:05:48 +00:00
Jerry James
cfc02b42ca Fix the VCS field
- Drop Conflicts with retired package wdune
- Minor spec file simplifications
2024-07-17 10:21:26 -06:00
Richard W.M. Jones
a5e7a8cbbe OCaml 5.2.0 ppc64le fix 2024-06-19 13:22:33 +01:00
Richard W.M. Jones
3a29ce3a6d Add RHEL gating test 2024-06-19 13:21:48 +01:00
Richard W.M. Jones
684f60e3d0 Remove ocaml-csexp and ocaml-pp dependencies (RHEL only) 2024-06-19 13:21:48 +01:00
Jerry James
6a01d90761 Version 3.16.0 2024-06-17 09:21:27 -06:00
Richard W.M. Jones
cb1ce5ff91 OCaml 5.2.0 for Fedora 41 2024-05-29 17:33:35 +01:00
Jerry James
5923869db8 Version 3.15.3 2024-05-27 07:54:51 -06:00
Richard W.M. Jones
7da3dbf488 Use bundled ocaml-csexp and ocaml-pp (RHEL only)
*On RHEL only* the aim is to minimize source packages.  Use the
bundled ocaml-csexp and ocaml-pp and remove those as build
dependencies.  They are still listed as Requires by some binary
packages that we don't actually use in RHEL.
2024-05-15 20:42:28 +01:00
Jerry James
58c31cc982 Version 3.15.2 2024-04-24 09:38:58 -06:00
Jerry James
f0c1c80838 Version 3.15.1 2024-04-18 08:55:01 -06:00
Yaakov Selkowitz
16fed01b22 Disable docs in RHEL builds
ocaml-dune is the only consumer of sphinx-copybutton in RHEL/ELN,
and the recent addition of sphinx-design pulls in many unwanted
Python build dependencies.
2024-04-08 13:34:37 -04:00
Jerry James
954cd5a48a Version 3.15.0 2024-04-05 09:28:31 -06:00
Jerry James
30e1a15ea4 Version 3.14.2 2024-03-14 08:53:27 -06:00
Jerry James
2b749b0551 Version 3.14.0 2024-02-14 09:02:25 -07:00
Jerry James
7835ceec6d Version 3.13.1 2024-02-06 08:10:31 -07:00
Jerry James
c42fdafe27 Rebuild for changed ocamlx(Dynlink) hash 2024-02-02 08:31:41 -07:00
Fedora Release Engineering
b25a690073 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 09:57:31 +00:00
Jerry James
77a25cee8c Version 3.13.0 2024-01-20 11:09:21 -07:00
Jerry James
326a9c68d2 Version 3.12.2 2024-01-09 09:29:47 -07:00
Richard W.M. Jones
594b95bea5 OCaml 5.1.1 + s390x code gen fix for Fedora 40 2023-12-18 13:27:19 +00:00
Richard W.M. Jones
89b356be90 OCaml 5.1.1 rebuild for Fedora 40 2023-12-12 08:47:57 +00:00
Jerry James
880cc573d3 Version 3.12.1 2023-11-30 10:40:39 -07:00
Jerry James
b6e079d202 Version 3.11.1 2023-10-09 21:02:58 -06:00
Richard W.M. Jones
5515cdc0e9 Bump release and rebuild 2023-10-05 12:32:47 +01:00
Richard W.M. Jones
3555f12da5 OCaml 5.1 rebuild for Fedora 40 2023-10-05 12:18:59 +01:00
Jerry James
a5fccffcba Version 3.11.0 2023-10-04 21:10:09 -06:00
Jerry James
7297f1f8dd Version 3.10.0 2023-08-01 09:09:34 -06:00
Jerry James
63aa62e5c3 Version 3.9.2 2023-07-26 10:42:39 -06:00
Fedora Release Engineering
84eda40037 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 17:16:23 +00:00
Richard W.M. Jones
0e8d9a2ae7 ExcludeArch i686 2023-07-11 22:25:58 +01:00
Richard W.M. Jones
3631ce9297 OCaml 5.0 rebuild for Fedora 39 2023-07-11 21:50:40 +01:00
Jerry James
ba5707b2bd Version 3.9.1 2023-07-10 14:24:27 -06:00
Jerry James
946f11170e Version 3.8.1
Add LGPL-2.1-or-later to License tag due to bundled 0install-solver
2023-06-09 16:18:32 -06:00
Jerry James
28ee4aaef9 Version 3.7.1 2023-04-04 10:38:35 -06:00
Jerry James
cfd816c53a Rebuild for ocaml-csexp 1.5.2 2023-03-24 10:59:58 -06:00
Jerry James
7995f539ab Add debuginfo patch to produce good debuginfo again 2023-03-21 10:25:09 -06:00
Jerry James
2d82b286c5 Version 3.7.0. The fiber subpackage has been removed. 2023-02-18 13:47:36 -07:00
Richard W.M. Jones
cf706e9f8c Rebuild OCaml packages for F38 2023-01-24 08:50:16 +00:00
Fedora Release Engineering
50825add7a Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 22:07:09 +00:00
Jerry James
c23f82a54c Version 3.6.1. 2022-11-25 10:37:20 -07:00
Jerry James
f795f84fab Version 3.6.0. Convert License tag to SPDX. 2022-11-17 09:12:17 -07:00
Jerry James
33ec5ddc6d Version 3.5.0. 2022-10-20 09:12:43 -06:00
Fedora Release Engineering
a0993487f4 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 01:12:33 +00:00
Jerry James
203d3dffb7 Version 3.4.0. 2022-07-20 10:25:32 -06:00
Jerry James
3bff422f6b Version 3.3.1.
- Expose the libraries individually.
- Explain why we do not run the test suite.
- Use new OCaml macros.
- Various spec file cleanups.
2022-07-05 09:31:01 -06:00
Richard W.M. Jones
14881fd6e2 OCaml 4.14.0 rebuild 2022-06-18 14:30:53 +01:00
Richard W.M. Jones
489d00e5f4 BR on emacs-nox
At the time of writing emacs is not installable because of a problem
with webkit (https://bugzilla.redhat.com/show_bug.cgi?id=2050480).
I'm sure this will be fixed eventually, but I found that we don't need
full emacs, a scratch build using emacs-nox worked fine.
2022-02-04 12:31:18 +00:00
Richard W.M. Jones
0f29a5f36a OCaml 4.13.1 rebuild to remove package notes 2022-02-04 12:06:48 +00:00
Jerry James
d77b748548 Version 2.9.3. Note the bundling of ocaml-incremental-cycles. 2022-02-03 15:38:54 -07:00
Richard W.M. Jones
993a65744a Rebuild to pick up new ocaml dependency 2022-01-26 17:46:08 +00:00
Fedora Release Engineering
fb83b68a67 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 21:43:04 +00:00
Richard W.M. Jones
18a3e99eaa Revert "Build bootstrap version without menhir"
I thought that would disable menhir, in fact it enables it.

This reverts commit 39c2970231.
2021-10-04 20:35:25 +01:00
Richard W.M. Jones
7bd779ad75 OCaml 4.13.1 build 2021-10-04 20:32:03 +01:00
Richard W.M. Jones
39c2970231 Build bootstrap version without menhir 2021-10-04 20:29:20 +01:00
Jerry James
2185ad6b08 Version 2.9.1. 2021-09-08 08:40:50 -06:00
Richard W.M. Jones
2cf3996c68 Rebuild for changed ocamlx(Dynlink) 2021-07-27 21:39:34 +01:00
Fedora Release Engineering
e601bae386 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 16:36:46 +00:00
Jerry James
7d172c2d75 Version 2.9.0. 2021-07-17 13:08:30 -06:00
Richard W.M. Jones
e65929cbc6 Bump and rebuild for ELN. 2021-03-30 16:18:41 +01:00
Jerry James
209222ba18 Version 2.8.5. 2021-03-29 17:18:17 -06:00
Jerry James
35e6c6f157 Version 2.8.4. 2021-03-08 11:28:24 -07:00
Jerry James
2f270baa4c Version 2.8.3. 2021-03-08 08:31:57 -07:00
Richard W.M. Jones
3fcc79c835 OCaml 4.12.0 build 2021-03-01 10:09:49 +00:00
Richard W.M. Jones
a7911740e1 Bump and rebuild for updated ocaml Dynlink dependency. 2021-02-01 18:28:58 +00:00
Fedora Release Engineering
6e0bc222a6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:56:35 +00:00
Jerry James
32d989760c Version 2.8.2. 2021-01-21 16:22:45 -07:00
Jerry James
36bff69e46 Version 2.8.1. 2021-01-14 20:31:36 -07:00
Jerry James
6e96dffe9b Version 2.8.0. Drop upstreamed patch from pull request 3757. 2021-01-13 15:40:32 -07:00
Jerry James
52ecf102bf Explicitly BR make. 2020-11-09 16:40:48 -07:00
Jerry James
6f162e464e Add ocaml-csexp-devel R to the -devel subpackage. 2020-09-18 13:04:05 -06:00
Jerry James
33574a9cc8 Version 2.7.1.
- Csexp is no longer vendored in.
- Drop upstreamed patches for issue 3736 and pull request 3739.
- Fix configuration with patch from pull request 3757.
2020-09-14 15:07:32 -06:00
Richard W.M. Jones
92351ab8b4 OCaml 4.11.1 rebuild 2020-09-01 20:06:35 +01:00
Richard W.M. Jones
12c4bb55a5 Further fix for https://github.com/ocaml/dune/issues/3736 2020-08-24 10:49:31 +01:00
Richard W.M. Jones
e699447e52 Add fix for https://github.com/ocaml/dune/issues/3736 2020-08-24 08:38:29 +01:00
Richard W.M. Jones
5203fad767 OCaml 4.11.0 rebuild 2020-08-21 11:59:58 +01:00
Jerry James
ce5c02c2a0 Version 2.7.0. Drop upstreamed patch for issue 3671. 2020-08-14 13:45:23 -06:00
Richard W.M. Jones
5a43ac7e12 Pass -g option when compiling ppx extensions.
https://github.com/ocaml/dune/pull/3671
2020-08-04 09:07:07 +01:00
Jerry James
80e921d901 New version 2.6.2. 2020-08-03 15:49:44 -06:00
Fedora Release Engineering
89ee7a420c - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:08:50 +00:00
Jerry James
3c27d8efa9 New version 2.6.1. 2020-07-02 16:46:41 -06:00
Jerry James
1a90f14efc New version 2.6.0. 2020-06-06 15:56:09 -06:00
Richard W.M. Jones
69d59c02f7 OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-04 23:06:51 +01:00
Richard W.M. Jones
e06e5d86e1 Rename cond "bootstrap" as "menhir".
The reason for this is that it causes the final package to be named
ocaml-dune-2.5.1-2.fc33~bootstrap.  This breaks build automation since
fedpkg verrel returns the name without the ~bootstrap appendage.
2020-04-21 17:17:28 +01:00
Richard W.M. Jones
16bb386c93 OCaml 4.11.0 pre-release attempt 2 2020-04-21 16:48:44 +01:00
Jerry James
672b2ed9cd New version 2.5.1. 2020-04-19 21:52:43 -06:00
Richard W.M. Jones
9630564026 Bump release and rebuild. 2020-04-18 10:37:49 +01:00
Richard W.M. Jones
96f14a2270 Bump release and rebuild. 2020-04-18 08:59:05 +01:00
Richard W.M. Jones
afe805eb5a Bump release and rebuild. 2020-04-17 23:40:44 +01:00
Richard W.M. Jones
c4c3592b95 OCaml 4.11.0 pre-release 2020-04-17 21:22:43 +01:00
Richard W.M. Jones
f3e530b23b Disable menhir for OCaml bootstrap. 2020-04-17 19:52:41 +01:00
Jerry James
308383c7bd Version 2.5.0 2020-04-10 10:37:25 -06:00
Richard W.M. Jones
4580e9dceb Update all OCaml dependencies for RPM 4.16. 2020-04-02 23:08:03 +01:00
Jerry James
134b5e568d New version 2.4.0.
Add bootstrap conditional for builds without ocaml-menhir.
2020-03-06 11:01:02 -07:00
Richard W.M. Jones
114710af4f OCaml 4.10.0 final. 2020-02-26 11:23:10 +00:00
Jerry James
384b7e5c5e New version 2.3.1 (bz 1805578). 2020-02-20 20:56:10 -07:00
Jerry James
acad1c2836 New version 2.3.0 (bz 1803374). 2020-02-17 21:30:57 -07:00
Jerry James
0fa0d4878c New version 2.2.0 (bz 1742638) 2020-02-07 10:27:36 -07:00
Fedora Release Engineering
4744349aaa - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:34:12 +00:00
Richard W.M. Jones
cb21dff8c8 OCaml 4.10.0+beta1 rebuild. 2020-01-19 14:34:13 +00:00
Ben Rosser
849682db3e Update to latest upstream release, 2.1.2. 2020-01-10 15:56:54 -05:00
Ben Rosser
358fca60b3 Update sources file; upload dune 2.1.0. 2020-01-10 15:28:35 -05:00
Jerry James
715e50af87 New version 2.1.0 (bz 1742638).
Also:
- Invoke the configure script (bz 1740196).
- Add LGPLv2 to License due to incremental-cycles.
- Add -emacs subpackage and byte compile the Emacs Lisp files.
- Drop upstreamed 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch.
- Add -doc-emphasis and -doc-scheme patches.
- Run the unit tests in %check.
2020-01-04 17:32:38 -07:00
Richard W.M. Jones
401aabeea7 OCaml 4.09.0 (final) rebuild. 2019-12-06 11:53:39 +00:00
Richard W.M. Jones
a1d73a2da4 OCaml 4.08.1 (final) rebuild. 2019-08-16 11:29:11 +01:00
Richard W.M. Jones
549469ed2f Work around nodynlink issue on armv7.
https://github.com/ocaml/dune/issues/2527
2019-08-09 10:38:35 +01:00
Richard W.M. Jones
8868602918 Revert "Disable armv7 temporarily."
This reverts commit b3bad1d821.
2019-08-09 08:57:04 +01:00
Richard W.M. Jones
b3bad1d821 Disable armv7 temporarily.
See https://github.com/ocaml/dune/issues/2527
2019-08-08 17:38:36 +01:00
Richard W.M. Jones
5b72f4d47a New version 1.11.0 (also required for camomile 1.0.2). 2019-08-08 16:21:06 +01:00
Ben Rosser
e1c4ce182d Add new development subpackage. Install all compiled dune libraries. 2019-08-06 14:33:41 -04:00
Richard W.M. Jones
f1b8e426d5 OCaml 4.08.1 (rc2) rebuild. 2019-07-31 17:23:35 +01:00
Fedora Release Engineering
39473a4e59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:51:47 +00:00
Richard W.M. Jones
c1ebc8d06d OCaml 4.08.0 (final) rebuild. 2019-06-27 19:25:05 +01:00
Andy Li
391b15504a Updated to latest upstream release (#1715394). 2019-06-16 01:47:57 +08:00
Andy Li
d1b193a3a8 add source 2019-05-16 16:55:03 +08:00
Andy Li
904f3c9fac Updated to latest upstream release (#1705660). 2019-05-16 16:52:17 +08:00
Richard W.M. Jones
1f11cd451a OCaml 4.08.0 (beta 3) rebuild. 2019-04-30 09:06:25 +01:00
Andy Li
0afa631907 update to 1.9.1 2019-04-11 18:43:28 +08:00
Andy Li
6a5a36b0b3 Update to 1.9.0. 2019-04-10 11:57:51 +08:00
Andy Li
c73c65fa07 Add missing dependency on sphinx_rtd_theme. 2019-03-13 03:44:03 +08:00
Andy Li
a1a02d530f Updated to latest upstream release (#1686836). 2019-03-13 02:37:43 +08:00
Andy Li
b2bdbf6204 Updated to latest upstream release (#1686466). 2019-03-08 11:35:20 +08:00
11 changed files with 1025 additions and 104 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

2
.gitignore vendored
View file

@ -1 +1 @@
/dune-1.7.3.tar.gz
/dune-*.tar.gz

View file

@ -1,3 +1,12 @@
# ocaml-dune
The ocaml-dune package
[Dune](https://dune.build) is a build system designed for
[OCaml](https://ocaml.org/)/[Reason](https://reasonml.github.io/) projects
only. It focuses on providing the user with a consistent experience and takes
care of most of the low-level details of OCaml compilation. All you have to
do is provide a description of your project and Dune will do the rest.
The scheme it implements is inspired from the one used inside
[Jane Street](https://opensource.janestreet.com/) and adapted to the open
source world. It has matured over a long time and is used daily by hundred of
developers, which means that it is highly tested and productive.

6
gating.yaml Executable file
View file

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View file

@ -0,0 +1,11 @@
--- dune-3.20.0/src/dune_lang/dune_project.ml.orig 2025-08-19 00:28:44.000000000 -0600
+++ dune-3.20.0/src/dune_lang/dune_project.ml 2025-08-21 20:42:51.793195598 -0600
@@ -425,7 +425,7 @@ let interpret_lang_and_extensions ~(lang
let filename = "dune-project"
let opam_file_location_default ~lang:_ = `Relative_to_project
let wrapped_executables_default ~(lang : Lang.Instance.t) = lang.version >= (2, 0)
-let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0)
+let map_workspace_root_default ~(lang : Lang.Instance.t) = false
let executables_implicit_empty_intf_default ~(lang : Lang.Instance.t) =
lang.version >= (3, 0)

31
ocaml-dune-no-lwt.patch Normal file
View file

@ -0,0 +1,31 @@
--- dune-3.15.0/dune-file.orig 2024-04-03 03:29:40.000000000 -0600
+++ dune-3.15.0/dune-file 2024-04-05 08:48:56.083804773 -0600
@@ -30,9 +30,6 @@
(copy dune-private-libs.opam.template ordering.opam.template))
(rule
- (copy dune-private-libs.opam.template dune-rpc-lwt.opam.template))
-
-(rule
(copy dune-private-libs.opam.template fiber.opam.template))
(rule
--- dune-3.15.0/dune-project.orig 2024-04-03 03:29:40.000000000 -0600
+++ dune-3.15.0/dune-project 2024-04-05 08:49:50.546090649 -0600
@@ -149,16 +149,6 @@ understood by dune language."))
(description "Library to connect and control a running dune instance"))
(package
- (name dune-rpc-lwt)
- (synopsis "Communicate with dune using rpc and Lwt")
- (depends
- (dune-rpc (= :version))
- (csexp (>= 1.5.0))
- (lwt (>= 5.6.0))
- base-unix)
- (description "Specialization of dune-rpc to Lwt"))
-
-(package
(name dyn)
(synopsis "Dynamic type")
(depends

File diff suppressed because it is too large Load diff

10
plans.fmf Normal file
View file

@ -0,0 +1,10 @@
summary: Run all tests
discover:
how: fmf
execute:
how: tmt
prepare:
how: install
package:
- ocaml
- ocaml-dune

View file

@ -1 +1 @@
SHA512 (dune-1.7.3.tar.gz) = 744ff584acc1695f3720b142a5bc00a26901d488531629fe386f4f3b02f13b86b74e7ba5801d468f4b8ebfcee9bd15017e6dd0d0c2ae242eaef40aa99668a39d
SHA512 (dune-3.20.2.tar.gz) = efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355

6
tests/basic-test.sh Executable file
View file

@ -0,0 +1,6 @@
#!/bin/bash -
set -e
set -x
# Just check that dune works.
dune --version

2
tests/main.fmf Normal file
View file

@ -0,0 +1,2 @@
summary: Basic test
test: ./basic-test.sh