[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64249] [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1.
From: |
Simon Tournier |
Subject: |
[bug#64249] [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. |
Date: |
Fri, 22 Sep 2023 16:21:38 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hi,
On Tue, 12 Sep 2023 at 06:57, pukkamustard <pukkamustard@posteo.net> wrote:
> * gnu/packages/ocaml.scm (opam): Update to 2.1.5.
> [native-inputs]: Add more test data.
> [arguments]: Disable failing test.
> (ocaml-graph): Update to 2.0.0.
> (ocaml-dose3): Update to 7.0.0.
> * gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch: Remove.
> * gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch: Remove.
> * gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch: Remove.
> * gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch: Remove.
> * gnu/local.mk (dist_path_DATA): Unregister removed patches.
> ---
> gnu/local.mk | 4 -
> gnu/packages/ocaml.scm | 132 +++++++++--------
> .../ocaml-dose3-Fix-for-ocaml-4.06.patch | 52 -------
> .../ocaml-dose3-Install-mli-cmx-etc.patch | 133 ------------------
> .../ocaml-dose3-add-unix-dependency.patch | 25 ----
> .../ocaml-dose3-dont-make-printconf.patch | 9 --
> 6 files changed, 74 insertions(+), 281 deletions(-)
> delete mode 100644 gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
> delete mode 100644 gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
> delete mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
> delete mode 100644 gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
I get:
--8<---------------cut here---------------start------------->8---
Applying: gnu: opam: Update to 2.1.5.
error: corrupt patch at line 292
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gnu: opam: Update to 2.1.5.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--8<---------------cut here---------------end--------------->8---
And as suggested by
base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e
from the cover letter, I am on the top of it.
What do I miss?
Cheers,
simon
- [bug#64249] [PATCH ocaml-team v6 00/12] The one where OPAM finally works, pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 05/12] gnu: Update coq-mathcomp to 1.17.0., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 06/12] gnu: Update coq-autosubst to 1.8., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 02/12] gnu: Update coq-flocq to 4.1.1., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 04/12] gnu: Update coq-coquelicot to 3.4.0., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 09/12] gnu: coq: Update to 8.17.1., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 07/12] gnu: Update coq-stdpp to 1.8.0., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 12/12] gnu: opam: Update to 2.1.5., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 08/12] gnu: Update coq-interval to 4.8.0., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 01/12] gnu: ocaml: Update to 4.14.1., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 10/12] gnu: dune-bootstrap: Update to 3.10.0., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 03/12] gnu: Update coq-gappa to 1.5.3., pukkamustard, 2023/09/12
- [bug#64249] [PATCH ocaml-team v6 11/12] gnu: opam: Split build into smaller sub-packages., pukkamustard, 2023/09/12