From: Julien Lepiller <julien@lepiller.eu>
To: zimoun <zimon.toutoune@gmail.com>
Cc: 52164@debbugs.gnu.org
Subject: [bug#52164] [PATCH] gnu: coq: Update to 8.14.0.
Date: Mon, 29 Nov 2021 07:29:51 -0500 [thread overview]
Message-ID: <592223CF-588B-44EF-A35F-9E9FDB3E4865@lepiller.eu> (raw)
In-Reply-To: <8635nfl2m6.fsf_-_@gmail.com>
Le 29 novembre 2021 04:42:25 GMT-05:00, zimoun <zimon.toutoune@gmail.com> a écrit :
>Hi,
>
>On dim., 28 nov. 2021 at 18:27, Julien Lepiller <julien@lepiller.eu> wrote:
>> * gnu/packages/coq.scm (coq): Update to 8.14.0.
>> (coq-bignums): Update to 8.14.0.
>> (coq-equations): Update to 1.3.
>> * gnu/packages/patches/coq-fix-envvars.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Add it.
>> ---
>> gnu/local.mk | 1 +
>> gnu/packages/coq.scm | 65 +++++++---
>> gnu/packages/patches/coq-fix-envvars.patch | 139 +++++++++++++++++++++
>> 3 files changed, 188 insertions(+), 17 deletions(-)
>> create mode 100644 gnu/packages/patches/coq-fix-envvars.patch
>
>[...]
>
>> -(define-public coq
>> +(define-public coq-core
>
>[...]
>
>> - `(("which" ,which)))
>> + `(("ocaml-ounit2" ,ocaml-ounit2)
>> + ("which" ,which)))
>
>This ’which’ could be removed. :-)
>
>
>> +(define-public coq-stdlib
>> + (package
>> + (inherit coq-core)
>> + (name "coq-stdlib")
>> + (arguments
>> + `(#:package "coq-stdlib"
>> + #:test-target "."))
>> + (inputs
>> + `(("coq-core" ,coq-core)
>> + ("gmp" ,gmp)
>> + ("ocaml-zarith" ,ocaml-zarith)))
>> + (native-inputs '())))
>> +
>> +(define-public coq
>> + (package
>> + (inherit coq-core)
>> + (name "coq")
>> + (arguments
>> + `(#:package "coq"
>> + #:test-target "."))
>> + (propagated-inputs
>> + `(("coq-core" ,coq-core)
>> + ("coq-stdlib" ,coq-stdlib)))
>> + (native-inputs '())))
>
>With this approach, 3 builds. Is it required by kind-of Coq bootstrap?
Coq now uses dune, and it is split into core, stdlib anl coq. I prefer to build one dune package in each guix package, rather than everything, especially since we want to separate coq-ide.
>
>
>> (define-public coq-bignums
>> (package
>> (name "coq-bignums")
>> - (version "8.13.0")
>> + (version "8.14.0")
>
>This…
>
>> (define-public coq-equations
>> (package
>> (name "coq-equations")
>> - (version "1.2.4")
>> + (version "1.3")
>
>and this… Cannot they be upgraded by a separated commit?
>
>They will probably be broken with Coq 8.13 but if their upgrade is right
>after and pushed with the same batch, it is transparent and the
>atomicity appears to me better.
They're broken with coq 8.13, and the previous version is also broken with coq 8.14. This is why I was able to update coq semantics independently but not these two.
>
>
>> diff --git a/gnu/packages/patches/coq-fix-envvars.patch b/gnu/packages/patches/coq-fix-envvars.patch
>> new file mode 100644
>> index 0000000000..deecf5ce74
>> --- /dev/null
>> +++ b/gnu/packages/patches/coq-fix-envvars.patch
>> @@ -0,0 +1,139 @@
>> +From ebe09fcac72b21d17c4e8fe6edc1b6076a4ae97c Mon Sep 17 00:00:00 2001
>> +From: Julien Lepiller <julien@lepiller.eu>
>> +Date: Sun, 21 Nov 2021 00:38:03 +0100
>> +Subject: [PATCH] Fix environment variable usage.
>> +
>> +---
>> + checker/checker.ml | 2 ++
>> + lib/envars.ml | 26 ++++++++++++++++----------
>> + sysinit/coqargs.ml | 3 ++-
>> + sysinit/coqloadpath.ml | 3 ++-
>> + sysinit/coqloadpath.mli | 2 +-
>> + tools/coqdep.ml | 2 +-
>> + 6 files changed, 24 insertions(+), 14 deletions(-)
>
>This fix LGTM.
>
>
>Otherwise, LTGM.
>
>
>Cheers,
>simon
next prev parent reply other threads:[~2021-11-29 12:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-28 16:44 [bug#52164] [PATCH] gnu: coq: Update to 8.14.0 Julien Lepiller
2021-11-28 17:27 ` [bug#52164] [PATCH 1/3] gnu: ocaml-semantics: " Julien Lepiller
2021-11-29 9:05 ` zimoun
2021-11-28 17:27 ` [bug#52164] [PATCH 2/3] gnu: proof-general: Update to latest commit Julien Lepiller
2021-11-29 9:06 ` [bug#52164] [PATCH] gnu: coq: Update to 8.14.0 zimoun
2021-11-28 17:27 ` [bug#52164] [PATCH 3/3] " Julien Lepiller
2021-11-29 9:42 ` [bug#52164] [PATCH] " zimoun
2021-11-29 12:29 ` Julien Lepiller [this message]
2021-11-29 13:21 ` zimoun
2021-11-29 13:39 ` Julien Lepiller
2021-11-29 14:13 ` zimoun
2022-05-03 12:35 ` bug#52164: " zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=592223CF-588B-44EF-A35F-9E9FDB3E4865@lepiller.eu \
--to=julien@lepiller.eu \
--cc=52164@debbugs.gnu.org \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.