Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 11:31:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 07:31:40 2023
Received: from localhost ([127.0.0.1]:56310 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qg1cK-0007LG-7E
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 07:31:40 -0400
Received: from jpoiret.xyz ([206.189.101.64]:40060)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <dev@HIDDEN>) id 1qg1cC-0007Kp-Cp
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 07:31:35 -0400
Received: from authenticated-user (jpoiret.xyz [206.189.101.64])
by jpoiret.xyz (Postfix) with ESMTPA id C3C00184D43;
Tue, 12 Sep 2023 11:31:24 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim;
t=1694518285;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=ZEDLNjLNA4/CQSSkZxqNdA5M+mmwYfyx5H/OwS2ggtI=;
b=nprYa0X0BzjqCrFxSBqoP7RbTDA3N34LiChcp7rWyXsprFzEtrV4Y0G7F/9MHww1L9kvGO
miMT2giGzvWZ8IMudJDomqbvbBwPZI77DlEaHyoEiGfo/RL3TCKHOH2McgkHsXF3Y6kU3P
8XEytt1syn/kUwJqD4h0oYaTGs2RCdrq8K01KURVxVON558HhW/NLMpcCMNeaghvFV02ov
qWJzHdZM/YU7y6DLziBCil+5SI15a8eRRP64Zev4UqL+v8G7915k+Hq3dkZOp4z0oYKaFL
57jx1Vww4nzegVmHST4RvfR62Ho4k8Na9Ho4Jf6uYelHs1JEBnTknp80E1p4jA==
From: Josselin Poiret <dev@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>,
64249 <at> debbugs.gnu.org
Subject: [PATCH] fixup! gnu: coq: Update to 8.17.1.
Date: Tue, 12 Sep 2023 13:31:06 +0200
Message-ID: <4c1fa55b62e1e172f123f18a334575c7c0a4f7a9.1694517929.git.dev@HIDDEN>
In-Reply-To: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@HIDDEN>
References: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Level: ****
X-Spamd-Bar: ++++
Authentication-Results: jpoiret.xyz;
auth=pass smtp.auth=jpoiret@HIDDEN smtp.mailfrom=dev@HIDDEN
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: Julien Lepiller <julien@HIDDEN>, Josselin Poiret <dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From: Josselin Poiret <dev@HIDDEN>
---
Hi pukkamustard,
Since we're dropping the coq-core and coq-stdlib separation, why not get rid of
all our custom stuff that came with it? Here's a fixup patch that does
precisely that!
Best,
gnu/local.mk | 1 -
gnu/packages/coq.scm | 49 ++++++++------------
gnu/packages/patches/coq-fix-envvars.patch | 53 ----------------------
3 files changed, 20 insertions(+), 83 deletions(-)
delete mode 100644 gnu/packages/patches/coq-fix-envvars.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d9b4229729..8925e483b5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1036,7 +1036,6 @@ dist_patch_DATA = \
%D%/packages/patches/converseen-hide-non-free-pointers.patch \
%D%/packages/patches/cool-retro-term-wctype.patch \
%D%/packages/patches/coreutils-gnulib-tests.patch \
- %D%/packages/patches/coq-fix-envvars.patch \
%D%/packages/patches/cppcheck-disable-char-signedness-test.patch \
%D%/packages/patches/cpuinfo-system-libraries.patch \
%D%/packages/patches/cpulimit-with-glib-2.32.patch \
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index d68f00a63c..6169b5f819 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -64,40 +64,31 @@ (define-public coq
(file-name (git-file-name name version))
(sha256
(base32
- "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
- (patches (search-patches "coq-fix-envvars.patch"))))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))))
(native-search-paths
(list (search-path-specification
(variable "COQPATH")
- (files (list "lib/ocaml/site-lib/coq/user-contrib"
- "lib/coq/user-contrib")))
- (search-path-specification
- (variable "COQLIBPATH")
- (files (list "lib/ocaml/site-lib/coq")))
- (search-path-specification
- (variable "COQCORELIB")
- (files (list "lib/ocaml/site-lib/coq-core"))
- (separator #f))))
+ (files (list "lib/coq/user-contrib")))))
(build-system dune-build-system)
(arguments
- `(#:package "coq-core,coq-stdlib,coq"
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libdir (string-append out "/lib/ocaml/site-lib")))
- (invoke "./configure" "-prefix" out
- "-libdir" libdir))))
- (add-before 'build 'make-dunestrap
- (lambda _ (invoke "make" "dunestrap")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libdir (string-append out "/lib/ocaml/site-lib")))
- (invoke "dune" "install" "--prefix" out
- "--libdir" libdir
- "coq-core" "coq-stdlib" "coq")))))))
+ (list
+ #:package "coq-core,coq-stdlib,coq"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (coqlib (string-append out "/lib/ocaml/site-lib/coq/")))
+ (invoke "./configure" "-prefix" out
+ "-libdir" coqlib))))
+ (add-before 'build 'make-dunestrap
+ (lambda _ (invoke "make" "dunestrap")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "dune" "install" "--prefix" out
+ "--libdir" libdir "coq" "coq-core" "coq-stdlib")))))))
(inputs
(list gmp ocaml-zarith))
(native-inputs
diff --git a/gnu/packages/patches/coq-fix-envvars.patch b/gnu/packages/patches/coq-fix-envvars.patch
deleted file mode 100644
index 6c48224c64..0000000000
--- a/gnu/packages/patches/coq-fix-envvars.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0e76cda958a4d3e4bcbb96e171c26b6b3478c6c2 Mon Sep 17 00:00:00 2001
-From: Julien Lepiller <julien@HIDDEN>
-Date: Thu, 10 Feb 2022 16:44:10 +0100
-Subject: [PATCH] Fix environment variable usage.
-
----
- boot/env.ml | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/boot/env.ml b/boot/env.ml
-index e8521e7..d834a3a 100644
---- a/boot/env.ml
-+++ b/boot/env.ml
-@@ -32,17 +32,29 @@ let fail_msg =
-
- let fail s = Format.eprintf "%s@\n%!" fail_msg; exit 1
-
-+let path_to_list p =
-+ let sep = if String.equal Sys.os_type "Win32" then ';' else ':' in
-+ String.split_on_char sep p
-+
- (* This code needs to be refactored, for now it is just what used to be in envvars *)
- let guess_coqlib () =
- Util.getenv_else "COQLIB" (fun () ->
- let prelude = "theories/Init/Prelude.vo" in
-- Util.check_file_else
-- ~dir:Coq_config.coqlibsuffix
-- ~file:prelude
-- (fun () ->
-- if Sys.file_exists (Filename.concat Coq_config.coqlib prelude)
-- then Coq_config.coqlib
-- else fail ()))
-+ let coqlibpath = Util.getenv_else "COQLIBPATH" (fun () -> Coq_config.coqlibsuffix) in
-+ let paths = path_to_list coqlibpath in
-+ let valid_paths =
-+ List.filter
-+ (fun dir -> (Util.check_file_else ~dir:dir ~file:prelude (fun () -> "")) <> "")
-+ paths in
-+ match valid_paths with
-+ | [] ->
-+ if Sys.file_exists (Filename.concat Coq_config.coqlib prelude)
-+ then Coq_config.coqlib
-+ else
-+ fail "cannot guess a path for Coq libraries; please use -coqlib option \
-+ or ensure you have installed the package containing Coq's stdlib (coq-stdlib in OPAM) \
-+ If you intend to use Coq without a standard library, the -boot -noinit options must be used."
-+ | p::_ -> p)
-
- (* Build layout uses coqlib = coqcorelib *)
- let guess_coqcorelib lib =
---
-2.34.0
-
base-commit: 9996896dc252a02ba3b17473a685ce8957237546
prerequisite-patch-id: 86064275d4e6973b4c6e0e92928e9f0492f1c1e8
prerequisite-patch-id: 1e373b37413142bb32fa4a3eac0c429cc06aade6
prerequisite-patch-id: 62f9047b558dc9ad8be2415eda1ca5a7f45afbd5
prerequisite-patch-id: f419c33161039acab8d70e190fbcf155ce69c392
prerequisite-patch-id: d03ea10df36ace9b645d943ee867c8ae3837871e
prerequisite-patch-id: fa3b358bf025ea4632af1d04265129af844583c3
prerequisite-patch-id: 30facf29a23518f813ee17eb213c9dda2c9891e9
prerequisite-patch-id: 4dffccb9ce6bc4446f8683035567e06d2dc7c98d
prerequisite-patch-id: d33f5858aa29cc2a674b4bd53170fc3484e6bc2a
prerequisite-patch-id: cde7bed13eeac7d6e836f2d02528885985f0fffb
prerequisite-patch-id: c6b875244504ca1effdd8a81e96dab5f988607be
prerequisite-patch-id: d04a32a675e2c778d3fa96eea636f44ae50b4968
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:57 2023
Received: from localhost ([127.0.0.1]:55856 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLQ-0005bo-0b
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:57 -0400
Received: from mout02.posteo.de ([185.67.36.66]:58435)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxLH-0005aj-NU
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:49 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 95CB7240105
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:37 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501857; bh=oCvwRMvkBE2OmuymuJ9FjnuxK+fbBfvUQvaEKdyNNsI=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=iAyht/S5V6QEZ6eMWOQBF3fzgm54zCFbKixZE1NNxXhki5JovV8s1yQoZix0JJw2B
nhRvg77aRpEnmh6nZHHTrt1pauPin+OLhbf9tgSBajoGlW+v/7Jkt3/F3VoZ9ZLAvC
eTzLS4uLgzkPunL8xwofhPDqOuxjDmRgn8dvudu4AbMKLui6aknhcC1JggtxFrc8iP
lrAkuMY5r6CjYGUjECdfBTt1Ys2O6qrTc8Jik8IRHqu6KAZsRCnJs50J5J+GizdcVP
joHl5vazEz95wwhIeAAZSFnpcTl/76nivx4GI+QlaAh2MCsJv7WwxOFa0oO6300FQx
2Xw607Jo8egkg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt90L3Bz6tvJ;
Tue, 12 Sep 2023 08:57:36 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 12/12] gnu: opam: Update to 2.1.5.
Date: Tue, 12 Sep 2023 06:57:02 +0000
Message-ID: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* 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
diff --git a/gnu/local.mk b/gnu/local.mk
index 4f8637418a..d9b4229729 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1666,10 +1666,6 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/obs-modules-location.patch \
- %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
- %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
- %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
- %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-multiple-definitions.patch \
%D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \
%D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 81b30aa8ea..396c5851e2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -713,7 +713,7 @@ (define-public ocaml-mccs
(define-public ocaml-dose3
(package
(name "ocaml-dose3")
- (version "5.0.1")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -722,29 +722,16 @@ (define-public ocaml-dose3
(file-name (git-file-name name version))
(sha256
(base32
- "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
- (patches
- (search-patches
- "ocaml-dose3-add-unix-dependency.patch"
- "ocaml-dose3-Fix-for-ocaml-4.06.patch"
- "ocaml-dose3-dont-make-printconf.patch"
- "ocaml-dose3-Install-mli-cmx-etc.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:tests? #f ;the test suite requires python 2
- #:configure-flags
- ,#~(list (string-append "SHELL="
- #+(file-append (canonical-package bash-minimal)
- "/bin/sh")))
- #:make-flags
- ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))))
- (propagated-inputs
- (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
- (native-inputs
- (list perl
- ocaml-extlib
- ocamlbuild
- ocaml-cppo))
+ "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "dose3"))
+ (propagated-inputs (list ocaml-extlib
+ ocaml-base64-boot
+ ocaml-cudf
+ ocaml-graph
+ ocaml-re
+ ocaml-stdlib-shims))
+ (native-inputs (list ocaml-ounit))
(home-page "https://www.mancoosi.org/software/")
(synopsis "Package distribution management framework")
(description "Dose3 is a framework made of several OCaml libraries for
@@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format
(define ocaml-opam-core
(package
(name "ocaml-opam-core")
- (version "2.1.3")
+ (version "2.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -858,7 +845,7 @@ (define ocaml-opam-core
(file-name (git-file-name name version))
(sha256
(base32
- "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
+ "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
(build-system dune-build-system)
(arguments `(#:package "opam-core"
;; tests are run with the opam package
@@ -1037,7 +1024,10 @@ (define-public opam
(("diff opamroot-versions.test opamroot-versions.out") "run true")
;; Disable a failing test, probably because the repository we
;; replaced is not as expected
- (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true"))
+ (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true")
+ ;; Disable a failing test because of missing sandboxing
+ ;; functionality
+ (("diff init.test init.out") "run true"))
(substitute* "tests/reftests/dune"
;; Because of our changes to the previous file, we cannot check
;; it can be regenerated
@@ -1073,18 +1063,42 @@ (define-public opam
("which" ,which)
;; Data for tests
- ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
- "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
- ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
- "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z"))
- ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd"
- "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
- ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
- "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
- ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
- "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
- ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
- "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
+ ("opam-repo-0070613707"
+ ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
+ ("opam-repo-009e00fa"
+ ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
+ "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
+ ("opam-repo-7090735c"
+ ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
+ "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z"))
+ ("opam-repo-a5d7cdc0"
+ ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd"
+ "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
+ ("opam-repo-ad4dd344"
+ ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
+ "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
+ ("opam-repo-c1842d168d"
+ ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8"
+ "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
+ ("opam-repo-c1d23f0e"
+ ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
+ "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
+ ("opam-repo-f372039d"
+ ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
+ "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
+ ("opam-repo-11ea1cb"
+ ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
+ "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
+ ("opam-repo-297366c"
+ ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
+ "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
+ ("opam-repo-3235916"
+ ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa"
+ "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
+ ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
+ ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
+ "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw")))))
(inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
@@ -4443,8 +4457,7 @@ (define-public ocaml-base64
(base32
"068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))))
(build-system dune-build-system)
- (native-inputs
- (list ocaml-alcotest ocaml-bos ocaml-rresult))
+ (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
(home-page "https://github.com/mirage/ocaml-base64")
(synopsis "Base64 encoding for OCaml")
@@ -4453,6 +4466,14 @@ (define-public ocaml-base64
radix-64 representation. It is specified in RFC 4648.")
(license license:isc)))
+;; A variant without tests that is used to prevent a cyclic dependency when
+;; compiling ocaml-dose3.
+(define ocaml-base64-boot
+ (package
+ (inherit ocaml-base64)
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ocaml4.07-base64
(package-with-ocaml4.07
(package
@@ -5325,27 +5346,22 @@ (define-public ocaml4.07-uuidm
(define-public ocaml-graph
(package
(name "ocaml-graph")
- (version "1.8.8")
+ (home-page "https://github.com/backtracking/ocamlgraph/")
+ (version "2.0.0")
(source (origin
- (method url-fetch)
- (uri (string-append "http://ocamlgraph.lri.fr/download/"
- "ocamlgraph-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:install-target "install-findlib"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL"
- (search-input-file inputs "/bin/sh")))))))
- (inputs (list lablgtk))
+ "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "ocamlgraph"))
+ (propagated-inputs (list ocaml-stdlib-shims))
+ (native-inputs (list ocaml-graphics))
(properties `((upstream-name . "ocamlgraph")))
- (home-page "https://ocamlgraph.lri.fr/")
(synopsis "Graph library for OCaml")
(description "OCamlgraph is a generic graph library for OCaml.")
(license license:lgpl2.1)))
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
deleted file mode 100644
index 2c344af821..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Sat, 2 Dec 2017 12:51:01 +0100
-Subject: [PATCH] Fix for ocaml 4.06
-
----
- common/criteria_lexer.mll | 8 ++++----
- common/util.ml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
-index 71f9178..fc4eae3 100644
---- a/common/criteria_lexer.mll
-+++ b/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
- let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
- (* find the terminating delimiter *)
- let endpos =
-- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
- |Invalid_argument _ ->
- raise (Format822.Syntax_error (
- Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
- Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
- in
- let len = endpos - (lexbuf.lex_start_pos + 3) in
-- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-- s
-+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+ Bytes.to_string s
-
- }
-
-diff --git a/common/util.ml b/common/util.ml
-index 598f266..36ca3d1 100644
---- a/common/util.ml
-+++ b/common/util.ml
-@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
- let clean label =
- try
- let s = Filename.chop_extension (Filename.basename label) in
-- String.capitalize s
-+ String.capitalize_ascii s
- with Invalid_argument _ -> label
-
- let create ?(enabled=false) label =
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
deleted file mode 100644
index 41494e7b3c..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Thu, 2 Mar 2017 12:19:56 +0100
-Subject: [PATCH] Install mli, cmx, etc.
-
----
- Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 09464ff..5044d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
- @for i in _build/cudf/cudf.*; do \
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
-+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
- fi ; \
- done
-
-@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ;\
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
-+ rm -f $(DOSELIBS)/*.mlpack ;\
- fi ; \
- done
-
-@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
--#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
-+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
- INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
-
- exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
deleted file mode 100644
index d2cc44c784..0000000000
--- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Tue, 6 Feb 2018 10:15:45 +0100
-Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
-
----
- META.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META.in b/META.in
-index aa2cd8d..0f9d337 100644
---- a/META.in
-+++ b/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
-
- package "algo" (
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
deleted file mode 100644
index 84b6a3b81b..0000000000
--- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
--make printconf
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:51 2023
Received: from localhost ([127.0.0.1]:55854 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLK-0005bX-Qq
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:51 -0400
Received: from mout02.posteo.de ([185.67.36.66]:45769)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxLF-0005aF-4D
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:46 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 02A84240105
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:35 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501855; bh=b2QV2bTbF7H20kms1Ll/DOjp5XtozGLYvRfQTloj4mI=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=jEzEVbTHESWcPLUWx4LZr4EzDsuMSTG7XZBLQsX16H3rsJmd0KZ0F+0GRm7yxDbut
r6nTD3w+thrLfN7c4lnNJuNqtOh42ApMmMGjumGkpk5t5mFaGXI7wUc6fFYulN55nM
jjUlP9TlhibR4+W+i2kYBWpL/ZJbhddL4tapSnofmV50Nk9pCAxCsW9nhgfZW1Z+vT
wg/B7A3NdjMwru5IOwCWNzi8xPzNW0tVgzM/ehT4KGV83LUFZzTtvmoBVvZ4ehqsfm
pkuUJr0O2fJEEdM8NcFvcjqSwzAuraOXFkXhqO1vLZi0i1FxZjLLKbz50lcVfnA51V
Zv0RtuLiTA+Bg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt63KcLz6tw6;
Tue, 12 Sep 2023 08:57:34 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 11/12] gnu: opam: Split build into smaller
sub-packages.
Date: Tue, 12 Sep 2023 06:57:01 +0000
Message-ID: <c26cffdce19812057d426a6f86d1ba1bc8e06a06.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages.
(ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt,
ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos,
ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime,
ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg,
ocaml-afl-persistent, ocaml-ocb-stubblr) [native-inputs]: Replace opam with
opam-installer.
---
gnu/packages/ocaml.scm | 263 ++++++++++++++++++++++++++++-------------
1 file changed, 183 insertions(+), 80 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6646632397..81b30aa8ea 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -780,7 +780,7 @@ (define-public ocaml-down
,#~(list "build" "--lib-dir"
(string-append #$output "/lib/ocaml/site-lib"))))
(native-inputs
- (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/down")
(synopsis "OCaml toplevel (REPL) upgrade")
(description "Down is an unintrusive user experience upgrade for the
@@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format
;; With static-linking exception
(license license:lgpl2.1+)))
-(define-public opam
+(define ocaml-opam-core
(package
- (name "opam")
+ (name "ocaml-opam-core")
(version "2.1.3")
(source (origin
(method git-fetch)
@@ -860,32 +860,151 @@ (define-public opam
(base32
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
+ (arguments `(#:package "opam-core"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash"))
+ (bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/core/opamSystem.ml"
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\""))
+ (("getconf")
+ (which "getconf")))))))))
+ (propagated-inputs
+ (list ocaml-graph
+ ocaml-re
+ ocaml-cppo))
+ (inputs (list bubblewrap))
+ (home-page "https://opam.ocamlpro.com/")
+ (synopsis "Package manager for OCaml")
+ (description
+ "OPAM is a tool to manage OCaml packages. It supports multiple
+simultaneous compiler installations, flexible package constraints, and a
+Git-friendly development workflow.")
+ ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
+ (license license:lgpl3)))
+
+(define ocaml-opam-format
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-format")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-core
+ ocaml-opam-file-format
+ ocaml-re))
+ (arguments `(#:package "opam-format"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define-public opam-installer
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam-installer")
+ (native-inputs (list ocaml-opam-format
+ ocaml-cmdliner))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments `(#:package "opam-installer"
+ ;; requires all of opam
+ #:tests? #f))
+ (synopsis "Tool for installing OCaml packages")
+ (description "@var{opam-installer} is a tool for installing OCaml packages
+based on @code{.install} files defined by the OPAM package manager. It is
+useful for installing OCaml packages without requiring the entirety of
+OPAM.")
+ (properties
+ ;; opam-installer is used as a tool and not as a library, we can use the
+ ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0.
+ `((ocaml5.0-variant . ,(delay opam-installer))))))
+
+(define ocaml-opam-repository
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-repository")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format))
+ (arguments `(#:package "opam-repository"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-state
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-state")
+ (arguments `(#:package "opam-state"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ ;; Use bwrap from the store directly.
+ (substitute* "src/state/shellscripts/bwrap.sh"
+ (("-v bwrap") (string-append "-v " bwrap))
+ (("exec bwrap") (string-append "exec " bwrap))
+ ;; Mount /gnu and /run/current-system in the
+ ;; isolated environment when building with opam.
+ ;; This is necessary for packages to find external
+ ;; dependencies, such as a C compiler, make, etc...
+ (("^add_sys_mounts /usr")
+ (string-append "add_sys_mounts "
+ (%store-directory)
+ " /run/current-system /usr")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs (list ocaml-opam-repository))))
+
+(define ocaml-opam-solver
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-solver")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format
+ ocaml-mccs
+ ocaml-dose3))
+ (arguments `(#:package "opam-solver"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-client
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-client")
+ (arguments `(#:package "opam-client"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/client/opamInitDefaults.ml"
+ (("\"bwrap\"") (string-append "\"" bwrap "\"")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs
+ (list ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-opam-repository
+ ocaml-base64
+ ocaml-re
+ ocaml-cmdliner))))
+
+(define-public opam
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam")
+ (build-system dune-build-system)
(arguments
- `(#:phases
+ `(#:package "opam"
+ #:phases
(modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda* (#:key inputs make-flags #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash"))
- (bwrap (search-input-file inputs "/bin/bwrap")))
- (substitute* "src/core/opamSystem.ml"
- (("\"/bin/sh\"")
- (string-append "\"" bash "/bin/sh\""))
- (("getconf")
- (which "getconf")))
- ;; Use bwrap from the store directly.
- (substitute* "src/state/shellscripts/bwrap.sh"
- (("-v bwrap") (string-append "-v " bwrap))
- (("exec bwrap") (string-append "exec " bwrap))
- ;; Mount /gnu and /run/current-system in the
- ;; isolated environment when building with opam.
- ;; This is necessary for packages to find external
- ;; dependencies, such as a C compiler, make, etc...
- (("^add_sys_mounts /usr")
- (string-append "add_sys_mounts "
- (%store-directory)
- " /run/current-system /usr")))
- (substitute* "src/client/opamInitDefaults.ml"
- (("\"bwrap\"") (string-append "\"" bwrap "\""))))))
(add-before 'check 'prepare-checks
(lambda* (#:key inputs #:allow-other-keys)
;; Opam tests need to run an isolated environment from a writable
@@ -966,22 +1085,11 @@ (define-public opam
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
"0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
- (inputs
- (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3
- ocaml-mccs ocaml-opam-file-format ocaml-re))
+ (inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
;; compiled opam until opam is compatible with OCaml 5.0.
- `((ocaml5.0-variant . ,(delay opam))))
- (home-page "https://opam.ocamlpro.com/")
- (synopsis "Package manager for OCaml")
- (description
- "OPAM is a tool to manage OCaml packages. It supports multiple
-simultaneous compiler installations, flexible package constraints, and a
-Git-friendly development workflow.")
-
- ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
- (license license:lgpl3)))
+ `((ocaml5.0-variant . ,(delay opam))))))
(define-public ocaml-opam-monorepo
(package
@@ -2238,7 +2346,7 @@ (define-public ocaml-topkg
"11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("result" ,ocaml-result)))
(arguments
@@ -2268,7 +2376,7 @@ (define-public ocaml-rresult
"0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2383,7 +2491,7 @@ (define-public ocaml-mtime
"1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2513,13 +2621,13 @@ (define-public ocaml-fmt
"0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
- `(("cmdliner" ,ocaml-cmdliner)
- ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)
- ("ocaml-uchar" ,ocaml-uchar)))
+ (list ocaml-cmdliner
+ ocaml-stdlib-shims
+ ocaml-uchar))
(arguments `(#:tests? #f
#:build-flags (list "build" "--with-base-unix" "true"
"--with-cmdliner" "true")
@@ -2560,9 +2668,9 @@ (define-public ocaml-astring
"1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2782,7 +2890,7 @@ (define-public ocaml-react
"16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam ocaml-topkg))
+ (list ocamlbuild opam-installer ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2906,7 +3014,7 @@ (define-public ocaml-hmap
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (native-inputs (list ocaml-topkg ocamlbuild opam))
+ (native-inputs (list ocaml-topkg ocamlbuild opam-installer))
(home-page "https://erratique.ch/software/hmap")
(synopsis "Heterogeneous value maps for OCaml")
(description
@@ -3368,7 +3476,7 @@ (define-public ocaml-logs
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("fmt" ,ocaml-fmt)
("lwt" ,ocaml-lwt)
@@ -3402,7 +3510,7 @@ (define-public ocaml-fpath
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)))
@@ -3432,7 +3540,7 @@ (define-public ocaml-bos
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)
@@ -3506,7 +3614,7 @@ (define-public ocaml-xmlm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-topkg opam))
+ (list ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/xmlm")
(synopsis "Streaming XML codec for OCaml")
(description "Xmlm is a streaming codec to decode and encode the XML data
@@ -3647,7 +3755,7 @@ (define-public ocaml-uchar
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(home-page "https://github.com/ocaml/uchar")
(synopsis "Compatibility library for OCaml's Uchar module")
(description "The uchar package provides a compatibility library for the
@@ -3673,9 +3781,9 @@ (define-public ocaml-uutf
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uchar" ,ocaml-uchar)
("cmdliner" ,ocaml-cmdliner)))
@@ -3720,7 +3828,7 @@ (define-public ocaml-uunf
#t)))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
+ ("opam-installer" ,opam-installer)
("topkg" ,ocaml-topkg)
;; Test data is otherwise downloaded with curl
("NormalizationTest.txt"
@@ -3761,9 +3869,9 @@ (define-public ocaml-jsonm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uutf" ,ocaml-uutf)
("cmdliner" ,ocaml-cmdliner)))
@@ -4181,7 +4289,7 @@ (define-public ocaml-ptime
#:phases (modify-phases %standard-phases
(delete 'configure))))
(propagated-inputs (list ocaml-result js-of-ocaml))
- (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/ptime")
(synopsis "POSIX time for OCaml")
(description
@@ -5188,7 +5296,7 @@ (define-public ocaml-uuidm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("cmdliner" ,ocaml-cmdliner)
("topkg" ,ocaml-topkg)))
@@ -5801,12 +5909,8 @@ (define-public ocaml-ocb-stubblr
;; Guix doesn't have cc, but it has gcc
(("\"cc\"") "\"gcc\""))
#t)))))
- (inputs
- `(("topkg" ,ocaml-topkg)
- ("opam" ,opam)))
- (native-inputs
- `(("astring" ,ocaml-astring)
- ("ocamlbuild" ,ocamlbuild)))
+ (inputs (list ocaml-topkg opam-installer))
+ (native-inputs (list ocaml-astring ocamlbuild))
(synopsis "OCamlbuild plugin for C stubs")
(description "Ocb-stubblr is about ten lines of code that you need to
repeat over, over, over and over again if you are using ocamlbuild to build
@@ -5834,7 +5938,7 @@ (define-public ocaml-tsdl
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-astring opam pkg-config))
+ (list ocamlbuild ocaml-astring opam-installer pkg-config))
(inputs
`(("topkg" ,ocaml-topkg)
("sdl2" ,sdl2)
@@ -9554,7 +9658,7 @@ (define-public ocaml-uucd
(propagated-inputs
(list ocaml-xmlm))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uucd")
(synopsis "Unicode character database decoder for OCaml")
(description "Uucd is an OCaml module to decode the data of the Unicode
@@ -9582,7 +9686,7 @@ (define-public ocaml-uucp
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list opam
+ (list opam-installer
ocaml-findlib
ocamlbuild
ocaml-topkg
@@ -9616,7 +9720,7 @@ (define-public ocaml-uuseg
(propagated-inputs
(list ocaml-uucp ocaml-uutf ocaml-cmdliner))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uuseg")
(synopsis "Unicode text segmentation for OCaml")
(description "Uuseg is an OCaml library for segmenting Unicode text. It
@@ -10077,8 +10181,7 @@ (define-public ocaml-afl-persistent
(invoke "./build.sh")))
;; XXX: The tests are already run in the build.sh script.
(delete 'check))))
- (native-inputs
- `(("opam" ,opam)))
+ (native-inputs (list opam-installer))
(home-page "https://github.com/stedolan/ocaml-afl-persistent")
(synopsis "Use afl-fuzz in persistent mode")
(description
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:50 2023
Received: from localhost ([127.0.0.1]:55852 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLK-0005bQ-F0
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:50 -0400
Received: from mout01.posteo.de ([185.67.36.65]:36289)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxL1-0005Yp-GO
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:44 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 5F17A240027
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:21 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501841; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=gkEDtaujRRUbVLDSSBdcllID0cXTXw9MXYy5Kc+RfCmb3QuPi23w9wJnsn0zHjIXH
A6XK+DF5QBC1Tq/08tOQrXiKU436LiMELXtvpesfk/Qse8DRt98jx9jf/5GBjJ82OG
E9QZng88w5dRY/i3yZHNuTmn88VwunR+puC+F6DNEV1ixju/isMCA82pQEgZSVDJRF
xCYvlaJRg8ZP4lbwXWsu38NdtgeKo+/keyJUSLISmFtsqZ6bIJbKtpmbW+VuB9Rh/5
m3X65uNWWR91DWxRXWXbjs+E720TlVx58b3DJx0xKaI2aJbjHrbRQ3yittyaLmVA3a
jqQ3NeuRIGYIw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDsr6kNlz6tvp;
Tue, 12 Sep 2023 08:57:20 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 03/12] gnu: Update coq-gappa to 1.5.3.
Date: Tue, 12 Sep 2023 06:56:53 +0000
Message-ID: <dbcf9e11b5bee1b15361b469b51421864432d1a9.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-gappa): Update to 1.5.3.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 215e947fd4..86a9aef0f4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -288,7 +288,7 @@ (define-public coq-flocq
(define-public coq-gappa
(package
(name "coq-gappa")
- (version "1.5.2")
+ (version "1.5.3")
(source
(origin
(method git-fetch)
@@ -298,7 +298,7 @@ (define-public coq-gappa
(file-name (git-file-name name version))
(sha256
(base32
- "0l65ah81yj9vabgkwqh47c02qvscvl8nl60gqn1qrs47dx1pi80q"))))
+ "1dzkb2sfglhik2ymw8p65khl163xxjsaqji9agnnkvlk5r6589v6"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:50 2023
Received: from localhost ([127.0.0.1]:55850 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLJ-0005bI-WC
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:50 -0400
Received: from mout01.posteo.de ([185.67.36.65]:39227)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxLD-0005a7-Bq
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:43 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 39FBB240027
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:33 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501853; bh=PLEmvDq0xvloDrPOj2Mg4kX4D+EsOCUZnGUC3b5RtLU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=oK5Al11BdvoBhcpaJLPD/U+tWRJSGhoyrGGB4YIOZYhKidKc7/Iuormc1yMUNhWGQ
bkGZhGZdog/aruxahHttRmMhleSOqVKndZJGCDG9A6WJSYAOGO6hvy7LnXfEWuL9BD
R977Lvd/mw8DcQMSnrQ0N4hr8JkmZa788zTQaCZIBrmesE7IBKVmXHXC2X9ElXXrRx
Gf+Sl21cYZzupx9QbZyWSO3TGVIPMLwh/WBZTsjjBA/QFFEvMltMAMCznYuTrB0J49
+OQpev2CLTaF4tRNPx7xs7UJl7dR+58g5HDz09du22pscvESlV1TUR1HWvTVBvgJeQ
IJw/0MChkFm8g==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt45bfKz6tx9;
Tue, 12 Sep 2023 08:57:32 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 10/12] gnu: dune-bootstrap: Update to 3.10.0.
Date: Tue, 12 Sep 2023 06:57:00 +0000
Message-ID: <31b19cdfc460cdbad5ff3d156e6f05580fd7e502.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.10.0.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 56661b1977..6646632397 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1818,7 +1818,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.10.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1827,7 +1827,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1844,9 +1844,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:50 2023
Received: from localhost ([127.0.0.1]:55848 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLJ-0005bG-Ea
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:49 -0400
Received: from mout02.posteo.de ([185.67.36.66]:50103)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxLB-0005Zm-Qr
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:43 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id AE8BF240103
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:31 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501851; bh=4cRTLvRtK/Ovb3+vr5MSKQlbvJibRpnqVWuQzGXKhpE=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=IKmDEQ51/BqQbLV78TcSCSZHG5OG3Q4hpb6HA9GTTX95NbpoCp6RQj6n0tr00AXIe
jbIZd9vvGEwsagEQPKoy/Ftx8e4/Qr4nYf7yDMjh7HvLBWcJdgGlnTiB6hd+SAchLF
8iz58P3WVdA7hkhWGYSJz2J/8o/VTC5iHfqq4G4V0Tw/Ej1QCYwfJmBrAjfS54a0Cm
uuHK4n14DxyLE/fOUuKrsy4H4V61/pK8Px/x7cB6kyMmnq0ju3zhXlmDHkT0dFS562
WJuzwDCNdZxY8Ib+PCMiATz+u1Ze1BaQMOzy/pgUvyhRmSvX+4CRd+kzVF2tOPq/FG
OEF6iBsEl6L2A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt31YmTz6txp;
Tue, 12 Sep 2023 08:57:31 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 09/12] gnu: coq: Update to 8.17.1.
Date: Tue, 12 Sep 2023 06:56:59 +0000
Message-ID: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq): Update to 8.17.1 and merge with coq-core and coq-stdlib.
[arguments] Merge with coq-core and coq-stdlib. Add pre-build phases and
add a custom install phase. Remove unnecessary test-target.
(coq-core): Remove variable.
(coq-stdlib): Remove variable.
(coq-ide)[propagated-inputs]: Add zlib.
(coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core.
(coq-mathcomp-finmap)[inputs]: Remove coq-stdlib.
(coq-equations): Update to 1.3-8.17.
---
gnu/packages/coq.scm | 78 ++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 663265f5be..d68f00a63c 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages coq)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
@@ -50,10 +51,10 @@ (define-module (gnu packages coq)
#:use-module (guix utils)
#:use-module ((srfi srfi-1) #:hide (zip)))
-(define-public coq-core
+(define-public coq
(package
- (name "coq-core")
- (version "8.16.1")
+ (name "coq")
+ (version "8.17.1")
(source
(origin
(method git-fetch)
@@ -63,7 +64,7 @@ (define-public coq-core
(file-name (git-file-name name version))
(sha256
(base32
- "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
(patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths
(list (search-path-specification
@@ -78,13 +79,29 @@ (define-public coq-core
(files (list "lib/ocaml/site-lib/coq-core"))
(separator #f))))
(build-system dune-build-system)
+ (arguments
+ `(#:package "coq-core,coq-stdlib,coq"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "./configure" "-prefix" out
+ "-libdir" libdir))))
+ (add-before 'build 'make-dunestrap
+ (lambda _ (invoke "make" "dunestrap")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "dune" "install" "--prefix" out
+ "--libdir" libdir
+ "coq-core" "coq-stdlib" "coq")))))))
(inputs
(list gmp ocaml-zarith))
(native-inputs
(list ocaml-ounit2 which))
- (arguments
- `(#:package "coq-core"
- #:test-target "."))
(properties '((upstream-name . "coq"))) ; also for inherited packages
(home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic")
@@ -96,39 +113,6 @@ (define-public coq-core
;; Some of the documentation is distributed under opl1.0+.
(license (list license:lgpl2.1 license:opl1.0+))))
-(define-public coq-stdlib
- (package
- (inherit coq-core)
- (name "coq-stdlib")
- (arguments
- `(#:package "coq-stdlib"
- #:test-target "."
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-dune
- (lambda _
- (substitute* "user-contrib/Ltac2/dune"
- (("coq-core.plugins.ltac2")
- (string-join
- (map (lambda (plugin) (string-append "coq-core.plugins." plugin))
- '("ltac2" "number_string_notation" "tauto" "cc"
- "firstorder"))
- " "))))))))
- (inputs
- (list coq-core gmp ocaml-zarith))
- (native-inputs '())))
-
-(define-public coq
- (package
- (inherit coq-core)
- (name "coq")
- (arguments
- `(#:package "coq"
- #:test-target "."))
- (propagated-inputs
- (list coq-core coq-stdlib))
- (native-inputs '())))
-
(define-public coq-ide-server
(package
(inherit coq)
@@ -147,7 +131,7 @@ (define-public coq-ide
`(#:tests? #f
#:package "coqide"))
(propagated-inputs
- (list coq coq-ide-server))
+ (list coq coq-ide-server zlib))
(inputs
(list lablgtk3 ocaml-lablgtk3-sourceview3))))
@@ -555,16 +539,16 @@ (define-public coq-autosubst
(define-public coq-equations
(package
(name "coq-equations")
- (version "1.3")
+ (version "1.3-8.17")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattam82/Coq-Equations")
- (commit (string-append "v" version "-8.16"))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "08f756vgdd1wklkarg0b93j4n5mhkqm5ixxrhyb23dcv2dwhc8yg"))))
+ "0g68h4c1ijpphixvl9wkd7sibds38v4236dpvvh194j5ii42vnn8"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml coq camlp5))
@@ -716,7 +700,7 @@ (define-public coq-mathcomp-finmap
"/lib/coq/user-contrib"))
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (inputs (list coq coq-stdlib coq-mathcomp which))
+ (inputs (list coq coq coq-mathcomp which))
(synopsis "Finite sets and finite types for coq-mathcomp")
(description
"This library is an extension of coq-mathcomp which supports finite sets
@@ -747,7 +731,7 @@ (define-public coq-mathcomp-bigenough
;; by the packaged project in the future.
#:tests? #f
#:make-flags ,#~(list (string-append "COQBIN="
- #$(this-package-input "coq-core")
+ #$(this-package-input "coq")
"/bin/")
(string-append "COQMF_COQLIB="
(assoc-ref %outputs "out")
@@ -757,7 +741,7 @@ (define-public coq-mathcomp-bigenough
"/lib/coq/user-contrib"))
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (propagated-inputs (list coq coq-core coq-mathcomp which))
+ (propagated-inputs (list coq coq-mathcomp which))
(home-page "https://math-comp.github.io/")
(synopsis "Small library to do epsilon - N reasoning")
(description
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:42 2023
Received: from localhost ([127.0.0.1]:55842 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLB-0005aY-Vo
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:42 -0400
Received: from mout02.posteo.de ([185.67.36.66]:56889)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxLA-0005Ze-9V
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:40 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 2C894240104
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:30 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501850; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=ie76M4/VMbAV+KRtWqkguLLHa9qQX33c2gW7gfRG6ZS0FjqW6mI3NGNsimuMv6Wgz
if78FH8zgrlrgc8330FAoNv0f5Dm/C5CZ9EbCVhL7zSOVjlwBbJXe/9LW+sil77i+e
HKDUj8iCLQ7nucoEII+iIfOyxHXXHcVv2wORqpilKuTFjYIAGkkCtEdfCLpT5xIRDA
hhybJIbuU90mrlOsgVNFQ38Rd1l+pkrY1y6DXervazELEq18OB4fm/qtIdhb6/uTFn
CSZNGw8I1kDvwEsvFy09aDlLodTpmflpUTxVyiazMIm/vl1pdGiaK+rc1otWAH4BeU
38rucdKliCfRg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt150xZz6txp;
Tue, 12 Sep 2023 08:57:29 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 08/12] gnu: Update coq-interval to 4.8.0.
Date: Tue, 12 Sep 2023 06:56:58 +0000
Message-ID: <f39a91d172975393b76b55572e9d1d0519855f75.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-interval): Update to 4.8.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 4a929c6bed..663265f5be 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -468,7 +468,7 @@ (define-public coq-bignums
(define-public coq-interval
(package
(name "coq-interval")
- (version "4.5.2")
+ (version "4.8.0")
(source
(origin
(method git-fetch)
@@ -478,7 +478,7 @@ (define-public coq-interval
(file-name (git-file-name name version))
(sha256
(base32
- "138vgb0bq6wkygrhkahjgb9spwpzc6x6kkycj2qnf5naxx1z412w"))))
+ "0m3icx77p99ld9qfl3xjq62q572pyi4m77i1kc3whvipvg7834rh"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:42 2023
Received: from localhost ([127.0.0.1]:55840 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLB-0005aP-Kj
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:41 -0400
Received: from mout01.posteo.de ([185.67.36.65]:40647)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxL8-0005ZO-Jl
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:38 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 7685C240028
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:28 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501848; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=dQuFjlFC45cDStG2+ucT2Cphb4i7w4V+LVaIwGk8qZFZuLMwRxDeMSJVhB3xFnN1s
ooPEO4c1NakCxuuPllfx+Ne9LM+k7YeVbM4TRBW6FZSjjz8N0uB39erAp6gCOwe++f
+OD+y92kvlRjki7DmXHggdU6VK3+KZ5zB25fLS4O7zu94YzAhcncpUa4yOvCB9XTR5
et3jbEOYqjjsUepNiNrNpXmAEWlkRD04u6zuMDKktWC2jy/KBzSv7DXh8g4cNVVPcm
PXq+O+hgTOhOAbvsxtLvG4BLQm2+9OZiRK4r7E8KIGd07g06g/6zu+8yMhzruQqRAW
VLJ4NwsCalktQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDt00Bdkz6twF;
Tue, 12 Sep 2023 08:57:27 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 07/12] gnu: Update coq-stdpp to 1.8.0.
Date: Tue, 12 Sep 2023 06:56:57 +0000
Message-ID: <b6d3bb689bc6c237d2040a842cad4dd97f136a28.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-stdpp): Update to 1.8.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 5ce4880f4b..4a929c6bed 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -642,7 +642,7 @@ (define-public coq-semantics
(define-public coq-stdpp
(package
(name "coq-stdpp")
- (version "1.7.0")
+ (version "1.8.0")
(synopsis "Alternative Coq standard library std++")
(source (origin
(method git-fetch)
@@ -652,7 +652,7 @@ (define-public coq-stdpp
(file-name (git-file-name name version))
(sha256
(base32
- "0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"))))
+ "0xawh3xkh76yhs689zw52k55cbzga2gyzl4g1a3pgg6yy420chjn"))))
(build-system gnu-build-system)
(inputs
(list coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:41 2023
Received: from localhost ([127.0.0.1]:55838 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxLB-0005aN-6x
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:41 -0400
Received: from mout01.posteo.de ([185.67.36.65]:48293)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxL7-0005ZH-1s
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:38 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id E4F5B240028
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:26 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501846; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=Aj2S5HtiGTsFomJwTDpKEzkfDwO16DoKkMomfbiqwSaaMXHglvwsvWB9vA/QuhYb2
qOcAkXeOp14FERaf7N6/S2+hV9K80EdaMHpj0apfGxcE2y69PWZPHVm8SooYF8r/89
Vn7+ZGXhQQB+ukUi8+YXCD+kqzgPL94JMI0Lv8MMhiuBjGS4rKlRR1YXgCJUck0Rgv
bTJRvTxLJkHk8q8emBSJ3kNhRtnC4UEGnLYU9peADSgolT5/+mVKQjWoYveAU1MTMf
gvdn8UsyK3Qqtd3cxx2E2IeBlg68pr3/p8/xh4JFeHAR3MtDUkB7NM23quoeMCEFB+
oADLTyNEuvx8w==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDsy3SZgz6tw4;
Tue, 12 Sep 2023 08:57:26 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 06/12] gnu: Update coq-autosubst to 1.8.
Date: Tue, 12 Sep 2023 06:56:56 +0000
Message-ID: <df04ab51ed8b3de3ca9f1aef57d623558dc66532.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-autosubst): Update to 1.8.
---
gnu/packages/coq.scm | 50 ++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index f9e3d89867..5ce4880f4b 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -515,35 +515,31 @@ (define-public coq-interval
(license license:cecill-c)))
(define-public coq-autosubst
- ;; Latest commit on that branch, where work on supporting coq 8.6 and
- ;; more recent versions of coq happen.
- (let ((branch "coq86-devel")
- (commit "fa6ef30664511ffa659cbcf3c962715cbee03572"))
- (package
- (name "coq-autosubst")
- (version (git-version "1" branch commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://github.com/uds-psl/autosubst")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1cl0bp96bk6lplbl7n5c703vd3gvbs5mvf2qrf8q333kkqd7jqq4"))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f
+ (package
+ (name "coq-autosubst")
+ (version "1.8")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coq-community/autosubst")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f
#:make-flags (list (string-append "COQLIBINSTALL="
(assoc-ref %outputs "out")
"/lib/coq/user-contrib"))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (native-inputs
- (list coq))
- (home-page "https://www.ps.uni-saarland.de/autosubst/")
- (synopsis "Coq library for parallel de Bruijn substitutions")
- (description "Formalizing syntactic theories with variable binders is
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure))))
+ (native-inputs
+ (list coq))
+ (home-page "https://www.ps.uni-saarland.de/autosubst/")
+ (synopsis "Coq library for parallel de Bruijn substitutions")
+ (description "Formalizing syntactic theories with variable binders is
not easy. Autosubst is a library for the Coq proof assistant to
automate this process. Given an inductive definition of syntactic objects in
de Bruijn representation augmented with binding annotations, Autosubst
@@ -554,7 +550,7 @@ (define-public coq-autosubst
work on a decision procedure for the equational theory of an extension of the
sigma-calculus by Abadi et al. The library is completely written in Coq and
uses Ltac to synthesize the substitution operation.")
- (license license:bsd-3))))
+ (license license:bsd-3)))
(define-public coq-equations
(package
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:37 2023
Received: from localhost ([127.0.0.1]:55833 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxL6-0005Zo-SW
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:37 -0400
Received: from mout02.posteo.de ([185.67.36.66]:51531)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxL5-0005ZD-D2
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:35 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 45445240103
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:25 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501845; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=ro9JNU2RNQnsZSCjsv8iq8r3njIM+CliRIVrY9YUeAydy8Vpt6c4sD5cnMuZkepGM
PNvrG1iTIJpC+VOtAyHwP5LsE8nS3lBOG/P4Tjs4JfVreDzrsKy1owVe4CfhpGdRsp
GpYR2XTvhvviEkEp1DP2pvMO2g3WOWOZfkigGYR59v6CmlyZdrDwA4sY5OHuQdEaN1
pp2Me00LaTBiA+MtXMKPfPEyOheYRAYMvrGJ20xB1/Jl56CH8yTujOEep6QSdeNUeE
ohrAJ4vWjMYJLnl4bIwA0QuyUuSt6ziW9X1IxNxgyV4DlePzYZDP06nCyrDTLZpi/u
GCYJRQTN7zB/A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDsw5vbKz6tsj;
Tue, 12 Sep 2023 08:57:24 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 05/12] gnu: Update coq-mathcomp to 1.17.0.
Date: Tue, 12 Sep 2023 06:56:55 +0000
Message-ID: <5a5d300c25c0c5f084cdf9a5a04141031e536fbc.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-mathcomp): Update to 1.17.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 6371084a71..f9e3d89867 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -348,7 +348,7 @@ (define-public coq-gappa
(define-public coq-mathcomp
(package
(name "coq-mathcomp")
- (version "1.15.0")
+ (version "1.17.0")
(source
(origin
(method git-fetch)
@@ -357,7 +357,7 @@ (define-public coq-mathcomp
(commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "158zl36zbvi5qx2nqbfnrg00jpgp6hjr5hmls7d8d0421ar6b67i"))))
+ (base32 "06i6kw5p2024n6h9mf8bvwn54il1a4z2h4qrgc8y0iq8hkvx4fnd"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:36 2023
Received: from localhost ([127.0.0.1]:55831 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxL6-0005Zl-Is
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:36 -0400
Received: from mout01.posteo.de ([185.67.36.65]:46771)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxL3-0005Yy-7V
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:33 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 1AFAF24002A
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:23 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501843; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=TTCAVuczY1fNj8tYKCgR2UMky7wLUkdd3PsEWJgXD0Gw9TTI3YSI9ftYFINN5lUl5
TDHr0SWaXsRKASPrQ+n/myYV8UAKcgZujNXcSfxAbgAbjDu4mbhAj0ykzzBC1TPdlB
0v4vL28VNdq2HMlwsRipwMXFmUSFfxsqGJrZy+mC8MnG6o/XozV3J0ZqtucJAz2yTy
EDDtCHQfND+kf1N4uYbApF/SOp0jmTMXkmeU8awaKUuI5mIZA6vLUdiO4i89MTtaFN
8Gn60peu4+J+xmoNWAfgW7PhueG3z0pdu9DoisXx/L2IfSDhwYoz8p2KIjRYQ+++hh
dmfkmmCjgYciw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDst4Kbyz6tx1;
Tue, 12 Sep 2023 08:57:22 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 04/12] gnu: Update coq-coquelicot to 3.4.0.
Date: Tue, 12 Sep 2023 06:56:54 +0000
Message-ID: <9aec7c4dc4287c1a05fbc2504bace122fa139bbb.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-coquelicot): Update to 3.4.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 86a9aef0f4..6371084a71 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -385,7 +385,7 @@ (define-public coq-mathcomp
(define-public coq-coquelicot
(package
(name "coq-coquelicot")
- (version "3.2.0")
+ (version "3.4.0")
(source
(origin
(method git-fetch)
@@ -395,7 +395,7 @@ (define-public coq-coquelicot
(file-name (git-file-name name version))
(sha256
(base32
- "146s5y2xsc7wb43m1pq1n4p14hw99gqbzx0ic3a4naxq16v7cv4w"))))
+ "1f6zim6hnm6zrij964vas6rfbxh5p147qsxxmmbxm7gyb85hhy45"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:34 2023
Received: from localhost ([127.0.0.1]:55828 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxL4-0005ZV-3q
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:34 -0400
Received: from mout01.posteo.de ([185.67.36.65]:60381)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxKz-0005Yh-NX
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:32 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 399CD24002A
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:19 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501839; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=lwcgYLW2aOf1/CKW9L4A5yu4jIcGtnIKI5s8CDZxW6X0l0j6qeu5npA1Ns+LvqjAu
e2MENB8wLJ/6RspE0OPhsqjHKEvGS4FvQgXVKJZZu/DMhJqCIU9i2ExO35XJ80rH4T
/lzi7lvijCJ3coplZ6AFjGoGPJfinTVFR1BB/gyZxUws4W2nMje06u/dYs9o6SIACv
cumf1l/qJp3MIZEh/hvkVy4BTVbaaYsPnkI3UXJhnBTIORXn4il8vlobqXRXiFmtpD
ioJiiynLHr+dud1D2FJLrW3fNXOLf6ijyyhG5nZps7p5RWnrob4iEVxp+BKHfW9Qa1
9hKx5uzrj3Chw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDsp3z7xz6tw3;
Tue, 12 Sep 2023 08:57:18 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 02/12] gnu: Update coq-flocq to 4.1.1.
Date: Tue, 12 Sep 2023 06:56:52 +0000
Message-ID: <86fe39332cc526337d07afa4d963f584f39cac01.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-flocq): Update to 4.1.1.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 09ca4030ea..215e947fd4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -241,7 +241,7 @@ (define-public proof-general
(define-public coq-flocq
(package
(name "coq-flocq")
- (version "4.1.0")
+ (version "4.1.1")
(source
(origin
(method git-fetch)
@@ -251,7 +251,7 @@ (define-public coq-flocq
(file-name (git-file-name name version))
(sha256
(base32
- "1yscj1120wch6myakaia03j11qji416v78ylx842d23hrbaqwmw5"))))
+ "01x38w58j95ba9679vpb5wv4bvfnrapd5dzjqlyz8k7i8a9sfqn0"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:30 2023
Received: from localhost ([127.0.0.1]:55823 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfxKz-0005Z7-PW
for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:30 -0400
Received: from mout02.posteo.de ([185.67.36.66]:50359)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qfxKx-0005Yf-QU
for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:28 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id AA9F1240106
for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:17 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1694501837; bh=uwMf5kjaCNDFzB04knvb2m7/xPAe3+UTMkaL/uYnqsQ=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=VO7qwd/mVKYJiyk4oXRFkuoKWjrOGrarqssnWSzkY46Z8wjZLLnD8e9e+lq7bAxGu
PkpRRb/ByhfADiy1bvRF7uzIZYah9BVtY5+WwAcvjK3qr6PWJaVlgt/HC3k2pGFS3a
z6UfXb365eaeytcBdIw/lI3RRQNVvrfltAS4f3irGFTDHrbi/CvF7dX2Ubc4RMkI5U
tppbZMD4KhppI5uSypS/2c2Gifm1RxO/G9i1BHjwK/a4pCwgTI78VZbyr5g7IBCgNg
rfuXgB6kb4biKl3HbCaUlJrP327RKwi9grYe1xb02bFeLh4S2+1c8xnXOja5+YSecX
G3HfLgynr6qOg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RlDsl5GfFz6tx5;
Tue, 12 Sep 2023 08:57:15 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v6 01/12] gnu: ocaml: Update to 4.14.1.
Date: Tue, 12 Sep 2023 06:56:51 +0000
Message-ID: <db35486131c1fa5282168a8f45b38327ab4330a8.1694501410.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1694501410.git.pukkamustard@HIDDEN>
References: <cover.1694501410.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8ff755aea9..56661b1977 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:26 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 12 02:57:26 2023 Received: from localhost ([127.0.0.1]:55820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qfxKw-0005Yq-CQ for submit <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pukkamustard@HIDDEN>) id 1qfxKq-0005YU-Qq for 64249 <at> debbugs.gnu.org; Tue, 12 Sep 2023 02:57:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8098E240104 for <64249 <at> debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501830; bh=5EUGGd81PiXw6Rn9VjBgH25/YK9tNHRqzbCw83esF6k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=P8B98KA+cj3VRYgXFfXin5KOi8R/w79wKoBh0iIZxAdDZItEjlTJ9w8Ur0kwbuAxW hdgnzqdumzxQATNYjFkjNMomM0kvR4fPqbrLyUfi6UAtofUKcG1lOjMHuykPpBK+ro YyKJ9L7qxD4J4/6vHCTEB5fh92JoJw5/eTqC5M5crvieHO1eakUEw7Ao+YT+kur+bp 5petnxa0BKTT8D/49jX+0t+A2Q/D4sqw67iEoP5jdYWRgt8g2qOjs1JQgZsT34yP39 b+WmAbxWFqEcDYM4pP5An1C1QjLSE5HInYDu7Gce2o1DTkZtZJouoEty999W1s+5KP J8nBXPbVRII/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsd6Wv2z6tw3; Tue, 12 Sep 2023 08:57:09 +0200 (CEST) From: pukkamustard <pukkamustard@HIDDEN> To: 64249 <at> debbugs.gnu.org Subject: [PATCH ocaml-team v6 00/12] The one where OPAM finally works Date: Tue, 12 Sep 2023 06:56:50 +0000 Message-ID: <cover.1694501410.git.pukkamustard@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>, pukkamustard <pukkamustard@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard <pukkamustard@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello Guix, Thanks to Julien's help this version finally build OPAM! I'm currently very slow and it will probably take quite a bit of time for me to look into the other things that could be updated in Guix's OCaml land (see https://yhetil.org/guix/86bkhgc7jj.fsf@HIDDEN/). Maybe it would make sense to merge this patch series into master instead of having a too long-lived ocaml-team branch? What do you think? Cheers, pukkamustard pukkamustard (12): gnu: ocaml: Update to 4.14.1. gnu: Update coq-flocq to 4.1.1. gnu: Update coq-gappa to 1.5.3. gnu: Update coq-coquelicot to 3.4.0. gnu: Update coq-mathcomp to 1.17.0. gnu: Update coq-autosubst to 1.8. gnu: Update coq-stdpp to 1.8.0. gnu: Update coq-interval to 4.8.0. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.10.0. gnu: opam: Split build into smaller sub-packages. gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 152 +++---- gnu/packages/ocaml.scm | 410 +++++++++++------- .../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 - 7 files changed, 331 insertions(+), 454 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 base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e -- 2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 17 Aug 2023 20:54:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 16:54:41 2023
Received: from localhost ([127.0.0.1]:45688 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWk0u-0007RZ-A5
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 16:54:41 -0400
Received: from lepiller.eu ([89.234.186.109]:56800)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <julien@HIDDEN>) id 1qWk0p-0007RJ-Ch
for 64249 <at> debbugs.gnu.org; Thu, 17 Aug 2023 16:54:38 -0400
Received: from lepiller.eu (localhost [127.0.0.1])
by lepiller.eu (OpenSMTPD) with ESMTP id 59f8963b;
Thu, 17 Aug 2023 20:54:31 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from
:to:cc:subject:message-id:in-reply-to:references:mime-version
:content-type:content-transfer-encoding; s=dkim; bh=nctW4225hVVG
HYH6hUtnt+Oco0EFVO57HICkiRFv4FQ=; b=bA4wu4ewKV9xhzX11b9UmylcafEt
hXO5hRozIn8CPshA28hJbHnF6dIdjusFBsMeFMdHkBMY9y5EUWixVd1VDbJxPMux
oRK7U8dyV0vSZBkW9uQ7o8ADtlXmgfHFl6h25IMb8LY+V1fNQuPMujJNi2EkWoq8
AKizV+RaPgPCIJo4/1UehqBAn0Dxl+3+sTlNsk8iytnL7CPbPBk/YT2czuFC84Tb
BZKBxfQfn4ZstVUcRmdf12tCPbfY3m2lhPTF8sO1bJ0Hmdgnn2fFoLoAUh9wUWXJ
brzsqtR4Riwt3ZqJLUhWLyr2yQqM5/QYdZwZMwlLBaRE+Kc9QU/Zj3UQDA==
Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 07f77f0a
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Thu, 17 Aug 2023 20:54:31 +0000 (UTC)
Date: Thu, 17 Aug 2023 22:54:21 +0200
From: Julien Lepiller <julien@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v5 12/12] FIXME: gnu: opam:
Update to 2.1.5.
Message-ID: <20230817225421.35482a31@HIDDEN>
In-Reply-To: <20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
<20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: 64249 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Adding ocaml-base64 to opam-client seems to fix this first issue, but
one test fails in opam:
File "tests/reftests/init.test", line 1, characters 0-0:
/gnu/store/s6nii4iazxdn9i60p39sa2p0k8yc5y4i-git-minimal-2.33.1/bin/git --no=
-pager diff --no-index --color=3Dalways -u _build/default/tests/reftests/in=
it.test _build/default/tests/reftests/init.out
diff --git a/_build/default/tests/reftests/init.test b/_build/default/tests=
/reftests/init.out
index 9768567..2defa37 100644
--- a/_build/default/tests/reftests/init.test
+++ b/_build/default/tests/reftests/init.out
@@ -220,6 +220,9 @@ wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-i=
nstall" ]
post-session-commands: ["%{hooks}%/a-script.sh" "post-session" ]
### opam init --bypass-checks --bare --no-setup --config opamrc
Configuring from ${BASEDIR}/opamrc and then from built-in defaults.
+[ERROR] Sandboxing is not working on your platform linux:
+ /tmp/guix-build-opam-2.1.5.drv-0/source/_build/default/src/client/=
opamMain.exe: "create_process" failed on ${BASEDIR}/OPAM/opam-init/hooks/sa=
ndbox.sh: No such file or directory
+Do you want to disable it? Note that this will result in less secure pack=
age builds, so please ensure that you have some other isolation mechanisms =
in place (such as running within a container or virtual machine). [y/N] y
=20
<><> Fetching repository information ><><><><><><><><><><><><><><><><><><>=
<><><>
[norepo] Initialised
@@ -237,9 +240,7 @@ opam-version: "2.0"
post-session-commands: ["%{hooks}%/a-script.sh" "post-session"]
pre-build-commands: ["%{hooks}%/a-script.sh" "pre-build"]
repositories: "norepo"
-wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os =3D "linux" | os=
=3D "macos"}
wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-install"]
-wrap-remove-commands: ["%{hooks}%/sandbox.sh" "remove"] {os =3D "linux" | =
os =3D "macos"}
### opam-cat $OPAMROOT/repo/repos-config
opam-version: "2.0"
repositories: "norepo" {"file://${BASEDIR}/REPO"}
Le Sun, 6 Aug 2023 15:20:31 +0000,
pukkamustard <pukkamustard@HIDDEN> a =C3=A9crit :
> * gnu/packages/ocaml.scm (opam): Update to 2.1.5.
> [native-inputs]: Add more test data.
> (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 | 94 +++++++------
> .../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, 48 insertions(+), 269 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
>=20
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 77707127a7..efe507905f 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1657,10 +1657,6 @@ dist_patch_DATA =3D
> \ %D%/packages/patches/nvi-db4.patch
> \
> %D%/packages/patches/nyacc-binary-literals.patch \
> %D%/packages/patches/obs-modules-location.patch \
> - %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
> - %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
> - %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
> - %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
> %D%/packages/patches/ocaml-multiple-definitions.patch
> \
> %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch
> \
> %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch
> \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index
> e5b1ea47ba..999b3a3ef2 100644 --- a/gnu/packages/ocaml.scm +++
> b/gnu/packages/ocaml.scm @@ -713,7 +713,7 @@ (define-public ocaml-mccs
> (define-public ocaml-dose3
> (package
> (name "ocaml-dose3")
> - (version "5.0.1")
> + (version "7.0.0")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> @@ -722,29 +722,16 @@ (define-public ocaml-dose3
> (file-name (git-file-name name version))
> (sha256
> (base32
> -
> "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
> - (patches
> - (search-patches
> - "ocaml-dose3-add-unix-dependency.patch"
> - "ocaml-dose3-Fix-for-ocaml-4.06.patch"
> - "ocaml-dose3-dont-make-printconf.patch"
> - "ocaml-dose3-Install-mli-cmx-etc.patch"))))
> - (build-system ocaml-build-system)
> - (arguments
> - `(#:tests? #f ;the test suite requires
> python 2
> - #:configure-flags
> - ,#~(list (string-append "SHELL=3D"
> - #+(file-append (canonical-package
> bash-minimal)
> - "/bin/sh")))
> - #:make-flags
> - ,#~(list (string-append "LIBDIR=3D" #$output
> "/lib/ocaml/site-lib"))))
> - (propagated-inputs
> - (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
> - (native-inputs
> - (list perl
> - ocaml-extlib
> - ocamlbuild
> - ocaml-cppo))
> +
> "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
> + (build-system dune-build-system)
> + (arguments `(#:package "dose3"))
> + (propagated-inputs (list ocaml-extlib
> + ocaml-base64-boot
> + ocaml-cudf
> + ocaml-graph
> + ocaml-re
> + ocaml-stdlib-shims))
> + (native-inputs (list ocaml-ounit))
> (home-page "https://www.mancoosi.org/software/")
> (synopsis "Package distribution management framework")
> (description "Dose3 is a framework made of several OCaml
> libraries for @@ -849,7 +836,7 @@ (define-public
> ocaml-opam-file-format (define ocaml-opam-core
> (package
> (name "ocaml-opam-core")
> - (version "2.1.3")
> + (version "2.1.5")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> @@ -858,7 +845,7 @@ (define ocaml-opam-core
> (file-name (git-file-name name version))
> (sha256
> (base32
> -
> "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
> +
> "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
> (build-system dune-build-system) (arguments `(#:package "opam-core"
> ;; tests are run with the opam package
> @@ -1072,6 +1059,8 @@ (define-public opam
> ("which" ,which)
> =20
> ;; Data for tests
> + ("opam-repo-0070613707" ,(opam-repo
> "00706137074d536d2019d2d222fbe1bea929deda"
> +
> "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
> ("opam-repo-009e00fa" ,(opam-repo
> "009e00fa86300d11c311309a2544e5c6c3eb8de2"
> "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
> ("opam-repo-7090735c" ,(opam-repo
> "7090735c9d1dd2dc481c4128c5ef4d3667238f15" @@ -1080,10 +1069,21 @@
> (define-public opam
> "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
> ("opam-repo-ad4dd344" ,(opam-repo
> "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
> "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
> + ("opam-repo-c1842d168d" ,(opam-repo
> "c1842d168de956caf06d7ac8588e65020d7594d8"
> +
> "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
> ("opam-repo-c1d23f0e" ,(opam-repo
> "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
> "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
> ("opam-repo-f372039d" ,(opam-repo
> "f372039db86a970ef3e662adbfe0d4f5cd980701"
> -
> "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
> +
> "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
> + ("opam-repo-11ea1cb" ,(opam-repo
> "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
> +
> "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
> + ("opam-repo-297366c" ,(opam-repo
> "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
> +
> "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
> + ("opam-repo-3235916" ,(opam-repo
> "3235916a162a59d7c82dac3fe24214975d48f1aa"
> +
> "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
> + ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
> + ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
> +
> "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw"))))) (inputs
> (list ocaml-opam-client)) (properties
> ;; OPAM is used as a tool and not as a library, we can use the
> OCaml 4.14 @@ -4442,8 +4442,7 @@ (define-public ocaml-base64
> (base32
> "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))=
))
> (build-system dune-build-system)
> - (native-inputs
> - (list ocaml-alcotest ocaml-bos ocaml-rresult))
> + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
> (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
> (home-page "https://github.com/mirage/ocaml-base64")
> (synopsis "Base64 encoding for OCaml")
> @@ -4452,6 +4451,14 @@ (define-public ocaml-base64
> radix-64 representation. It is specified in RFC 4648.")
> (license license:isc)))
> =20
> +;; A variant without tests that is used to prevent a cyclic
> dependency when +;; compiling ocaml-dose3.
> +(define ocaml-base64-boot
> + (package
> + (inherit ocaml-base64)
> + (arguments `(#:tests? #f))
> + (native-inputs '())))
> +
> (define-public ocaml4.07-base64
> (package-with-ocaml4.07
> (package
> @@ -5324,27 +5331,22 @@ (define-public ocaml4.07-uuidm
> (define-public ocaml-graph
> (package
> (name "ocaml-graph")
> - (version "1.8.8")
> + (home-page "https://github.com/backtracking/ocamlgraph/")
> + (version "2.0.0")
> (source (origin
> - (method url-fetch)
> - (uri (string-append
> "http://ocamlgraph.lri.fr/download/"
> - "ocamlgraph-" version ".tar.gz"))
> + (method git-fetch)
> + (uri (git-reference
> + (url home-page)
> + (commit version)))
> + (file-name (git-file-name name version))
> (sha256
> (base32
> -
> "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
> - (build-system ocaml-build-system)
> - (arguments
> - `(#:install-target "install-findlib"
> - #:tests? #f
> - #:phases
> - (modify-phases %standard-phases
> - (add-before 'configure 'set-shell
> - (lambda* (#:key inputs #:allow-other-keys)
> - (setenv "CONFIG_SHELL"
> - (search-input-file inputs "/bin/sh")))))))
> - (inputs (list lablgtk))
> +
> "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
> + (build-system dune-build-system)
> + (arguments `(#:package "ocamlgraph"))
> + (propagated-inputs (list ocaml-stdlib-shims))
> + (native-inputs (list ocaml-graphics))
> (properties `((upstream-name . "ocamlgraph")))
> - (home-page "https://ocamlgraph.lri.fr/")
> (synopsis "Graph library for OCaml")
> (description "OCamlgraph is a generic graph library for OCaml.")
> (license license:lgpl2.1)))
> diff --git
> a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
> b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch deleted
> file mode 100644 index 2c344af821..0000000000 ---
> a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch +++
> /dev/null @@ -1,52 +0,0 @@
> -From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00
> 2001 -From: Louis Gesbert <louis.gesbert@HIDDEN>
> -Date: Sat, 2 Dec 2017 12:51:01 +0100
> -Subject: [PATCH] Fix for ocaml 4.06
> -
> ----
> - common/criteria_lexer.mll | 8 ++++----
> - common/util.ml | 2 +-
> - 2 files changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
> -index 71f9178..fc4eae3 100644
> ---- a/common/criteria_lexer.mll
> -+++ b/common/criteria_lexer.mll
> -@@ -18,7 +18,7 @@
> - let c =3D Lexing.lexeme_char lexbuf 2 in (* the delimiter can be
> any character *)
> - (* find the terminating delimiter *)
> - let endpos =3D
> -- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos
> + 3) c with -+ try Bytes.index_from lexbuf.lex_buffer
> (lexbuf.lex_start_pos + 3) c with
> - |Invalid_argument _ ->
> - raise (Format822.Syntax_error (
> - Format822.error lexbuf "String too short"))
> -@@ -27,9 +27,9 @@
> - Format822.error lexbuf (Printf.sprintf "cannot find:
> %c" c)))
> - in
> - let len =3D endpos - (lexbuf.lex_start_pos + 3) in
> -- let s =3D String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3)
> len in -- lexbuf.Lexing.lex_curr_pos <-
> lexbuf.Lexing.lex_start_pos + ((String.length s)+4); -- s
> -+ let s =3D Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3)
> len in -+ lexbuf.Lexing.lex_curr_pos <-
> lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4); -+
> Bytes.to_string s
> -=20
> - }
> -=20
> -diff --git a/common/util.ml b/common/util.ml
> -index 598f266..36ca3d1 100644
> ---- a/common/util.ml
> -+++ b/common/util.ml
> -@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string
> end) =3D struct
> - let clean label =3D
> - try=20
> - let s =3D Filename.chop_extension (Filename.basename label) in
> -- String.capitalize s
> -+ String.capitalize_ascii s
> - with Invalid_argument _ -> label
> -=20
> - let create ?(enabled=3Dfalse) label =3D
> ---=20
> -2.11.0
> -
> diff --git
> a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
> b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch deleted
> file mode 100644 index 41494e7b3c..0000000000 ---
> a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch +++
> /dev/null @@ -1,133 +0,0 @@
> -From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00
> 2001 -From: Louis Gesbert <louis.gesbert@HIDDEN>
> -Date: Thu, 2 Mar 2017 12:19:56 +0100
> -Subject: [PATCH] Install mli, cmx, etc.
> -
> ----
> - Makefile | 26 +++++++++++++-------------
> - 1 file changed, 13 insertions(+), 13 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 09464ff..5044d7f 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
> - @for i in _build/cudf/cudf.*; do \
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml
> versioning/*.mli
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli
> $(DOSELIBS)/common.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli
> $(DOSELIBS)/pef.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli
> $(DOSELIBS)/pef.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli
> $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml
> $(DOSELIBS)/versioning.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
> -+ rm -f $(DOSELIBS)/*.mlpack ; \
> - fi ; \
> - done
> -=20
> -@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.%
> $(DOSELIBS)/debian.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ; \
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx
> $(DOSELIBS)/*.ml ; \ -+ rm -f $(DOSELIBS)/*.mlpack
> $(DOSELIBS)/*.ml ; \
> - fi ; \
> - done
> -=20
> -@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.%
> $(DOSELIBS)/debian.%
> - if [ -e $$i ]; then \
> - cp $$i $(DOSELIBS) ;\
> - rm $$i ;\
> -- rm -f $(DOSELIBS)/*.mlpack
> $(DOSELIBS)/*.cmx ;\ -+ rm -f
> $(DOSELIBS)/*.mlpack ;\
> - fi ; \
> - done
> -=20
> -@@ -223,7 +223,7 @@ INSTALL_STUFF_ =3D META
> - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cma
> _build/doselibs/*.cmi)
> - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cmxa
> _build/doselibs/*.cmxs)
> - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.a)
> --#INSTALL_STUFF_ +=3D $(wildcard _build/*/*.mli)
> -+INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.mli) $(wildcard
> _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
> - INSTALL_STUFF_ +=3D $(wildcard _build/rpm/*.so)
> -=20
> - exclude_cudf =3D $(wildcard _build/doselibs/*cudf* _build/cudf/*)
> ---=20
> -2.11.0
> -
> diff --git
> a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
> b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch deleted
> file mode 100644 index d2cc44c784..0000000000 ---
> a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch +++
> /dev/null @@ -1,25 +0,0 @@
> -From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00
> 2001 -From: Louis Gesbert <louis.gesbert@HIDDEN>
> -Date: Tue, 6 Feb 2018 10:15:45 +0100
> -Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in
> META.in -
> ----
> - META.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/META.in b/META.in
> -index aa2cd8d..0f9d337 100644
> ---- a/META.in
> -+++ b/META.in
> -@@ -8,7 +8,7 @@ package "common" (
> - version =3D "@PACKAGE_VERSION@"
> - archive(byte) =3D "common.cma"
> - archive(native) =3D "common.cmxa"
> --requires =3D "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
> -+requires =3D "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
> - )
> -=20
> - package "algo" (
> ---=20
> -2.11.0
> -
> diff --git
> a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
> b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch deleted
> file mode 100644 index 84b6a3b81b..0000000000 ---
> a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch +++
> /dev/null @@ -1,9 +0,0 @@
> ---- a/configure
> -+++ b/configure
> -@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test
> "$enable_option_checking" !=3D no; then
> - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized
> options: $ac_unrecognized_opts" >&5
> - $as_echo "$as_me: WARNING: unrecognized options:
> $ac_unrecognized_opts" >&2;}
> - fi
> --
> --
> --make printconf
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 17 Aug 2023 19:08:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 17 15:08:51 2023
Received: from localhost ([127.0.0.1]:45639 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qWiMV-0004Wz-5s
for submit <at> debbugs.gnu.org; Thu, 17 Aug 2023 15:08:51 -0400
Received: from lepiller.eu ([2a00:5884:8208::1]:48492)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <julien@HIDDEN>) id 1qWiMQ-0004Wk-6h
for 64249 <at> debbugs.gnu.org; Thu, 17 Aug 2023 15:08:50 -0400
Received: from lepiller.eu (localhost [127.0.0.1])
by lepiller.eu (OpenSMTPD) with ESMTP id 6d3e72bc;
Thu, 17 Aug 2023 19:08:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from
:to:cc:subject:message-id:in-reply-to:references:mime-version
:content-type:content-transfer-encoding; s=dkim; bh=z2LK7+6Fw/52
CckzKJXqZdADGCAbXJkA9oORk5hDhs0=; b=KOEfv4RpokZEbF/sEZvLG2lrDcgW
Qt9mPVvKTqbl3rjA1J8ZCv/E2b/HPAQ5gApaXMeSdkUCcmhrpaoprg1iDV22B1SY
lqaG0b90B4X2Q2dawudMfEGyo8btb0dKAh4Hvk7piVa3KmI7zRI5w9dwLhawiR3i
IPV33XwIF1Vsau20QIzNCdj/+g8o0I+ZDI+zoqJ6Npwoa8NAOUkUo5Vo1DVUGZcC
1kO8iU4LkQQzfizAE8riqLkSDQGu7rAXLuKpNpr5ROtP8JFx9C4CAPheiCUpkfVG
OMrGxse5deJisM7Xa+AQGp2Pg2VCLoP+VGaT+X+vspOsRKq8eP8oZ7MivQ==
Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b6e32bc2
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Thu, 17 Aug 2023 19:08:41 +0000 (UTC)
Date: Thu, 17 Aug 2023 21:08:24 +0200
From: Julien Lepiller <julien@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v5 09/12] gnu: coq: Update to
8.17.1.
Message-ID: <20230817210824.22f673e2@HIDDEN>
In-Reply-To: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
<7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: 64249 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
this looks good to me, but there's a new failure in
coq-mathcomp-bigenough after that. Replacing "coq-core" with "coq" in
the configure flags fix the issue.
Le Sun, 6 Aug 2023 15:20:28 +0000,
pukkamustard <pukkamustard@HIDDEN> a =C3=A9crit :
> * gnu/packages/coq.scm (coq): Update to 8.17.1 and merge with
> coq-core and coq-stdlib. [arguments] Merge with coq-core and
> coq-stdlib. Add pre-build phases and add a custom install phase.
> Remove unnecessary test-target. (coq-core): Remove variable.
> (coq-stdlib): Remove variable.
> (coq-ide)[propagated-inputs]: Add zlib.
> (coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core.
> (coq-mathcomp-finmap)[inputs]: Remove coq-stdlib.
> (coq-equations): Update to 1.3-8.17.
> ---
> gnu/packages/coq.scm | 76
> +++++++++++++++++--------------------------- 1 file changed, 30
> insertions(+), 46 deletions(-)
>=20
> diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
> index 663265f5be..b63239b99e 100644
> --- a/gnu/packages/coq.scm
> +++ b/gnu/packages/coq.scm
> @@ -31,6 +31,7 @@ (define-module (gnu packages coq)
> #:use-module (gnu packages base)
> #:use-module (gnu packages bison)
> #:use-module (gnu packages boost)
> + #:use-module (gnu packages compression)
> #:use-module (gnu packages emacs)
> #:use-module (gnu packages flex)
> #:use-module (gnu packages gawk)
> @@ -50,10 +51,10 @@ (define-module (gnu packages coq)
> #:use-module (guix utils)
> #:use-module ((srfi srfi-1) #:hide (zip)))
> =20
> -(define-public coq-core
> +(define-public coq
> (package
> - (name "coq-core")
> - (version "8.16.1")
> + (name "coq")
> + (version "8.17.1")
> (source
> (origin
> (method git-fetch)
> @@ -63,7 +64,7 @@ (define-public coq-core
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
> (patches (search-patches "coq-fix-envvars.patch"))))
> (native-search-paths
> (list (search-path-specification
> @@ -78,13 +79,29 @@ (define-public coq-core
> (files (list "lib/ocaml/site-lib/coq-core"))
> (separator #f))))
> (build-system dune-build-system)
> + (arguments
> + `(#:package "coq-core,coq-stdlib,coq"
> + #:phases
> + (modify-phases %standard-phases
> + (add-before 'build 'configure
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (libdir (string-append out
> "/lib/ocaml/site-lib")))
> + (invoke "./configure" "-prefix" out
> + "-libdir" libdir))))
> + (add-before 'build 'make-dunestrap
> + (lambda _ (invoke "make" "dunestrap")))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (libdir (string-append out
> "/lib/ocaml/site-lib")))
> + (invoke "dune" "install" "--prefix" out
> + "--libdir" libdir
> + "coq-core" "coq-stdlib" "coq")))))))
> (inputs
> (list gmp ocaml-zarith))
> (native-inputs
> (list ocaml-ounit2 which))
> - (arguments
> - `(#:package "coq-core"
> - #:test-target "."))
> (properties '((upstream-name . "coq"))) ; also for inherited
> packages (home-page "https://coq.inria.fr")
> (synopsis "Proof assistant for higher-order logic")
> @@ -96,39 +113,6 @@ (define-public coq-core
> ;; Some of the documentation is distributed under opl1.0+.
> (license (list license:lgpl2.1 license:opl1.0+))))
> =20
> -(define-public coq-stdlib
> - (package
> - (inherit coq-core)
> - (name "coq-stdlib")
> - (arguments
> - `(#:package "coq-stdlib"
> - #:test-target "."
> - #:phases
> - (modify-phases %standard-phases
> - (add-before 'build 'fix-dune
> - (lambda _
> - (substitute* "user-contrib/Ltac2/dune"
> - (("coq-core.plugins.ltac2")
> - (string-join
> - (map (lambda (plugin) (string-append
> "coq-core.plugins." plugin))
> - '("ltac2" "number_string_notation" "tauto"
> "cc"
> - "firstorder"))
> - " "))))))))
> - (inputs
> - (list coq-core gmp ocaml-zarith))
> - (native-inputs '())))
> -
> -(define-public coq
> - (package
> - (inherit coq-core)
> - (name "coq")
> - (arguments
> - `(#:package "coq"
> - #:test-target "."))
> - (propagated-inputs
> - (list coq-core coq-stdlib))
> - (native-inputs '())))
> -
> (define-public coq-ide-server
> (package
> (inherit coq)
> @@ -147,7 +131,7 @@ (define-public coq-ide
> `(#:tests? #f
> #:package "coqide"))
> (propagated-inputs
> - (list coq coq-ide-server))
> + (list coq coq-ide-server zlib))
> (inputs
> (list lablgtk3 ocaml-lablgtk3-sourceview3))))
> =20
> @@ -555,16 +539,16 @@ (define-public coq-autosubst
> (define-public coq-equations
> (package
> (name "coq-equations")
> - (version "1.3")
> + (version "1.3-8.17")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> (url "https://github.com/mattam82/Coq-Equations")
> - (commit (string-append "v" version "-8.16"))))
> + (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> (base32
> -
> "08f756vgdd1wklkarg0b93j4n5mhkqm5ixxrhyb23dcv2dwhc8yg"))))
> +
> "0g68h4c1ijpphixvl9wkd7sibds38v4236dpvvh194j5ii42vnn8"))))
> (build-system gnu-build-system) (native-inputs
> (list ocaml coq camlp5))
> @@ -716,7 +700,7 @@ (define-public coq-mathcomp-finmap
> "/lib/coq/user-contrib"))
> #:phases (modify-phases %standard-phases
> (delete 'configure))))
> - (inputs (list coq coq-stdlib coq-mathcomp which))
> + (inputs (list coq coq coq-mathcomp which))
> (synopsis "Finite sets and finite types for coq-mathcomp")
> (description
> "This library is an extension of coq-mathcomp which supports
> finite sets @@ -757,7 +741,7 @@ (define-public coq-mathcomp-bigenough
> "/lib/coq/user-contrib"))
> #:phases (modify-phases %standard-phases
> (delete 'configure))))
> - (propagated-inputs (list coq coq-core coq-mathcomp which))
> + (propagated-inputs (list coq coq-mathcomp which))
> (home-page "https://math-comp.github.io/")
> (synopsis "Small library to do epsilon - N reasoning")
> (description
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 15 Aug 2023 21:26:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 15 17:26:02 2023 Received: from localhost ([127.0.0.1]:36955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qW1YA-0001GH-DB for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 17:26:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qW1Y8-0001Fm-BD for 64249 <at> debbugs.gnu.org; Tue, 15 Aug 2023 17:26:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qW1Y2-0003eQ-GO; Tue, 15 Aug 2023 17:25:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=lIMMTtBrDz2Pboc1Jo3LaNsrU2PmSlNHSpFaWFtp9lo=; b=pL0O3ZGA/hHCft+4jxu2 I7kFNmUePSvPmdVc+yv15VdDMo/hG+mN4d65sGvhbmt+uGQRsDBeJLbG1KP1DevnxFTAXJp/j5w1D FDONgiUtEByzI0AU7TfuDvvc1ocEQDXYgMtAKBugNc057AFPZBNmS/hI8D/Jm4RVyaJXg4e/3ggr+ SE3PIJYavc7dfUCv4VqjnG8+hWdN6eQM35jR2qwn0XGzjlEn3DDmve/JcPgKunMQoGjZ7ZpPMXEVk acfSJiCefuIbvfuWuS3710QMoZvszJFTcmVwH0Wpq9Hh+c6X5Bj9DJPqk3LD9gKkjvUPYHJdLW1zP 9PuW8ru7pJ9L7Q==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: pukkamustard <pukkamustard@HIDDEN> Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN> <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN> Date: Tue, 15 Aug 2023 23:25:52 +0200 In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN> (pukkamustard@HIDDEN's message of "Sun, 6 Aug 2023 15:20:20 +0000") Message-ID: <87sf8k6lr3.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249 <at> debbugs.gnu.org, Julien Lepiller <julien@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello! <https://qa.guix.gnu.org/issue/64249> hasn=E2=80=99t caught up yet. Julien, do you have further reservations or do you think it=E2=80=99s OK to commit, assuming there=E2=80=99s no build breakage? Ludo=E2=80=99.
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:33 2023
Received: from localhost ([127.0.0.1]:59847 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZU-0002Oq-FF
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:33 -0400
Received: from mout02.posteo.de ([185.67.36.66]:54355)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZS-0002O3-0O
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:31 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 7518E240103
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:24 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335284; bh=ELz5EQl2rzDo6A/HbVWqHDy3gVibxzJqqY6MBByA/Q4=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=hRASPhgnjFqEoufMjr4sZ1Ll/Skz8NrJAz/G/OVGx5gXgNAKC9VYP6L/x9L5Y/Sco
rfeVVJHuzQr7AYynDi6YpCutEesUBWVb4sucP6vk//wG8hFbdm9kpjUOpVFFBtYRkS
60Jv7o0HcpDqyKVSx03+a3SCFkXZar92i2kaqY1cvUbxvPe1fpyTazG4hhgThbBXyR
96W+Wcs57hFa3S43BAIrlNH98X8KpbpGbit9I9aFWHpXWx/6DKrADkEBFaezjabH4V
L2z8rs3iCkiX298OlISqwynRIl9vR9oddegMfWPbp55h10zmRNT9y7K2joAfvG7E/p
5Oxr3QlMKsxow==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpW5PsFz6twM;
Sun, 6 Aug 2023 17:21:23 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 12/12] FIXME: gnu: opam: Update to 2.1.5.
Date: Sun, 6 Aug 2023 15:20:31 +0000
Message-ID: <20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/ocaml.scm (opam): Update to 2.1.5.
[native-inputs]: Add more test data.
(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 | 94 +++++++------
.../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, 48 insertions(+), 269 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
diff --git a/gnu/local.mk b/gnu/local.mk
index 77707127a7..efe507905f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1657,10 +1657,6 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/obs-modules-location.patch \
- %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
- %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
- %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
- %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-multiple-definitions.patch \
%D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \
%D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e5b1ea47ba..999b3a3ef2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -713,7 +713,7 @@ (define-public ocaml-mccs
(define-public ocaml-dose3
(package
(name "ocaml-dose3")
- (version "5.0.1")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -722,29 +722,16 @@ (define-public ocaml-dose3
(file-name (git-file-name name version))
(sha256
(base32
- "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
- (patches
- (search-patches
- "ocaml-dose3-add-unix-dependency.patch"
- "ocaml-dose3-Fix-for-ocaml-4.06.patch"
- "ocaml-dose3-dont-make-printconf.patch"
- "ocaml-dose3-Install-mli-cmx-etc.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:tests? #f ;the test suite requires python 2
- #:configure-flags
- ,#~(list (string-append "SHELL="
- #+(file-append (canonical-package bash-minimal)
- "/bin/sh")))
- #:make-flags
- ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))))
- (propagated-inputs
- (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
- (native-inputs
- (list perl
- ocaml-extlib
- ocamlbuild
- ocaml-cppo))
+ "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "dose3"))
+ (propagated-inputs (list ocaml-extlib
+ ocaml-base64-boot
+ ocaml-cudf
+ ocaml-graph
+ ocaml-re
+ ocaml-stdlib-shims))
+ (native-inputs (list ocaml-ounit))
(home-page "https://www.mancoosi.org/software/")
(synopsis "Package distribution management framework")
(description "Dose3 is a framework made of several OCaml libraries for
@@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format
(define ocaml-opam-core
(package
(name "ocaml-opam-core")
- (version "2.1.3")
+ (version "2.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -858,7 +845,7 @@ (define ocaml-opam-core
(file-name (git-file-name name version))
(sha256
(base32
- "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
+ "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
(build-system dune-build-system)
(arguments `(#:package "opam-core"
;; tests are run with the opam package
@@ -1072,6 +1059,8 @@ (define-public opam
("which" ,which)
;; Data for tests
+ ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
"1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
@@ -1080,10 +1069,21 @@ (define-public opam
"0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
"1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
+ ("opam-repo-c1842d168d" ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8"
+ "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
- "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
+ "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
+ ("opam-repo-11ea1cb" ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
+ "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
+ ("opam-repo-297366c" ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
+ "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
+ ("opam-repo-3235916" ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa"
+ "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
+ ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
+ ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
+ "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw")))))
(inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
@@ -4442,8 +4442,7 @@ (define-public ocaml-base64
(base32
"068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))))
(build-system dune-build-system)
- (native-inputs
- (list ocaml-alcotest ocaml-bos ocaml-rresult))
+ (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
(home-page "https://github.com/mirage/ocaml-base64")
(synopsis "Base64 encoding for OCaml")
@@ -4452,6 +4451,14 @@ (define-public ocaml-base64
radix-64 representation. It is specified in RFC 4648.")
(license license:isc)))
+;; A variant without tests that is used to prevent a cyclic dependency when
+;; compiling ocaml-dose3.
+(define ocaml-base64-boot
+ (package
+ (inherit ocaml-base64)
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ocaml4.07-base64
(package-with-ocaml4.07
(package
@@ -5324,27 +5331,22 @@ (define-public ocaml4.07-uuidm
(define-public ocaml-graph
(package
(name "ocaml-graph")
- (version "1.8.8")
+ (home-page "https://github.com/backtracking/ocamlgraph/")
+ (version "2.0.0")
(source (origin
- (method url-fetch)
- (uri (string-append "http://ocamlgraph.lri.fr/download/"
- "ocamlgraph-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:install-target "install-findlib"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL"
- (search-input-file inputs "/bin/sh")))))))
- (inputs (list lablgtk))
+ "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "ocamlgraph"))
+ (propagated-inputs (list ocaml-stdlib-shims))
+ (native-inputs (list ocaml-graphics))
(properties `((upstream-name . "ocamlgraph")))
- (home-page "https://ocamlgraph.lri.fr/")
(synopsis "Graph library for OCaml")
(description "OCamlgraph is a generic graph library for OCaml.")
(license license:lgpl2.1)))
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
deleted file mode 100644
index 2c344af821..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Sat, 2 Dec 2017 12:51:01 +0100
-Subject: [PATCH] Fix for ocaml 4.06
-
----
- common/criteria_lexer.mll | 8 ++++----
- common/util.ml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
-index 71f9178..fc4eae3 100644
---- a/common/criteria_lexer.mll
-+++ b/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
- let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
- (* find the terminating delimiter *)
- let endpos =
-- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
- |Invalid_argument _ ->
- raise (Format822.Syntax_error (
- Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
- Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
- in
- let len = endpos - (lexbuf.lex_start_pos + 3) in
-- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-- s
-+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+ Bytes.to_string s
-
- }
-
-diff --git a/common/util.ml b/common/util.ml
-index 598f266..36ca3d1 100644
---- a/common/util.ml
-+++ b/common/util.ml
-@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
- let clean label =
- try
- let s = Filename.chop_extension (Filename.basename label) in
-- String.capitalize s
-+ String.capitalize_ascii s
- with Invalid_argument _ -> label
-
- let create ?(enabled=false) label =
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
deleted file mode 100644
index 41494e7b3c..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Thu, 2 Mar 2017 12:19:56 +0100
-Subject: [PATCH] Install mli, cmx, etc.
-
----
- Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 09464ff..5044d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
- @for i in _build/cudf/cudf.*; do \
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
-+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
- fi ; \
- done
-
-@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ;\
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
-+ rm -f $(DOSELIBS)/*.mlpack ;\
- fi ; \
- done
-
-@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
--#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
-+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
- INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
-
- exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
deleted file mode 100644
index d2cc44c784..0000000000
--- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Tue, 6 Feb 2018 10:15:45 +0100
-Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
-
----
- META.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META.in b/META.in
-index aa2cd8d..0f9d337 100644
---- a/META.in
-+++ b/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
-
- package "algo" (
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
deleted file mode 100644
index 84b6a3b81b..0000000000
--- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
--make printconf
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:32 2023
Received: from localhost ([127.0.0.1]:59845 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZT-0002Oh-2e
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:32 -0400
Received: from mout01.posteo.de ([185.67.36.65]:36755)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZP-0002Nc-6N
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:28 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 9EBF5240027
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:21 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335281; bh=65jhgDCRVMZXKq9zi7Mhgkigu9tIBzh5ietohx9Z4TU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=k8r70NPGVknAW5d5bz8QtuMWqtiyGQ1pyxtvtxJm5shJVRtFmDs3OdrDQoAyh0WUK
vaKG155poRooXv1h/ZqDxScZPtih3a2b3HtTHaR1EjYtKX5FV5j/9a7GdkYRqtvexa
pCbpG74EjlWGiQu/lhzHQtCXWOugH3Z09gq4xu1fYMxJJZaAGiQyUsTA7fF0AaSQj1
1QaQnjSelxlDCmLnCdTkB9y6S3OJvguWd6IkQ1//RvuM1cF9yygq+NyzunS5mo9Jy3
WlZzYkPYmuq2gbwgmVEnBfEIGIzn16XmCrPHA86W6SwKgvHH++aZR1635PU8j4yLTf
60GHf27+E+KQg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpT10psz6twb;
Sun, 6 Aug 2023 17:21:21 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 11/12] gnu: opam: Split build into smaller
sub-packages.
Date: Sun, 6 Aug 2023 15:20:30 +0000
Message-ID: <d1e3db9b0914fb9e85a585b3b13b9e4e7da21fb3.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages.
(ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt,
ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos,
ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime,
ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg,
ocaml-afl-persistent, ocaml-ocb-stubblr) [native-inputs]: Replace opam with
opam-installer.
---
gnu/packages/ocaml.scm | 262 ++++++++++++++++++++++++++++-------------
1 file changed, 182 insertions(+), 80 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6646632397..e5b1ea47ba 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -780,7 +780,7 @@ (define-public ocaml-down
,#~(list "build" "--lib-dir"
(string-append #$output "/lib/ocaml/site-lib"))))
(native-inputs
- (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/down")
(synopsis "OCaml toplevel (REPL) upgrade")
(description "Down is an unintrusive user experience upgrade for the
@@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format
;; With static-linking exception
(license license:lgpl2.1+)))
-(define-public opam
+(define ocaml-opam-core
(package
- (name "opam")
+ (name "ocaml-opam-core")
(version "2.1.3")
(source (origin
(method git-fetch)
@@ -860,32 +860,150 @@ (define-public opam
(base32
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
+ (arguments `(#:package "opam-core"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash"))
+ (bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/core/opamSystem.ml"
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\""))
+ (("getconf")
+ (which "getconf")))))))))
+ (propagated-inputs
+ (list ocaml-graph
+ ocaml-re
+ ocaml-cppo))
+ (inputs (list bubblewrap))
+ (home-page "https://opam.ocamlpro.com/")
+ (synopsis "Package manager for OCaml")
+ (description
+ "OPAM is a tool to manage OCaml packages. It supports multiple
+simultaneous compiler installations, flexible package constraints, and a
+Git-friendly development workflow.")
+ ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
+ (license license:lgpl3)))
+
+(define ocaml-opam-format
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-format")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-core
+ ocaml-opam-file-format
+ ocaml-re))
+ (arguments `(#:package "opam-format"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define-public opam-installer
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam-installer")
+ (native-inputs (list ocaml-opam-format
+ ocaml-cmdliner))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments `(#:package "opam-installer"
+ ;; requires all of opam
+ #:tests? #f))
+ (synopsis "Tool for installing OCaml packages")
+ (description "@var{opam-installer} is a tool for installing OCaml packages
+based on @code{.install} files defined by the OPAM package manager. It is
+useful for installing OCaml packages without requiring the entirety of
+OPAM.")
+ (properties
+ ;; opam-installer is used as a tool and not as a library, we can use the
+ ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0.
+ `((ocaml5.0-variant . ,(delay opam-installer))))))
+
+(define ocaml-opam-repository
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-repository")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format))
+ (arguments `(#:package "opam-repository"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-state
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-state")
+ (arguments `(#:package "opam-state"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ ;; Use bwrap from the store directly.
+ (substitute* "src/state/shellscripts/bwrap.sh"
+ (("-v bwrap") (string-append "-v " bwrap))
+ (("exec bwrap") (string-append "exec " bwrap))
+ ;; Mount /gnu and /run/current-system in the
+ ;; isolated environment when building with opam.
+ ;; This is necessary for packages to find external
+ ;; dependencies, such as a C compiler, make, etc...
+ (("^add_sys_mounts /usr")
+ (string-append "add_sys_mounts "
+ (%store-directory)
+ " /run/current-system /usr")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs (list ocaml-opam-repository))))
+
+(define ocaml-opam-solver
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-solver")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format
+ ocaml-mccs
+ ocaml-dose3))
+ (arguments `(#:package "opam-solver"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-client
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-client")
+ (arguments `(#:package "opam-client"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/client/opamInitDefaults.ml"
+ (("\"bwrap\"") (string-append "\"" bwrap "\"")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs
+ (list ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-opam-repository
+ ocaml-re
+ ocaml-cmdliner))))
+
+(define-public opam
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam")
+ (build-system dune-build-system)
(arguments
- `(#:phases
+ `(#:package "opam"
+ #:phases
(modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda* (#:key inputs make-flags #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash"))
- (bwrap (search-input-file inputs "/bin/bwrap")))
- (substitute* "src/core/opamSystem.ml"
- (("\"/bin/sh\"")
- (string-append "\"" bash "/bin/sh\""))
- (("getconf")
- (which "getconf")))
- ;; Use bwrap from the store directly.
- (substitute* "src/state/shellscripts/bwrap.sh"
- (("-v bwrap") (string-append "-v " bwrap))
- (("exec bwrap") (string-append "exec " bwrap))
- ;; Mount /gnu and /run/current-system in the
- ;; isolated environment when building with opam.
- ;; This is necessary for packages to find external
- ;; dependencies, such as a C compiler, make, etc...
- (("^add_sys_mounts /usr")
- (string-append "add_sys_mounts "
- (%store-directory)
- " /run/current-system /usr")))
- (substitute* "src/client/opamInitDefaults.ml"
- (("\"bwrap\"") (string-append "\"" bwrap "\""))))))
(add-before 'check 'prepare-checks
(lambda* (#:key inputs #:allow-other-keys)
;; Opam tests need to run an isolated environment from a writable
@@ -966,22 +1084,11 @@ (define-public opam
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
"0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
- (inputs
- (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3
- ocaml-mccs ocaml-opam-file-format ocaml-re))
+ (inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
;; compiled opam until opam is compatible with OCaml 5.0.
- `((ocaml5.0-variant . ,(delay opam))))
- (home-page "https://opam.ocamlpro.com/")
- (synopsis "Package manager for OCaml")
- (description
- "OPAM is a tool to manage OCaml packages. It supports multiple
-simultaneous compiler installations, flexible package constraints, and a
-Git-friendly development workflow.")
-
- ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
- (license license:lgpl3)))
+ `((ocaml5.0-variant . ,(delay opam))))))
(define-public ocaml-opam-monorepo
(package
@@ -2238,7 +2345,7 @@ (define-public ocaml-topkg
"11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("result" ,ocaml-result)))
(arguments
@@ -2268,7 +2375,7 @@ (define-public ocaml-rresult
"0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2383,7 +2490,7 @@ (define-public ocaml-mtime
"1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2513,13 +2620,13 @@ (define-public ocaml-fmt
"0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
- `(("cmdliner" ,ocaml-cmdliner)
- ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)
- ("ocaml-uchar" ,ocaml-uchar)))
+ (list ocaml-cmdliner
+ ocaml-stdlib-shims
+ ocaml-uchar))
(arguments `(#:tests? #f
#:build-flags (list "build" "--with-base-unix" "true"
"--with-cmdliner" "true")
@@ -2560,9 +2667,9 @@ (define-public ocaml-astring
"1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2782,7 +2889,7 @@ (define-public ocaml-react
"16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam ocaml-topkg))
+ (list ocamlbuild opam-installer ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2906,7 +3013,7 @@ (define-public ocaml-hmap
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (native-inputs (list ocaml-topkg ocamlbuild opam))
+ (native-inputs (list ocaml-topkg ocamlbuild opam-installer))
(home-page "https://erratique.ch/software/hmap")
(synopsis "Heterogeneous value maps for OCaml")
(description
@@ -3368,7 +3475,7 @@ (define-public ocaml-logs
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("fmt" ,ocaml-fmt)
("lwt" ,ocaml-lwt)
@@ -3402,7 +3509,7 @@ (define-public ocaml-fpath
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)))
@@ -3432,7 +3539,7 @@ (define-public ocaml-bos
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)
@@ -3506,7 +3613,7 @@ (define-public ocaml-xmlm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-topkg opam))
+ (list ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/xmlm")
(synopsis "Streaming XML codec for OCaml")
(description "Xmlm is a streaming codec to decode and encode the XML data
@@ -3647,7 +3754,7 @@ (define-public ocaml-uchar
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(home-page "https://github.com/ocaml/uchar")
(synopsis "Compatibility library for OCaml's Uchar module")
(description "The uchar package provides a compatibility library for the
@@ -3673,9 +3780,9 @@ (define-public ocaml-uutf
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uchar" ,ocaml-uchar)
("cmdliner" ,ocaml-cmdliner)))
@@ -3720,7 +3827,7 @@ (define-public ocaml-uunf
#t)))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
+ ("opam-installer" ,opam-installer)
("topkg" ,ocaml-topkg)
;; Test data is otherwise downloaded with curl
("NormalizationTest.txt"
@@ -3761,9 +3868,9 @@ (define-public ocaml-jsonm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uutf" ,ocaml-uutf)
("cmdliner" ,ocaml-cmdliner)))
@@ -4181,7 +4288,7 @@ (define-public ocaml-ptime
#:phases (modify-phases %standard-phases
(delete 'configure))))
(propagated-inputs (list ocaml-result js-of-ocaml))
- (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/ptime")
(synopsis "POSIX time for OCaml")
(description
@@ -5188,7 +5295,7 @@ (define-public ocaml-uuidm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("cmdliner" ,ocaml-cmdliner)
("topkg" ,ocaml-topkg)))
@@ -5801,12 +5908,8 @@ (define-public ocaml-ocb-stubblr
;; Guix doesn't have cc, but it has gcc
(("\"cc\"") "\"gcc\""))
#t)))))
- (inputs
- `(("topkg" ,ocaml-topkg)
- ("opam" ,opam)))
- (native-inputs
- `(("astring" ,ocaml-astring)
- ("ocamlbuild" ,ocamlbuild)))
+ (inputs (list ocaml-topkg opam-installer))
+ (native-inputs (list ocaml-astring ocamlbuild))
(synopsis "OCamlbuild plugin for C stubs")
(description "Ocb-stubblr is about ten lines of code that you need to
repeat over, over, over and over again if you are using ocamlbuild to build
@@ -5834,7 +5937,7 @@ (define-public ocaml-tsdl
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-astring opam pkg-config))
+ (list ocamlbuild ocaml-astring opam-installer pkg-config))
(inputs
`(("topkg" ,ocaml-topkg)
("sdl2" ,sdl2)
@@ -9554,7 +9657,7 @@ (define-public ocaml-uucd
(propagated-inputs
(list ocaml-xmlm))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uucd")
(synopsis "Unicode character database decoder for OCaml")
(description "Uucd is an OCaml module to decode the data of the Unicode
@@ -9582,7 +9685,7 @@ (define-public ocaml-uucp
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list opam
+ (list opam-installer
ocaml-findlib
ocamlbuild
ocaml-topkg
@@ -9616,7 +9719,7 @@ (define-public ocaml-uuseg
(propagated-inputs
(list ocaml-uucp ocaml-uutf ocaml-cmdliner))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uuseg")
(synopsis "Unicode text segmentation for OCaml")
(description "Uuseg is an OCaml library for segmenting Unicode text. It
@@ -10077,8 +10180,7 @@ (define-public ocaml-afl-persistent
(invoke "./build.sh")))
;; XXX: The tests are already run in the build.sh script.
(delete 'check))))
- (native-inputs
- `(("opam" ,opam)))
+ (native-inputs (list opam-installer))
(home-page "https://github.com/stedolan/ocaml-afl-persistent")
(synopsis "Use afl-fuzz in persistent mode")
(description
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:28 2023
Received: from localhost ([127.0.0.1]:59842 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZP-0002OL-Lj
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:28 -0400
Received: from mout02.posteo.de ([185.67.36.66]:40653)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZM-0002NE-SW
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:25 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 5541A240101
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:19 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335279; bh=PLEmvDq0xvloDrPOj2Mg4kX4D+EsOCUZnGUC3b5RtLU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=OmfbX3ZRj4IyfVuNkpDcSiJ9XyNapBqrOKnoXj1MPrf0tVSYUSmE5DHVNw4Eb7uvP
pLVe+o/iMCuBu7X7og+3C294ZTCzgVOWqNRlGd558WOSH7yvBBQtvnvr0tXRquUUPa
LIUS9Rom0m0s6nOYefI+V5lP96f/LhPJ2H2+T7A89pZiDY1JGcZ/x1jNj2fP5UtMQG
G7gRcSju4VEhknpUBkki4Uz3ftwFFYuOo38qXBiooS/vWq6uY1L/zJfzwPiTiKWgQT
IE3YsSLrnbbyQhvqU78pAGj+A8dXe7sZQXycXanKz/rimjuTyPqNjKB88lHq67TBkC
ZjaUnNsdO287A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpQ5qp0z6txv;
Sun, 6 Aug 2023 17:21:18 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 10/12] gnu: dune-bootstrap: Update to 3.10.0.
Date: Sun, 6 Aug 2023 15:20:29 +0000
Message-ID: <5cb71a21794085eff5bdf0c9ac355991a644845d.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.10.0.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 56661b1977..6646632397 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1818,7 +1818,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.10.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1827,7 +1827,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1844,9 +1844,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:27 2023
Received: from localhost ([127.0.0.1]:59839 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZP-0002OE-1B
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:27 -0400
Received: from mout01.posteo.de ([185.67.36.65]:46899)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZL-0002N7-9Z
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:24 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id B844A240027
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:17 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335277; bh=n5Ws/qt9fUICNgzqxNKmTzzeTN4zWWZV4A3caGTx0ao=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=ifaXy/6gO7fpXWklKWgYD9kxT7G2rGfGYPt2OIY9d3JyjrVXqhqwWwMBH4Ev3RIcW
Z+9Jw0ZGfThiRYkEx/qLmpclIZoTEISRsvczYXYYDourbtYnPFjG53FCRFGqh1sPVl
5rR74CWZOqIQlHjnE1s1rEaMAMazZmwiWoWeSCRRAmsA9TXEgJJAGy7FNrjTmuKDn+
KKe0wWHH98rhyOCnYTfPHOsqlfyr3050h9SuC3jNi56hlBsV7KqltoeE+/qGG4sUFz
3R31yupK0lr9rXtFTwsp6AF6WjZg0AJDVHPujQ0it2PnciC0+oiFBk9SAo5sohOXFQ
Y/bQO41s7b+Ig==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpP1rh3z6txn;
Sun, 6 Aug 2023 17:21:17 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 09/12] gnu: coq: Update to 8.17.1.
Date: Sun, 6 Aug 2023 15:20:28 +0000
Message-ID: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq): Update to 8.17.1 and merge with coq-core and coq-stdlib.
[arguments] Merge with coq-core and coq-stdlib. Add pre-build phases and
add a custom install phase. Remove unnecessary test-target.
(coq-core): Remove variable.
(coq-stdlib): Remove variable.
(coq-ide)[propagated-inputs]: Add zlib.
(coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core.
(coq-mathcomp-finmap)[inputs]: Remove coq-stdlib.
(coq-equations): Update to 1.3-8.17.
---
gnu/packages/coq.scm | 76 +++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 46 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 663265f5be..b63239b99e 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages coq)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
@@ -50,10 +51,10 @@ (define-module (gnu packages coq)
#:use-module (guix utils)
#:use-module ((srfi srfi-1) #:hide (zip)))
-(define-public coq-core
+(define-public coq
(package
- (name "coq-core")
- (version "8.16.1")
+ (name "coq")
+ (version "8.17.1")
(source
(origin
(method git-fetch)
@@ -63,7 +64,7 @@ (define-public coq-core
(file-name (git-file-name name version))
(sha256
(base32
- "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
(patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths
(list (search-path-specification
@@ -78,13 +79,29 @@ (define-public coq-core
(files (list "lib/ocaml/site-lib/coq-core"))
(separator #f))))
(build-system dune-build-system)
+ (arguments
+ `(#:package "coq-core,coq-stdlib,coq"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "./configure" "-prefix" out
+ "-libdir" libdir))))
+ (add-before 'build 'make-dunestrap
+ (lambda _ (invoke "make" "dunestrap")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "dune" "install" "--prefix" out
+ "--libdir" libdir
+ "coq-core" "coq-stdlib" "coq")))))))
(inputs
(list gmp ocaml-zarith))
(native-inputs
(list ocaml-ounit2 which))
- (arguments
- `(#:package "coq-core"
- #:test-target "."))
(properties '((upstream-name . "coq"))) ; also for inherited packages
(home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic")
@@ -96,39 +113,6 @@ (define-public coq-core
;; Some of the documentation is distributed under opl1.0+.
(license (list license:lgpl2.1 license:opl1.0+))))
-(define-public coq-stdlib
- (package
- (inherit coq-core)
- (name "coq-stdlib")
- (arguments
- `(#:package "coq-stdlib"
- #:test-target "."
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-dune
- (lambda _
- (substitute* "user-contrib/Ltac2/dune"
- (("coq-core.plugins.ltac2")
- (string-join
- (map (lambda (plugin) (string-append "coq-core.plugins." plugin))
- '("ltac2" "number_string_notation" "tauto" "cc"
- "firstorder"))
- " "))))))))
- (inputs
- (list coq-core gmp ocaml-zarith))
- (native-inputs '())))
-
-(define-public coq
- (package
- (inherit coq-core)
- (name "coq")
- (arguments
- `(#:package "coq"
- #:test-target "."))
- (propagated-inputs
- (list coq-core coq-stdlib))
- (native-inputs '())))
-
(define-public coq-ide-server
(package
(inherit coq)
@@ -147,7 +131,7 @@ (define-public coq-ide
`(#:tests? #f
#:package "coqide"))
(propagated-inputs
- (list coq coq-ide-server))
+ (list coq coq-ide-server zlib))
(inputs
(list lablgtk3 ocaml-lablgtk3-sourceview3))))
@@ -555,16 +539,16 @@ (define-public coq-autosubst
(define-public coq-equations
(package
(name "coq-equations")
- (version "1.3")
+ (version "1.3-8.17")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattam82/Coq-Equations")
- (commit (string-append "v" version "-8.16"))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "08f756vgdd1wklkarg0b93j4n5mhkqm5ixxrhyb23dcv2dwhc8yg"))))
+ "0g68h4c1ijpphixvl9wkd7sibds38v4236dpvvh194j5ii42vnn8"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml coq camlp5))
@@ -716,7 +700,7 @@ (define-public coq-mathcomp-finmap
"/lib/coq/user-contrib"))
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (inputs (list coq coq-stdlib coq-mathcomp which))
+ (inputs (list coq coq coq-mathcomp which))
(synopsis "Finite sets and finite types for coq-mathcomp")
(description
"This library is an extension of coq-mathcomp which supports finite sets
@@ -757,7 +741,7 @@ (define-public coq-mathcomp-bigenough
"/lib/coq/user-contrib"))
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (propagated-inputs (list coq coq-core coq-mathcomp which))
+ (propagated-inputs (list coq coq-mathcomp which))
(home-page "https://math-comp.github.io/")
(synopsis "Small library to do epsilon - N reasoning")
(description
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:27 2023
Received: from localhost ([127.0.0.1]:59837 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZO-0002OC-OJ
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:26 -0400
Received: from mout01.posteo.de ([185.67.36.65]:33391)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZJ-0002Mr-Kv
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:21 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 1A73C240027
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:16 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335276; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=mwuhkmN4VQp5gMHkI2bqsvyhPQ/GqiPIAPy9sBerGQ8uBKk2W65XS/4g+TzaMvxCD
uSAnVUxFC6sUW3n1WUjWPopp1riu8D3IbHoDv8maW6g5frXc5isbEB3Acc5bv/QBA7
i637hzm5rFtynWy6f17/7ZtLKxh5M9Zw4xW1YwvxbVXYK7iJ9fGETLaIVCn3jsJFpF
LZTILaOaFkDMfv9nq/3n5D9U/RWGsnMw9khhHmjuPdJ+oq97s22g24q4Xsl6q+/vz0
dg8hkaepBiVrDlduuhyZk4Z/bAaxt4r0RT7Czzl3cjRhCjn6VKI6TDD+AnDl3RkXWN
F37AtnMG6sNCg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpM4Lbkz6twv;
Sun, 6 Aug 2023 17:21:15 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 08/12] gnu: Update coq-interval to 4.8.0.
Date: Sun, 6 Aug 2023 15:20:27 +0000
Message-ID: <ca1135a74517453d1cb490c132f65b39f68c78c4.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-interval): Update to 4.8.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 4a929c6bed..663265f5be 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -468,7 +468,7 @@ (define-public coq-bignums
(define-public coq-interval
(package
(name "coq-interval")
- (version "4.5.2")
+ (version "4.8.0")
(source
(origin
(method git-fetch)
@@ -478,7 +478,7 @@ (define-public coq-interval
(file-name (git-file-name name version))
(sha256
(base32
- "138vgb0bq6wkygrhkahjgb9spwpzc6x6kkycj2qnf5naxx1z412w"))))
+ "0m3icx77p99ld9qfl3xjq62q572pyi4m77i1kc3whvipvg7834rh"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:22 2023
Received: from localhost ([127.0.0.1]:59833 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZK-0002Nk-D4
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:22 -0400
Received: from mout02.posteo.de ([185.67.36.66]:53799)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZI-0002Mk-2F
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 8427D240101
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:14 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335274; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=eyOVmFfYgP+NSAHlf559dw0mf6g9ud1igkdMhGwvyUX2g7V6tuJqBC72Evxbkgk7N
BlC7cx3PQ2lN0qwy0PJSRgOJvIUXt/ZdFo8JrZ7Ad/Oodb/L5Kxjp47DCI2dOqY8yC
8qvR0X5j1H/gK2UrkhEOCYt8Th2523gPzX1raMPJscfepfrt/W64dizUcc+pl+7eJl
PfsTBJZVbXMgDYqRnSnAyighxJWIh+Cd+VdEu3Q+nFqMwCFeRXJsPc0jX9nLxW/aKZ
bI6WIp0g+i+rrOTjU1fww4bClMk3ICKIwGL5y7N0thfo13W3ddgWVLMnCFJyQD5zZM
Em/MJw9T4mY7w==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpL0P0jz6tw6;
Sun, 6 Aug 2023 17:21:13 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 07/12] gnu: Update coq-stdpp to 1.8.0.
Date: Sun, 6 Aug 2023 15:20:26 +0000
Message-ID: <9e1deab704644c0c63f13516c946b97a03b753c5.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-stdpp): Update to 1.8.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 5ce4880f4b..4a929c6bed 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -642,7 +642,7 @@ (define-public coq-semantics
(define-public coq-stdpp
(package
(name "coq-stdpp")
- (version "1.7.0")
+ (version "1.8.0")
(synopsis "Alternative Coq standard library std++")
(source (origin
(method git-fetch)
@@ -652,7 +652,7 @@ (define-public coq-stdpp
(file-name (git-file-name name version))
(sha256
(base32
- "0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"))))
+ "0xawh3xkh76yhs689zw52k55cbzga2gyzl4g1a3pgg6yy420chjn"))))
(build-system gnu-build-system)
(inputs
(list coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:22 2023
Received: from localhost ([127.0.0.1]:59830 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZJ-0002Nb-IR
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:22 -0400
Received: from mout01.posteo.de ([185.67.36.65]:37375)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZG-0002MP-EE
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:19 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id DBDEC240028
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:12 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335272; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=GYHQUJ6s2Z8oOHr9/A2YfJAyTHwvuXyBeXiyvmJf5Rn3IWEslIv/xoCXSL11pMcXJ
NV5LFZqCVUmyAolUHkPu5M1xX0Tex+lgZE61m2gNljjrsvOH2Fglrpug9x0qSDv358
emJL1p8D/gDbJM4HkA++5dJw8r9A6RrBf1uIW3ykErGxiOeYR0PPWXYEwXisd/i8ke
JzY1j9qavFY1aMSuZUHAOwRkloH/gBgBz8bH74Af0dr6bIdnOdUd/t6QkuNg4H0CgI
yNOJd3WStNAdeqkqOniCWogQlrQNVZeCt+SUFYL2R6zxu+TVmnD97Jg/o8J6v26Jp4
Q0vJ66DEAv6BA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpJ2jSxz6tw6;
Sun, 6 Aug 2023 17:21:12 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 06/12] gnu: Update coq-autosubst to 1.8.
Date: Sun, 6 Aug 2023 15:20:25 +0000
Message-ID: <dcfc8636350f2c81ad977283f93b652bf9117b7f.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-autosubst): Update to 1.8.
---
gnu/packages/coq.scm | 50 ++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index f9e3d89867..5ce4880f4b 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -515,35 +515,31 @@ (define-public coq-interval
(license license:cecill-c)))
(define-public coq-autosubst
- ;; Latest commit on that branch, where work on supporting coq 8.6 and
- ;; more recent versions of coq happen.
- (let ((branch "coq86-devel")
- (commit "fa6ef30664511ffa659cbcf3c962715cbee03572"))
- (package
- (name "coq-autosubst")
- (version (git-version "1" branch commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://github.com/uds-psl/autosubst")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1cl0bp96bk6lplbl7n5c703vd3gvbs5mvf2qrf8q333kkqd7jqq4"))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f
+ (package
+ (name "coq-autosubst")
+ (version "1.8")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coq-community/autosubst")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f
#:make-flags (list (string-append "COQLIBINSTALL="
(assoc-ref %outputs "out")
"/lib/coq/user-contrib"))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (native-inputs
- (list coq))
- (home-page "https://www.ps.uni-saarland.de/autosubst/")
- (synopsis "Coq library for parallel de Bruijn substitutions")
- (description "Formalizing syntactic theories with variable binders is
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure))))
+ (native-inputs
+ (list coq))
+ (home-page "https://www.ps.uni-saarland.de/autosubst/")
+ (synopsis "Coq library for parallel de Bruijn substitutions")
+ (description "Formalizing syntactic theories with variable binders is
not easy. Autosubst is a library for the Coq proof assistant to
automate this process. Given an inductive definition of syntactic objects in
de Bruijn representation augmented with binding annotations, Autosubst
@@ -554,7 +550,7 @@ (define-public coq-autosubst
work on a decision procedure for the equational theory of an extension of the
sigma-calculus by Abadi et al. The library is completely written in Coq and
uses Ltac to synthesize the substitution operation.")
- (license license:bsd-3))))
+ (license license:bsd-3)))
(define-public coq-equations
(package
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:20 2023
Received: from localhost ([127.0.0.1]:59827 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZI-0002NI-4V
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400
Received: from mout01.posteo.de ([185.67.36.65]:53343)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZF-0002MC-2z
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:17 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 8568C240028
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:11 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335271; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=l1MJCbYvHi44DEgEST3t3guUUde+OoMhxDDqC8lqgLkgtcI12dIbspgS875v2wpOo
cQgtZCSDQCKrE09PL9EmsQAiBsZ1T+OpWhRYd7k+828x1Q1269vMjyHDLBVmarroyb
iy2mT/Im89Xj19jYGhiNujmbrK+s4fvzBL3oSdOgorjy1wNUH4NcBTyC72vx7IrN4r
X+pFB9V7LLPz3Yt2lBpGb8Y02BQKMZDgawgSXJyM2WUO15D9QmWOzyukNY4cdrn+p7
M1fUP40T5LjKLnhWzKrK0j9dhXR8K0/kGuxxzvsRsmbbffLOhS+XZ5/e1aqsz1Qq4+
j0DpFMmFw8W9A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpH0QFhz6twB;
Sun, 6 Aug 2023 17:21:10 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 05/12] gnu: Update coq-mathcomp to 1.17.0.
Date: Sun, 6 Aug 2023 15:20:24 +0000
Message-ID: <3d6710d69735a054c6d09477ec6fcb9a7c84e904.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-mathcomp): Update to 1.17.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 6371084a71..f9e3d89867 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -348,7 +348,7 @@ (define-public coq-gappa
(define-public coq-mathcomp
(package
(name "coq-mathcomp")
- (version "1.15.0")
+ (version "1.17.0")
(source
(origin
(method git-fetch)
@@ -357,7 +357,7 @@ (define-public coq-mathcomp
(commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "158zl36zbvi5qx2nqbfnrg00jpgp6hjr5hmls7d8d0421ar6b67i"))))
+ (base32 "06i6kw5p2024n6h9mf8bvwn54il1a4z2h4qrgc8y0iq8hkvx4fnd"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:20 2023
Received: from localhost ([127.0.0.1]:59825 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZH-0002NF-Qw
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400
Received: from mout01.posteo.de ([185.67.36.65]:46791)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZD-0002MA-KL
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:16 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 16CE9240028
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:10 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335270; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=lPCVx3B54OCRit/Hy7oLzTxLMqzIB25gA+Y6bs0UMa3Vc1a/0x1gN+mAKEwL4fuD4
aSirk0gG0PRSUSBZecPQyuNtjSofm7ZO/54kRe6HVRKgkgjmfLmtHG2cB8oJ7QalGI
MJu9OOGEFrIZkFXPWFT/DbzyzWj8tV9ZM9WiuIVZhHnHcsSVIQDT5X0USIHtnc3tHR
u3yopbfK5u7AUVvro5IFk71CVYPCjcwhE+roqFeMKXxWsEfORgq4saPM69zaTi7jD1
s3nSCWe0645EEVdN4GoRKBn3+Sfc4tg/p8ookWrZT2sHxfMAS3IZkr4Hp8Y0X6Cqxb
JvZ48ARLR/ryA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpF4K2Jz6tmv;
Sun, 6 Aug 2023 17:21:09 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 04/12] gnu: Update coq-coquelicot to 3.4.0.
Date: Sun, 6 Aug 2023 15:20:23 +0000
Message-ID: <ec7938a4a5f7e706bc4aba5d9e6a3c237ad91cb9.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-coquelicot): Update to 3.4.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 86a9aef0f4..6371084a71 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -385,7 +385,7 @@ (define-public coq-mathcomp
(define-public coq-coquelicot
(package
(name "coq-coquelicot")
- (version "3.2.0")
+ (version "3.4.0")
(source
(origin
(method git-fetch)
@@ -395,7 +395,7 @@ (define-public coq-coquelicot
(file-name (git-file-name name version))
(sha256
(base32
- "146s5y2xsc7wb43m1pq1n4p14hw99gqbzx0ic3a4naxq16v7cv4w"))))
+ "1f6zim6hnm6zrij964vas6rfbxh5p147qsxxmmbxm7gyb85hhy45"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:16 2023
Received: from localhost ([127.0.0.1]:59821 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZE-0002Mt-Gi
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:16 -0400
Received: from mout02.posteo.de ([185.67.36.66]:50861)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZC-0002M6-7W
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id AA2CA240101
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:08 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335268; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=aim+g9tTYkVdMyWOeSR6eKy588sf7dM5oYBgHD7TgFvX2pw7Pj2/vcN0eSdDc22fR
vv5qjIAFAsveaRf9BPCVipT+ktJ6EeqvUrZMgjZrPq9JhNIlUWH1XeSBIU6r58R0Si
lbMT5rUVrQPD9EHdlQuiVtHxlGec0rz4rkhSvr2bHqNMmYF9TdjphPJkfdviOlAHKT
qnqQve5SeNVBGTYKIlsrUkdZJDv1sUe7hsR4slJ8kKWsbnWvTtCXALcifuU2S7UcHO
zCsey80gh1FvNijAri/wpoOe/XYIk9exFPME5Q5LOCCrceK3DpJzwySjM7ETLyEk3o
XIl6684W3PXag==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjpD1j5Fz6tmv;
Sun, 6 Aug 2023 17:21:08 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 03/12] gnu: Update coq-gappa to 1.5.3.
Date: Sun, 6 Aug 2023 15:20:22 +0000
Message-ID: <752d12d40ab4c114d828c2918dbda39ab3f0615d.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-gappa): Update to 1.5.3.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 215e947fd4..86a9aef0f4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -288,7 +288,7 @@ (define-public coq-flocq
(define-public coq-gappa
(package
(name "coq-gappa")
- (version "1.5.2")
+ (version "1.5.3")
(source
(origin
(method git-fetch)
@@ -298,7 +298,7 @@ (define-public coq-gappa
(file-name (git-file-name name version))
(sha256
(base32
- "0l65ah81yj9vabgkwqh47c02qvscvl8nl60gqn1qrs47dx1pi80q"))))
+ "1dzkb2sfglhik2ymw8p65khl163xxjsaqji9agnnkvlk5r6589v6"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:14 2023
Received: from localhost ([127.0.0.1]:59817 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZC-0002MS-2o
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400
Received: from mout01.posteo.de ([185.67.36.65]:58997)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZA-0002M3-6L
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:12 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id A1111240029
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:06 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335266; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=cnmu5E83Rs9E1jUk20LAc2XnLaSNDI3MrsrB9FsqunDsa52k1E/F0It/4rPYWEO6J
ux8DiG222ebu/luD/fF3dxy01cyIc9+UJdIOqhXz220rl2f+oUDko5VsJgF52d/n/B
QpIon3eFT1eak9fBLr7QAlGh6IXlAt/VakQ7N1+yVuNlYp109s2rg7ojqa4ENwfpfc
Nz5BphgSUFmdq31c3UqJpPt4bFSLy35PFWmhrmyUSbL+ZGfawCI9v8yHpm1+9QqXvS
Vohbivh6PCsrPxppivTvL0LMTXXyeX8GsaPd1oFleAXKwUXgejDNHQEu9dIf48dSVO
cA2fxTqV/bBDQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjp96Y4Cz6tmv;
Sun, 6 Aug 2023 17:21:05 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 02/12] gnu: Update coq-flocq to 4.1.1.
Date: Sun, 6 Aug 2023 15:20:21 +0000
Message-ID: <73ed93b86a64df74487769342b492c7d46b94661.1691335142.git.pukkamustard@HIDDEN>
In-Reply-To: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
References: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/coq.scm (coq-flocq): Update to 4.1.1.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 09ca4030ea..215e947fd4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -241,7 +241,7 @@ (define-public proof-general
(define-public coq-flocq
(package
(name "coq-flocq")
- (version "4.1.0")
+ (version "4.1.1")
(source
(origin
(method git-fetch)
@@ -251,7 +251,7 @@ (define-public coq-flocq
(file-name (git-file-name name version))
(sha256
(base32
- "1yscj1120wch6myakaia03j11qji416v78ylx842d23hrbaqwmw5"))))
+ "01x38w58j95ba9679vpb5wv4bvfnrapd5dzjqlyz8k7i8a9sfqn0"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:21:14 2023
Received: from localhost ([127.0.0.1]:59815 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfZB-0002MQ-OK
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400
Received: from mout01.posteo.de ([185.67.36.65]:45785)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfZ8-0002M0-6c
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:21:12 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 22933240029
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:04 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335264; bh=zeJt3uWTgIaqQkBsywLXCIv63sI6woY9G+3vrK5j8pY=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=AB9o2kRfYH02HhhWt7e60LUNtzOaQqgR9UZrYGhq+qB5PF0/4GLCyom8eDuf4BY2s
08aU+Seu9ya6jpfRw/8pgPbNhrh5CMkwo/F1cIY5/6kf+G53gQhivVeu5E/ENCoZad
g9lCOmfZ88KVi1QueTqOmGP75bNIEhiMMK8D/b4YYBWHmcex5XZBoc6/gtH3Ky8V3t
Fop3QisgZMxl1uweEQCjJD8vPP89kvgxjqh7yXxkb3SNw5O1q4vU/OhdTszmomSlGO
ZFE3nFlZjvYz3ZtFZaCfXosi07WJvg+uc4FRi/Wr9MpUHe+cWSSA6l6u4/JPgZ2gWz
RTRfdvRxyUP3w==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjp73rKWz6twM;
Sun, 6 Aug 2023 17:21:03 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v5 01/12] gnu: ocaml: Update to 4.14.1.
Date: Sun, 6 Aug 2023 15:20:20 +0000
Message-ID: <ccfc0a14ebd75f8c509076c9140bc1c3ce22993e.1691335142.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8ff755aea9..56661b1977 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
base-commit: c4b9f726e3a1889b92a4b14a2af1c25f10798469
--
2.41.0
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:20:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Aug 06 11:20:07 2023
Received: from localhost ([127.0.0.1]:59810 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qSfY7-0002K6-3F
for submit <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:20:07 -0400
Received: from mout02.posteo.de ([185.67.36.66]:49265)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qSfY2-0002JR-Qt
for 64249 <at> debbugs.gnu.org; Sun, 06 Aug 2023 11:20:05 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id ED7CD240101
for <64249 <at> debbugs.gnu.org>; Sun, 6 Aug 2023 17:19:56 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1691335197; bh=OhEF2vmyCYqF4N5NlnbfbCUdVwbKPL3khaaqVf2W0G8=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=pcMXuy2w3OFeaULRBS5g9W3ZQZrdfYJHY/kyyXw8M1rNpFMJASflycGY4lt0Yjflz
g6G1VRwczTEGaUkuh1Zd0PDOmrZNTY/1v95GFbDBYBzgd7e+dyU1ShF420UcjvFCvo
P3IDJMy4oWpiV/LBGjsTBPvxMDJDCPBa3kztIJelSA8zXR3IoHqseWER5vi4E/iIOL
PFWXBzAJWRc9UKcn4HWmSJN9+qXuAt0sFHipozvsx0nesimgfMZtw9Ta0wDIcUUrOR
UXRsTKnhjqym8987Zgs8pPKuxbTxZTXYpVVQxx1wn5J/IVIZaTe1mfrRL9KcFnI97F
0e37eR/doCxpA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RJjmr0Dnlz9rxD;
Sun, 6 Aug 2023 17:19:55 +0200 (CEST)
References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN>
<cover.1690541801.git.pukkamustard@HIDDEN>
<20230730194221.50deb15c@HIDDEN>
From: pukkamustard <pukkamustard@HIDDEN>
To: Julien Lepiller <julien@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9]
Date: Sun, 06 Aug 2023 14:09:42 +0000
In-reply-to: <20230730194221.50deb15c@HIDDEN>
Message-ID: <86y1io8ag9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -3.3 (---)
X-Debbugs-Envelope-To: 64249
Cc: 64249 <at> debbugs.gnu.org, DABY-SEESARAM Arnaud <ds-ac@HIDDEN>,
Josselin Poiret <dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.3 (----)
Hi Julien,
Thanks for your comments! Will send in updated patches as a v5.
Julien Lepiller <julien@HIDDEN> writes:
>> pukkamustard (9):
>> gnu: ocaml: Update to 4.14.1.
>> gnu: Update coq-flocq to 4.1.1.
>> gnu: Update coq-gappa to 1.5.3.
>> gnu: Update coq-mathcomp to 1.17.0.
>
> This patch breaks coq-coquelicot, but it can be updated to 1.4.0, and
> that fixes the issue.
Updated coq-coquelicot to 3.4.0.
>> gnu: coq: Update to 8.17.1.
>
> You've missed a coq-stdlib reference in coq-mathcomp-finmap, but simply
> removing it fixes the issue.
Done.
> coq-autosubst-1, coq-equations, coqstdpp, coq-interval and
> coq-mathcomp-bigenough fail to build with the newer coq. coq-ide also
> fails, but it used to fail already.
- Fixed coq-ide by adding zlib to propagated-inputs.
- Fixed coq-autosubst by updating to 1.8
- Fixed coq-equations by updating to 1.3-8.17 (I chose to add the
release variant in the version string)
- Fixed coq-stdpp by updating to 1.8.0.
- Fixed coq-interval by updating to 4.8.0.
coq-mathcomp-bigenough is still broken. There is a (to me) cryptic but
seemingly related message on the issue tracker:
https://github.com/math-comp/bigenough/issues/9.
Maybe somebody with more insight/interest in Coq could look into this?
>> gnu: dune-bootstrap: Update to 3.9.1.
>> gnu: opam: Split build into smaller sub-packages.
>
> there are quite a few more failures with this patch. For instance,
> ocaml-topkg fails because it can't find the opam-installer binary.
>
>> gnu: Add opam-installer.
>
> And of course this patch fixes the issue. I haven't followed closely
> recent changes to policy, but it used to be that, if there were no
> other solutions we would prefer to have multiple changes in a single
> patch if separating them would break something, even in an intermediate
> commit.
>
> ocaml-ocb-stubblr still fails because it has opam instead of
> opam-installer. It can be switche to new style inputs too :)
Merged the commit to add opam-installer to the previous commit and fixed
ocaml-ocb-stubblr.
>> FIXME: gnu: opam: Update to 2.1.5.
>
> You replaced the home-page of dose3 with the http version, but the
> https version still works.
I re-imported dose3 with `guix import opam` and it seems like http is
used in the opam metadata. Fixed to use https.
> I looked into the build issue, but I can only see deprecation warnings.
> Did I miss something?
Yes, the error is quite hidden:
--8<---------------cut here---------------start------------->8---
(cd _build/default && /gnu/store/qpbrmd6qaakv0zw3f2w2x2cw4nwy5lsg-ocaml-4.1=
4.1/bin/ocamlc.opt -w -40 -w +a-4-40-42-44-48 -safe-string -g -bin-annot -I=
src/client/.opam_client.objs/byte -I /gnu/store/1zzqn0z6rkgb1bwh2hn5in1wfj=
jcr7ik-ocaml-opam-format-2.1.5/lib/ocaml/site-lib/opam-format -I /gnu/store=
/46q0hi0bzinsp4jl4921rfw2yd2hxyhd-ocaml-opam-repository-2.1.5/lib/ocaml/sit=
e-lib/opam-repository -I /gnu/store/4ldlmhrq0nrbh9sf29r17d9y3qndwch4-ocaml-=
mccs-1.1+14/lib/ocaml/site-lib/mccs -I /gnu/store/4ldlmhrq0nrbh9sf29r17d9y3=
qndwch4-ocaml-mccs-1.1+14/lib/ocaml/site-lib/mccs/glpk/internal -I /gnu/sto=
re/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml/site-lib/re -=
I /gnu/store/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml/sit=
e-lib/re/pcre -I /gnu/store/7h1nbgpy8c2vyisq6dyvwww2di2xnx9n-ocaml-graph-2.=
0.0/lib/ocaml/site-lib/ocamlgraph -I /gnu/store/87njknpz4803bcfvx9flwchqf4l=
8prcj-ocaml-cudf-0.10/lib/ocaml/site-lib/cudf -I /gnu/store/ai8z8r9ykib0003=
9gq0gylyps6xzs55w-ocaml-opam-file-format-2.1.4/lib/ocaml/site-lib/opam-file=
-format -I /gnu/store/fz8a8plnh2j7z020jljy66fg4mmbp3hv-ocaml-extlib-1.7.9/l=
ib/ocaml/site-lib/extlib -I /gnu/store/hmsqsalxyda0c0g41rl3znj8lqnbc1cy-oca=
ml-opam-solver-2.1.5/lib/ocaml/site-lib/opam-solver -I /gnu/store/k51jkvxz1=
smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/ocaml/site-lib/dose3/algo -I =
/gnu/store/k51jkvxz1smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/ocaml/sit=
e-lib/dose3/common -I /gnu/store/lvhm3dnkqbacm7gy2r6ppvng9rq8rqzx-ocaml-seq=
-0.1/lib/ocaml/site-lib/seq -I /gnu/store/qpxf86c2qkyjwidlf5dhj17jwg5pfwz5-=
ocaml-opam-core-2.1.5/lib/ocaml/site-lib/opam-core -I /gnu/store/rav2kpix7f=
b1gj9x609qzrd6a3cla9b1-ocaml-base64-3.5.0/lib/ocaml/site-lib/base64 -I /gnu=
/store/v63rrnbsq9806s8q0qz0fkrw1napqn0f-ocaml-stdlib-shims-0.3.0/lib/ocaml/=
site-lib/stdlib-shims -I /gnu/store/vw64xzqqkz8gzg6ikrp4ks5bqdbjash3-ocaml-=
cmdliner-1.1.1/lib/ocaml/site-lib/cmdliner -I /gnu/store/ylwbjd8fmi6mrk2lxs=
vh7yrjajh7qbi4-ocaml-opam-state-2.1.5/lib/ocaml/site-lib/opam-state -intf-s=
uffix .ml -no-alias-deps -o src/client/.opam_client.objs/byte/opamSwitchCom=
mand.cmo -c -impl src/client/opamSwitchCommand.ml)
File "src/client/opamSwitchCommand.ml", line 405, characters 18-35:
405 | let value =3D Base64.decode_exn content in
^^^^^^^^^^^^^^^^^
Error: Unbound value Base64.decode_exn
--8<---------------cut here---------------end--------------->8---
In the meantime dune 3.10.0 was released and the v5 updates to it. So,
happy recompiling! :)
Thanks,
pukkamustard
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 30 Jul 2023 17:42:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 30 13:42:33 2023 Received: from localhost ([127.0.0.1]:51210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qQAR6-0004Go-OG for submit <at> debbugs.gnu.org; Sun, 30 Jul 2023 13:42:33 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:40148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <julien@HIDDEN>) id 1qQAR1-0004GZ-F2 for 64249 <at> debbugs.gnu.org; Sun, 30 Jul 2023 13:42:31 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 5ec5cc41; Sun, 30 Jul 2023 17:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=dLYqki3kKGOg AueC6ct4gVY82KByg5LwdA/cUenEutg=; b=IWV5kAnoV0qxQE0SVYOW1xR3Ufzz 2FIUyOjkN5JvPYVqjiYx/ggOV/CTD+vLGxXWV6BrbNggrvFzDnzoZfglgL4KVAHt KFHw6C5TcUo4g6+TD38xYHtjNooOddHu5KY/q9LhyV/eVoNip3x+ik3jFTpUv97h tkf6gCyik4OB4c3TYynzMIjbz5NjdKiPYki/xk89xDsxDDPUfvzug/s3Gqv1uWFW pbQG+ykfmzlbrGkgGOoVi68ptBS+Ib8cGWg1TMO/3lTr1Pz1t521dbdBtNGD+ddb tekdT0b8DUZ4GIMtnYxm0tM7k8QZeo69i+eNxUaOJhWJn0ICGmG+3WE4xg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 481e8b9d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 30 Jul 2023 17:42:22 +0000 (UTC) Date: Sun, 30 Jul 2023 19:42:21 +0200 From: Julien Lepiller <julien@HIDDEN> To: pukkamustard <pukkamustard@HIDDEN> Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Message-ID: <20230730194221.50deb15c@HIDDEN> In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN> References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN> <cover.1690541801.git.pukkamustard@HIDDEN> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249 <at> debbugs.gnu.org, DABY-SEESARAM Arnaud <ds-ac@HIDDEN>, Josselin Poiret <dev@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Le Fri, 28 Jul 2023 11:08:22 +0000, pukkamustard <pukkamustard@HIDDEN> a =C3=A9crit : > Hello, >=20 > This v4 fixes the previously broken Coq packages. >=20 > As mentioned (https://issues.guix.gnu.org/64249#20) this merges > coq-core and coq-stdlib into coq. >=20 > It turns out that dune allows multiple package to be built at the > same time by providing a comma-seperated list. Our #:package field > can be fed such a comma-seperated list. With this trick only the > 'install phase needs some tweaking. Eventually it would be nice to > allow our #:package field to be a proper Scheme list. >=20 > Some Coq packages need to be updated for 8.17.1 compatibility. I have > not systematically checked all Coq packages. Let's see what CI says. >=20 > opam is still broken. Very gracious if another pair of eyes could > have a look. >=20 > Thanks, > pukkamustard >=20 > pukkamustard (9): > gnu: ocaml: Update to 4.14.1. > gnu: Update coq-flocq to 4.1.1. > gnu: Update coq-gappa to 1.5.3. > gnu: Update coq-mathcomp to 1.17.0. This patch breaks coq-coquelicot, but it can be updated to 1.4.0, and that fixes the issue. > gnu: coq: Update to 8.17.1. You've missed a coq-stdlib reference in coq-mathcomp-finmap, but simply removing it fixes the issue. coq-autosubst-1, coq-equations, coqstdpp, coq-interval and coq-mathcomp-bigenough fail to build with the newer coq. coq-ide also fails, but it used to fail already. > gnu: dune-bootstrap: Update to 3.9.1. > gnu: opam: Split build into smaller sub-packages. there are quite a few more failures with this patch. For instance, ocaml-topkg fails because it can't find the opam-installer binary. > gnu: Add opam-installer. And of course this patch fixes the issue. I haven't followed closely recent changes to policy, but it used to be that, if there were no other solutions we would prefer to have multiple changes in a single patch if separating them would break something, even in an intermediate commit. ocaml-ocb-stubblr still fails because it has opam instead of opam-installer. It can be switche to new style inputs too :) > FIXME: gnu: opam: Update to 2.1.5. You replaced the home-page of dose3 with the http version, but the https version still works. I looked into the build issue, but I can only see deprecation warnings. Did I miss something? >=20 > gnu/local.mk | 4 - > gnu/packages/coq.scm | 77 ++-- > gnu/packages/ocaml.scm | 365 > ++++++++++++------ .../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 - > 7 files changed, 267 insertions(+), 398 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 >=20 >=20 > base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:24 2023
Received: from localhost ([127.0.0.1]:43856 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLX-00005U-Ml
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:24 -0400
Received: from mout02.posteo.de ([185.67.36.66]:41245)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLLG-0008Ut-Em
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:08 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id E17C8240101
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:09:00 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542540; bh=irzh3NitpBPjTzfbJVtxtfTswy2l3e6MBrFhBG7UN1Q=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=kG4k+7pqrgP7eqqVYycVKxfNoE5avlFwFZrLp1eqtEwHJOler+6jEO3Ks9wNrXxLc
Mg+IHW71+83mooPnI8VeDVAehnPevdS6IRPAp8WLiDkRKL+bGfbeQpT5KLffFiEL8/
Y6r6GPYZ8NAFC8TPWjEiy07j8acSXm5YcVqpH1LnIZiATKVW/v9Sv++NK7ftsBD6nW
r6wbIWh5VH3uNxDoec2wOy+EdQQ/o1NrNtGtILw+A9AKzccCVwnnOwRvKS6IxNpPL8
9a3+rT+EJsVKItKnfQ5xvCvYtIFsi1YFOvtrIT7MXO9BX1an0zTtxnLgkQ7nYApPb6
4rsEXUt9D2Hyw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dS2MMbz6tyq;
Fri, 28 Jul 2023 13:09:00 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 9/9] FIXME: gnu: opam: Update to 2.1.5.
Date: Fri, 28 Jul 2023 11:08:31 +0000
Message-ID: <f0953c1c4c02b458b44bf614f2b74b64454eaf49.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam): Update to 2.1.5.
[native-inputs]: Add more test data.
(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 | 96 ++++++-------
.../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, 49 insertions(+), 270 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
diff --git a/gnu/local.mk b/gnu/local.mk
index 06a376a99a..f28baefdb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1646,10 +1646,6 @@ dist_patch_DATA = \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-xmlsec-compat.patch \
%D%/packages/patches/obs-modules-location.patch \
- %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
- %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
- %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
- %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-multiple-definitions.patch \
%D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \
%D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 90fedc2e88..badc898648 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -713,7 +713,7 @@ (define-public ocaml-mccs
(define-public ocaml-dose3
(package
(name "ocaml-dose3")
- (version "5.0.1")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -722,30 +722,17 @@ (define-public ocaml-dose3
(file-name (git-file-name name version))
(sha256
(base32
- "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
- (patches
- (search-patches
- "ocaml-dose3-add-unix-dependency.patch"
- "ocaml-dose3-Fix-for-ocaml-4.06.patch"
- "ocaml-dose3-dont-make-printconf.patch"
- "ocaml-dose3-Install-mli-cmx-etc.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:tests? #f ;the test suite requires python 2
- #:configure-flags
- ,#~(list (string-append "SHELL="
- #+(file-append (canonical-package bash-minimal)
- "/bin/sh")))
- #:make-flags
- ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))))
- (propagated-inputs
- (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
- (native-inputs
- (list perl
- ocaml-extlib
- ocamlbuild
- ocaml-cppo))
- (home-page "https://www.mancoosi.org/software/")
+ "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "dose3"))
+ (propagated-inputs (list ocaml-extlib
+ ocaml-base64-boot
+ ocaml-cudf
+ ocaml-graph
+ ocaml-re
+ ocaml-stdlib-shims))
+ (native-inputs (list ocaml-ounit))
+ (home-page "http://www.mancoosi.org/software/")
(synopsis "Package distribution management framework")
(description "Dose3 is a framework made of several OCaml libraries for
managing distribution packages and their dependencies. Though not tied to
@@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format
(define ocaml-opam-core
(package
(name "ocaml-opam-core")
- (version "2.1.3")
+ (version "2.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -858,7 +845,7 @@ (define ocaml-opam-core
(file-name (git-file-name name version))
(sha256
(base32
- "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
+ "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
(build-system dune-build-system)
(arguments `(#:package "opam-core"
;; tests are run with the opam package
@@ -1072,6 +1059,8 @@ (define-public opam
("which" ,which)
;; Data for tests
+ ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
"1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
@@ -1080,10 +1069,21 @@ (define-public opam
"0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
"1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
+ ("opam-repo-c1842d168d" ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8"
+ "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
- "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
+ "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
+ ("opam-repo-11ea1cb" ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
+ "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
+ ("opam-repo-297366c" ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
+ "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
+ ("opam-repo-3235916" ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa"
+ "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
+ ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
+ ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
+ "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw")))))
(inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
@@ -4443,8 +4443,7 @@ (define-public ocaml-base64
(base32
"068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))))
(build-system dune-build-system)
- (native-inputs
- (list ocaml-alcotest ocaml-bos ocaml-rresult))
+ (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
(home-page "https://github.com/mirage/ocaml-base64")
(synopsis "Base64 encoding for OCaml")
@@ -4453,6 +4452,14 @@ (define-public ocaml-base64
radix-64 representation. It is specified in RFC 4648.")
(license license:isc)))
+;; A variant without tests that is used to prevent a cyclic dependency when
+;; compiling ocaml-dose3.
+(define ocaml-base64-boot
+ (package
+ (inherit ocaml-base64)
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ocaml4.07-base64
(package-with-ocaml4.07
(package
@@ -5325,27 +5332,22 @@ (define-public ocaml4.07-uuidm
(define-public ocaml-graph
(package
(name "ocaml-graph")
- (version "1.8.8")
+ (home-page "https://github.com/backtracking/ocamlgraph/")
+ (version "2.0.0")
(source (origin
- (method url-fetch)
- (uri (string-append "http://ocamlgraph.lri.fr/download/"
- "ocamlgraph-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:install-target "install-findlib"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL"
- (search-input-file inputs "/bin/sh")))))))
- (inputs (list lablgtk))
+ "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "ocamlgraph"))
+ (propagated-inputs (list ocaml-stdlib-shims))
+ (native-inputs (list ocaml-graphics))
(properties `((upstream-name . "ocamlgraph")))
- (home-page "https://ocamlgraph.lri.fr/")
(synopsis "Graph library for OCaml")
(description "OCamlgraph is a generic graph library for OCaml.")
(license license:lgpl2.1)))
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
deleted file mode 100644
index 2c344af821..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Sat, 2 Dec 2017 12:51:01 +0100
-Subject: [PATCH] Fix for ocaml 4.06
-
----
- common/criteria_lexer.mll | 8 ++++----
- common/util.ml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
-index 71f9178..fc4eae3 100644
---- a/common/criteria_lexer.mll
-+++ b/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
- let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
- (* find the terminating delimiter *)
- let endpos =
-- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
- |Invalid_argument _ ->
- raise (Format822.Syntax_error (
- Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
- Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
- in
- let len = endpos - (lexbuf.lex_start_pos + 3) in
-- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-- s
-+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+ Bytes.to_string s
-
- }
-
-diff --git a/common/util.ml b/common/util.ml
-index 598f266..36ca3d1 100644
---- a/common/util.ml
-+++ b/common/util.ml
-@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
- let clean label =
- try
- let s = Filename.chop_extension (Filename.basename label) in
-- String.capitalize s
-+ String.capitalize_ascii s
- with Invalid_argument _ -> label
-
- let create ?(enabled=false) label =
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
deleted file mode 100644
index 41494e7b3c..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Thu, 2 Mar 2017 12:19:56 +0100
-Subject: [PATCH] Install mli, cmx, etc.
-
----
- Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 09464ff..5044d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
- @for i in _build/cudf/cudf.*; do \
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
-+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
- fi ; \
- done
-
-@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ;\
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
-+ rm -f $(DOSELIBS)/*.mlpack ;\
- fi ; \
- done
-
-@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
--#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
-+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
- INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
-
- exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
deleted file mode 100644
index d2cc44c784..0000000000
--- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Tue, 6 Feb 2018 10:15:45 +0100
-Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
-
----
- META.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META.in b/META.in
-index aa2cd8d..0f9d337 100644
---- a/META.in
-+++ b/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
-
- package "algo" (
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
deleted file mode 100644
index 84b6a3b81b..0000000000
--- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
--make printconf
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:09 2023
Received: from localhost ([127.0.0.1]:43854 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLI-000051-Sm
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:09 -0400
Received: from mout02.posteo.de ([185.67.36.66]:33777)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLLE-0008Uj-66
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:05 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 9E6BA240101
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:58 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542538; bh=3CEtR37R50aLzKWg7206Cum8u8tjLG3CUbWnf2VaZro=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=U1f8XrjMpL6Txp0q4LzbNQHdJITudqOerMmgsZ2uQLckkY1gs7OxFwPcPXH9QbbVF
bE/kVCxDI4ksnXLRkYYllQvAIUdttzFTZtRxZ7qESb5pGv0A7+RGIocn0Xg3JTWZPl
rtymIfiSPM6s2Hb/DlA5lgp47m2AhJf4bW1DLO6ZGXTiUkGXtNW2A5PKDz8PMLXgzU
zWvCHk6li4/DIYFypCcr4Gj5BgCgfkAqo/VBuUg33D0ojJ98Bapt8PVKkJ3gErjja6
dLCUcXe8bPnA8IUY5JBspGfPNqdZObbPyT713LPp8xY4HIa9VvFiPNg4vIoF3qMZmy
IZVMgcXJezHAg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dQ1W0Tz6ty7;
Fri, 28 Jul 2023 13:08:58 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 8/9] gnu: Add opam-installer.
Date: Fri, 28 Jul 2023 11:08:30 +0000
Message-ID: <736385d685b5a9b8074265a8e063f9d666680966.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam-installer): New variable.
(ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt,
ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos,
ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime,
ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg,
ocaml-afl-persistent) [native-inputs]: Replace opam with opam-installer.
---
gnu/packages/ocaml.scm | 90 ++++++++++++++++++++++++++----------------
1 file changed, 55 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0d78f4d864..90fedc2e88 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -780,7 +780,7 @@ (define-public ocaml-down
,#~(list "build" "--lib-dir"
(string-append #$output "/lib/ocaml/site-lib"))))
(native-inputs
- (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/down")
(synopsis "OCaml toplevel (REPL) upgrade")
(description "Down is an unintrusive user experience upgrade for the
@@ -901,6 +901,27 @@ (define ocaml-opam-format
#:tests? #f
#:phases %standard-phases))))
+(define-public opam-installer
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam-installer")
+ (native-inputs (list ocaml-opam-format
+ ocaml-cmdliner))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments `(#:package "opam-installer"
+ ;; requires all of opam
+ #:tests? #f))
+ (synopsis "Tool for installing OCaml packages")
+ (description "@var{opam-installer} is a tool for installing OCaml packages
+based on @code{.install} files defined by the OPAM package manager. It is
+useful for installing OCaml packages without requiring the entirety of
+OPAM.")
+ (properties
+ ;; opam-installer is used as a tool and not as a library, we can use the
+ ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0.
+ `((ocaml5.0-variant . ,(delay opam-installer))))))
+
(define ocaml-opam-repository
(package
(inherit ocaml-opam-core)
@@ -2325,7 +2346,7 @@ (define-public ocaml-topkg
"11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("result" ,ocaml-result)))
(arguments
@@ -2355,7 +2376,7 @@ (define-public ocaml-rresult
"0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2470,7 +2491,7 @@ (define-public ocaml-mtime
"1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2600,13 +2621,13 @@ (define-public ocaml-fmt
"0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
- `(("cmdliner" ,ocaml-cmdliner)
- ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)
- ("ocaml-uchar" ,ocaml-uchar)))
+ (list ocaml-cmdliner
+ ocaml-stdlib-shims
+ ocaml-uchar))
(arguments `(#:tests? #f
#:build-flags (list "build" "--with-base-unix" "true"
"--with-cmdliner" "true")
@@ -2647,9 +2668,9 @@ (define-public ocaml-astring
"1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2869,7 +2890,7 @@ (define-public ocaml-react
"16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam ocaml-topkg))
+ (list ocamlbuild opam-installer ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2993,7 +3014,7 @@ (define-public ocaml-hmap
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (native-inputs (list ocaml-topkg ocamlbuild opam))
+ (native-inputs (list ocaml-topkg ocamlbuild opam-installer))
(home-page "https://erratique.ch/software/hmap")
(synopsis "Heterogeneous value maps for OCaml")
(description
@@ -3455,7 +3476,7 @@ (define-public ocaml-logs
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("fmt" ,ocaml-fmt)
("lwt" ,ocaml-lwt)
@@ -3489,7 +3510,7 @@ (define-public ocaml-fpath
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)))
@@ -3519,7 +3540,7 @@ (define-public ocaml-bos
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)
@@ -3593,7 +3614,7 @@ (define-public ocaml-xmlm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-topkg opam))
+ (list ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/xmlm")
(synopsis "Streaming XML codec for OCaml")
(description "Xmlm is a streaming codec to decode and encode the XML data
@@ -3734,7 +3755,7 @@ (define-public ocaml-uchar
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(home-page "https://github.com/ocaml/uchar")
(synopsis "Compatibility library for OCaml's Uchar module")
(description "The uchar package provides a compatibility library for the
@@ -3760,9 +3781,9 @@ (define-public ocaml-uutf
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uchar" ,ocaml-uchar)
("cmdliner" ,ocaml-cmdliner)))
@@ -3807,7 +3828,7 @@ (define-public ocaml-uunf
#t)))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
+ ("opam-installer" ,opam-installer)
("topkg" ,ocaml-topkg)
;; Test data is otherwise downloaded with curl
("NormalizationTest.txt"
@@ -3848,9 +3869,9 @@ (define-public ocaml-jsonm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uutf" ,ocaml-uutf)
("cmdliner" ,ocaml-cmdliner)))
@@ -4268,7 +4289,7 @@ (define-public ocaml-ptime
#:phases (modify-phases %standard-phases
(delete 'configure))))
(propagated-inputs (list ocaml-result js-of-ocaml))
- (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/ptime")
(synopsis "POSIX time for OCaml")
(description
@@ -5275,7 +5296,7 @@ (define-public ocaml-uuidm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("cmdliner" ,ocaml-cmdliner)
("topkg" ,ocaml-topkg)))
@@ -5921,7 +5942,7 @@ (define-public ocaml-tsdl
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-astring opam pkg-config))
+ (list ocamlbuild ocaml-astring opam-installer pkg-config))
(inputs
`(("topkg" ,ocaml-topkg)
("sdl2" ,sdl2)
@@ -9641,7 +9662,7 @@ (define-public ocaml-uucd
(propagated-inputs
(list ocaml-xmlm))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uucd")
(synopsis "Unicode character database decoder for OCaml")
(description "Uucd is an OCaml module to decode the data of the Unicode
@@ -9669,7 +9690,7 @@ (define-public ocaml-uucp
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list opam
+ (list opam-installer
ocaml-findlib
ocamlbuild
ocaml-topkg
@@ -9703,7 +9724,7 @@ (define-public ocaml-uuseg
(propagated-inputs
(list ocaml-uucp ocaml-uutf ocaml-cmdliner))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uuseg")
(synopsis "Unicode text segmentation for OCaml")
(description "Uuseg is an OCaml library for segmenting Unicode text. It
@@ -10164,8 +10185,7 @@ (define-public ocaml-afl-persistent
(invoke "./build.sh")))
;; XXX: The tests are already run in the build.sh script.
(delete 'check))))
- (native-inputs
- `(("opam" ,opam)))
+ (native-inputs (list opam-installer))
(home-page "https://github.com/stedolan/ocaml-afl-persistent")
(synopsis "Use afl-fuzz in persistent mode")
(description
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:08 2023
Received: from localhost ([127.0.0.1]:43852 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLH-0008WQ-OO
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:08 -0400
Received: from mout02.posteo.de ([185.67.36.66]:56947)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLLC-0008UN-Sh
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:04 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 56BFC240101
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542537; bh=AE6egnh9p8KeIR9WngIaz7Ysnw6bAepv2pqQJjccwiA=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=Qebhiq5833ThcI9Fc9jd3UsvRdqyWBwHJUGKRfdk+dSvKIQt0TaiPR8wJw8g7I4/s
NMLVUhT7R4k2jOczf6IhCaW+89ncqN0fzGfdjkrL+NUh/WkoyrmxwpAtSeScsN7Bxo
sIIT1n+3RR7LAaL1cF3V6wlPaM/V4RDGgvufiD7EZiXQpvWKloU28pmkdiVEJLdp+J
2sl8tVzOg/LZg02YQHl0C8ZMhpBpfE05WpsQSskGyarCZEM1CerVsgJ90h67k/Ybdl
himZXZoH6kmnM3am427Hoi2xSwTKQg0uCU9d9r8hTIOnGmdQ3uQRipY60WLm3UjWBt
T3LDwzsM/UqwA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dN6WG5z6ty7;
Fri, 28 Jul 2023 13:08:56 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 7/9] gnu: opam: Split build into smaller
sub-packages.
Date: Fri, 28 Jul 2023 11:08:29 +0000
Message-ID: <d91acdcce7c2286983e5e3136f27b44306ce21be.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages.
---
gnu/packages/ocaml.scm | 164 +++++++++++++++++++++++++++++++----------
1 file changed, 125 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d2bc7cc118..0d78f4d864 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format
;; With static-linking exception
(license license:lgpl2.1+)))
-(define-public opam
+(define ocaml-opam-core
(package
- (name "opam")
+ (name "ocaml-opam-core")
(version "2.1.3")
(source (origin
(method git-fetch)
@@ -860,32 +860,129 @@ (define-public opam
(base32
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
+ (arguments `(#:package "opam-core"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash"))
+ (bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/core/opamSystem.ml"
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\""))
+ (("getconf")
+ (which "getconf")))))))))
+ (propagated-inputs
+ (list ocaml-graph
+ ocaml-re
+ ocaml-cppo))
+ (inputs (list bubblewrap))
+ (home-page "https://opam.ocamlpro.com/")
+ (synopsis "Package manager for OCaml")
+ (description
+ "OPAM is a tool to manage OCaml packages. It supports multiple
+simultaneous compiler installations, flexible package constraints, and a
+Git-friendly development workflow.")
+ ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
+ (license license:lgpl3)))
+
+(define ocaml-opam-format
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-format")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-core
+ ocaml-opam-file-format
+ ocaml-re))
+ (arguments `(#:package "opam-format"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-repository
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-repository")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format))
+ (arguments `(#:package "opam-repository"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-state
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-state")
+ (arguments `(#:package "opam-state"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ ;; Use bwrap from the store directly.
+ (substitute* "src/state/shellscripts/bwrap.sh"
+ (("-v bwrap") (string-append "-v " bwrap))
+ (("exec bwrap") (string-append "exec " bwrap))
+ ;; Mount /gnu and /run/current-system in the
+ ;; isolated environment when building with opam.
+ ;; This is necessary for packages to find external
+ ;; dependencies, such as a C compiler, make, etc...
+ (("^add_sys_mounts /usr")
+ (string-append "add_sys_mounts "
+ (%store-directory)
+ " /run/current-system /usr")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs (list ocaml-opam-repository))))
+
+(define ocaml-opam-solver
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-solver")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format
+ ocaml-mccs
+ ocaml-dose3))
+ (arguments `(#:package "opam-solver"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-client
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-client")
+ (arguments `(#:package "opam-client"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/client/opamInitDefaults.ml"
+ (("\"bwrap\"") (string-append "\"" bwrap "\"")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs
+ (list ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-opam-repository
+ ocaml-re
+ ocaml-cmdliner))))
+
+(define-public opam
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam")
+ (build-system dune-build-system)
(arguments
- `(#:phases
+ `(#:package "opam"
+ #:phases
(modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda* (#:key inputs make-flags #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash"))
- (bwrap (search-input-file inputs "/bin/bwrap")))
- (substitute* "src/core/opamSystem.ml"
- (("\"/bin/sh\"")
- (string-append "\"" bash "/bin/sh\""))
- (("getconf")
- (which "getconf")))
- ;; Use bwrap from the store directly.
- (substitute* "src/state/shellscripts/bwrap.sh"
- (("-v bwrap") (string-append "-v " bwrap))
- (("exec bwrap") (string-append "exec " bwrap))
- ;; Mount /gnu and /run/current-system in the
- ;; isolated environment when building with opam.
- ;; This is necessary for packages to find external
- ;; dependencies, such as a C compiler, make, etc...
- (("^add_sys_mounts /usr")
- (string-append "add_sys_mounts "
- (%store-directory)
- " /run/current-system /usr")))
- (substitute* "src/client/opamInitDefaults.ml"
- (("\"bwrap\"") (string-append "\"" bwrap "\""))))))
(add-before 'check 'prepare-checks
(lambda* (#:key inputs #:allow-other-keys)
;; Opam tests need to run an isolated environment from a writable
@@ -966,22 +1063,11 @@ (define-public opam
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
"0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
- (inputs
- (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3
- ocaml-mccs ocaml-opam-file-format ocaml-re))
+ (inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
;; compiled opam until opam is compatible with OCaml 5.0.
- `((ocaml5.0-variant . ,(delay opam))))
- (home-page "https://opam.ocamlpro.com/")
- (synopsis "Package manager for OCaml")
- (description
- "OPAM is a tool to manage OCaml packages. It supports multiple
-simultaneous compiler installations, flexible package constraints, and a
-Git-friendly development workflow.")
-
- ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
- (license license:lgpl3)))
+ `((ocaml5.0-variant . ,(delay opam))))))
(define-public ocaml-opam-monorepo
(package
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:07 2023
Received: from localhost ([127.0.0.1]:43850 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLH-0008WI-9P
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:07 -0400
Received: from mout02.posteo.de ([185.67.36.66]:44353)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLLB-0008UF-LD
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:02 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 1E28B240103
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:56 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542536; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=SgAZfSQI9HjUlHA780mdQ4ydp4f6Xpg/k9SeaR9WnawtJBRCAWrs/Mp3zDT9sVoIe
GOxHbBIgUK/3n0dpG1KUskojw0e4wvvcLeitjXCVTp6o1AAo+Y6G6w+CetLUPwLw7Y
w2Imm3XmhnOnRa2NN4tqel8UzdZOmoEyzgAT9hCHGiKn5s+RvjBCW5GgSih/RTB2kO
oeOgU20hz1EPLeltVr10AphDYgMGnSqnps/EUsI8Hpu++HS0dJzdGOtmAih4CSnQAh
Qn952Wrqqy/bbOMK+pyVIZ92RzZ+jslkWfdlOwgTvQ6FfXVHGLD3hUu7JKpvDxFyMe
crgeboZ/usQ/A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dM4zpmz6ty7;
Fri, 28 Jul 2023 13:08:55 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 6/9] gnu: dune-bootstrap: Update to 3.9.1.
Date: Fri, 28 Jul 2023 11:08:28 +0000
Message-ID: <54108cad3e6d8ff5a0a6f3071b3e7f61752621c2.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6ffde41cc0..d2bc7cc118 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1819,7 +1819,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1828,7 +1828,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1845,9 +1845,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:07 2023
Received: from localhost ([127.0.0.1]:43847 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLG-0008WA-42
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:07 -0400
Received: from mout01.posteo.de ([185.67.36.65]:44247)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLLA-0008U8-Dl
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:01 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id D9B4D240028
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:54 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542534; bh=X/eXZDk7vm2Oqyo6tDMFe2VA5E2J75zBAJSmx++V3kE=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=rz8HM2ewVykeMxTS94PhdRgbfH2snfyri1PEtjtQwH50cvYbVOz5QUdlba89YrjVI
a34F3+AZndgFSDJaHCkVKPDH82KwIVPa8cB7Jgb1fundS8pTZMtWl8zZICWIRtyllj
PdgzIk8F1Z3BH/qRYY85nnNOGUz1gWyWnIF/cOqTXZnyUYVtptDLEJPXxDMXhl3bWH
Scuxj9i+2yNYIrHOfQGzixce6YNRoIR/REBtkxb7Xh9dLwMh4saeoh8rwJZj4w3eFE
PBbeMssgA9cbb9kLv82MNSeT7OHmeQA7oAN6zr3a54MjJrtjr+16c05NxI1aOqGWgW
cp0nRQ05B21xg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dL34b5z6txd;
Fri, 28 Jul 2023 13:08:54 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 5/9] gnu: coq: Update to 8.17.1.
Date: Fri, 28 Jul 2023 11:08:27 +0000
Message-ID: <97754585bac7132fd7ab70f7c7b5372ddad049c3.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq): Update to 8.17.1 and merge with coq-core and coq-stdlib.
[arguments] Merge with coq-core and coq-stdlib. Add pre-build phases and
add a custom install phase. Remove unnecessary test-target
(coq-core): Remove variable.
(coq-stdlib): Remove variable.
(coq-mathcomp-bigenough)[propagated-inputs] Remove coq-core.
---
gnu/packages/coq.scm | 65 ++++++++++++++++----------------------------
1 file changed, 24 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index cc914422d4..6f9205cfb0 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -50,10 +50,10 @@ (define-module (gnu packages coq)
#:use-module (guix utils)
#:use-module ((srfi srfi-1) #:hide (zip)))
-(define-public coq-core
+(define-public coq
(package
- (name "coq-core")
- (version "8.16.1")
+ (name "coq")
+ (version "8.17.1")
(source
(origin
(method git-fetch)
@@ -63,7 +63,7 @@ (define-public coq-core
(file-name (git-file-name name version))
(sha256
(base32
- "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
(patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths
(list (search-path-specification
@@ -78,13 +78,29 @@ (define-public coq-core
(files (list "lib/ocaml/site-lib/coq-core"))
(separator #f))))
(build-system dune-build-system)
+ (arguments
+ `(#:package "coq-core,coq-stdlib,coq"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "./configure" "-prefix" out
+ "-libdir" libdir))))
+ (add-before 'build 'make-dunestrap
+ (lambda _ (invoke "make" "dunestrap")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libdir (string-append out "/lib/ocaml/site-lib")))
+ (invoke "dune" "install" "--prefix" out
+ "--libdir" libdir
+ "coq-core" "coq-stdlib" "coq")))))))
(inputs
(list gmp ocaml-zarith))
(native-inputs
(list ocaml-ounit2 which))
- (arguments
- `(#:package "coq-core"
- #:test-target "."))
(properties '((upstream-name . "coq"))) ; also for inherited packages
(home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic")
@@ -96,39 +112,6 @@ (define-public coq-core
;; Some of the documentation is distributed under opl1.0+.
(license (list license:lgpl2.1 license:opl1.0+))))
-(define-public coq-stdlib
- (package
- (inherit coq-core)
- (name "coq-stdlib")
- (arguments
- `(#:package "coq-stdlib"
- #:test-target "."
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-dune
- (lambda _
- (substitute* "user-contrib/Ltac2/dune"
- (("coq-core.plugins.ltac2")
- (string-join
- (map (lambda (plugin) (string-append "coq-core.plugins." plugin))
- '("ltac2" "number_string_notation" "tauto" "cc"
- "firstorder"))
- " "))))))))
- (inputs
- (list coq-core gmp ocaml-zarith))
- (native-inputs '())))
-
-(define-public coq
- (package
- (inherit coq-core)
- (name "coq")
- (arguments
- `(#:package "coq"
- #:test-target "."))
- (propagated-inputs
- (list coq-core coq-stdlib))
- (native-inputs '())))
-
(define-public coq-ide-server
(package
(inherit coq)
@@ -761,7 +744,7 @@ (define-public coq-mathcomp-bigenough
"/lib/coq/user-contrib"))
#:phases (modify-phases %standard-phases
(delete 'configure))))
- (propagated-inputs (list coq coq-core coq-mathcomp which))
+ (propagated-inputs (list coq coq-mathcomp which))
(home-page "https://math-comp.github.io/")
(synopsis "Small library to do epsilon - N reasoning")
(description
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:06 2023
Received: from localhost ([127.0.0.1]:43845 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLF-0008W3-Pn
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:06 -0400
Received: from mout02.posteo.de ([185.67.36.66]:60545)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLL9-0008Tz-52
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:59 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 97B0C240101
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:53 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542533; bh=B9g25xQC+VlWV4nAoGJPea43S47XVcYNbXJ6gijs9XU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=IMBpRKin+9+zUTd4r6i0x0sezoLcOYtZO3IeOI1oaJs20xhfiVkQGbn7guwD2T68f
2F8YGnCLD96mElcUvmqJ7CNbU6Tp7leKfum765rCoYgbkzxKQFnizxJOXg4HVBipoO
gaRSq76uOY3jVP0l/DFXq+JxPUdmhJxlfrDzgMMb1Tus98L4PQ5U8xRFKVm5N4v3WU
owhLJKu91oM98KS+nPWimj+O+DJzaULzQs92dBwMdLxjdiPCDmapxrggBHnVGIqO0Y
su8HHM8Spy5o9U+0BExnhj8Z0TiRMwY2SSLNcR/iBWZM0tGtj2ec7ub4JSMyqsxsNm
gAw7Q+asiUvXQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dK12DXz6tyj;
Fri, 28 Jul 2023 13:08:53 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 4/9] gnu: Update coq-mathcomp to 1.17.0.
Date: Fri, 28 Jul 2023 11:08:26 +0000
Message-ID: <64830fd90936cc3da91187d036887bc6296b165a.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-mathcomp): Update to 1.17.0.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 86a9aef0f4..cc914422d4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -348,7 +348,7 @@ (define-public coq-gappa
(define-public coq-mathcomp
(package
(name "coq-mathcomp")
- (version "1.15.0")
+ (version "1.17.0")
(source
(origin
(method git-fetch)
@@ -357,7 +357,7 @@ (define-public coq-mathcomp
(commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "158zl36zbvi5qx2nqbfnrg00jpgp6hjr5hmls7d8d0421ar6b67i"))))
+ (base32 "06i6kw5p2024n6h9mf8bvwn54il1a4z2h4qrgc8y0iq8hkvx4fnd"))))
(build-system gnu-build-system)
(native-inputs
(list ocaml which coq))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:09:05 2023
Received: from localhost ([127.0.0.1]:43843 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLLF-0008W0-GT
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:09:05 -0400
Received: from mout01.posteo.de ([185.67.36.65]:54693)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLL7-0008Ts-SB
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:58 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 501F5240027
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:52 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542532; bh=iDuYl+NZjT0HbFLy6F1zyZvehLzekvdRtQ2GAT0H8so=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=T7cWnhF8OPAD5cKiYeOLczpWYkldrSnBkJ2FdFW8I7iKMpP2O1RYFCcmWtZQUeBi0
W1o5ViRx6D7PMGD+tinvPYDV09+wi46xp2LeZ2USwnYy4peHAXJeV+EBo4VjZo4H9w
FIfOEqogZXSN/Vkxdt6qhbc04yzivd3WpC/cu/Btgj7Z6vdNOD/oBL8yhrmPCPa8AH
8EVVxgLBXqPt0cm+zluW94esuVAHXy6ePCZW0s0NVIEb9TpY++zLkL7qc+sbZKY2tp
2uFu5EMhglt35NKSMYglVdJRYC6IRDa4eEUU/PD29i7t97Q49tML2WE9t1KQMs3ay/
+uxIsWQgL9jQw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dH6GQJz6tyd;
Fri, 28 Jul 2023 13:08:51 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 3/9] gnu: Update coq-gappa to 1.5.3.
Date: Fri, 28 Jul 2023 11:08:25 +0000
Message-ID: <0ecaf2c0a4704a361187d69a696118f54112fbba.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-gappa): Update to 1.5.3.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 215e947fd4..86a9aef0f4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -288,7 +288,7 @@ (define-public coq-flocq
(define-public coq-gappa
(package
(name "coq-gappa")
- (version "1.5.2")
+ (version "1.5.3")
(source
(origin
(method git-fetch)
@@ -298,7 +298,7 @@ (define-public coq-gappa
(file-name (git-file-name name version))
(sha256
(base32
- "0l65ah81yj9vabgkwqh47c02qvscvl8nl60gqn1qrs47dx1pi80q"))))
+ "1dzkb2sfglhik2ymw8p65khl163xxjsaqji9agnnkvlk5r6589v6"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:08:58 2023
Received: from localhost ([127.0.0.1]:43827 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLL8-0008UR-0u
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:58 -0400
Received: from mout01.posteo.de ([185.67.36.65]:55585)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLL6-0008Tq-Iq
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:56 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 0A42924002D
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:51 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542531; bh=2KQjyhZBWAOZElKnOLnFTVK3DEBRBdgrBsCgkA50FlU=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=kRAoi7qK7lhiYofRuDYsfPwa78nDFO1Y1fddWsK3dq27PsrNgn59g4Oc3I7IE011p
YBleoSj59o1K2KdcShCGOrCjtKVqSBaje9Ao1SjBgc7/1TIsgy2w47rVQOwSGpCEOp
ZxBhE//+3cCN8q+MiFOMtFSp2j4/TlhGjCSOdn8VaHotyksOag9+53jEwd7TC77NDS
YTfrQyLYqetFUY9HWK0YdH5tYV5WrAMGK1FZxCp6cu745OH7qPsLTqqwLSyqithOOX
4/uqgY7f4HWzqrCWNm5TQ95//UfpC7/qvIGDz/umbJkoXfXK12P0/gcgpW4gaafTHk
d1Rmh06SMd5fw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dG3VMqz6twS;
Fri, 28 Jul 2023 13:08:50 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 2/9] gnu: Update coq-flocq to 4.1.1.
Date: Fri, 28 Jul 2023 11:08:24 +0000
Message-ID: <5f2cae191723166ffd3f492af6e1cf921a7d2f89.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-flocq): Update to 4.1.1.
---
gnu/packages/coq.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 09ca4030ea..215e947fd4 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -241,7 +241,7 @@ (define-public proof-general
(define-public coq-flocq
(package
(name "coq-flocq")
- (version "4.1.0")
+ (version "4.1.1")
(source
(origin
(method git-fetch)
@@ -251,7 +251,7 @@ (define-public coq-flocq
(file-name (git-file-name name version))
(sha256
(base32
- "1yscj1120wch6myakaia03j11qji416v78ylx842d23hrbaqwmw5"))))
+ "01x38w58j95ba9679vpb5wv4bvfnrapd5dzjqlyz8k7i8a9sfqn0"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake ocaml which coq))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:08:58 2023
Received: from localhost ([127.0.0.1]:43824 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qPLL7-0008UO-NZ
for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:57 -0400
Received: from mout02.posteo.de ([185.67.36.66]:55127)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qPLL4-0008Tn-Ss
for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:55 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 0DDFE240101
for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:48 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690542529; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding:From;
b=YcTUY7gZrl0sTBQ8lPi1jB43rrp9u6jGYASsyxMn5QeruSuGdGUlNqo3rnEOiHy/w
8basRoOT5XZlnFoXyR9yjcZi0OxX99ZmSZyaA8bX8XdcvwPS/LOL5PmbCkJq2nJCRe
brBjlqXmQy8imoJLF5xP2kZtVbPyG++JxfsdTbeM2+01bjaEv8LZf9tKdBXn9RgIyT
/U3fjAQkVvtZ6E/i/Z0VlSIrMSEZ3eS6wVF2V+Sn0SfTzVQcytOqoNv9AMkISArESi
TifyOgaeE91M3ZWYTdlRjT2EAeQkhKemNQt+bQhYdeySRZkgTYnByJTsYIR2Ri4WKD
0NspGd8r5ImeQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4RC4dD2fTnz6tsj;
Fri, 28 Jul 2023 13:08:48 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v4 1/9] gnu: ocaml: Update to 4.14.1.
Date: Fri, 28 Jul 2023 11:08:23 +0000
Message-ID: <3d4419719af956eac5e207468d8f19afccc16a62.1690541801.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1690541801.git.pukkamustard@HIDDEN>
References: <cover.1690541801.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..6ffde41cc0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:54 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 28 07:08:54 2023 Received: from localhost ([127.0.0.1]:43820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qPLL4-0008U0-Ah for submit <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pukkamustard@HIDDEN>) id 1qPLL1-0008Tj-Kf for 64249 <at> debbugs.gnu.org; Fri, 28 Jul 2023 07:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7664C240029 for <64249 <at> debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542525; bh=hSMamd2C6gqmZBYWHr2k2cdyMC4r3gBYQ4oBfhIJQ24=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=YJVJm8iHjnkayWSedESA6bETpcWuM2dW4mPTMmZP9kcOCQCqzy+Bd5Wl0EsWqbzoK YV2IwX5I+8cschrQtionCNx3AldnQI1RZPeW5rD22stSyJJSGNXRBx0S5UVyX0QzOc InGoAIyHo0Xv9ygfQqWp6gn7q951oSTtmBshgXteWKOARQC+rRqi10F1wj+wn1H5ij 6O4Iklr9RCEarMhAa4xQfGI9o0oZ3NrosJa5Pt01+xDWq/sYGQk2BAKofNm5EoayXu +5tCSzrVV41L8SrbhDLJHTTdnxRfYpnpBhFvXI/bfkyQf+ugHRWY0srZ0eBi2oJsnE D+pbRVdN7hROA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4d82bH1z6twS; Fri, 28 Jul 2023 13:08:44 +0200 (CEST) From: pukkamustard <pukkamustard@HIDDEN> To: 64249 <at> debbugs.gnu.org Subject: [PATCH ocaml-team v4 0/9] Date: Fri, 28 Jul 2023 11:08:22 +0000 Message-ID: <cover.1690541801.git.pukkamustard@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>, pukkamustard <pukkamustard@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard <pukkamustard@HIDDEN>, DABY-SEESARAM Arnaud <ds-ac@HIDDEN>, Julien Lepiller <julien@HIDDEN>, Josselin Poiret <dev@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello, This v4 fixes the previously broken Coq packages. As mentioned (https://issues.guix.gnu.org/64249#20) this merges coq-core and coq-stdlib into coq. It turns out that dune allows multiple package to be built at the same time by providing a comma-seperated list. Our #:package field can be fed such a comma-seperated list. With this trick only the 'install phase needs some tweaking. Eventually it would be nice to allow our #:package field to be a proper Scheme list. Some Coq packages need to be updated for 8.17.1 compatibility. I have not systematically checked all Coq packages. Let's see what CI says. opam is still broken. Very gracious if another pair of eyes could have a look. Thanks, pukkamustard pukkamustard (9): gnu: ocaml: Update to 4.14.1. gnu: Update coq-flocq to 4.1.1. gnu: Update coq-gappa to 1.5.3. gnu: Update coq-mathcomp to 1.17.0. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: opam: Split build into smaller sub-packages. gnu: Add opam-installer. FIXME: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 77 ++-- gnu/packages/ocaml.scm | 365 ++++++++++++------ .../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 - 7 files changed, 267 insertions(+), 398 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 24 Jul 2023 15:22:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 11:22:27 2023
Received: from localhost ([127.0.0.1]:43799 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNxOF-0002n2-CP
for submit <at> debbugs.gnu.org; Mon, 24 Jul 2023 11:22:27 -0400
Received: from lepiller.eu ([2a00:5884:8208::1]:49504)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <julien@HIDDEN>) id 1qNxOC-0002mm-7V
for 64249 <at> debbugs.gnu.org; Mon, 24 Jul 2023 11:22:26 -0400
Received: from lepiller.eu (localhost [127.0.0.1])
by lepiller.eu (OpenSMTPD) with ESMTP id 261af57a;
Mon, 24 Jul 2023 15:22:19 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from
:to:cc:subject:in-reply-to:references:message-id:mime-version
:content-type:content-transfer-encoding; s=dkim; bh=/fLOl++g9cn1
/h9gBvSdt9xq6ev1cKRA/bZAcUhtCnY=; b=Ryn2n4c0urGStDEDiQLxv2PZm8J2
W5W5zgT2IcVEb6Ev8QDLDdnORLHLB7NEhC6LzqPSS/A2/D15UMEpBgfgHkuyosKX
N6fIIR415Z7aoinKSL6bSt/FLxxvW3gyxSEIPt3Znx8IcJD14SyH7Jtd4+ZoQo59
/0NbZwQn2vdumFgycPiNJKN0toRjXZFbXtUYNwxI8vXSNAJCJajC9soXdnfLoEvK
z7THYhFqB02nbEoLL1Q9j5tFaY3j0sM3zV8rb3CZPjzm76hLQMtjaujZQWDsVVpq
y5mRo/YC5JWSW3+VWiSI91oDx9fIpdNjD4Egr1wP56UP7vBLtWpLKCmeEQ==
Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ab35c659
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Mon, 24 Jul 2023 15:22:19 +0000 (UTC)
Date: Mon, 24 Jul 2023 17:22:14 +0200
From: Julien Lepiller <julien@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1.
User-Agent: K-9 Mail for Android
In-Reply-To: <86sf9dny39.fsf@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
<858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@HIDDEN>
<20230719201843.31b30208@HIDDEN> <86sf9dny39.fsf@HIDDEN>
Message-ID: <7F0D4C89-4838-4C95-82FA-42A49E4119A9@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain;
charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: DABY-SEESARAM Arnaud <ds-ac@HIDDEN>, 64249 <at> debbugs.gnu.org,
Josselin Poiret <dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
I don't see how one would use coq-core without coq-stdlib and coq-stdlib de=
pends on coq-core, so I think it's fine to merge these packages=2E It might=
make the package definition a bit harder, since there isn't a single dune =
target, but I'm fine with it=2E
Le 24 juillet 2023 16:54:05 GMT+02:00, pukkamustard <pukkamustard@posteo=
=2Enet> a =C3=A9crit=C2=A0:
>
>Hi,
>
>Julien Lepiller <julien@lepiller=2Eeu> writes:
>
>> I'm not sure why, but this is breaking all coq dependents, with
>> messages similar to:
>>
>> cannot guess a path for Coq libraries; please use -coqlib option or
>> ensure you have installed the package containing Coq's stdlib
>> (coq-stdlib in OPAM) If you intend to use Coq without a standard
>> library, the -boot -noinit options must be used=2E
>>
>> I think this is because coq-stdlib is mostly empty for some reason=2E
>
>A couple of build failures later this is where I'm at:
>
>- Coq 8=2E17=2E1 includes considerable changes to the build system=2E
>
>- Some `dune` files are autogenerated with `make dunestrap` (which runs
> the OCaml program `tools/dune_rule_gen/gen_rules=2Eml`=2E
>
>- In the v3 patches I submitted `make dunestrap` was not being run,
> resulting in missing dune files and a quite empty `coq-stdlib`
> package=2E
>
>- The 8=2E17=2E1 generated dune files for `coq-stdlib` reference things i=
n
> `coq-core` directly with relative paths instead of letting
> dune/findlib find them (with entries in the `libraries` stanza in dune
> files)=2E This makes building `coq-core` and `coq-stdlib` seperately
> more tricky=2E
>
>I've asked in #coq for ideas on how `coq-stdlib` and `coq-core` can be
>built seperately/kept in separate packages=2E Nothing yet=2E
>
>What do you think about merging `coq-core`, `coq-stdlib` and `coq` into
>a single package? Not as nice as the current situation, but maybe a way
>to go without too many custom patches/hacks?
>
>CC: Arnaud and Josselin who might be interested in Coq stuff=2E
>
>Thanks,
>pukkamustard
>
>
>>> * gnu/packages/coq=2Escm (coq-core, coq-stdlib, coq): Update to 8=2E17=
=2E1
>>> and remove test-target argument=2E
>>> ---
>>> gnu/packages/coq=2Escm | 24 +++++-------------------
>>> 1 file changed, 5 insertions(+), 19 deletions(-)
>>>=20
>>> diff --git a/gnu/packages/coq=2Escm b/gnu/packages/coq=2Escm
>>> index 09ca4030ea=2E=2E3332707a71 100644
>>> --- a/gnu/packages/coq=2Escm
>>> +++ b/gnu/packages/coq=2Escm
>>> @@ -53,7 +53,7 @@ (define-module (gnu packages coq)
>>> (define-public coq-core
>>> (package
>>> (name "coq-core")
>>> - (version "8=2E16=2E1")
>>> + (version "8=2E17=2E1")
>>> (source
>>> (origin
>>> (method git-fetch)
>>> @@ -63,7 +63,7 @@ (define-public coq-core
>>> (file-name (git-file-name name version))
>>> (sha256
>>> (base32
>>> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
>>> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
>>> (patches (search-patches "coq-fix-envvars=2Epatch"))))
>>> (native-search-paths
>>> (list (search-path-specification
>>> @@ -83,8 +83,7 @@ (define-public coq-core
>>> (native-inputs
>>> (list ocaml-ounit2 which))
>>> (arguments
>>> - `(#:package "coq-core"
>>> - #:test-target "=2E"))
>>> + `(#:package "coq-core"))
>>> (properties '((upstream-name =2E "coq"))) ; also for inherited
>>> packages (home-page "https://coq=2Einria=2Efr")
>>> (synopsis "Proof assistant for higher-order logic")
>>> @@ -101,19 +100,7 @@ (define-public coq-stdlib
>>> (inherit coq-core)
>>> (name "coq-stdlib")
>>> (arguments
>>> - `(#:package "coq-stdlib"
>>> - #:test-target "=2E"
>>> - #:phases
>>> - (modify-phases %standard-phases
>>> - (add-before 'build 'fix-dune
>>> - (lambda _
>>> - (substitute* "user-contrib/Ltac2/dune"
>>> - (("coq-core=2Eplugins=2Eltac2")
>>> - (string-join
>>> - (map (lambda (plugin) (string-append
>>> "coq-core=2Eplugins=2E" plugin))
>>> - '("ltac2" "number_string_notation" "tauto"
>>> "cc"
>>> - "firstorder"))
>>> - " "))))))))
>>> + `(#:package "coq-stdlib"))
>>> (inputs
>>> (list coq-core gmp ocaml-zarith))
>>> (native-inputs '())))
>>> @@ -123,8 +110,7 @@ (define-public coq
>>> (inherit coq-core)
>>> (name "coq")
>>> (arguments
>>> - `(#:package "coq"
>>> - #:test-target "=2E"))
>>> + `(#:package "coq"))
>>> (propagated-inputs
>>> (list coq-core coq-stdlib))
>>> (native-inputs '())))
>
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 24 Jul 2023 15:11:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 11:11:50 2023
Received: from localhost ([127.0.0.1]:43788 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNxDx-0002Vo-JA
for submit <at> debbugs.gnu.org; Mon, 24 Jul 2023 11:11:50 -0400
Received: from mout01.posteo.de ([185.67.36.65]:44731)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qNxDu-0002VV-NB
for 64249 <at> debbugs.gnu.org; Mon, 24 Jul 2023 11:11:48 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 1E5B2240027
for <64249 <at> debbugs.gnu.org>; Mon, 24 Jul 2023 17:11:39 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1690211500; bh=b6GCDCO7oQe2jtYkdwe+DbC/J4j1kEzGyaRzEAbxfDw=;
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From;
b=rdLBVJF6v04WAJq5X3+ZeQcNShNSsZ0ZtaSEr7NZoMzMEXxOVwgwzjqumrxtWtSz5
XMpmT8/2Q0qIik2i/GLuHdsh3RjNAxEqzJApVmrAJ3k6aSKBD+u3kaAMM/6uBCP98i
ZHvFYInH7VniEGOV4N3MEdNFR6ZgylzemZcX8iOLR++FDkEgyXlTYrwEpj47jCfsZa
INKPOCwwuKKvF7MFAF3SvtC5k0HGsj2XjWvTEsVfIv0Suky4ylOhrVtA3H9l/wMTW5
N/Odm78TTNjqacUYtzG27HjpM56k3v/ioD9l3NOfFFICoVK/azb4n2OPcmuH470gm9
r/KijPnBnsSbQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R8kCG5Qqqz9s41;
Mon, 24 Jul 2023 17:11:38 +0200 (CEST)
References: <cover.1689682320.git.pukkamustard@HIDDEN>
<858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@HIDDEN>
<20230719201843.31b30208@HIDDEN>
From: pukkamustard <pukkamustard@HIDDEN>
To: Julien Lepiller <julien@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1.
Date: Mon, 24 Jul 2023 14:54:05 +0000
In-reply-to: <20230719201843.31b30208@HIDDEN>
Message-ID: <86sf9dny39.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: DABY-SEESARAM Arnaud <ds-ac@HIDDEN>, 64249 <at> debbugs.gnu.org,
Josselin Poiret <dev@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
Julien Lepiller <julien@HIDDEN> writes:
> I'm not sure why, but this is breaking all coq dependents, with
> messages similar to:
>
> cannot guess a path for Coq libraries; please use -coqlib option or
> ensure you have installed the package containing Coq's stdlib
> (coq-stdlib in OPAM) If you intend to use Coq without a standard
> library, the -boot -noinit options must be used.
>
> I think this is because coq-stdlib is mostly empty for some reason.
A couple of build failures later this is where I'm at:
- Coq 8.17.1 includes considerable changes to the build system.
- Some `dune` files are autogenerated with `make dunestrap` (which runs
the OCaml program `tools/dune_rule_gen/gen_rules.ml`.
- In the v3 patches I submitted `make dunestrap` was not being run,
resulting in missing dune files and a quite empty `coq-stdlib`
package.
- The 8.17.1 generated dune files for `coq-stdlib` reference things in
`coq-core` directly with relative paths instead of letting
dune/findlib find them (with entries in the `libraries` stanza in dune
files). This makes building `coq-core` and `coq-stdlib` seperately
more tricky.
I've asked in #coq for ideas on how `coq-stdlib` and `coq-core` can be
built seperately/kept in separate packages. Nothing yet.
What do you think about merging `coq-core`, `coq-stdlib` and `coq` into
a single package? Not as nice as the current situation, but maybe a way
to go without too many custom patches/hacks?
CC: Arnaud and Josselin who might be interested in Coq stuff.
Thanks,
pukkamustard
>> * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1
>> and remove test-target argument.
>> ---
>> gnu/packages/coq.scm | 24 +++++-------------------
>> 1 file changed, 5 insertions(+), 19 deletions(-)
>>
>> diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
>> index 09ca4030ea..3332707a71 100644
>> --- a/gnu/packages/coq.scm
>> +++ b/gnu/packages/coq.scm
>> @@ -53,7 +53,7 @@ (define-module (gnu packages coq)
>> (define-public coq-core
>> (package
>> (name "coq-core")
>> - (version "8.16.1")
>> + (version "8.17.1")
>> (source
>> (origin
>> (method git-fetch)
>> @@ -63,7 +63,7 @@ (define-public coq-core
>> (file-name (git-file-name name version))
>> (sha256
>> (base32
>> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
>> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
>> (patches (search-patches "coq-fix-envvars.patch"))))
>> (native-search-paths
>> (list (search-path-specification
>> @@ -83,8 +83,7 @@ (define-public coq-core
>> (native-inputs
>> (list ocaml-ounit2 which))
>> (arguments
>> - `(#:package "coq-core"
>> - #:test-target "."))
>> + `(#:package "coq-core"))
>> (properties '((upstream-name . "coq"))) ; also for inherited
>> packages (home-page "https://coq.inria.fr")
>> (synopsis "Proof assistant for higher-order logic")
>> @@ -101,19 +100,7 @@ (define-public coq-stdlib
>> (inherit coq-core)
>> (name "coq-stdlib")
>> (arguments
>> - `(#:package "coq-stdlib"
>> - #:test-target "."
>> - #:phases
>> - (modify-phases %standard-phases
>> - (add-before 'build 'fix-dune
>> - (lambda _
>> - (substitute* "user-contrib/Ltac2/dune"
>> - (("coq-core.plugins.ltac2")
>> - (string-join
>> - (map (lambda (plugin) (string-append
>> "coq-core.plugins." plugin))
>> - '("ltac2" "number_string_notation" "tauto"
>> "cc"
>> - "firstorder"))
>> - " "))))))))
>> + `(#:package "coq-stdlib"))
>> (inputs
>> (list coq-core gmp ocaml-zarith))
>> (native-inputs '())))
>> @@ -123,8 +110,7 @@ (define-public coq
>> (inherit coq-core)
>> (name "coq")
>> (arguments
>> - `(#:package "coq"
>> - #:test-target "."))
>> + `(#:package "coq"))
>> (propagated-inputs
>> (list coq-core coq-stdlib))
>> (native-inputs '())))
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 19 Jul 2023 18:19:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jul 19 14:19:00 2023
Received: from localhost ([127.0.0.1]:57108 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qMBlM-0005IU-Bw
for submit <at> debbugs.gnu.org; Wed, 19 Jul 2023 14:19:00 -0400
Received: from lepiller.eu ([89.234.186.109]:52016)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <julien@HIDDEN>) id 1qMBlJ-0005IK-AH
for 64249 <at> debbugs.gnu.org; Wed, 19 Jul 2023 14:18:59 -0400
Received: from lepiller.eu (localhost [127.0.0.1])
by lepiller.eu (OpenSMTPD) with ESMTP id fc8cfc7b;
Wed, 19 Jul 2023 18:18:52 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from
:to:cc:subject:message-id:in-reply-to:references:mime-version
:content-type:content-transfer-encoding; s=dkim; bh=I58ozrwourQm
ozdteuThirHVfymu3AHI0R1Non4iDjY=; b=ngTOvlj2RsztmRkc7xrAGo2fwSR/
o7tEWvqepjUPxMWBKO1RsQmgzLrjLpGYCSIlG0ALn1do0K3u3H0E1jwTL8GZ4fqc
1l2qim3a8nJgVRZM1fF5fFkY5RFJ8P63CARoO91ufyvfX9NvTPsqiHeez+heLF5f
u0m/kccidgkOkMMdbpKcNMhTR8oGhXJ3DWs27mzkBOPS+ugcEM0mweF6A23wbIRx
k/Xj/6HFMd9WI7hFrflbSO6mft2UukioYNoo4f1RVONVzsW7lKaKXchjuhDs5wAN
o4g43YDmMJZ9FaqmgekNZMCRW4DliV/QGZQXAdrLuKMp4Gu3YkMS3qIPYQ==
Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e5ee75b0
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Wed, 19 Jul 2023 18:18:52 +0000 (UTC)
Date: Wed, 19 Jul 2023 20:18:43 +0200
From: Julien Lepiller <julien@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>
Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1.
Message-ID: <20230719201843.31b30208@HIDDEN>
In-Reply-To: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
<858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: 64249 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
I'm not sure why, but this is breaking all coq dependents, with
messages similar to:
cannot guess a path for Coq libraries; please use -coqlib option or
ensure you have installed the package containing Coq's stdlib
(coq-stdlib in OPAM) If you intend to use Coq without a standard
library, the -boot -noinit options must be used.
I think this is because coq-stdlib is mostly empty for some reason.
Le Tue, 18 Jul 2023 12:23:59 +0000,
pukkamustard <pukkamustard@HIDDEN> a =C3=A9crit :
> * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1
> and remove test-target argument.
> ---
> gnu/packages/coq.scm | 24 +++++-------------------
> 1 file changed, 5 insertions(+), 19 deletions(-)
>=20
> diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
> index 09ca4030ea..3332707a71 100644
> --- a/gnu/packages/coq.scm
> +++ b/gnu/packages/coq.scm
> @@ -53,7 +53,7 @@ (define-module (gnu packages coq)
> (define-public coq-core
> (package
> (name "coq-core")
> - (version "8.16.1")
> + (version "8.17.1")
> (source
> (origin
> (method git-fetch)
> @@ -63,7 +63,7 @@ (define-public coq-core
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
> (patches (search-patches "coq-fix-envvars.patch"))))
> (native-search-paths
> (list (search-path-specification
> @@ -83,8 +83,7 @@ (define-public coq-core
> (native-inputs
> (list ocaml-ounit2 which))
> (arguments
> - `(#:package "coq-core"
> - #:test-target "."))
> + `(#:package "coq-core"))
> (properties '((upstream-name . "coq"))) ; also for inherited
> packages (home-page "https://coq.inria.fr")
> (synopsis "Proof assistant for higher-order logic")
> @@ -101,19 +100,7 @@ (define-public coq-stdlib
> (inherit coq-core)
> (name "coq-stdlib")
> (arguments
> - `(#:package "coq-stdlib"
> - #:test-target "."
> - #:phases
> - (modify-phases %standard-phases
> - (add-before 'build 'fix-dune
> - (lambda _
> - (substitute* "user-contrib/Ltac2/dune"
> - (("coq-core.plugins.ltac2")
> - (string-join
> - (map (lambda (plugin) (string-append
> "coq-core.plugins." plugin))
> - '("ltac2" "number_string_notation" "tauto"
> "cc"
> - "firstorder"))
> - " "))))))))
> + `(#:package "coq-stdlib"))
> (inputs
> (list coq-core gmp ocaml-zarith))
> (native-inputs '())))
> @@ -123,8 +110,7 @@ (define-public coq
> (inherit coq-core)
> (name "coq")
> (arguments
> - `(#:package "coq"
> - #:test-target "."))
> + `(#:package "coq"))
> (propagated-inputs
> (list coq-core coq-stdlib))
> (native-inputs '())))
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:25:13 2023
Received: from localhost ([127.0.0.1]:51916 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjlP-0002Mu-RA
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:25:13 -0400
Received: from mout02.posteo.de ([185.67.36.66]:47113)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjlH-0002Kt-Cq
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:25:10 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id D111F240101
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683097; bh=irzh3NitpBPjTzfbJVtxtfTswy2l3e6MBrFhBG7UN1Q=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=Uw+JrjR9LyXTYtQHfOKfq22nFO5rNwpQr5WOq4m1D6TWg23l6mV1UUqQRHgifRw1m
4OAhKF0gMXcr8QKvUQfdLQNmX7KAUeGxjva1s2DGOgAOZPVcNrLvH7gvPY7nV3i0Xo
O6PfPyqGcp1dsjAqoQRezYubx7M4+H4p1aa7jwuCKyBU4Fmap7hMvMGLAfcl3yDQr4
ydMPbtPJR8UgS1WoOgOVfHj9PwUMQw1809P9ZxMaS0FPssDRTJCQ4aJ2jiC2II4FMD
sEZOWcUaX/6sPlWpH2cg+jfZ+GX3SyWIGq+dx4yuiLKh/BRqn4MGD34IAFS7XCZ94R
yYUDECsErzwgw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynh64ZKz6txJ;
Tue, 18 Jul 2023 14:24:56 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 6/6] FIXME: gnu: opam: Update to 2.1.5.
Date: Tue, 18 Jul 2023 12:24:03 +0000
Message-Id: <038aa45a69fa8ec7870ef658bcf4ca809c23eee9.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam): Update to 2.1.5.
[native-inputs]: Add more test data.
(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 | 96 ++++++-------
.../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, 49 insertions(+), 270 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
diff --git a/gnu/local.mk b/gnu/local.mk
index 06a376a99a..f28baefdb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1646,10 +1646,6 @@ dist_patch_DATA = \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-xmlsec-compat.patch \
%D%/packages/patches/obs-modules-location.patch \
- %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
- %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
- %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
- %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-multiple-definitions.patch \
%D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \
%D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 90fedc2e88..badc898648 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -713,7 +713,7 @@ (define-public ocaml-mccs
(define-public ocaml-dose3
(package
(name "ocaml-dose3")
- (version "5.0.1")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -722,30 +722,17 @@ (define-public ocaml-dose3
(file-name (git-file-name name version))
(sha256
(base32
- "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
- (patches
- (search-patches
- "ocaml-dose3-add-unix-dependency.patch"
- "ocaml-dose3-Fix-for-ocaml-4.06.patch"
- "ocaml-dose3-dont-make-printconf.patch"
- "ocaml-dose3-Install-mli-cmx-etc.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:tests? #f ;the test suite requires python 2
- #:configure-flags
- ,#~(list (string-append "SHELL="
- #+(file-append (canonical-package bash-minimal)
- "/bin/sh")))
- #:make-flags
- ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))))
- (propagated-inputs
- (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
- (native-inputs
- (list perl
- ocaml-extlib
- ocamlbuild
- ocaml-cppo))
- (home-page "https://www.mancoosi.org/software/")
+ "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "dose3"))
+ (propagated-inputs (list ocaml-extlib
+ ocaml-base64-boot
+ ocaml-cudf
+ ocaml-graph
+ ocaml-re
+ ocaml-stdlib-shims))
+ (native-inputs (list ocaml-ounit))
+ (home-page "http://www.mancoosi.org/software/")
(synopsis "Package distribution management framework")
(description "Dose3 is a framework made of several OCaml libraries for
managing distribution packages and their dependencies. Though not tied to
@@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format
(define ocaml-opam-core
(package
(name "ocaml-opam-core")
- (version "2.1.3")
+ (version "2.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -858,7 +845,7 @@ (define ocaml-opam-core
(file-name (git-file-name name version))
(sha256
(base32
- "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
+ "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
(build-system dune-build-system)
(arguments `(#:package "opam-core"
;; tests are run with the opam package
@@ -1072,6 +1059,8 @@ (define-public opam
("which" ,which)
;; Data for tests
+ ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
"1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
@@ -1080,10 +1069,21 @@ (define-public opam
"0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
"1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
+ ("opam-repo-c1842d168d" ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8"
+ "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
- "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
+ "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
+ ("opam-repo-11ea1cb" ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
+ "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
+ ("opam-repo-297366c" ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
+ "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
+ ("opam-repo-3235916" ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa"
+ "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
+ ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
+ ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
+ "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw")))))
(inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
@@ -4443,8 +4443,7 @@ (define-public ocaml-base64
(base32
"068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))))
(build-system dune-build-system)
- (native-inputs
- (list ocaml-alcotest ocaml-bos ocaml-rresult))
+ (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
(home-page "https://github.com/mirage/ocaml-base64")
(synopsis "Base64 encoding for OCaml")
@@ -4453,6 +4452,14 @@ (define-public ocaml-base64
radix-64 representation. It is specified in RFC 4648.")
(license license:isc)))
+;; A variant without tests that is used to prevent a cyclic dependency when
+;; compiling ocaml-dose3.
+(define ocaml-base64-boot
+ (package
+ (inherit ocaml-base64)
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ocaml4.07-base64
(package-with-ocaml4.07
(package
@@ -5325,27 +5332,22 @@ (define-public ocaml4.07-uuidm
(define-public ocaml-graph
(package
(name "ocaml-graph")
- (version "1.8.8")
+ (home-page "https://github.com/backtracking/ocamlgraph/")
+ (version "2.0.0")
(source (origin
- (method url-fetch)
- (uri (string-append "http://ocamlgraph.lri.fr/download/"
- "ocamlgraph-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:install-target "install-findlib"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL"
- (search-input-file inputs "/bin/sh")))))))
- (inputs (list lablgtk))
+ "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "ocamlgraph"))
+ (propagated-inputs (list ocaml-stdlib-shims))
+ (native-inputs (list ocaml-graphics))
(properties `((upstream-name . "ocamlgraph")))
- (home-page "https://ocamlgraph.lri.fr/")
(synopsis "Graph library for OCaml")
(description "OCamlgraph is a generic graph library for OCaml.")
(license license:lgpl2.1)))
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
deleted file mode 100644
index 2c344af821..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Sat, 2 Dec 2017 12:51:01 +0100
-Subject: [PATCH] Fix for ocaml 4.06
-
----
- common/criteria_lexer.mll | 8 ++++----
- common/util.ml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
-index 71f9178..fc4eae3 100644
---- a/common/criteria_lexer.mll
-+++ b/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
- let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
- (* find the terminating delimiter *)
- let endpos =
-- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
- |Invalid_argument _ ->
- raise (Format822.Syntax_error (
- Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
- Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
- in
- let len = endpos - (lexbuf.lex_start_pos + 3) in
-- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-- s
-+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+ Bytes.to_string s
-
- }
-
-diff --git a/common/util.ml b/common/util.ml
-index 598f266..36ca3d1 100644
---- a/common/util.ml
-+++ b/common/util.ml
-@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
- let clean label =
- try
- let s = Filename.chop_extension (Filename.basename label) in
-- String.capitalize s
-+ String.capitalize_ascii s
- with Invalid_argument _ -> label
-
- let create ?(enabled=false) label =
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
deleted file mode 100644
index 41494e7b3c..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Thu, 2 Mar 2017 12:19:56 +0100
-Subject: [PATCH] Install mli, cmx, etc.
-
----
- Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 09464ff..5044d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
- @for i in _build/cudf/cudf.*; do \
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
-+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
- fi ; \
- done
-
-@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ;\
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
-+ rm -f $(DOSELIBS)/*.mlpack ;\
- fi ; \
- done
-
-@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
--#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
-+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
- INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
-
- exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
deleted file mode 100644
index d2cc44c784..0000000000
--- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Tue, 6 Feb 2018 10:15:45 +0100
-Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
-
----
- META.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META.in b/META.in
-index aa2cd8d..0f9d337 100644
---- a/META.in
-+++ b/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
-
- package "algo" (
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
deleted file mode 100644
index 84b6a3b81b..0000000000
--- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
--make printconf
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:25:03 2023
Received: from localhost ([127.0.0.1]:51895 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjlG-0002LR-AW
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:25:03 -0400
Received: from mout01.posteo.de ([185.67.36.65]:55623)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjlD-0002Kb-PX
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:25:01 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 3F23B240027
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:54 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683094; bh=3CEtR37R50aLzKWg7206Cum8u8tjLG3CUbWnf2VaZro=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=YHKO7wXEKdjRlw2w31rvnXnyN8XxPX4g4qhlq0hvLJIl1RsnlOPecPB1Lor9QKKWC
wQrADlvQz8Gc/caisuoU+KrjZGosRupglyHsi3ZIKFpxrjjorMKJa3rkaFbZynKISN
GXy6NGw8ucw/wpdigNOIWbg4eNxFQQwYmH/t1Vk/9AZgaSn1aLNjH4XfaMAUuZXbpm
7hmyaXiw5Rw58UC8LcTJE5WioX7KHFYgToYtqsljUR5TeNPMQ4Cj3M93T+4E9mrybP
bbYX/98ZZGPekbVfIXKAGpYKzcUI+bX/4kh9NNTHBjj1s9Hw0qlGZalby5JpVJLi9d
C9FXBnNk1w4Mw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynd4MjPz6tvn;
Tue, 18 Jul 2023 14:24:53 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 5/6] gnu: Add opam-installer.
Date: Tue, 18 Jul 2023 12:24:02 +0000
Message-Id: <829d10a062184b49e0ce970e4c800e72d5415833.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam-installer): New variable.
(ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt,
ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos,
ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime,
ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg,
ocaml-afl-persistent) [native-inputs]: Replace opam with opam-installer.
---
gnu/packages/ocaml.scm | 90 ++++++++++++++++++++++++++----------------
1 file changed, 55 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0d78f4d864..90fedc2e88 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -780,7 +780,7 @@ (define-public ocaml-down
,#~(list "build" "--lib-dir"
(string-append #$output "/lib/ocaml/site-lib"))))
(native-inputs
- (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/down")
(synopsis "OCaml toplevel (REPL) upgrade")
(description "Down is an unintrusive user experience upgrade for the
@@ -901,6 +901,27 @@ (define ocaml-opam-format
#:tests? #f
#:phases %standard-phases))))
+(define-public opam-installer
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam-installer")
+ (native-inputs (list ocaml-opam-format
+ ocaml-cmdliner))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments `(#:package "opam-installer"
+ ;; requires all of opam
+ #:tests? #f))
+ (synopsis "Tool for installing OCaml packages")
+ (description "@var{opam-installer} is a tool for installing OCaml packages
+based on @code{.install} files defined by the OPAM package manager. It is
+useful for installing OCaml packages without requiring the entirety of
+OPAM.")
+ (properties
+ ;; opam-installer is used as a tool and not as a library, we can use the
+ ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0.
+ `((ocaml5.0-variant . ,(delay opam-installer))))))
+
(define ocaml-opam-repository
(package
(inherit ocaml-opam-core)
@@ -2325,7 +2346,7 @@ (define-public ocaml-topkg
"11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("result" ,ocaml-result)))
(arguments
@@ -2355,7 +2376,7 @@ (define-public ocaml-rresult
"0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi"))))
(build-system ocaml-build-system)
(native-inputs
- (list opam ocamlbuild))
+ (list opam-installer ocamlbuild))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2470,7 +2491,7 @@ (define-public ocaml-mtime
"1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)))
(arguments
@@ -2600,13 +2621,13 @@ (define-public ocaml-fmt
"0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
- `(("cmdliner" ,ocaml-cmdliner)
- ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)
- ("ocaml-uchar" ,ocaml-uchar)))
+ (list ocaml-cmdliner
+ ocaml-stdlib-shims
+ ocaml-uchar))
(arguments `(#:tests? #f
#:build-flags (list "build" "--with-base-unix" "true"
"--with-cmdliner" "true")
@@ -2647,9 +2668,9 @@ (define-public ocaml-astring
"1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"))))
(build-system ocaml-build-system)
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2869,7 +2890,7 @@ (define-public ocaml-react
"16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4"))))
(build-system ocaml-build-system)
(native-inputs
- (list ocamlbuild opam ocaml-topkg))
+ (list ocamlbuild opam-installer ocaml-topkg))
(arguments
`(#:tests? #f
#:build-flags (list "build")
@@ -2993,7 +3014,7 @@ (define-public ocaml-hmap
#:phases
(modify-phases %standard-phases
(delete 'configure))))
- (native-inputs (list ocaml-topkg ocamlbuild opam))
+ (native-inputs (list ocaml-topkg ocamlbuild opam-installer))
(home-page "https://erratique.ch/software/hmap")
(synopsis "Heterogeneous value maps for OCaml")
(description
@@ -3455,7 +3476,7 @@ (define-public ocaml-logs
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("fmt" ,ocaml-fmt)
("lwt" ,ocaml-lwt)
@@ -3489,7 +3510,7 @@ (define-public ocaml-fpath
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)))
@@ -3519,7 +3540,7 @@ (define-public ocaml-bos
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("topkg" ,ocaml-topkg)
("astring" ,ocaml-astring)
@@ -3593,7 +3614,7 @@ (define-public ocaml-xmlm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-topkg opam))
+ (list ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/xmlm")
(synopsis "Streaming XML codec for OCaml")
(description "Xmlm is a streaming codec to decode and encode the XML data
@@ -3734,7 +3755,7 @@ (define-public ocaml-uchar
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(home-page "https://github.com/ocaml/uchar")
(synopsis "Compatibility library for OCaml's Uchar module")
(description "The uchar package provides a compatibility library for the
@@ -3760,9 +3781,9 @@ (define-public ocaml-uutf
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uchar" ,ocaml-uchar)
("cmdliner" ,ocaml-cmdliner)))
@@ -3807,7 +3828,7 @@ (define-public ocaml-uunf
#t)))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
+ ("opam-installer" ,opam-installer)
("topkg" ,ocaml-topkg)
;; Test data is otherwise downloaded with curl
("NormalizationTest.txt"
@@ -3848,9 +3869,9 @@ (define-public ocaml-jsonm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- `(("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)
- ("topkg" ,ocaml-topkg)))
+ (list ocamlbuild
+ opam-installer
+ ocaml-topkg))
(propagated-inputs
`(("uutf" ,ocaml-uutf)
("cmdliner" ,ocaml-cmdliner)))
@@ -4268,7 +4289,7 @@ (define-public ocaml-ptime
#:phases (modify-phases %standard-phases
(delete 'configure))))
(propagated-inputs (list ocaml-result js-of-ocaml))
- (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam))
+ (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer))
(home-page "https://erratique.ch/software/ptime")
(synopsis "POSIX time for OCaml")
(description
@@ -5275,7 +5296,7 @@ (define-public ocaml-uuidm
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild opam))
+ (list ocamlbuild opam-installer))
(propagated-inputs
`(("cmdliner" ,ocaml-cmdliner)
("topkg" ,ocaml-topkg)))
@@ -5921,7 +5942,7 @@ (define-public ocaml-tsdl
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list ocamlbuild ocaml-astring opam pkg-config))
+ (list ocamlbuild ocaml-astring opam-installer pkg-config))
(inputs
`(("topkg" ,ocaml-topkg)
("sdl2" ,sdl2)
@@ -9641,7 +9662,7 @@ (define-public ocaml-uucd
(propagated-inputs
(list ocaml-xmlm))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uucd")
(synopsis "Unicode character database decoder for OCaml")
(description "Uucd is an OCaml module to decode the data of the Unicode
@@ -9669,7 +9690,7 @@ (define-public ocaml-uucp
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs
- (list opam
+ (list opam-installer
ocaml-findlib
ocamlbuild
ocaml-topkg
@@ -9703,7 +9724,7 @@ (define-public ocaml-uuseg
(propagated-inputs
(list ocaml-uucp ocaml-uutf ocaml-cmdliner))
(native-inputs
- (list opam ocaml-findlib ocamlbuild ocaml-topkg))
+ (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg))
(home-page "https://erratique.ch/software/uuseg")
(synopsis "Unicode text segmentation for OCaml")
(description "Uuseg is an OCaml library for segmenting Unicode text. It
@@ -10164,8 +10185,7 @@ (define-public ocaml-afl-persistent
(invoke "./build.sh")))
;; XXX: The tests are already run in the build.sh script.
(delete 'check))))
- (native-inputs
- `(("opam" ,opam)))
+ (native-inputs (list opam-installer))
(home-page "https://github.com/stedolan/ocaml-afl-persistent")
(synopsis "Use afl-fuzz in persistent mode")
(description
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:25:02 2023
Received: from localhost ([127.0.0.1]:51892 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjlB-0002Kr-MR
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:25:02 -0400
Received: from mout01.posteo.de ([185.67.36.65]:46633)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjl9-0002KI-KE
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:56 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 1527E240028
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:50 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683090; bh=AE6egnh9p8KeIR9WngIaz7Ysnw6bAepv2pqQJjccwiA=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=VNP14kNGWWEu/lrs0ZjWkgOcMS/naK3MdMm9E76psTMDDmnBpVdviWtw2c4vErCqb
Y6kS4OY+r048NOIl/R5Zjw+ds7zxstPfKpgg7afGhJVtSK8YQVv5O1qKL7rUc+liKQ
BlQPEXhuVj26yU8ogRgO6dTqaD3kdC4cVscpVDRd6eeQu7mlIwjQ5J5wPehc2XAjvI
VjUKcPRdTHKU2vjGUaoWBbS1Z3KYnemm7aF7n0INz2C3CmW++IhOK6FEcrz4b9GtMo
kPkNG1rQpf728JZj735/4Hm5jU88VxJ/v3ijDmjr3WE6o4MB9N7D4uM70h0sdHQbij
b2ArpMlReQqRw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynY3YCwz6tyb;
Tue, 18 Jul 2023 14:24:49 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 4/6] gnu: opam: Split build into smaller
sub-packages.
Date: Tue, 18 Jul 2023 12:24:01 +0000
Message-Id: <db6b0fdfb6b8c488d849f52bdf0fbe791c8a0475.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages.
---
gnu/packages/ocaml.scm | 164 +++++++++++++++++++++++++++++++----------
1 file changed, 125 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d2bc7cc118..0d78f4d864 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format
;; With static-linking exception
(license license:lgpl2.1+)))
-(define-public opam
+(define ocaml-opam-core
(package
- (name "opam")
+ (name "ocaml-opam-core")
(version "2.1.3")
(source (origin
(method git-fetch)
@@ -860,32 +860,129 @@ (define-public opam
(base32
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
+ (arguments `(#:package "opam-core"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash"))
+ (bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/core/opamSystem.ml"
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\""))
+ (("getconf")
+ (which "getconf")))))))))
+ (propagated-inputs
+ (list ocaml-graph
+ ocaml-re
+ ocaml-cppo))
+ (inputs (list bubblewrap))
+ (home-page "https://opam.ocamlpro.com/")
+ (synopsis "Package manager for OCaml")
+ (description
+ "OPAM is a tool to manage OCaml packages. It supports multiple
+simultaneous compiler installations, flexible package constraints, and a
+Git-friendly development workflow.")
+ ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
+ (license license:lgpl3)))
+
+(define ocaml-opam-format
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-format")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-core
+ ocaml-opam-file-format
+ ocaml-re))
+ (arguments `(#:package "opam-format"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-repository
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-repository")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format))
+ (arguments `(#:package "opam-repository"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-state
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-state")
+ (arguments `(#:package "opam-state"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ ;; Use bwrap from the store directly.
+ (substitute* "src/state/shellscripts/bwrap.sh"
+ (("-v bwrap") (string-append "-v " bwrap))
+ (("exec bwrap") (string-append "exec " bwrap))
+ ;; Mount /gnu and /run/current-system in the
+ ;; isolated environment when building with opam.
+ ;; This is necessary for packages to find external
+ ;; dependencies, such as a C compiler, make, etc...
+ (("^add_sys_mounts /usr")
+ (string-append "add_sys_mounts "
+ (%store-directory)
+ " /run/current-system /usr")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs (list ocaml-opam-repository))))
+
+(define ocaml-opam-solver
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-solver")
+ (inputs '())
+ (propagated-inputs (list ocaml-opam-format
+ ocaml-mccs
+ ocaml-dose3))
+ (arguments `(#:package "opam-solver"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases %standard-phases))))
+
+(define ocaml-opam-client
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-client")
+ (arguments `(#:package "opam-client"
+ ;; tests are run with the opam package
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/client/opamInitDefaults.ml"
+ (("\"bwrap\"") (string-append "\"" bwrap "\"")))))))))
+ (inputs (list bubblewrap))
+ (propagated-inputs
+ (list ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-opam-repository
+ ocaml-re
+ ocaml-cmdliner))))
+
+(define-public opam
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam")
+ (build-system dune-build-system)
(arguments
- `(#:phases
+ `(#:package "opam"
+ #:phases
(modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda* (#:key inputs make-flags #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash"))
- (bwrap (search-input-file inputs "/bin/bwrap")))
- (substitute* "src/core/opamSystem.ml"
- (("\"/bin/sh\"")
- (string-append "\"" bash "/bin/sh\""))
- (("getconf")
- (which "getconf")))
- ;; Use bwrap from the store directly.
- (substitute* "src/state/shellscripts/bwrap.sh"
- (("-v bwrap") (string-append "-v " bwrap))
- (("exec bwrap") (string-append "exec " bwrap))
- ;; Mount /gnu and /run/current-system in the
- ;; isolated environment when building with opam.
- ;; This is necessary for packages to find external
- ;; dependencies, such as a C compiler, make, etc...
- (("^add_sys_mounts /usr")
- (string-append "add_sys_mounts "
- (%store-directory)
- " /run/current-system /usr")))
- (substitute* "src/client/opamInitDefaults.ml"
- (("\"bwrap\"") (string-append "\"" bwrap "\""))))))
(add-before 'check 'prepare-checks
(lambda* (#:key inputs #:allow-other-keys)
;; Opam tests need to run an isolated environment from a writable
@@ -966,22 +1063,11 @@ (define-public opam
"0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
"0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
- (inputs
- (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3
- ocaml-mccs ocaml-opam-file-format ocaml-re))
+ (inputs (list ocaml-opam-client))
(properties
;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
;; compiled opam until opam is compatible with OCaml 5.0.
- `((ocaml5.0-variant . ,(delay opam))))
- (home-page "https://opam.ocamlpro.com/")
- (synopsis "Package manager for OCaml")
- (description
- "OPAM is a tool to manage OCaml packages. It supports multiple
-simultaneous compiler installations, flexible package constraints, and a
-Git-friendly development workflow.")
-
- ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
- (license license:lgpl3)))
+ `((ocaml5.0-variant . ,(delay opam))))))
(define-public ocaml-opam-monorepo
(package
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:24:54 2023
Received: from localhost ([127.0.0.1]:51889 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjl8-0002KY-7E
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:54 -0400
Received: from mout01.posteo.de ([185.67.36.65]:55043)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjl6-0002K9-4T
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:52 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 790AB240029
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:46 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683086; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=azy+1uQcBAevcbfFoJeiwIc/7uMIidL8ppP3CwjMdE9NM92XFKImxSEQ+W3tZZn9R
poKS46Snob2iONJicO38F3MHR33GofFi+KcRs9zepI0gzPOZdthE4CUdhHJAxfg/cl
oOmo0ArAFcp70GHD5hxKrLDs/3N+ktpLBAKcPe3RjG3Nyag/wcbhotWpBBXshSlrDx
xRkV+rfQMZ7KcP+nzyHTGaoV0Y1ru/FoWWE92glJUTAlSeKEmgNh2KqBxDfagHh3rT
y0lGfELJIgCGBlncpXKp3vc9yjv978tc3z0l1Lc8z75MuyhuWq7/7IrxrbLaIKuVmm
CfLUy4nD8Rivw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynT0gSmz6tyc;
Tue, 18 Jul 2023 14:24:45 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 3/6] gnu: dune-bootstrap: Update to 3.9.1.
Date: Tue, 18 Jul 2023 12:24:00 +0000
Message-Id: <78010b3f2b18cb49d9742777ec9ba79b15d137cc.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6ffde41cc0..d2bc7cc118 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1819,7 +1819,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1828,7 +1828,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1845,9 +1845,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:24:51 2023
Received: from localhost ([127.0.0.1]:51886 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjl4-0002KJ-Qg
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:51 -0400
Received: from mout01.posteo.de ([185.67.36.65]:54193)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjl2-0002Jx-JE
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:49 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 0DB16240027
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:43 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683083; bh=UaEQVNH8CpU+ilH6DM8veOcIBQz7pq0KN7sbcKxPb00=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=V0KmjmWZNS2E9AsnYjuCVlQlObWlnnRSgQJqg38u7q/VbWuqMBSZ0AVpHWpM/s1/8
ho5yWkf4+FTpADBhT5z500KJO9JMkOhecRIeR+kr2x+TNRiAMcV/K2jga1bJg75IFv
yfqZTXreHWpz2BY6SfPkCbqJ2Xy7O4BusPk0lbVncm8YH5GaXaxirAUX75nUyEjtiD
xyP8FlwkWhKJ/ODED46+c2LpJTQugn+u8BdxoMr8UsZ6UTnxY8P2h9P/ypNNNa6dDs
Av/tY8LeGWkDiFBHBPn34gnwo4koZxiUzosyD6K1EQvHpBVpJZZTTY/SQsUPeKJuTr
nYr/zwEHGAUwg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynQ29f9z6txZ;
Tue, 18 Jul 2023 14:24:42 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1.
Date: Tue, 18 Jul 2023 12:23:59 +0000
Message-Id: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 and
remove test-target argument.
---
gnu/packages/coq.scm | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 09ca4030ea..3332707a71 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -53,7 +53,7 @@ (define-module (gnu packages coq)
(define-public coq-core
(package
(name "coq-core")
- (version "8.16.1")
+ (version "8.17.1")
(source
(origin
(method git-fetch)
@@ -63,7 +63,7 @@ (define-public coq-core
(file-name (git-file-name name version))
(sha256
(base32
- "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
(patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths
(list (search-path-specification
@@ -83,8 +83,7 @@ (define-public coq-core
(native-inputs
(list ocaml-ounit2 which))
(arguments
- `(#:package "coq-core"
- #:test-target "."))
+ `(#:package "coq-core"))
(properties '((upstream-name . "coq"))) ; also for inherited packages
(home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic")
@@ -101,19 +100,7 @@ (define-public coq-stdlib
(inherit coq-core)
(name "coq-stdlib")
(arguments
- `(#:package "coq-stdlib"
- #:test-target "."
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-dune
- (lambda _
- (substitute* "user-contrib/Ltac2/dune"
- (("coq-core.plugins.ltac2")
- (string-join
- (map (lambda (plugin) (string-append "coq-core.plugins." plugin))
- '("ltac2" "number_string_notation" "tauto" "cc"
- "firstorder"))
- " "))))))))
+ `(#:package "coq-stdlib"))
(inputs
(list coq-core gmp ocaml-zarith))
(native-inputs '())))
@@ -123,8 +110,7 @@ (define-public coq
(inherit coq-core)
(name "coq")
(arguments
- `(#:package "coq"
- #:test-target "."))
+ `(#:package "coq"))
(propagated-inputs
(list coq-core coq-stdlib))
(native-inputs '())))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:24:43 2023
Received: from localhost ([127.0.0.1]:51883 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qLjkx-0002Jz-IK
for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:43 -0400
Received: from mout01.posteo.de ([185.67.36.65]:58351)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qLjkw-0002Jh-0S
for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:42 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 4AEFC240029
for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:36 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689683076; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=Jo5c6QO3v+rucooxXNVQy5n/lsJZs8KFPOOz3evYsPF2yY/hZVBdPOQ0DhrCHrPXm
ysVoyo1eRKkpPUm4P1FMAShPPOSi6eNY2Ec+FzYaKHzPgNHR/JdJ7TA8Y4o/z1f5+v
fRJ+t/9z0XxzT450kqR96P3DqSnFOeinfc1RLyJfC+1cZfesisPpM8go0B+bPLmABn
jXI0DgyH4vS1mnPcjz4T6aGdLVsAX1ybBgqqoQiqZLNYl/Sk5r6fscBdqt2OCUGmxu
DXPmIwErrdLAMgWTTT3DDeMPdRnogduSeBvqjJDuUZgbcYeofjZlnxBjCqXMd+eLU2
jTD7KLAlw5vKg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R4ynD399lz6txZ;
Tue, 18 Jul 2023 14:24:32 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v3 1/6] gnu: ocaml: Update to 4.14.1.
Date: Tue, 18 Jul 2023 12:23:58 +0000
Message-Id: <3d4419719af956eac5e207468d8f19afccc16a62.1689682321.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689682320.git.pukkamustard@HIDDEN>
References: <cover.1689682320.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..6ffde41cc0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:24:35 2023 Received: from localhost ([127.0.0.1]:51880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qLjkp-0002JY-50 for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:35 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pukkamustard@HIDDEN>) id 1qLjkm-0002JG-Vg for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:24:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 063F1240104 for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683067; bh=ICBBMpdvYO0eb2W6YBh6EpgEdaSnXnczwwzgmZJB3e0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=fOldRjjQGCHBO8pF8M8ohuiBhuZCZDfuujbtKYHqz1JcdCx1xBAoq2vW/OrdadR7s 6l0uFsTxw1kSi0pnGwEfxtlyPzwTEynGrOJoz/fHP7Xbiw19vzXHnL/AHEuZbq2RJ6 pa4XQAEY2VM1ZpHlzCDTZc9GgatSjJdWJ1e2yvxFqnWTUFAkdJEYGY41ZDHToFn2fs 7dYAdQCPeKNWT6QZZXkgVG/9If2WjhB5VHM4wGF55hSablNskDGYHsLdsl/jg3msel ldx6zBtGdOrVB6eE4/hleP+vuYKUJ3XnggOyhPJxwejWG5b59d4g6li/NcN1BbUMa7 keq60/kGqfC6g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4yn60f4Dz6twc; Tue, 18 Jul 2023 14:24:26 +0200 (CEST) From: pukkamustard <pukkamustard@HIDDEN> To: 64249 <at> debbugs.gnu.org Subject: [PATCH ocaml-team v3 0/6] Update and break opam (but nothing else) Date: Tue, 18 Jul 2023 12:23:57 +0000 Message-Id: <cover.1689682320.git.pukkamustard@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>, pukkamustard <pukkamustard@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard <pukkamustard@HIDDEN>, ludo@HIDDEN, julien@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello! Some changes versus v2: - opam is split into smaller builds before updating. The size of the new opam package decreases from ~600MiB to ~80MiB (mostly as the OCaml compiler is no longer referenced). - We add the `opam-installer` package. This can be used by packages that require opam for installation (e.g. ocaml-react or ocaml-jsonm). There are no more packages that require opam as build dependency. - Update `opam` to 2.1.5 as last step. This still breaks the build of `opam`, but nothing else as `opam-installer` builds at version 2.1.5. -pukkamustard pukkamustard (6): gnu: ocaml: Update to 4.14.1. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: opam: Split build into smaller sub-packages. gnu: Add opam-installer. FIXME: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 24 +- gnu/packages/ocaml.scm | 365 ++++++++++++------ .../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 - 7 files changed, 242 insertions(+), 370 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:11:31 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 08:11:31 2023 Received: from localhost ([127.0.0.1]:51850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qLjYB-0001xI-1Z for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:11:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pukkamustard@HIDDEN>) id 1qLjY6-0001x3-QW for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 08:11:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D6C4D240027 for <64249 <at> debbugs.gnu.org>; Tue, 18 Jul 2023 14:11:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689682280; bh=fcGbT0HytL6EXhuIFIyriaiQe6cMNI4dH++kSy+M5aQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hJ0/MItEjC+TLuAU3hH6bZBlt9U9DWgGHl+d4gEbvbiW0wpA6PsiP8KPABh32+HG+ wPnq+nT61tjXwdKOLfJRNJdEzTdWO/4oNmjd3eQ1aeSOM2UEBfLfay20qZYZE2Mhx8 rmpWVxcirfFL9r2xWktjRDgOyhcArfGwkL+L1fcMX93OTZqWprt9b7AVLt1srnvG36 BvOKKYrsAjWseTJebvUZ2rbbLZs6wc2fMkO/oaTc9xg+YWmg4Uv4oz8OLLfoxCCseb naQkvdqO4MJzCKPw/iZIiVbL3SsCLgJXSzBd+QMUNT/qD9ADySLzHyJcL34jofiR16 /5YgUWZfPBerw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4yTr2hVmz9rxm; Tue, 18 Jul 2023 14:11:12 +0200 (CEST) References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN> <cover.1689442089.git.pukkamustard@HIDDEN> <877cqxl9xf.fsf_-_@HIDDEN> From: pukkamustard <pukkamustard@HIDDEN> To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. Date: Tue, 18 Jul 2023 12:05:15 +0000 In-reply-to: <877cqxl9xf.fsf_-_@HIDDEN> Message-ID: <86sf9lju74.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249 <at> debbugs.gnu.org, Julien Lepiller <julien@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hm, weird. I'm pretty sure this was not the case in my local checkout. In any case, I have a v3 ready that solves some issues - and should be cyclic dependency free. Will send it in asap. Thanks for having a look! -pukkamustard Ludovic Court=C3=A8s <ludo@HIDDEN> writes: > Hello! > > pukkamustard <pukkamustard@HIDDEN> skribis: > >> This is a WIP v2 for some updates to the OCaml packages.=20 > > There=E2=80=99s a cyclic dependency in here: > > (exception %exception (non-self-quoting 140736850154944 "#<&packag= e-cyclic-dependency-error package: #<package ocaml4.07-alcotest@HIDDEN gn= u/packages/ocaml.scm:2838 7fffde9308f0> cycle: (#<package ocaml4.07-b= ase64@HIDDEN gnu/packages/ocaml.scm:4565 7fffde93f2c0> #<package ocaml= 4.07-dose3@HIDDEN gnu/packages/ocaml.scm:714 7fffde2bb6e0> #<package o= caml4.07-opam-solver@HIDDEN gnu/packages/ocaml.scm:897 7fffde2aff20> #<= ;package ocaml4.07-opam-client@HIDDEN gnu/packages/ocaml.scm:909 7fffde2a721= 0> #<package ocaml4.07-opam@HIDDEN gnu/packages/ocaml.scm:925 7fffde2a= 74d0> #<package ocaml4.07-astring@HIDDEN gnu/packages/ocaml.scm:2759 7= fffde2a7b00> #<package ocaml4.07-alcotest@HIDDEN gnu/packages/ocaml.sc= m:2838 7fffde9308f0>)>")) > builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cac= he.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrnyk799y2bxx= w51by75-guix-package-cache' > @ build-failed /gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-c= ache.drv - 1 builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-= package-cache.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkr= nyk799y2bxxw51by75-guix-package-cache' > > Via <https://qa.guix.gnu.org/issue/64249>. > > Could you take a look and submit an updated version? > > Ludo=E2=80=99.
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 11:46:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 18 07:46:16 2023 Received: from localhost ([127.0.0.1]:51789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qLj9k-0001Ax-Bu for submit <at> debbugs.gnu.org; Tue, 18 Jul 2023 07:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qLj9h-0001Ag-2B for 64249 <at> debbugs.gnu.org; Tue, 18 Jul 2023 07:46:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qLj9a-0005iA-2k; Tue, 18 Jul 2023 07:46:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=W12C1d66BPbSOYJMU2OKF8eKV15RhTIvtJcggIN7K80=; b=NjJ32rjDX5M473ka8K47 pwafSU1vi5mEkqrhs4GW+yZdY1EG+cgMpD0T8jVlbCOXtaNZo0op43FvbmxVXCWsQoGDrryXbtNbl ISF0JcNAHcXHvDy+9ObksYDCOKuUt+Llh13xjeHuXjsyM/B7heOyFaRSOCvxed7Gd4mlrcKxcmLv1 NLIxHhSnujl9zU0X5CZm04vV0KWwbX/dSAhNGQ69BBxy5qt2xCLJ6Gkh9hsHpTIVWDSvW1epfAVY+ tRNkdxk0GZxbiw2hV8U4WvhGF9zCcUh13K6PAYhQ9vZZaDDtOcJi1vyDLc3b6C1q9me+9HDaVOy7P JKQESeNOaSVehQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qLj9Z-0006K1-Lu; Tue, 18 Jul 2023 07:46:05 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: pukkamustard <pukkamustard@HIDDEN> Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN> <cover.1689442089.git.pukkamustard@HIDDEN> Date: Tue, 18 Jul 2023 13:46:04 +0200 In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN> (pukkamustard@HIDDEN's message of "Sat, 15 Jul 2023 17:38:27 +0000") Message-ID: <877cqxl9xf.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249 <at> debbugs.gnu.org, Julien Lepiller <julien@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello! pukkamustard <pukkamustard@HIDDEN> skribis: > This is a WIP v2 for some updates to the OCaml packages.=20 There=E2=80=99s a cyclic dependency in here: --8<---------------cut here---------------start------------->8--- (exception %exception (non-self-quoting 140736850154944 "#<&package-= cyclic-dependency-error package: #<package ocaml4.07-alcotest@HIDDEN gnu/= packages/ocaml.scm:2838 7fffde9308f0> cycle: (#<package ocaml4.07-bas= e64@HIDDEN gnu/packages/ocaml.scm:4565 7fffde93f2c0> #<package ocaml4.= 07-dose3@HIDDEN gnu/packages/ocaml.scm:714 7fffde2bb6e0> #<package oca= ml4.07-opam-solver@HIDDEN gnu/packages/ocaml.scm:897 7fffde2aff20> #<p= ackage ocaml4.07-opam-client@HIDDEN gnu/packages/ocaml.scm:909 7fffde2a7210&= gt; #<package ocaml4.07-opam@HIDDEN gnu/packages/ocaml.scm:925 7fffde2a74= d0> #<package ocaml4.07-astring@HIDDEN gnu/packages/ocaml.scm:2759 7ff= fde2a7b00> #<package ocaml4.07-alcotest@HIDDEN gnu/packages/ocaml.scm:= 2838 7fffde9308f0>)>")) builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cache= .drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrnyk799y2bxxw5= 1by75-guix-package-cache' @ build-failed /gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cac= he.drv - 1 builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-pa= ckage-cache.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrny= k799y2bxxw51by75-guix-package-cache' --8<---------------cut here---------------end--------------->8--- Via <https://qa.guix.gnu.org/issue/64249>. Could you take a look and submit an updated version? Ludo=E2=80=99.
guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:15 2023
Received: from localhost ([127.0.0.1]:45979 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEg-0006ue-Lm
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:15 -0400
Received: from mout02.posteo.de ([185.67.36.66]:54467)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEZ-0006ss-JQ
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 14360240104
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:02 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442742; bh=iDSmw+MJr8Ri8I8yFPcmMhBe9JvJWmHvF18hqmczPxM=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=B26IPfcO8ALMpk1KCc48tQbA+WN4TANGpTkF4MG48orKL1GaIijBdIIAVO0dDJTOt
RzAyhdKmiWZRwI0deynkZ3pDcRqII/JiUfidmLKIpzWAc9XvNXA5ba0yw1xmazc90B
L6pdgfrTJeO8YfDTZqxOnggX9qVkF0UMQrWyrOcguIQduUq0AqOZC7A/hO+sx/KBoD
dOx1zZNU/evftJ1dxWPAsnd7Bev0PeNEwFbaQvFkNoXwNBT925zG4f6Aqo40ljwcaz
bjm7VrZ3ISpHHToSFO5khzenxrBo/epNUKkl9zpupUfasa0mRyZCuKko5Ijm1yj7SR
LJL9cOB/nW/gw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvT4Rqnz9rxQ;
Sat, 15 Jul 2023 19:39:01 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 7/7] WIP: gnu: opam: Update to 2.1.5.
Date: Sat, 15 Jul 2023 17:38:34 +0000
Message-Id: <a9855c7df2c1b4abcd4acdac3774c1bae4666848.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
---
gnu/packages/ocaml.scm | 220 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 220 insertions(+)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 289b86cc27..d96af0ee2d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -833,7 +833,225 @@ (define-public ocaml-opam-file-format
;; With static-linking exception
(license license:lgpl2.1+)))
+(define-public ocaml-opam-core
+ (package
+ (name "ocaml-opam-core")
+ (version "2.1.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml/opam")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))))
+ (build-system dune-build-system)
+ (native-inputs (list ocaml-cppo))
+ (propagated-inputs (list ocaml-graph ocaml-re))
+ (arguments `(#:package "opam-core"
+ ;; tests require the opam-client library that is not yet available
+ #:tests? #f))
+ (home-page "https://opam.ocaml.org/")
+ (synopsis "Package manager for OCaml")
+ (description
+ "OPAM is a tool to manage OCaml packages. It supports multiple
+simultaneous compiler installations, flexible package constraints, and a
+Git-friendly development workflow.")
+ ;; The 'LICENSE' file waives some requirements compared to LGPLv3.
+ (license license:lgpl3)))
+
+(define-public ocaml-opam-format
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-format")
+ (native-inputs '())
+ (propagated-inputs (list ocaml-opam-core
+ ocaml-opam-file-format
+ ocaml-re))
+ (arguments `(#:package "opam-format"
+ ;; tests require the opam-client library that is not yet available
+ #:tests? #f))))
+
+(define-public ocaml-opam-repository
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-repository")
+ (native-inputs '())
+ (propagated-inputs (list ocaml-opam-format))
+ (arguments `(#:package "opam-repository"
+ ;; tests require the opam-client library that is not yet available
+ #:tests? #f))))
+
+(define-public ocaml-opam-state
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-state")
+ (native-inputs '())
+ (propagated-inputs (list ocaml-opam-repository))
+ (arguments `(#:package "opam-state"
+ ;; tests require the opam-client library that is not yet available
+ #:tests? #f))))
+
+(define-public ocaml-opam-solver
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-solver")
+ (native-inputs '())
+ (propagated-inputs (list ocaml-opam-format
+ ocaml-mccs
+ ocaml-dose3))
+ (arguments `(#:package "opam-solver"
+ ;; tests require the opam-client library that is not yet available
+ #:tests? #f))))
+
+(define-public ocaml-opam-client
+ (package
+ (inherit ocaml-opam-core)
+ (name "ocaml-opam-client")
+ (native-inputs '())
+ (propagated-inputs '())
+ (inputs (list ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-base64-boot
+ ocaml-opam-repository
+ ocaml-re
+ ocaml-cmdliner))
+ (arguments `(#:package "opam-client"
+ ;; TODO
+ #:tests? #f))))
+
(define-public opam
+ (package
+ (inherit ocaml-opam-core)
+ (name "opam")
+ (arguments
+ `(#:package "opam"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash"))
+ (bwrap (search-input-file inputs "/bin/bwrap")))
+ (substitute* "src/core/opamSystem.ml"
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\""))
+ (("getconf")
+ (which "getconf")))
+ ;; Use bwrap from the store directly.
+ (substitute* "src/state/shellscripts/bwrap.sh"
+ (("-v bwrap") (string-append "-v " bwrap))
+ (("exec bwrap") (string-append "exec " bwrap))
+ ;; Mount /gnu and /run/current-system in the
+ ;; isolated environment when building with opam.
+ ;; This is necessary for packages to find external
+ ;; dependencies, such as a C compiler, make, etc...
+ (("^add_sys_mounts /usr")
+ (string-append "add_sys_mounts "
+ (%store-directory)
+ " /run/current-system /usr")))
+ (substitute* "src/client/opamInitDefaults.ml"
+ (("\"bwrap\"") (string-append "\"" bwrap "\""))))))
+ (add-before 'check 'prepare-checks
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Opam tests need to run an isolated environment from a writable
+ ;; home directory.
+ (mkdir-p "test-home")
+ (setenv "HOME" (string-append (getcwd) "/test-home"))
+ (with-output-to-file (string-append (getcwd) "/test-home/.gitconfig")
+ (lambda _
+ (display "[user]
+email = guix@HIDDEN
+name = Guix Builder")
+ (newline)))
+
+ ;; Opam tests require data from opam-repository. Instead of
+ ;; downloading them with wget from the guix environment, copy the
+ ;; content to the expected directory.
+ (substitute* "tests/reftests/dune.inc"
+ (("tar -C.*opam-archive-([0-9a-f]*)[^)]*" _ commit)
+ (string-append "rmdir %{targets}) (run cp -r "
+ (assoc-ref inputs (string-append "opam-repo-" commit))
+ "/ %{targets}) (run chmod +w -R %{targets}"))
+ (("wget[^)]*") "touch %{targets}")
+ ;; Disable a failing test because it tries to clone a git
+ ;; repository from inside bwrap
+ (("diff upgrade-format.test upgrade-format.out") "run true")
+ ;; Disable a failing test because it tries to figure out which
+ ;; distro this is, and it doesn't know Guix
+ (("diff pin.unix.test pin.unix.out") "run true")
+ ;; Disable a failing test because of a failed expansion
+ (("diff opamroot-versions.test opamroot-versions.out") "run true")
+ ;; Disable a failing test, probably because the repository we
+ ;; replaced is not as expected
+ (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true"))
+ (substitute* "tests/reftests/dune"
+ ;; Because of our changes to the previous file, we cannot check
+ ;; it can be regenerated
+ (("diff dune.inc dune.inc.gen") "run true"))
+ ;; Ensure we can run the generated build.sh (no /bin/sh)
+ (substitute* '("tests/reftests/legacy-local.test"
+ "tests/reftests/legacy-git.test")
+ (("#! ?/bin/sh")
+ (string-append "#!"
+ (search-input-file inputs "/bin/sh"))))
+ (substitute* "tests/reftests/testing-env"
+ (("OPAMSTRICT=1")
+ (string-append "OPAMSTRICT=1\nLIBRARY_PATH="
+ (assoc-ref inputs "libc") "/lib"))))))))
+ (native-inputs
+ (let ((opam-repo (lambda (commit hash)
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml/opam-repository")
+ (commit commit)))
+ (file-name (git-file-name "opam-repo" commit))
+ (sha256 (base32 hash))))))
+ `(;; For tests.
+ ("bubblewrap" ,bubblewrap)
+ ("git" ,git-minimal/pinned)
+ ("openssl" ,openssl)
+ ("python" ,python-wrapper)
+ ("rsync" ,rsync)
+ ("unzip" ,unzip)
+ ("which" ,which)
+
+ ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w"))
+ ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
+ "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
+ ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
+ "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z"))
+ ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd"
+ "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
+ ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
+ "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
+ ("opam-repo-c1842d168d" ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8"
+ "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai"))
+ ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
+ "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii"))
+ ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
+ "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))
+ ("opam-repo-11ea1cb" ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655"
+ "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0"))
+ ("opam-repo-297366c" ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3"
+ "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j"))
+ ("opam-repo-3235916" ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa"
+ "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486"))
+ ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a"
+ ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a"
+ "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw")))))
+ (propagated-inputs '())
+ (inputs (list ocaml-opam-client
+ ocaml-opam-state
+ ocaml-opam-solver
+ ocaml-base64-boot
+ ocaml-opam-repository
+ ocaml-re
+ ocaml-cmdliner))))
+
+(define-public opam-2.1.3
(package
(name "opam")
(version "2.1.3")
@@ -941,6 +1159,8 @@ (define-public opam
("which" ,which)
;; Data for tests
+ ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda"
+ "1wwy0rwrsjf4q10j1rh1dbzk32fbzhzy5f7zl6qmndidx9b1bq7w"))
("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
"1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:14 2023
Received: from localhost ([127.0.0.1]:45977 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEg-0006uX-AU
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:14 -0400
Received: from mout01.posteo.de ([185.67.36.65]:58959)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEX-0006sE-Al
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id C585B240027
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:59 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442739; bh=DAJSp/jQyZdKtEXRqjLZHc44a0hAOOLn+2osbS5HWoA=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=LuQu8xkhhjcemrRJ5c+jjjhUG93VLgGq3hEjquBSk6swlypUl18S4DL7RiYOeN2Ib
8h31hbhZaI7cd+p2QzpMa9OSWLWYhTyltXXcN4YeQeMvl1UoeLofETf9i5ObQfzvfh
gf/MtR6S8ta6qKbOorxZv7bjJzpxzQDqfabjeVsBfLONQEHandv06Wsj4ifcX31Sec
2WlzR7f1oI5G50OOVAja/qldQTxKUtARQHbnTCNjxAIQpI5PONR5/mCpClBvjCyEv7
T3p5cQ8ZWgvwathfvhbJFh7Fu4fh5VGlQKWJ2OoizDYMIb3z9oT2zdDcz0HtvQThQ3
X7dA69WhPbERw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvR2K2Jz9rxN;
Sat, 15 Jul 2023 19:38:59 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 4/7] gnu: ocaml-graph: Update to 2.0.0.
Date: Sat, 15 Jul 2023 17:38:31 +0000
Message-Id: <a10954f8b31cd9434b26630e8cd3e3681a640bb3.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml-graph): Update to 2.0.0.
---
gnu/packages/ocaml.scm | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d2bc7cc118..02c808b599 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5218,27 +5218,22 @@ (define-public ocaml4.07-uuidm
(define-public ocaml-graph
(package
(name "ocaml-graph")
- (version "1.8.8")
+ (home-page "https://github.com/backtracking/ocamlgraph/")
+ (version "2.0.0")
(source (origin
- (method url-fetch)
- (uri (string-append "http://ocamlgraph.lri.fr/download/"
- "ocamlgraph-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:install-target "install-findlib"
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL"
- (search-input-file inputs "/bin/sh")))))))
- (inputs (list lablgtk))
+ "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "ocamlgraph"))
+ (propagated-inputs (list ocaml-stdlib-shims))
+ (native-inputs (list ocaml-graphics))
(properties `((upstream-name . "ocamlgraph")))
- (home-page "https://ocamlgraph.lri.fr/")
(synopsis "Graph library for OCaml")
(description "OCamlgraph is a generic graph library for OCaml.")
(license license:lgpl2.1)))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:14 2023
Received: from localhost ([127.0.0.1]:45975 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEf-0006uT-Ef
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:14 -0400
Received: from mout01.posteo.de ([185.67.36.65]:56177)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEY-0006sX-TL
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:08 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 5E2ED240027
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:01 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442741; bh=bDktCXJPsjID+6FBkUDGBmELWFQ8vBt6hroPqlrbyX4=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=kv53K/flGmRrVUm8zRMPiSsvWknXOTnYRliU7goCBPbPk7RylRz5G2AwQa5modvbJ
XcnM13oeeVJ0do2IXF4y7PFXo72V4jIOE2rUA8iaulvNrsr/uAwnD3+K55qmNWdncY
emmSvJXAbjl8zz7JXkWxARx6gCDQmtvQTFJ32PY9McNCWpP9satUmMDvEI1NIMB6X7
pDewjzKfVx6jkL2dLfjt351QiJ/B2qME4o15cl3oo1FQOm6Em7dywFvfuxqRI5uut1
KyyYa7tDvhKdYA29ghlD7+cEx4CPpRSxzmrwoPHO8A6WYVzFuOyMHH/skqlgImdJxe
+t4BFXGtyV1DQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvS6RZ8z9rxH;
Sat, 15 Jul 2023 19:39:00 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 6/7] gnu: ocaml-dose3: Update to 7.0.0.
Date: Sat, 15 Jul 2023 17:38:33 +0000
Message-Id: <4c636e6c328766def8cb6b45e34aa72dcdf9ab51.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (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 | 48 +++----
.../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, 21 insertions(+), 250 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
diff --git a/gnu/local.mk b/gnu/local.mk
index 06a376a99a..f28baefdb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1646,10 +1646,6 @@ dist_patch_DATA = \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-xmlsec-compat.patch \
%D%/packages/patches/obs-modules-location.patch \
- %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
- %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
- %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
- %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
%D%/packages/patches/ocaml-multiple-definitions.patch \
%D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \
%D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 73c82bf7c7..289b86cc27 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -713,7 +713,7 @@ (define-public ocaml-mccs
(define-public ocaml-dose3
(package
(name "ocaml-dose3")
- (version "5.0.1")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -722,30 +722,17 @@ (define-public ocaml-dose3
(file-name (git-file-name name version))
(sha256
(base32
- "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3"))
- (patches
- (search-patches
- "ocaml-dose3-add-unix-dependency.patch"
- "ocaml-dose3-Fix-for-ocaml-4.06.patch"
- "ocaml-dose3-dont-make-printconf.patch"
- "ocaml-dose3-Install-mli-cmx-etc.patch"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:tests? #f ;the test suite requires python 2
- #:configure-flags
- ,#~(list (string-append "SHELL="
- #+(file-append (canonical-package bash-minimal)
- "/bin/sh")))
- #:make-flags
- ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))))
- (propagated-inputs
- (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re))
- (native-inputs
- (list perl
- ocaml-extlib
- ocamlbuild
- ocaml-cppo))
- (home-page "https://www.mancoosi.org/software/")
+ "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))))
+ (build-system dune-build-system)
+ (arguments `(#:package "dose3"))
+ (propagated-inputs (list ocaml-extlib
+ ocaml-base64-boot
+ ocaml-cudf
+ ocaml-graph
+ ocaml-re
+ ocaml-stdlib-shims))
+ (native-inputs (list ocaml-ounit))
+ (home-page "http://www.mancoosi.org/software/")
(synopsis "Package distribution management framework")
(description "Dose3 is a framework made of several OCaml libraries for
managing distribution packages and their dependencies. Though not tied to
@@ -4336,8 +4323,7 @@ (define-public ocaml-base64
(base32
"1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q"))))
(build-system dune-build-system)
- (native-inputs
- (list ocaml-alcotest ocaml-bos ocaml-rresult))
+ (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64))))
(home-page "https://github.com/mirage/ocaml-base64")
(synopsis "Base64 encoding for OCaml")
@@ -4346,6 +4332,14 @@ (define-public ocaml-base64
radix-64 representation. It is specified in RFC 4648.")
(license license:isc)))
+;; A variant without tests that is used to prevent a cyclic dependency when
+;; compiling ocaml-dose3.
+(define ocaml-base64-boot
+ (package
+ (inherit ocaml-base64)
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ocaml4.07-base64
(package-with-ocaml4.07
(package
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
deleted file mode 100644
index 2c344af821..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Sat, 2 Dec 2017 12:51:01 +0100
-Subject: [PATCH] Fix for ocaml 4.06
-
----
- common/criteria_lexer.mll | 8 ++++----
- common/util.ml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
-index 71f9178..fc4eae3 100644
---- a/common/criteria_lexer.mll
-+++ b/common/criteria_lexer.mll
-@@ -18,7 +18,7 @@
- let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
- (* find the terminating delimiter *)
- let endpos =
-- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
-+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
- |Invalid_argument _ ->
- raise (Format822.Syntax_error (
- Format822.error lexbuf "String too short"))
-@@ -27,9 +27,9 @@
- Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
- in
- let len = endpos - (lexbuf.lex_start_pos + 3) in
-- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-- s
-+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
-+ Bytes.to_string s
-
- }
-
-diff --git a/common/util.ml b/common/util.ml
-index 598f266..36ca3d1 100644
---- a/common/util.ml
-+++ b/common/util.ml
-@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
- let clean label =
- try
- let s = Filename.chop_extension (Filename.basename label) in
-- String.capitalize s
-+ String.capitalize_ascii s
- with Invalid_argument _ -> label
-
- let create ?(enabled=false) label =
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
deleted file mode 100644
index 41494e7b3c..0000000000
--- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Thu, 2 Mar 2017 12:19:56 +0100
-Subject: [PATCH] Install mli, cmx, etc.
-
----
- Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 09464ff..5044d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
- @for i in _build/cudf/cudf.*; do \
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
-+ rm -f $(DOSELIBS)/*.mlpack ; \
- fi ; \
- done
-
-@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ; \
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
-+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
- fi ; \
- done
-
-@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
- if [ -e $$i ]; then \
- cp $$i $(DOSELIBS) ;\
- rm $$i ;\
-- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
-+ rm -f $(DOSELIBS)/*.mlpack ;\
- fi ; \
- done
-
-@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
- INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
--#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
-+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
- INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
-
- exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
deleted file mode 100644
index d2cc44c784..0000000000
--- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
-From: Louis Gesbert <louis.gesbert@HIDDEN>
-Date: Tue, 6 Feb 2018 10:15:45 +0100
-Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
-
----
- META.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META.in b/META.in
-index aa2cd8d..0f9d337 100644
---- a/META.in
-+++ b/META.in
-@@ -8,7 +8,7 @@ package "common" (
- version = "@PACKAGE_VERSION@"
- archive(byte) = "common.cma"
- archive(native) = "common.cmxa"
--requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
-+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
- )
-
- package "algo" (
---
-2.11.0
-
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
deleted file mode 100644
index 84b6a3b81b..0000000000
--- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
--make printconf
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:09 2023
Received: from localhost ([127.0.0.1]:45973 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEa-0006u1-PO
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400
Received: from mout02.posteo.de ([185.67.36.66]:45813)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEW-0006s9-JH
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 1756B240101
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:59 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442739; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=kvf01Dy5ETelf6hl7Tr2a9+VzS+d3bbFoOHUZz7SR6IgSmSm10nNWxgrQx6teRnOY
C9cMiIUdBp38io3M/GVQ26/fUf0h1p6nuAx6jTVQn5Ri9bXugqn4EwqRb2OJBXJDYN
hOvXNC1+S8e1LcLwBZrFHeC3N7uQF6QW/JPbXKw9dNJwzcS6DVjTKcHBSveNFP3En7
zrG4yS17Pkgb5ztQswnj/v7biU0sx+anqs0lkQwXn+pz9oeMVr8+X/hvWgiKbkPvu8
A8ycKggBWtHKo+kGOlYOjzFP9IOZdYmtMrzEqIhJ7vcoRn8LcHGb/ZYYXMK9yZAWpC
FfzowGR9QNxiQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvQ4D1kz9rxV;
Sat, 15 Jul 2023 19:38:58 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 3/7] gnu: dune-bootstrap: Update to 3.9.1.
Date: Sat, 15 Jul 2023 17:38:30 +0000
Message-Id: <78010b3f2b18cb49d9742777ec9ba79b15d137cc.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6ffde41cc0..d2bc7cc118 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1819,7 +1819,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1828,7 +1828,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1845,9 +1845,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:08 2023
Received: from localhost ([127.0.0.1]:45971 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEa-0006tl-14
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:08 -0400
Received: from mout02.posteo.de ([185.67.36.66]:57667)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEY-0006sI-5c
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id A2092240101
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:00 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442740; bh=PakorzIwtyE98g7FeA7wnQuylkJjSmN+i3jaW4IQD58=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=iMt+n+EazJ5wEjY3XAHuhA2Xl6w9LkC6BOtY5d4jERrr9RgSMsiAM66ottzbpgpad
k9VOoKMLwUDbmcK9D9vPyeQGJl5x+jxCCcnclAuIA8tfoBpRIsfFuiA2VcOjtj7DMs
3qMAB39HS9hita62/BrtHo1EQjFwG0txV4aa1HBAkfrOdydQEEbVgdgmu8sAuFQZn7
jx+a6yM5G1nsJyMbDA2m4iUFyyfWwF6s7nm+IsEx/X43IT3Sn2s9NNZQ9HmvJjaps8
0vqJz7HkvHd6Q/LEKF8pF2ThNz6f545pb2kUO0sU4vSK0Y5ae17nkp2/OGgZQV2wq+
JPwSxmUpoyQpQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvS1BKDz9rxH;
Sat, 15 Jul 2023 19:39:00 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 5/7] gnu: ocaml-base64: Update to 3.5.1.
Date: Sat, 15 Jul 2023 17:38:32 +0000
Message-Id: <72e1634d2ef135ce44a5b01c3e4a9f2e1e8cc81e.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml-base64): Update to 3.5.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 02c808b599..73c82bf7c7 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4325,7 +4325,7 @@ (define-public ocaml-ocurl
(define-public ocaml-base64
(package
(name "ocaml-base64")
- (version "3.5.0")
+ (version "3.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4334,7 +4334,7 @@ (define-public ocaml-base64
(file-name (git-file-name name version))
(sha256
(base32
- "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))))
+ "1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q"))))
(build-system dune-build-system)
(native-inputs
(list ocaml-alcotest ocaml-bos ocaml-rresult))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:08 2023
Received: from localhost ([127.0.0.1]:45968 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEZ-0006ti-G2
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:07 -0400
Received: from mout02.posteo.de ([185.67.36.66]:38655)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEW-0006s6-4n
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 3F230240101
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:58 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442738; bh=UaEQVNH8CpU+ilH6DM8veOcIBQz7pq0KN7sbcKxPb00=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=PCDzQG6W6pXVbxijKgVmy9yhUlkKERoWPXmW0Xr+bhOJlHRz6CRIuUSQBaBFi/84B
HqoSXCmkxSZjS5CE75v4ZAtLTTBRYrPqhYYUKZYrxHdtHgzcJwPp0i1q0cy4scgzUe
2YpiGfPaesPKSbyju9KNPBJyvN6we4y9tjwg2VMltk73G3ob5Pq2qHLCsx9pPndFX3
UwwAXe3QqHuiKzJ0ZvIuAtzuXIkZ/DRNVx+ag+TKWX7eT4JvdSdq8esSXx0+ER/ic8
jkXUutr0r+tBqhbBDYJ5mtgycJPX6w1vPvmaUsBmj8VMWbDQ70UoAtXw/ckFXAvquV
dVbig2iMZ8QAg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvP5f73z9rxG;
Sat, 15 Jul 2023 19:38:57 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 2/7] gnu: coq: Update to 8.17.1.
Date: Sat, 15 Jul 2023 17:38:29 +0000
Message-Id: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 and
remove test-target argument.
---
gnu/packages/coq.scm | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 09ca4030ea..3332707a71 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -53,7 +53,7 @@ (define-module (gnu packages coq)
(define-public coq-core
(package
(name "coq-core")
- (version "8.16.1")
+ (version "8.17.1")
(source
(origin
(method git-fetch)
@@ -63,7 +63,7 @@ (define-public coq-core
(file-name (git-file-name name version))
(sha256
(base32
- "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf"))
+ "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63"))
(patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths
(list (search-path-specification
@@ -83,8 +83,7 @@ (define-public coq-core
(native-inputs
(list ocaml-ounit2 which))
(arguments
- `(#:package "coq-core"
- #:test-target "."))
+ `(#:package "coq-core"))
(properties '((upstream-name . "coq"))) ; also for inherited packages
(home-page "https://coq.inria.fr")
(synopsis "Proof assistant for higher-order logic")
@@ -101,19 +100,7 @@ (define-public coq-stdlib
(inherit coq-core)
(name "coq-stdlib")
(arguments
- `(#:package "coq-stdlib"
- #:test-target "."
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-dune
- (lambda _
- (substitute* "user-contrib/Ltac2/dune"
- (("coq-core.plugins.ltac2")
- (string-join
- (map (lambda (plugin) (string-append "coq-core.plugins." plugin))
- '("ltac2" "number_string_notation" "tauto" "cc"
- "firstorder"))
- " "))))))))
+ `(#:package "coq-stdlib"))
(inputs
(list coq-core gmp ocaml-zarith))
(native-inputs '())))
@@ -123,8 +110,7 @@ (define-public coq
(inherit coq-core)
(name "coq")
(arguments
- `(#:package "coq"
- #:test-target "."))
+ `(#:package "coq"))
(propagated-inputs
(list coq-core coq-stdlib))
(native-inputs '())))
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:04 2023
Received: from localhost ([127.0.0.1]:45961 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qKjEV-0006t8-W5
for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:04 -0400
Received: from mout01.posteo.de ([185.67.36.65]:32887)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qKjEV-0006s2-2t
for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:03 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 8C391240027
for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1689442737; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=jhCzIlI0zd8Mbhi911yGF2jmZr4I7rR4nqgsGKvAM7iUj0Y3ccjHh/GcN5H/gdajs
XEa+8D5WzyGvocUniAUohiAe6McFTwMeQXGnqtqOqmRl5v2/MqZMgzhLQ1BytckkJR
enO270oOK6ungOVvmPYZBHt22c7BLSVlMAq+gRymXXjP0XXBZEe39F2IQJbpjAMLn7
hecNWMuBoueiMsDtc37nPoTjYhLO1AZraWTzXizuIIma7E62AOgeDBuPFk25i/bFfg
SHb4Y1wXKBjnX0AySvRwma5zRytcH96ksGYP0B71TYZyd+pTGBRr+dDye482eujZsh
Op1KDE3wvzi0g==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4R3FvP0hzRz9rxG;
Sat, 15 Jul 2023 19:38:57 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team v2 1/7] gnu: ocaml: Update to 4.14.1.
Date: Sat, 15 Jul 2023 17:38:28 +0000
Message-Id: <3d4419719af956eac5e207468d8f19afccc16a62.1689442089.git.pukkamustard@HIDDEN>
In-Reply-To: <cover.1689442089.git.pukkamustard@HIDDEN>
References: <cover.1689442089.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..6ffde41cc0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 15 13:39:03 2023 Received: from localhost ([127.0.0.1]:45958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qKjEU-0006st-J6 for submit <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pukkamustard@HIDDEN>) id 1qKjER-0006rq-V7 for 64249 <at> debbugs.gnu.org; Sat, 15 Jul 2023 13:39:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D07A1240028 for <64249 <at> debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442733; bh=pMcSoZ7W+E2JwybeZIxM9QwuafJbId4Y/+ij1Frn3PY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=icBkqgd+UbYAblc3OWSNFnPgfpKQ5Iy91oqHTSffA2B8BBs8mwIK0vT4JzTSn9aYE wEqi/HiCdAH6m7V56xbAH8oVHVlCV2FK67SbdmV1l8Xa75xCPs1+trfeJ/6XqiYa09 vRuUCghhoTCYv3lAVHzt+xDP9ht+kZVa866afNU3BPpYh2sZHEvYk6oTeY/olIG8Ir EwcKRWldwTJdAJDV2WrPA8KsLsr8HVQOvX9OdMOOwVFh/lcCyz/Bzv4zkzpmntn8Eu zyPzS/PZd7j/se8OhMrq0+UHT+nsWsQD0OFGeL47g72FmhSo44AmFuKaJ/tuZ13cES yKPi8CqdSA35g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvK1nclz9rxN; Sat, 15 Jul 2023 19:38:52 +0200 (CEST) From: pukkamustard <pukkamustard@HIDDEN> To: 64249 <at> debbugs.gnu.org Subject: [PATCH ocaml-team v2 0/7] Attempt to update ocaml, coq, dune and opam. Date: Sat, 15 Jul 2023 17:38:27 +0000 Message-Id: <cover.1689442089.git.pukkamustard@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>, pukkamustard <pukkamustard@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard <pukkamustard@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello Guix, This is a WIP v2 for some updates to the OCaml packages. See also https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00075.html. Some changes to the v1: - Update coq to 8.17.1. This fixes a build failure caused by the v1 of this series. - Attempt to update opam to 2.1.5. Build fails with `Error: Unbound value Base64.decode_exn` even though the base64 library seems to be available properly. When keeping the failed build directory and manually building, build seems to work. I'm a bit clueless on what is going on and just posting this in the hope that somebody can spot the issue or provide some clues. - opam package is split into individual sub-libraries. This reduces the size of the final `opam` package considerably (tested for 2.1.3). - The update to `ocaml-dose3` needs to be merged with the opam update commit as old opam (2.1.3) does not compile with the new ocaml-dose3. Thanks, pukkamustard pukkamustard (7): gnu: ocaml: Update to 4.14.1. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: ocaml-graph: Update to 2.0.0. gnu: ocaml-base64: Update to 3.5.1. gnu: ocaml-dose3: Update to 7.0.0. WIP: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 24 +- gnu/packages/ocaml.scm | 316 +++++++++++++++--- .../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 - 7 files changed, 268 insertions(+), 295 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at 64249) by debbugs.gnu.org; 23 Jun 2023 13:46:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 23 09:46:49 2023
Received: from localhost ([127.0.0.1]:37895 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qCh7g-00073J-Sw
for submit <at> debbugs.gnu.org; Fri, 23 Jun 2023 09:46:49 -0400
Received: from mout01.posteo.de ([185.67.36.65]:50527)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qCh7f-000736-64
for 64249 <at> debbugs.gnu.org; Fri, 23 Jun 2023 09:46:48 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id E94CB240027
for <64249 <at> debbugs.gnu.org>; Fri, 23 Jun 2023 15:46:40 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1687528000; bh=PtkNjpERXsMbyAn8bdVY2yLQ/1v7TYGUOaH/abi3USA=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=KqgblMBfLZ5dGNRyagvi+LQfocwLak2+MWHMxuHg/ab4aTHoK36ygMhJftwBDRuBx
AMo/5VftRFbfQhMSMkvrFK+pr+JoSPnH9kXz/5Wwmax67LbjXVLhzoDQGJQHWbPCOl
J0YOKlD7EYqmY1sHFA07GsB6m3HadCiuyEO6BxQtn73q6gtsJnbmRM8As7bSI/vtnA
sMJA0cso81GuB/dAYUgvz31g2jqfHSYmffNSe2SYerzc6YxOZp+LZPUiGFDEDGEjle
9VrUlK8J+uyMDVoIb2/majTQHDqunuC+TxiVGzORZiQ78zQTwaix59Mgj9gYJAtPIL
HEn38lgJNdjbA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4QndnX13NLz9rxS;
Fri, 23 Jun 2023 15:46:40 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: 64249 <at> debbugs.gnu.org
Subject: [PATCH ocaml-team 2/2] gnu: dune-bootstrap: Update to 3.8.2.
Date: Fri, 23 Jun 2023 13:46:28 +0000
Message-Id: <6e376acaf2b79d5c0c34820275528549da85757d.1687527699.git.pukkamustard@HIDDEN>
In-Reply-To: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN>
References: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 64249
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2.
[description]: Revise and de-emphasize historic origin.
---
gnu/packages/ocaml.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6ffde41cc0..8d7c0d60a8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1819,7 +1819,7 @@ (define-public ocaml-stringext
(define dune-bootstrap
(package
(name "dune")
- (version "3.6.1")
+ (version "3.8.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1828,7 +1828,7 @@ (define dune-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
- "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6"))))
+ "02f8wrqhflgvd1gz3y181r9kmlpqmrc8az902ndihyvg58xxi83r"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@@ -1845,9 +1845,10 @@ (define dune-bootstrap
#t)))))
(home-page "https://github.com/ocaml/dune")
(synopsis "OCaml build system")
- (description "Dune is a build system that was designed to simplify the
-release of Jane Street packages. It reads metadata from @file{dune} files
-following a very simple s-expression syntax.")
+ (description "Dune is a build system for OCaml. It provides a consistent
+experience and takes care of the low-level details of OCaml compilation.
+Descriptions of projects, libraries and executables are provided in
+@file{dune} files following a s-expression syntax.")
(license license:expat)))
(define ocaml4.09-dune-bootstrap
--
2.40.1
julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 23 Jun 2023 13:44:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 23 09:44:18 2023
Received: from localhost ([127.0.0.1]:37888 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qCh5F-0006yg-N8
for submit <at> debbugs.gnu.org; Fri, 23 Jun 2023 09:44:18 -0400
Received: from lists.gnu.org ([209.51.188.17]:44584)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pukkamustard@HIDDEN>) id 1qCh5A-0006yV-3w
for submit <at> debbugs.gnu.org; Fri, 23 Jun 2023 09:44:16 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <pukkamustard@HIDDEN>)
id 1qCh59-0007VM-PI
for guix-patches@HIDDEN; Fri, 23 Jun 2023 09:44:11 -0400
Received: from mout01.posteo.de ([185.67.36.65])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <pukkamustard@HIDDEN>)
id 1qCh57-0002jO-FB
for guix-patches@HIDDEN; Fri, 23 Jun 2023 09:44:11 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id AE76624002A
for <guix-patches@HIDDEN>; Fri, 23 Jun 2023 15:44:00 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
t=1687527840; bh=PvS3361pzwNR1ioiSyUNT87kOFCRqgi0r49fGuav/D4=;
h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:
Content-Transfer-Encoding:From;
b=R7zvvvhiGavswTfRjcHnA3Q6yRMbpg7HqkpNS70/NJ26lwHHI6N8DosH0N3aihRJi
DQfGdT0h1PvhrLM9sJ2+lWSQaGreu98yexqpRP0wQrkafuMvmadRfHVK1s7S16SAIJ
wDSrIDOQ7MsE/Y5CU9fKjjF6KocrBm+SMhk6WACIJo/BUPCoZrZCL7HlkW58GL/VNi
43DoHdtRYFk3euJXAtcIKzrNpW8VBtJmoEF1IgBoe3NDwH3EXpr/B3C/CGjfW7U1p1
PmsN25ePRE85zxzxhfyIEOV/N75tAZEhB4JndAsbjIjkAhUJN6h7pRW/yDRgOkWtCA
gIK/IzMiEZ12A==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4QndkS1PPqz6tsB;
Fri, 23 Jun 2023 15:44:00 +0200 (CEST)
From: pukkamustard <pukkamustard@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1.
Date: Fri, 23 Jun 2023 13:43:38 +0000
Message-Id: <a06ca6a604f420b4c6a994e4475ab078d1c9c386.1687527699.git.pukkamustard@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=185.67.36.65;
envelope-from=pukkamustard@HIDDEN; helo=mout01.posteo.de
X-Spam_score_int: -43
X-Spam_score: -4.4
X-Spam_bar: ----
X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: pukkamustard <pukkamustard@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
* gnu/packages/ocaml.scm (ocaml): Update to 4.14.1.
---
gnu/packages/ocaml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..6ffde41cc0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -253,7 +253,7 @@ (define-public ocaml-5.0
(define-public ocaml-4.14
(package
(name "ocaml")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -262,7 +262,7 @@ (define-public ocaml-4.14
"/ocaml-" version ".tar.xz"))
(sha256
(base32
- "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"))))
+ "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
base-commit: 6e1215fb9c03ccb4a2d4440990aee5a66a935268
--
2.40.1
pukkamustard <pukkamustard@HIDDEN>:julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN.
Full text available.julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:bug#64249; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.