From unknown Tue Aug 19 21:03:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Oct 2020 15:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44032 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44032@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160286130624729 (code B ref -1); Fri, 16 Oct 2020 15:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2020 15:15:06 +0000 Received: from localhost ([127.0.0.1]:60507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTRRd-0006MZ-8l for submit@debbugs.gnu.org; Fri, 16 Oct 2020 11:15:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:53144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTRRb-0006MR-6V for submit@debbugs.gnu.org; Fri, 16 Oct 2020 11:14:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTRRb-00024R-14 for guix-patches@gnu.org; Fri, 16 Oct 2020 11:14:59 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:33858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTRRX-00076P-6B for guix-patches@gnu.org; Fri, 16 Oct 2020 11:14:58 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id da5752a7 for ; Fri, 16 Oct 2020 15:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=ZGS 22rvK0xIbqm6hA9V2xX0x2ahMyipK6N0m0lzDJIA=; b=dZkfNl7iDk9cQQtBnKd ib58S6Vvciiva5qMcHjKc8sAmUB/VeucDEK4j+qxozJ0AZo5uOsSAudXHMX6/HHT QH12Hyh5MpB+kjfPXFO+z7XioKkUcHHr5Clh3qgl0XGph0r/HupQg71wmRM3r2rE ZUMIsZCr4JTMGEsf8SVWq5G+JTFmWPOkDPXdTskTVxt8E6Ii6F9cJiRms55dipan UD+qN0ORrncsLOLXXJj0V4yTvNRvpN66YiwhLo7wDDiW7OaJKqc2O9T34lTl/t62 GkQcykYkpW8vdk+8KFakOAIL7K5f4GXeGuaWKXjcqd8ARaktiSKrTmlg+iDBTd3a dDQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id fbca6733 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Fri, 16 Oct 2020 15:14:48 +0000 (UTC) Date: Fri, 16 Oct 2020 17:14:36 +0200 From: Julien Lepiller Message-ID: <20201016171436.5f642654@tachikoma> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/rPl+tp8.mCNO4=3EzwSif3e" Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! this small patch series update ocaml to 4.11.1. The first patch adds ocaml 4.11.1, the second adds findlib for 4.09, the third add package-with-ocaml4.09 (along with ocaml4.09-dune, which I can't put in a separate patch without breaking something). Then, three patches fix the build of three packages (with these patches, they build fine with 4.09 and 4.11). The last patch performs the final switch to 4.11. Easier than I expected! :) Note that with that, previously unreproducible packages are reproducible! --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ocaml-Update-to-4.11.1.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4cc530509a..be2f486179 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -132,10 +132,10 @@ "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (delete 'configure)))) -(define-public ocaml-4.09 +(define-public ocaml-4.11 (package (name "ocaml") - (version "4.09.0") + (version "4.11.1") (source (origin (method url-fetch) (uri (string-append @@ -144,7 +144,7 @@ "/ocaml-" version ".tar.xz")) (sha256 (base32 - "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) + "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -202,6 +202,20 @@ functional, imperative and object-oriented styles of programming.") ;; distributed under lgpl2.0. (license (list license:qpl license:lgpl2.0)))) +(define-public ocaml-4.09 + (package + (inherit ocaml-4.11) + (version "4.09.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://caml.inria.fr/pub/distrib/ocaml-" + (version-major+minor version) + "/ocaml-" version ".tar.xz")) + (sha256 + (base32 + "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) + (define-public ocaml-4.07 (package (inherit ocaml-4.09) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-Add-ocaml4.09-findlib.patch >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 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-guix-ocaml-Add-package-with-ocaml4.09.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 84daa8afca..e3ddb36a4e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1321,15 +1321,36 @@ following a very simple s-expression syntax.") #:tests? #f)) (propagated-inputs `(("ocaml-csexp" ,ocaml-csexp))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)))) (synopsis "") (description ""))) +(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)))))) + (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)))))) + +(define-public ocaml4.09-dune + (package + (inherit (package-with-ocaml4.09 dune-bootstrap)) + (propagated-inputs + `(("dune-configurator" ,dune-configurator))))) (define-public ocaml4.07-dune (package @@ -1370,6 +1391,7 @@ following a very simple s-expression syntax.") #t))))) (propagated-inputs `(("ocaml-result" ,ocaml-result))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp)))) (home-page "https://github.com/ocaml-dune/csexp") (synopsis "Parsing and printing of S-expressions in Canonical form") (description "This library provides minimal support for Canonical @@ -1386,6 +1408,18 @@ To avoid a dependency on a particular S-expression library, the only module of this library is parameterised by the type of S-expressions.") (license license:expat))) +(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)))))) + (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)))) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >= 4.03 while staying compatible with older version of OCaml should use the Result module defined in this library.") (license license:bsd-3))) + +(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)))) (define-public ocaml-topkg (package diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index c5996bf0cf..5513216c25 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -29,6 +29,8 @@ #:export (%ocaml-build-system-modules package-with-ocaml4.07 strip-ocaml4.07-variant + package-with-ocaml4.09 + strip-ocaml4.09-variant default-findlib default-ocaml lower @@ -96,6 +98,18 @@ (let ((module (resolve-interface '(gnu packages ocaml)))) (module-ref module 'ocaml4.07-dune))) +(define (default-ocaml4.09) + (let ((ocaml (resolve-interface '(gnu packages ocaml)))) + (module-ref ocaml 'ocaml-4.09))) + +(define (default-ocaml4.09-findlib) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml4.09-findlib))) + +(define (default-ocaml4.09-dune) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml4.09-dune))) + (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix #:key variant-property) "Return a procedure of one argument, P. The procedure creates a package @@ -171,6 +185,19 @@ pre-defined variants." (inherit p) (properties (alist-delete 'ocaml4.07-variant (package-properties p))))) +(define package-with-ocaml4.09 + (package-with-explicit-ocaml (delay (default-ocaml4.09)) + (delay (default-ocaml4.09-findlib)) + (delay (default-ocaml4.09-dune)) + "ocaml-" "ocaml4.09-" + #:variant-property 'ocaml4.09-variant)) + +(define (strip-ocaml4.09-variant p) + "Remove the 'ocaml4.09-variant' property from P." + (package + (inherit p) + (properties (alist-delete 'ocaml4.09-variant (package-properties p))))) + (define* (lower name #:key source inputs native-inputs outputs system target (ocaml (default-ocaml)) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-gnu-laby-Update-to-0.7.0.patch >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(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d473baa335..b03e4ebfea 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5119,7 +5119,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.") (define-public laby (package (name "laby") - (version "0.6.4") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -5128,7 +5128,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.") (file-name (git-file-name name version)) (sha256 (base32 - "12fq9hhrxpzgfinmj9ra9ckss9yficwdlrmgjvvsq7agvh3sgyl1")) + "1y6nfxcjhqg9bb81hs0wijg7kcwk5kff81rgd8bsv5ps7ia9nj6b")) (patches (search-patches "laby-make-install.patch")))) (build-system gnu-build-system) (inputs -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0005-gnu-ocaml-ppx-tools-versioned-Use-release-profile.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3ddb36a4e..15ca326376 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1464,7 +1464,8 @@ functions to the next and/or previous version.") "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:package "ppx_tools_versioned")) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) (properties `((upstream-name . "ppx_tools_versioned"))) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-gnu-ocamlify-Perform-bootstrap-build.patch =46rom 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 46= 48.") (base32 "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii")))) (build-system ocaml-build-system) (arguments - `(#:phases + `(#:tests? #f; no tests + #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-safe-string - ;; Work around =E2=80=98Error: This expression has type string = but an - ;; expression was expected of type bytes=E2=80=99 since OCaml 4= .06. + (delete 'configure) + (replace 'build + ;; This package uses pre-generated setup.ml by oasis, but is + ;; a dependency of oasis. the pre-generated setup.ml is broken + ;; with recent versions of OCaml, so we perform a bootstrap ins= tead. (lambda _ - (setenv "OCAMLPARAM" "safe-string=3D0,_") + (substitute* "src/OCamlifyConfig.ml.ab" + (("$pkg_version") ,version)) + (rename-file "src/OCamlifyConfig.ml.ab" "src/OCamlifyConfig.m= l") + (with-directory-excursion "src" + (invoke "ocamlc" "OCamlifyConfig.ml" "ocamlify.ml" "-o" + "ocamlify")) #t)) - (delete 'check) ; tests are run during the build - (replace 'configure + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (invoke "ocaml" "setup.ml" "-configure" "--prefix" - (assoc-ref outputs "out"))))))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "src/ocamlify" bin) + #t)))))) (home-page "https://forge.ocamlcore.org/projects/ocamlify") (synopsis "Include files in OCaml code") (description "OCamlify creates OCaml source code by including --=20 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0007-gnu-ocaml-Switch-to-4.11-by-default.patch >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 -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e-- From unknown Tue Aug 19 21:03:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Oct 2020 19:23:02 +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.160287612916547 (code B ref 44032); Fri, 16 Oct 2020 19:23:02 +0000 Received: (at 44032) by debbugs.gnu.org; 16 Oct 2020 19:22:09 +0000 Received: from localhost ([127.0.0.1]:60913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTVIn-0004Ip-4l for submit@debbugs.gnu.org; Fri, 16 Oct 2020 15:22:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTVIk-0004IQ-VT for 44032@debbugs.gnu.org; Fri, 16 Oct 2020 15:22:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40109) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTVIc-0007Nt-BY; Fri, 16 Oct 2020 15:21:58 -0400 Received: from cpe-70-118-247-167.kc.res.rr.com ([70.118.247.167]:56598 helo=debian) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kTVIb-0006lG-Sk; Fri, 16 Oct 2020 15:21:58 -0400 From: Brett Gilio References: <20201016171436.5f642654@tachikoma> Date: Fri, 16 Oct 2020 14:21:56 -0500 In-Reply-To: <20201016171436.5f642654@tachikoma> (Julien Lepiller's message of "Fri, 16 Oct 2020 17:14:36 +0200") Message-ID: <87362egenf.fsf@debian> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Julien Lepiller writes: > Hi Guix! > > this small patch series update ocaml to 4.11.1. The first patch adds > ocaml 4.11.1, the second adds findlib for 4.09, the third add > package-with-ocaml4.09 (along with ocaml4.09-dune, which I can't put in > a separate patch without breaking something). Then, three patches fix > the build of three packages (with these patches, they build fine with > 4.09 and 4.11). The last patch performs the final switch to 4.11. > Easier than I expected! :) > > Note that with that, previously unreproducible packages are > reproducible! > Great work Julien! We are also working on this on the Debian side as well. I am looking forward to seeing 4.11.1 hit Guix master. Thanks a lot for your and other's hard work on this. -- Brett M. Gilio brettg@gnu.org https://brettgilio.com/ E82A C026 95D6 FF02 43CA 1E5C F6C5 2DD1 BA27 CB87 From unknown Tue Aug 19 21:03:32 2025 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Tue Aug 19 21:03:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Oct 2020 14:12:02 +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: zimoun Cc: 44032@debbugs.gnu.org Received: via spool by 44032-submit@debbugs.gnu.org id=B44032.160311671027169 (code B ref 44032); Mon, 19 Oct 2020 14:12:02 +0000 Received: (at 44032) by debbugs.gnu.org; 19 Oct 2020 14:11:50 +0000 Received: from localhost ([127.0.0.1]:41938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUVt7-000748-En for submit@debbugs.gnu.org; Mon, 19 Oct 2020 10:11:49 -0400 Received: from lepiller.eu ([89.234.186.109]:47692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUVt4-00073w-0H for 44032@debbugs.gnu.org; Mon, 19 Oct 2020 10:11:47 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 71726932; Mon, 19 Oct 2020 14:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=16nJVeporjs120L7J8qEEKpHHPRP3uaypEckj2lWqTc=; b=kKv4yZa VjJ5N4fS+nENyQQTTkNwMlcP17NP5ihJKhXQStUhjbCLXRa9xLDkj9FT6KMELUgx tVkb7g5lbh7pWezs1JSgTGxF0MUYhlct2HF/J8CIqeAAU8VGf+vz69g5aqkJZPS1 rVQdnbgCUc4qNFlZD5LT1HlX7rSm+dDCssuBMTmGZq8qrjUeF08G37foAwqi062m QVmviIRYUI/hLfzQz5rmpejCjB7RHSLsA2oSqhh167yJu0tzGaulMg8YA9NyjKZL nwNAk16pELdUTlf/RUupmdBMeAW5auaTo0X76oUuamHZqHshnpHJPRO5QCzIrB8a LlPajfkvcXOE/BA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 18d6c2f0 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 19 Oct 2020 14:11:43 +0000 (UTC) Date: Mon, 19 Oct 2020 10:11:32 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <87y2k2fikr.fsf@gmail.com> References: <20201016171436.5f642654@tachikoma> <87y2k2fikr.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Julien Lepiller Message-ID: <26294C8B-1271-4ED9-8B1C-9A6DDF7E9AEA@lepiller.eu> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le 19 octobre 2020 09:31:32 GMT-04:00, zimoun a =C3=A9crit : >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=2E :-) Thanks for the review! > > >>>>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=2E11=2E1=2E >> >> * gnu/packages/ocaml=2Escm (ocaml): Update to 4=2E11=2E1=2E >> --- >> gnu/packages/ocaml=2Escm | 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=2E09-findlib=2E >> >> * gnu/packages/ocaml=2Escm (ocaml4=2E09-findlib): New variable=2E >> --- >> gnu/packages/ocaml=2Escm | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/gnu/packages/ocaml=2Escm b/gnu/packages/ocaml=2Escm >> index be2f486179=2E=2E84daa8afca 100644 >> --- a/gnu/packages/ocaml=2Escm >> +++ b/gnu/packages/ocaml=2Escm >> @@ -1007,6 +1007,14 @@ compilers that can directly deal with >packages=2E") >> `(("m4" ,m4) >> ("ocaml" ,ocaml-4=2E07))))) >> =20 >> +(define-public ocaml4=2E09-findlib >> + (package >> + (inherit ocaml-findlib) >> + (name "ocaml4=2E09-findlib") >> + (native-inputs >> + `(("m4" ,m4) >> + ("ocaml" ,ocaml-4=2E09))))) >> + >> ;; note that some tests may hang for no obvious reason=2E >> (define-public ocaml-ounit >> (package >> --=20 >> 2=2E28=2E0 > >LGTM! Even if I was confused at first by: :-) The goal is to switcg to ocaml 4=2E11 by default, so after the switcg we n= eed a way to express pcakages with ocaml 4=2E09 :) > >--8<---------------cut here---------------start------------->8--- >$ =2E/pre-inst-env guix build ocaml4=2E09-findlib >/gnu/store/p49l1cr1wmf53szd5k4s2nx9n3p3qfc3-ocaml4=2E09-findlib-1=2E8=2E1 > >$ guix build ocaml-findlib >/gnu/store/n791rs3wvbm0fpmd0bqfhb3f4ysjwqia-ocaml-findlib-1=2E8=2E1 > >$ =2E/pre-inst-env guix build ocaml-findlib >/gnu/store/n791rs3wvbm0fpmd0bqfhb3f4ysjwqia-ocaml-findlib-1=2E8=2E1 >--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=2E09=2E >> >> * guix/build-system/ocaml=2Escm (package-with-ocaml4=2E09) >> (strip-ocaml4=2E09-variant): New variables=2E >> * gnu/packages/ocaml=2Escm (ocaml4=2E09-result, ocaml4=2E09-csexp) >> (ocaml4=2E09-dune-configurator, ocaml4=2E09-dune): New variables=2E >> --- >> gnu/packages/ocaml=2Escm | 46 >++++++++++++++++++++++++++++++++++++- >> guix/build-system/ocaml=2Escm | 27 ++++++++++++++++++++++ >> 2 files changed, 72 insertions(+), 1 deletion(-) > >[=2E=2E=2E] > =20 >> +(define-public ocaml4=2E09-dune-configurator >> + (package >> + (inherit dune-configurator) >> + (name "ocaml4=2E09-dune-configurator") >> + (arguments >> + `(#:package "dune-configurator" >> + #:tests? #f >> + #:dune ,(package-with-ocaml4=2E09 dune-bootstrap) >> + #:ocaml ,ocaml-4=2E09 >> + #:findlib ,ocaml4=2E09-findlib)) >> + (propagated-inputs >> + `(("ocaml-csexp" ,(package-with-ocaml4=2E09 ocaml-csexp)))))) > >As I wrote in the other thread about updating Dune, it looks ackward to >me the use the 'package-with-ocaml4=2E09' inside and not wrap outside=2E= =2E=2E I understand this is confusing=2E The issue is that package-with-ocaml4=2E= 09 uses ocaml4=2E09-dune, but ocaml4=2E09-dune-configurator (as well as cse= xp and result) are dependencies of dune=2E So I define them separately, and use the properties field, so I can use pa= ckage-with-ocaml4=2E09, and use the variant I define, instead of the defaul= t=2E > >> (define-public dune >> (package >> (inherit dune-bootstrap) >> (propagated-inputs >> `(("dune-configurator" ,dune-configurator))) >> - (properties `((ocaml4=2E07-variant =2E ,(delay ocaml4=2E07-dune)))= ))) >> + (properties `((ocaml4=2E07-variant =2E ,(delay ocaml4=2E07-dune)) >> + (ocaml4=2E09-variant =2E ,(delay ocaml4=2E09-dune)))= ))) > >=2E=2E=2Eespecially these 'delay' in properties=2E But I got your >arguments=2E :-)=20 > > >> +(define-public ocaml4=2E09-dune >> + (package >> + (inherit (package-with-ocaml4=2E09 dune-bootstrap)) >> + (propagated-inputs >> + `(("dune-configurator" ,dune-configurator))))) > >[=2E=2E=2E] Uh oh this is an issue I think :) > >> +(define-public ocaml4=2E09-csexp >> + (package >> + (inherit ocaml-csexp) >> + (name "ocaml4=2E09-csexp") >> + (arguments >> + `(#:ocaml ,ocaml-4=2E09 >> + #:findlib ,ocaml4=2E09-findlib >> + ,@(substitute-keyword-arguments (package-arguments >ocaml-csexp) >> + ((#:dune _) (package-with-ocaml4=2E09 dune-bootstrap))))) >> + (propagated-inputs >> + `(("ocaml-result" ,(package-with-ocaml4=2E09 ocaml-result)))))) > >You do not use the one you define below=2E Why? Other said, do you >really need 'ocaml4=2E09=2Eresult' defined below? Actually, the properties ensure that I actually use the one below :) > >> + >> (define-public ocaml-migrate-parsetree >> (package >> (name "ocaml-migrate-parsetree") >> @@ -1494,12 +1528,22 @@ powerful=2E") >> (arguments >> `(#:test-target "=2E" >> #:dune ,dune-bootstrap)) >> + (properties `((ocaml4=2E09-variant =2E ,(delay ocaml4=2E09-result)= ))) > >Does it fail if instead > >(properties `((ocaml4=2E09-variant =2E ,(package-with-ocaml4=2E09 >ocaml-result))) Ah no, that should be fine, thanks=2E > >? > > >> +(define-public ocaml4=2E09-result >> + (package >> + (inherit ocaml-result) >> + (arguments >> + `(#:test-target "=2E" >> + #:dune ,(package-with-ocaml4=2E09 dune-bootstrap) >> + #:ocaml ,ocaml-4=2E09 >> + #:findlib ,ocaml4=2E09-findlib)))) > >Since the name is not changed after inheritance, this package is >ambiguous=2E And possibly do not compile=2E Ah right, thanks! > > >Otherwise, LGTM=2E > > >>>>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=2E7=2E0=2E >> >> * gnu/packages/games=2Escm (laby): Update to 0=2E7=2E0=2E >> --- >> gnu/packages/games=2Escm | 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=2E09'=2E And the update in other patch set=2E Well, >bikeshed=2E :-) > >LGTM=2E > > >>>>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=2E >> >> * gnu/packages/ocaml=2Escm (ocaml-ppx-tools-versioned): Use release >> profile=2E >> --- >> gnu/packages/ocaml=2Escm | 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=2E >> >> * gnu/packages/ocaml=2Escm (ocamlify): Perform bootstrap build=2E >> --- >> gnu/packages/ocaml=2Escm | 29 ++++++++++++++++++----------- >> 1 file changed, 18 insertions(+), 11 deletions(-) >> >> diff --git a/gnu/packages/ocaml=2Escm b/gnu/packages/ocaml=2Escm >> index 15ca326376=2E=2E660aeef25a 100644 >> --- a/gnu/packages/ocaml=2Escm >> +++ b/gnu/packages/ocaml=2Escm >> @@ -2433,21 +2433,28 @@ radix-64 representation=2E It is specified in >RFC 4648=2E") >> (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? No, the comment might have come from a previous version or just copied by = mistake=2E There is really no test in this package (unless there's somethin= g weird going on with oasis scripts)=2E > >> + #:phases > >[=2E=2E=2E] > >> #t)) >> - (delete 'check) ; tests are run during the >build > >[=2E=2E=2E] > >> (home-page "https://forge=2Eocamlcore=2Eorg/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=2E11 by default=2E >> >> * gnu/packages/ocaml=2Escm (ocaml): Switch to 4=2E11 by default=2E >> --- >> gnu/packages/ocaml=2Escm | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/gnu/packages/ocaml=2Escm b/gnu/packages/ocaml=2Escm >> index 660aeef25a=2E=2Ee486a09fbb 100644 >> --- a/gnu/packages/ocaml=2Escm >> +++ b/gnu/packages/ocaml=2Escm >> @@ -243,7 +243,7 @@ functional, imperative and object-oriented styles >of programming=2E") >> "--prefix" out >> "--mandir" mandir)))))))))) >> =20 >> -(define-public ocaml ocaml-4=2E09) >> +(define-public ocaml ocaml-4=2E11) >> =20 >> (define-public ocamlbuild >> (package > >Cool! LGTM! > > >All the best, >simon From unknown Tue Aug 19 21:03:32 2025 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 14:25:02 +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.160311748328517 (code B ref 44032); Mon, 19 Oct 2020 14:25:02 +0000 Received: (at 44032) by debbugs.gnu.org; 19 Oct 2020 14:24:43 +0000 Received: from localhost ([127.0.0.1]:41985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUW5a-0007Pt-KI for submit@debbugs.gnu.org; Mon, 19 Oct 2020 10:24:42 -0400 Received: from mail-qv1-f65.google.com ([209.85.219.65]:37336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUW5Z-0007Pe-4B for 44032@debbugs.gnu.org; Mon, 19 Oct 2020 10:24:41 -0400 Received: by mail-qv1-f65.google.com with SMTP id t6so4379064qvz.4 for <44032@debbugs.gnu.org>; Mon, 19 Oct 2020 07:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FJUTczWToc5w+0Cpy7tYLJFFKvCk47gIPNbm2mo9o8Q=; b=sdW0+bIv7o2Y0VbTA3LBuHJq/iUQxP0AiL5XuFZmIegLkeYlYJ1bRKvwEjDWFbIbJn 7XdhSKe34D40z6Zjk16jLdGwnP72ZY3A2mjrtAV2Ka23yw1bsNbCDw2Pqx6/V/WIJkqy moioAtZm8riIGk5pssrUEWKpNrTSkfzEdo2sylLsV15Rl/xMhLaV4Cz+7MYM7Z3KHXwq jYjf+n8oEtryqH4vCDmQ1l8ocFa8GDY9XeyV44fxlIA6Hyh8GjGYR5sonopLVUW2UPWj ThXzPmprcoW+doX7i0aYs7ImvDofQH3leW+E3FoWqNUT/qOG+yHDOXnk68RXwsY0BHxc wUIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FJUTczWToc5w+0Cpy7tYLJFFKvCk47gIPNbm2mo9o8Q=; b=e8riPxnlPwzQrFMSZ1M9qH8RAw69G6gGixISJs4g/SLu/dUiFjf0mlGqpm+DznFerX AnAz6KcybaR9OVcxQGwHlxdJZAwdddDgited1mS+jzCto3RvK11XdJUvupQA36nCeB29 CukiXoYjld1CZu3Hstg233Z9NXadOeqyFsErgjxS+6cTccqeyk4TjGYPMnKHifbmZJfL kZYkdtBwVbxHH/3biAXCOZ+zPUXtwNx8UljMAoV9Z73V9oqO6JJNAxG+3O7WKgissJsO zX9lAbBcxQ/N1FBhcOeO48hXQibmeiNX2NS5Bkt5tlnNhv7r0L0I1Q2HTZEwi51cEQXx lazA== X-Gm-Message-State: AOAM533/QAcfWHShU6xlqtYzeChLcHagtRq83t7r6W7nlqWQZonWywXQ G7W/M89q8I1wJz/nhoRbQNoI7nk+ehLJQHB9PWHJMVoHp9M= X-Google-Smtp-Source: ABdhPJwPYtBkKVrShDgTfb9iVhh6yQ1I+5e9Yfyu8jeBtf3O9BwuZk7JIyF3iMVYLp7WB62AI7f/G7au+h+vsNcwps4= X-Received: by 2002:a0c:bd2d:: with SMTP id m45mr17454945qvg.36.1603117474760; Mon, 19 Oct 2020 07:24:34 -0700 (PDT) MIME-Version: 1.0 References: <20201016171436.5f642654@tachikoma> <87y2k2fikr.fsf@gmail.com> <26294C8B-1271-4ED9-8B1C-9A6DDF7E9AEA@lepiller.eu> In-Reply-To: <26294C8B-1271-4ED9-8B1C-9A6DDF7E9AEA@lepiller.eu> From: zimoun Date: Mon, 19 Oct 2020 16:24:23 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Mon, 19 Oct 2020 at 16:11, Julien Lepiller wrote: > >> +(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? > > Actually, the properties ensure that I actually use the one below :) I am not sure. You are recreating a package based on 'ocaml-result' and not using the package 'ocaml4.09-result'. Or I miss something about the symbols. > >> +(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. > > Ah right, thanks! Moreover, my point is: you are using once: (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)))) and once: `(("ocaml-result" ,(package-with-ocaml4.09 ocaml-result)))))) and it seems easier to only use one form. Other said, maybe you do not need the new 'ocaml4.09-result' and '(package-with-ocaml4.09 ocaml-result)' is enough. > >> - `(#: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? > > No, the comment might have come from a previous version or just copied by mistake. There is really no test in this package (unless there's something weird going on with oasis scripts). Maybe reword the comment: "no test provided by the package"or something like that. All the best, simon From unknown Tue Aug 19 21:03:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Oct 2020 15:15: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: zimoun Cc: 44032@debbugs.gnu.org Received: via spool by 44032-submit@debbugs.gnu.org id=B44032.16031204989109 (code B ref 44032); Mon, 19 Oct 2020 15:15:01 +0000 Received: (at 44032) by debbugs.gnu.org; 19 Oct 2020 15:14:58 +0000 Received: from localhost ([127.0.0.1]:42041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUWsE-0002Mr-0m for submit@debbugs.gnu.org; Mon, 19 Oct 2020 11:14:58 -0400 Received: from lepiller.eu ([89.234.186.109]:47712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUWsB-0002Me-SM for 44032@debbugs.gnu.org; Mon, 19 Oct 2020 11:14:56 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9351f725; Mon, 19 Oct 2020 15:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=RMZIDBVAV6cfpUU1aS8wvLqtoRz1vp+A8v3B35SWncw=; b=N6mQoAh E3BxNSJSk2Cxrv1hJVobmk2JiCxyN2dfL8jcrLaP+selT65Jm6blRQc/QrPwlHeu vwBY7n6z8+86dQlhuuEx66+ul7oZQqutJ6OPG2O/zDPji6PK1a3BJt6eL64hHmv/ t0TyBZ4uq5hXKtrd42EZ+82GyiXLyDe+ydCvGM+co5f4qoUG+ndFEWIpHwW9+Jhu /cXq5r5ewUx0zVU5HUJx+KtWJCob5EHOYAf53OgUAT4Xzwxa6/44SFpl4PH3v1dE wB7zks1VXRsrncyiHQhdE1bHHvbloQGge2Cr9rmSqqnlB+0/MXmfb21HLS931eKJ tXB5bvBnXCFzXUg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3eedd85a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 19 Oct 2020 15:14:50 +0000 (UTC) Date: Mon, 19 Oct 2020 11:14:32 -0400 User-Agent: K-9 Mail for Android In-Reply-To: References: <20201016171436.5f642654@tachikoma> <87y2k2fikr.fsf@gmail.com> <26294C8B-1271-4ED9-8B1C-9A6DDF7E9AEA@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Julien Lepiller Message-ID: <0736C245-79D4-4A6F-B79E-0D51A45F67DC@lepiller.eu> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le 19 octobre 2020 10:24:23 GMT-04:00, zimoun a =C3=A9crit : >On Mon, 19 Oct 2020 at 16:11, Julien Lepiller >wrote: > >> >> +(define-public ocaml4=2E09-csexp >> >> + (package >> >> + (inherit ocaml-csexp) >> >> + (name "ocaml4=2E09-csexp") >> >> + (arguments >> >> + `(#:ocaml ,ocaml-4=2E09 >> >> + #:findlib ,ocaml4=2E09-findlib >> >> + ,@(substitute-keyword-arguments (package-arguments >> >ocaml-csexp) >> >> + ((#:dune _) (package-with-ocaml4=2E09 >dune-bootstrap))))) >> >> + (propagated-inputs >> >> + `(("ocaml-result" ,(package-with-ocaml4=2E09 >ocaml-result)))))) >> > >> >You do not use the one you define below=2E Why? Other said, do you >> >really need 'ocaml4=2E09=2Eresult' defined below? >> >> Actually, the properties ensure that I actually use the one below :) > >I am not sure=2E You are recreating a package based on 'ocaml-result' >and not using the package 'ocaml4=2E09-result'=2E Or I miss something >about the symbols=2E package-with-ocaml4=2E09 first reads the properties field of its arguments= , and if it has an ocaml4=2E09-variant,it uses it=2E Otherwise it creates a= new package that uses ocaml 4=2E09, ocaml4=2E09-findlib and ocaml4=2E09-du= ne=2E If you remove the property in ocaml-result, you'll see that building (pack= age-with-ocaml4=2E09 result) ends up in a loop: it wants ocaml4=2E09-dune, = but is itself a dependency of ocaml4=2E09-dune=2E > > >> >> +(define-public ocaml4=2E09-result >> >> + (package >> >> + (inherit ocaml-result) >> >> + (arguments >> >> + `(#:test-target "=2E" >> >> + #:dune ,(package-with-ocaml4=2E09 dune-bootstrap) >> >> + #:ocaml ,ocaml-4=2E09 >> >> + #:findlib ,ocaml4=2E09-findlib)))) >> > >> >Since the name is not changed after inheritance, this package is >> >ambiguous=2E And possibly do not compile=2E >> >> Ah right, thanks! > >Moreover, my point is: you are using > > once: > (properties `((ocaml4=2E09-variant =2E ,(delay ocaml4=2E09-result)))) >and once: > `(("ocaml-result" ,(package-with-ocaml4=2E09 ocaml-result)))))) > >and it seems easier to only use one form=2E Other said, maybe you do >not need the new 'ocaml4=2E09-result' and '(package-with-ocaml4=2E09 >ocaml-result)' is enough=2E OK, I'll use the variant I define everywhere if it makes things easier to = understand later=2E > > >> >> - `(#: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? >> >> No, the comment might have come from a previous version or just >copied by mistake=2E There is really no test in this package (unless >there's something weird going on with oasis scripts)=2E > >Maybe reword the comment: "no test provided by the package"or >something like that=2E > > >All the best, >simon From unknown Tue Aug 19 21:03:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Julien Lepiller Subject: bug#44032: closed (Re: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1) Message-ID: References: <20201110160702.4242be2b@tachikoma.lepiller.eu> <20201016171436.5f642654@tachikoma> X-Gnu-PR-Message: they-closed 44032 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 44032@debbugs.gnu.org Date: Tue, 10 Nov 2020 15:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1605020882-20506-1" This is a multi-part message in MIME format... ------------=_1605020882-20506-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #44032: [PATCH] gnu: ocaml: Update to 4.11.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 44032@debbugs.gnu.org. --=20 44032: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44032 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1605020882-20506-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 44032-done) by debbugs.gnu.org; 10 Nov 2020 15:07:21 +0000 Received: from localhost ([127.0.0.1]:38578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcVEv-0005JY-AU for submit@debbugs.gnu.org; Tue, 10 Nov 2020 10:07:21 -0500 Received: from lepiller.eu ([89.234.186.109]:53748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcVEs-0005JO-Ir for 44032-done@debbugs.gnu.org; Tue, 10 Nov 2020 10:07:19 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 95102ac6; Tue, 10 Nov 2020 15:07:13 +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=RtxkTRU6Vcg3 Is3wtNTvdv2Shr/NvWBSlaBLvSvCjXM=; b=fp9n7JlFnSsDn9buvfbWSkpJfb+p dKdaJN1Rv2HJfL0VjnrRpE9ZgLrvFARYfc3BETQ/ONxVrJPWbvRmNrrsIdFSrRDl QJHC0zdBQUUYWssfyJzRu5oZiQXenv1ydP0XSVeqklElfbE+gMAQcPHCYq1EYMfP ItLo4XlAt6xQC8o7Apb43FPXnXFp3ZxAg1K/ELgCcvPGG7lt1doCEu3QQJw2jo08 5yYCSZJVMFzLKi81b94oY5uTBXZ/KxOy0zoeL8ZbLC+/NxctM+OYGZd0nBkLyIea BZHc4ovs52VQQYMhK6ETHxo8JVtQxkv6fGDqPGf6bnXRqaXbBUNsgwYmiw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2fe29add (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 10 Nov 2020 15:07:09 +0000 (UTC) Date: Tue, 10 Nov 2020 16:07:02 +0100 From: Julien Lepiller To: zimoun Subject: Re: [bug#44032] [PATCH] gnu: ocaml: Update to 4.11.1 Message-ID: <20201110160702.4242be2b@tachikoma.lepiller.eu> In-Reply-To: <0736C245-79D4-4A6F-B79E-0D51A45F67DC@lepiller.eu> References: <20201016171436.5f642654@tachikoma> <87y2k2fikr.fsf@gmail.com> <26294C8B-1271-4ED9-8B1C-9A6DDF7E9AEA@lepiller.eu> <0736C245-79D4-4A6F-B79E-0D51A45F67DC@lepiller.eu> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44032-done Cc: 44032-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Sorry for the delay! It's finally pushed as 0c8370824080991fa9fd3f2698aae13a9d4ec894 to 0a173fe25f3040d692c15fb26dace7eace9948e4 Thank you for the review! ------------=_1605020882-20506-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Oct 2020 15:15:06 +0000 Received: from localhost ([127.0.0.1]:60507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTRRd-0006MZ-8l for submit@debbugs.gnu.org; Fri, 16 Oct 2020 11:15:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:53144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTRRb-0006MR-6V for submit@debbugs.gnu.org; Fri, 16 Oct 2020 11:14:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTRRb-00024R-14 for guix-patches@gnu.org; Fri, 16 Oct 2020 11:14:59 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:33858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTRRX-00076P-6B for guix-patches@gnu.org; Fri, 16 Oct 2020 11:14:58 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id da5752a7 for ; Fri, 16 Oct 2020 15:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=ZGS 22rvK0xIbqm6hA9V2xX0x2ahMyipK6N0m0lzDJIA=; b=dZkfNl7iDk9cQQtBnKd ib58S6Vvciiva5qMcHjKc8sAmUB/VeucDEK4j+qxozJ0AZo5uOsSAudXHMX6/HHT QH12Hyh5MpB+kjfPXFO+z7XioKkUcHHr5Clh3qgl0XGph0r/HupQg71wmRM3r2rE ZUMIsZCr4JTMGEsf8SVWq5G+JTFmWPOkDPXdTskTVxt8E6Ii6F9cJiRms55dipan UD+qN0ORrncsLOLXXJj0V4yTvNRvpN66YiwhLo7wDDiW7OaJKqc2O9T34lTl/t62 GkQcykYkpW8vdk+8KFakOAIL7K5f4GXeGuaWKXjcqd8ARaktiSKrTmlg+iDBTd3a dDQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id fbca6733 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Fri, 16 Oct 2020 15:14:48 +0000 (UTC) Date: Fri, 16 Oct 2020 17:14:36 +0200 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: ocaml: Update to 4.11.1 Message-ID: <20201016171436.5f642654@tachikoma> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/rPl+tp8.mCNO4=3EzwSif3e" Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! this small patch series update ocaml to 4.11.1. The first patch adds ocaml 4.11.1, the second adds findlib for 4.09, the third add package-with-ocaml4.09 (along with ocaml4.09-dune, which I can't put in a separate patch without breaking something). Then, three patches fix the build of three packages (with these patches, they build fine with 4.09 and 4.11). The last patch performs the final switch to 4.11. Easier than I expected! :) Note that with that, previously unreproducible packages are reproducible! --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ocaml-Update-to-4.11.1.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4cc530509a..be2f486179 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -132,10 +132,10 @@ "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (delete 'configure)))) -(define-public ocaml-4.09 +(define-public ocaml-4.11 (package (name "ocaml") - (version "4.09.0") + (version "4.11.1") (source (origin (method url-fetch) (uri (string-append @@ -144,7 +144,7 @@ "/ocaml-" version ".tar.xz")) (sha256 (base32 - "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) + "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -202,6 +202,20 @@ functional, imperative and object-oriented styles of programming.") ;; distributed under lgpl2.0. (license (list license:qpl license:lgpl2.0)))) +(define-public ocaml-4.09 + (package + (inherit ocaml-4.11) + (version "4.09.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://caml.inria.fr/pub/distrib/ocaml-" + (version-major+minor version) + "/ocaml-" version ".tar.xz")) + (sha256 + (base32 + "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) + (define-public ocaml-4.07 (package (inherit ocaml-4.09) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-Add-ocaml4.09-findlib.patch >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 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-guix-ocaml-Add-package-with-ocaml4.09.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 84daa8afca..e3ddb36a4e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1321,15 +1321,36 @@ following a very simple s-expression syntax.") #:tests? #f)) (propagated-inputs `(("ocaml-csexp" ,ocaml-csexp))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)))) (synopsis "") (description ""))) +(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)))))) + (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)))))) + +(define-public ocaml4.09-dune + (package + (inherit (package-with-ocaml4.09 dune-bootstrap)) + (propagated-inputs + `(("dune-configurator" ,dune-configurator))))) (define-public ocaml4.07-dune (package @@ -1370,6 +1391,7 @@ following a very simple s-expression syntax.") #t))))) (propagated-inputs `(("ocaml-result" ,ocaml-result))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp)))) (home-page "https://github.com/ocaml-dune/csexp") (synopsis "Parsing and printing of S-expressions in Canonical form") (description "This library provides minimal support for Canonical @@ -1386,6 +1408,18 @@ To avoid a dependency on a particular S-expression library, the only module of this library is parameterised by the type of S-expressions.") (license license:expat))) +(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)))))) + (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)))) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >= 4.03 while staying compatible with older version of OCaml should use the Result module defined in this library.") (license license:bsd-3))) + +(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)))) (define-public ocaml-topkg (package diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index c5996bf0cf..5513216c25 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -29,6 +29,8 @@ #:export (%ocaml-build-system-modules package-with-ocaml4.07 strip-ocaml4.07-variant + package-with-ocaml4.09 + strip-ocaml4.09-variant default-findlib default-ocaml lower @@ -96,6 +98,18 @@ (let ((module (resolve-interface '(gnu packages ocaml)))) (module-ref module 'ocaml4.07-dune))) +(define (default-ocaml4.09) + (let ((ocaml (resolve-interface '(gnu packages ocaml)))) + (module-ref ocaml 'ocaml-4.09))) + +(define (default-ocaml4.09-findlib) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml4.09-findlib))) + +(define (default-ocaml4.09-dune) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml4.09-dune))) + (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix #:key variant-property) "Return a procedure of one argument, P. The procedure creates a package @@ -171,6 +185,19 @@ pre-defined variants." (inherit p) (properties (alist-delete 'ocaml4.07-variant (package-properties p))))) +(define package-with-ocaml4.09 + (package-with-explicit-ocaml (delay (default-ocaml4.09)) + (delay (default-ocaml4.09-findlib)) + (delay (default-ocaml4.09-dune)) + "ocaml-" "ocaml4.09-" + #:variant-property 'ocaml4.09-variant)) + +(define (strip-ocaml4.09-variant p) + "Remove the 'ocaml4.09-variant' property from P." + (package + (inherit p) + (properties (alist-delete 'ocaml4.09-variant (package-properties p))))) + (define* (lower name #:key source inputs native-inputs outputs system target (ocaml (default-ocaml)) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-gnu-laby-Update-to-0.7.0.patch >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(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d473baa335..b03e4ebfea 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5119,7 +5119,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.") (define-public laby (package (name "laby") - (version "0.6.4") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -5128,7 +5128,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.") (file-name (git-file-name name version)) (sha256 (base32 - "12fq9hhrxpzgfinmj9ra9ckss9yficwdlrmgjvvsq7agvh3sgyl1")) + "1y6nfxcjhqg9bb81hs0wijg7kcwk5kff81rgd8bsv5ps7ia9nj6b")) (patches (search-patches "laby-make-install.patch")))) (build-system gnu-build-system) (inputs -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0005-gnu-ocaml-ppx-tools-versioned-Use-release-profile.patch >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(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3ddb36a4e..15ca326376 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1464,7 +1464,8 @@ functions to the next and/or previous version.") "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:package "ppx_tools_versioned")) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) (properties `((upstream-name . "ppx_tools_versioned"))) -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-gnu-ocamlify-Perform-bootstrap-build.patch =46rom 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 46= 48.") (base32 "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii")))) (build-system ocaml-build-system) (arguments - `(#:phases + `(#:tests? #f; no tests + #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-safe-string - ;; Work around =E2=80=98Error: This expression has type string = but an - ;; expression was expected of type bytes=E2=80=99 since OCaml 4= .06. + (delete 'configure) + (replace 'build + ;; This package uses pre-generated setup.ml by oasis, but is + ;; a dependency of oasis. the pre-generated setup.ml is broken + ;; with recent versions of OCaml, so we perform a bootstrap ins= tead. (lambda _ - (setenv "OCAMLPARAM" "safe-string=3D0,_") + (substitute* "src/OCamlifyConfig.ml.ab" + (("$pkg_version") ,version)) + (rename-file "src/OCamlifyConfig.ml.ab" "src/OCamlifyConfig.m= l") + (with-directory-excursion "src" + (invoke "ocamlc" "OCamlifyConfig.ml" "ocamlify.ml" "-o" + "ocamlify")) #t)) - (delete 'check) ; tests are run during the build - (replace 'configure + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (invoke "ocaml" "setup.ml" "-configure" "--prefix" - (assoc-ref outputs "out"))))))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "src/ocamlify" bin) + #t)))))) (home-page "https://forge.ocamlcore.org/projects/ocamlify") (synopsis "Include files in OCaml code") (description "OCamlify creates OCaml source code by including --=20 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0007-gnu-ocaml-Switch-to-4.11-by-default.patch >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 -- 2.28.0 --MP_/rPl+tp8.mCNO4=3EzwSif3e-- ------------=_1605020882-20506-1--