From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aMX4FVWWjV+8GAAA0tVLHw (envelope-from ) for ; Mon, 19 Oct 2020 13:36:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UKjXEVWWjV+oYwAA1q6Kng (envelope-from ) for ; Mon, 19 Oct 2020 13:36:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CBDEF9400D3 for ; Mon, 19 Oct 2020 13:36:20 +0000 (UTC) Received: from localhost ([::1]:52592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUVKl-0006pV-PK for larch@yhetil.org; Mon, 19 Oct 2020 09:36:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUVGc-00025h-EU for guix-patches@gnu.org; Mon, 19 Oct 2020 09:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUVGc-0005kp-2e for guix-patches@gnu.org; Mon, 19 Oct 2020 09:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kUVGb-0005bi-Ux for guix-patches@gnu.org; Mon, 19 Oct 2020 09:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Oct 2020 13:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44032 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller Cc: 44032@debbugs.gnu.org Received: via spool by 44032-submit@debbugs.gnu.org id=B44032.160311430321521 (code B ref 44032); Mon, 19 Oct 2020 13:32:01 +0000 Received: (at 44032) by debbugs.gnu.org; 19 Oct 2020 13:31:43 +0000 Received: from localhost ([127.0.0.1]:40288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUVGI-0005b3-Fd for submit@debbugs.gnu.org; Mon, 19 Oct 2020 09:31:42 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUVGG-0005an-8o for 44032@debbugs.gnu.org; Mon, 19 Oct 2020 09:31:41 -0400 Received: by mail-wm1-f66.google.com with SMTP id e2so12891183wme.1 for <44032@debbugs.gnu.org>; Mon, 19 Oct 2020 06:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ARJyA/LVy5unzjsNQ/SgeEDGauuk9X+mXQozEWxkYjI=; b=U4EJq8SYw1Ektv8c9EUa1P+eW56A3r0Gu7ss+STMY4bhF8l5uhsQsT+9g8MmPalzAz 8GZcqAhhM26wV3DPb5xTPqDcgiaxf/SNyOtMOFsF9fCZ2bu3Wieqo9IPVE5ZkNwbsnwz yYDM8kzpDR3RGCRCCcA4rRMlBPbRqSoHCdW4G0+85bKtYrIYxUgBLKrqEZkfgwXfPI0g ZTfenvp64fjRNpYNhSiMspYNvbMSDpAVW8LFprSeUrlhi8IYEednwXQWX7HzbR+GJDfG VlGuEifeXs/W4c85s03fwI1HOc/xDl4Vpaeo1T9T7bhkccE58uDXHaLPR6wTryiSrr6H oXXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ARJyA/LVy5unzjsNQ/SgeEDGauuk9X+mXQozEWxkYjI=; b=JgsDAkA9WSnH+QBgqc4dOS91Kfp8RMK31I+GUWK6joC2wbTSSi0mfrxsEqPWPteJMw 8Du5kTYRMCOSym57u7pweQy037o3eQLrY7EXvx9gVtwkZCH4hD5w2PsSh79q7uKDEsT4 P9Qay97JEHFOWZnp0A6rNkZhQKuF19o0RIVcbzs1pdfge3G3/oVbnNkEUquu789CMK/v SquibiU/hr6R9D8WBgTbEK4bLV9ihERyztfdkrCp1CjZu4K0GIT8RmoN9MT0EBT/KAxZ rwmtjyvkuOut1yf/bNWOjuXq5Bclu8rjqiCaYzYZcJfHeYokni/KDIFCDn7qZpP/Fv3f WWwg== X-Gm-Message-State: AOAM531LcE9LH6xTNxfimn6cR38BjW6VCgYF/kA+KqlDzJoqgf3TNJic b+g7Im1u/uH9YKm17+mzrY4ECYypKRU= X-Google-Smtp-Source: ABdhPJwRGzyM1sCnuAoQvxo39jCE3oPwVo+A3VMDpl05j53HPhBSHnx/2zPgEkM7IA7585mHSQRCSQ== X-Received: by 2002:a1c:98d2:: with SMTP id a201mr16071178wme.166.1603114293870; Mon, 19 Oct 2020 06:31:33 -0700 (PDT) Received: from pfiuh02 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id x10sm1417740wrp.62.2020.10.19.06.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 06:31:33 -0700 (PDT) From: zimoun References: <20201016171436.5f642654@tachikoma> Date: Mon, 19 Oct 2020 15:31:32 +0200 In-Reply-To: <20201016171436.5f642654@tachikoma> (Julien Lepiller's message of "Fri, 16 Oct 2020 17:14:36 +0200") Message-ID: <87y2k2fikr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=U4EJq8SY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: KPRGyJhqFXDj Hi! On Fri, 16 Oct 2020 at 17:14, Julien Lepiller wrote: > Note that with that, previously unreproducible packages are > reproducible! I have not checked yet this point. :-) >>>From 2dc52a0077ffe1f0b416032fb1dfbf035f82c34e Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Thu, 15 Oct 2020 22:02:56 +0200 > Subject: [PATCH 1/7] gnu: ocaml: Update to 4.11.1. > > * gnu/packages/ocaml.scm (ocaml): Update to 4.11.1. > --- > gnu/packages/ocaml.scm | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) LTGM! >>>From 2b5fa1b7f30e7ff0315a752e10e87930e72dbb8e Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Thu, 15 Oct 2020 22:04:36 +0200 > Subject: [PATCH 2/7] gnu: Add ocaml4.09-findlib. > > * gnu/packages/ocaml.scm (ocaml4.09-findlib): New variable. > --- > gnu/packages/ocaml.scm | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index be2f486179..84daa8afca 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -1007,6 +1007,14 @@ compilers that can directly deal with packages.") > `(("m4" ,m4) > ("ocaml" ,ocaml-4.07))))) > > +(define-public ocaml4.09-findlib > + (package > + (inherit ocaml-findlib) > + (name "ocaml4.09-findlib") > + (native-inputs > + `(("m4" ,m4) > + ("ocaml" ,ocaml-4.09))))) > + > ;; note that some tests may hang for no obvious reason. > (define-public ocaml-ounit > (package > -- > 2.28.0 LGTM! Even if I was confused at first by: :-) --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build ocaml4.09-findlib /gnu/store/p49l1cr1wmf53szd5k4s2nx9n3p3qfc3-ocaml4.09-findlib-1.8.1 $ guix build ocaml-findlib /gnu/store/n791rs3wvbm0fpmd0bqfhb3f4ysjwqia-ocaml-findlib-1.8.1 $ ./pre-inst-env guix build ocaml-findlib /gnu/store/n791rs3wvbm0fpmd0bqfhb3f4ysjwqia-ocaml-findlib-1.8.1 --8<---------------cut here---------------end--------------->8--- >>>From a810e6647ba30aba02b58840101ee66b7fbcd792 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Thu, 15 Oct 2020 22:34:38 +0200 > Subject: [PATCH 3/7] guix: ocaml: Add package-with-ocaml4.09. > > * guix/build-system/ocaml.scm (package-with-ocaml4.09) > (strip-ocaml4.09-variant): New variables. > * gnu/packages/ocaml.scm (ocaml4.09-result, ocaml4.09-csexp) > (ocaml4.09-dune-configurator, ocaml4.09-dune): New variables. > --- > gnu/packages/ocaml.scm | 46 ++++++++++++++++++++++++++++++++++++- > guix/build-system/ocaml.scm | 27 ++++++++++++++++++++++ > 2 files changed, 72 insertions(+), 1 deletion(-) [...] > +(define-public ocaml4.09-dune-configurator > + (package > + (inherit dune-configurator) > + (name "ocaml4.09-dune-configurator") > + (arguments > + `(#:package "dune-configurator" > + #:tests? #f > + #:dune ,(package-with-ocaml4.09 dune-bootstrap) > + #:ocaml ,ocaml-4.09 > + #:findlib ,ocaml4.09-findlib)) > + (propagated-inputs > + `(("ocaml-csexp" ,(package-with-ocaml4.09 ocaml-csexp)))))) As I wrote in the other thread about updating Dune, it looks ackward to me the use the 'package-with-ocaml4.09' inside and not wrap outside... > (define-public dune > (package > (inherit dune-bootstrap) > (propagated-inputs > `(("dune-configurator" ,dune-configurator))) > - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)))))) > + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)) > + (ocaml4.09-variant . ,(delay ocaml4.09-dune)))))) ...especially these 'delay' in properties. But I got your arguments. :-) > +(define-public ocaml4.09-dune > + (package > + (inherit (package-with-ocaml4.09 dune-bootstrap)) > + (propagated-inputs > + `(("dune-configurator" ,dune-configurator))))) [...] > +(define-public ocaml4.09-csexp > + (package > + (inherit ocaml-csexp) > + (name "ocaml4.09-csexp") > + (arguments > + `(#:ocaml ,ocaml-4.09 > + #:findlib ,ocaml4.09-findlib > + ,@(substitute-keyword-arguments (package-arguments ocaml-csexp) > + ((#:dune _) (package-with-ocaml4.09 dune-bootstrap))))) > + (propagated-inputs > + `(("ocaml-result" ,(package-with-ocaml4.09 ocaml-result)))))) You do not use the one you define below. Why? Other said, do you really need 'ocaml4.09.result' defined below? > + > (define-public ocaml-migrate-parsetree > (package > (name "ocaml-migrate-parsetree") > @@ -1494,12 +1528,22 @@ powerful.") > (arguments > `(#:test-target "." > #:dune ,dune-bootstrap)) > + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)))) Does it fail if instead (properties `((ocaml4.09-variant . ,(package-with-ocaml4.09 ocaml-result))) ? > +(define-public ocaml4.09-result > + (package > + (inherit ocaml-result) > + (arguments > + `(#:test-target "." > + #:dune ,(package-with-ocaml4.09 dune-bootstrap) > + #:ocaml ,ocaml-4.09 > + #:findlib ,ocaml4.09-findlib)))) Since the name is not changed after inheritance, this package is ambiguous. And possibly do not compile. Otherwise, LGTM. >>>From 447de03a51a39fa7a7d8c5216c8ba23e632d0b88 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Fri, 16 Oct 2020 17:01:40 +0200 > Subject: [PATCH 4/7] gnu: laby: Update to 0.7.0. > > * gnu/packages/games.scm (laby): Update to 0.7.0. > --- > gnu/packages/games.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I am not sure to get why this one needs update instead of replacing 'ocaml' by 'ocaml4.09'. And the update in other patch set. Well, bikeshed. :-) LGTM. >>>From cb1c4f34d558b3b0b3cfc2d21d77c3d703f6013c Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Fri, 16 Oct 2020 17:02:56 +0200 > Subject: [PATCH 5/7] gnu: ocaml-ppx-tools-versioned: Use release profile. > > * gnu/packages/ocaml.scm (ocaml-ppx-tools-versioned): Use release > profile. > --- > gnu/packages/ocaml.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) LGTM! > From 6b08d42d9ebaa3ee6da4a9f8aa9cc6d70cf19231 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Fri, 16 Oct 2020 17:06:53 +0200 > Subject: [PATCH 6/7] gnu: ocamlify: Perform bootstrap build. > > * gnu/packages/ocaml.scm (ocamlify): Perform bootstrap build. > --- > gnu/packages/ocaml.scm | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index 15ca326376..660aeef25a 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -2433,21 +2433,28 @@ radix-64 representation. It is specified in RFC 4648.") > (base32 "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii")))) > (build-system ocaml-build-system) > (arguments > - `(#:phases > + `(#:tests? #f; no tests Why? Because the tests are run during the build? If yes, does it make sense to move the comment there? > + #:phases [...] > #t)) > - (delete 'check) ; tests are run during the build [...] > (home-page "https://forge.ocamlcore.org/projects/ocamlify") > (synopsis "Include files in OCaml code") > (description "OCamlify creates OCaml source code by including Otherwise, LGTM! >>>From 0c2ba2bf29d4a72fe05710a84ca2ca548801702a Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Fri, 16 Oct 2020 17:07:45 +0200 > Subject: [PATCH 7/7] gnu: ocaml: Switch to 4.11 by default. > > * gnu/packages/ocaml.scm (ocaml): Switch to 4.11 by default. > --- > gnu/packages/ocaml.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index 660aeef25a..e486a09fbb 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -243,7 +243,7 @@ functional, imperative and object-oriented styles of programming.") > "--prefix" out > "--mandir" mandir)))))))))) > > -(define-public ocaml ocaml-4.09) > +(define-public ocaml ocaml-4.11) > > (define-public ocamlbuild > (package Cool! LGTM! All the best, simon