From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 22:16:40 2021 Received: (at submit) by debbugs.gnu.org; 22 Dec 2021 03:16:40 +0000 Received: from localhost ([127.0.0.1]:56347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzs7L-0002LG-Ug for submit@debbugs.gnu.org; Tue, 21 Dec 2021 22:16:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:53226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzs7G-0002L5-Lm for submit@debbugs.gnu.org; Tue, 21 Dec 2021 22:16:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzs7G-0007kT-Fb for guix-patches@gnu.org; Tue, 21 Dec 2021 22:16:34 -0500 Received: from lepiller.eu ([89.234.186.109]:51254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzs7D-0002sk-Tv for guix-patches@gnu.org; Tue, 21 Dec 2021 22:16:34 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8de3aaf2 for ; Wed, 22 Dec 2021 03:16:22 +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=5vM IamyMHennjv7voTOEkJ9MlWr2ILwMHVUcIQkSK/Y=; b=eoI52GLTdQLCAiv5phJ yIH83K9YaOeTK9sjXzkaZXg9d0RkBCVS6C/fmP9+Iv8QpGGTbooHabCUMlrNHRUq 0oVzD/j8oq02a4IlCuv01l+4NUBlP+HZGema8NcRA6mqxYnUs60lNjHAPzgMAEBA s9KsmFKJuQDo+iPixIkKe/oQ//giFBN44ec1q/m97sjgpDG5G1AsalO31+nTxejr a/YMySddiZ7QUeeiEbH3qbfM+Wx6DPf+84MMScrdmri3ESf2HIAq76oM8Gr9J/IW zAOnJnfMfX9ak6HqBoxtQFpGe8T+YUorJQwFpN29x7aIPU7g09nb+ckXkYUWXiOT QvA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b1453d15 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Wed, 22 Dec 2021 03:16:21 +0000 (UTC) Date: Wed, 22 Dec 2021 04:16:09 +0100 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: ocaml: Update to 4.13. Message-ID: <20211222041609.2fde841e@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/VBLKtYienWiTsrVGKf.V2Rp" Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu 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: -2.3 (--) --MP_/VBLKtYienWiTsrVGKf.V2Rp Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! This patch updates ocaml to the latest version, without the need to keep the previous version around like previous updates :) --MP_/VBLKtYienWiTsrVGKf.V2Rp Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ocaml-Update-to-4.13.patch >From df28351979735231bbf494da95d7fc0af5dfd32b Mon Sep 17 00:00:00 2001 Message-Id: From: Julien Lepiller Date: Wed, 22 Dec 2021 04:13:53 +0100 Subject: [PATCH] gnu: ocaml: Update to 4.13. * gnu/packages/ocaml.scm (ocaml-4.13): New variable. (ocaml-4.11): Remove variable. (ocaml-dot-merlin-reader): Update to 4.4-413. (js-of-ocaml): Update to 3.11.0. --- gnu/packages/ocaml.scm | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e6001ca37b..9a031c9220 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -182,10 +182,10 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") (license license:expat)))) -(define-public ocaml-4.11 +(define-public ocaml-4.13 (package (name "ocaml") - (version "4.11.1") + (version "4.13.1") (source (origin (method url-fetch) (uri (string-append @@ -194,7 +194,7 @@ (define-public ocaml-4.11 "/ocaml-" version ".tar.xz")) (sha256 (base32 - "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) + "1s7xwqidpjwfhnpfma4nb93gxfr7g9jfn03s1j03iyavmpgph7ck")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -210,7 +210,10 @@ (define-public ocaml-4.11 (list libx11 libiberty ;needed for objdump support zlib)) ;also needed for objdump support (arguments - `(#:phases + `(#:configure-flags '("--enable-ocamltest") + #:test-target "tests" + #:make-flags '("world.opt") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh-references (lambda* (#:key inputs #:allow-other-keys) @@ -226,16 +229,7 @@ (define-public ocaml-4.11 patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" file quoted-sh) quoted-sh)))) - (find-files "." "\\.ml$")) - #t)))) - (replace 'build - (lambda _ - (invoke "make" "-j" (number->string (parallel-job-count)) - "world.opt"))) - (replace 'check - (lambda _ - (with-directory-excursion "testsuite" - (invoke "make" "all"))))))) + (find-files "." "\\.ml$"))))))))) (home-page "https://ocaml.org/") (synopsis "The OCaml programming language") (description @@ -250,7 +244,7 @@ (define-public ocaml-4.11 (define-public ocaml-4.09 (package - (inherit ocaml-4.11) + (inherit ocaml-4.13) (version "4.09.0") (source (origin (method url-fetch) @@ -261,7 +255,33 @@ (define-public ocaml-4.09 (patches (search-patches "ocaml-4.09-multiple-definitions.patch")) (sha256 (base32 - "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) + "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh-references + (lambda* (#:key inputs #:allow-other-keys) + (let* ((sh (search-input-file inputs "/bin/sh")) + (quoted-sh (string-append "\"" sh "\""))) + (with-fluids ((%default-port-encoding #f)) + (for-each + (lambda (file) + (substitute* file + (("\"/bin/sh\"") + (begin + (format (current-error-port) "\ +patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" + file quoted-sh) + quoted-sh)))) + (find-files "." "\\.ml$")))))) + (replace 'build + (lambda _ + (invoke "make" "-j" (number->string (parallel-job-count)) + "world.opt"))) + (replace 'check + (lambda _ + (with-directory-excursion "testsuite" + (invoke "make" "all"))))))))) ;; This package is a bootstrap package for ocaml-4.07. It builds from camlboot, ;; using the upstream sources for ocaml 4.07. It installs a bytecode ocamllex @@ -440,7 +460,7 @@ (define-public ocaml-4.07 ("perl" ,perl) ("pkg-config" ,pkg-config))))) -(define-public ocaml ocaml-4.11) +(define-public ocaml ocaml-4.13) (define-public ocamlbuild (package @@ -4735,7 +4755,7 @@ (define-public ocaml-craml (define-public ocaml-dot-merlin-reader (package (name "ocaml-dot-merlin-reader") - (version "4.3.1-411") + (version "4.4-413") (source (origin (method git-fetch) @@ -4745,7 +4765,7 @@ (define-public ocaml-dot-merlin-reader (file-name (git-file-name name version)) (sha256 (base32 - "1nwgc9nyy80dc9cgkskyfwv9c785yjyg39s005d4wiagj4fy68v8")))) + "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23")))) (build-system dune-build-system) (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests @@ -7617,7 +7637,7 @@ (define-public ocaml-cohttp (define-public js-of-ocaml (package (name "js-of-ocaml") - (version "3.9.1") + (version "3.11.0") (source (origin (method git-fetch) @@ -7626,9 +7646,20 @@ (define-public js-of-ocaml (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (base32 "1x5f1ph9wgx0mgyibssssnrcwp69ihw66gzhsnz9h79czgzyjpp2")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) + (arguments + `(#:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-failing-test + (lambda _ + ;; Formating difference + (with-output-to-file "compiler/tests-jsoo/bin/error2.expected" + (lambda _ + (format #t + "Fatal error: exception Match_failure(\ +\"compiler/tests-jsoo/bin/error2.ml\", 11, 2)\n\n")))))))) (propagated-inputs (list ocaml-ppxlib ocaml-uchar -- 2.34.0 --MP_/VBLKtYienWiTsrVGKf.V2Rp-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 22 08:34:20 2021 Received: (at 52729) by debbugs.gnu.org; 22 Dec 2021 13:34:20 +0000 Received: from localhost ([127.0.0.1]:57107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n01l5-0002g2-Tb for submit@debbugs.gnu.org; Wed, 22 Dec 2021 08:34:20 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:41908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n01l3-0002fq-Pu for 52729@debbugs.gnu.org; Wed, 22 Dec 2021 08:34:18 -0500 Received: by mail-wr1-f43.google.com with SMTP id a9so4952727wrr.8 for <52729@debbugs.gnu.org>; Wed, 22 Dec 2021 05:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=Norw+owmM6rn5lSCUlrOvwgy6pCb3eyqbubCHvK4SnY=; b=HAD5UDrP6CV/FITXaEcK6uFXZpVX+52QwHS/tMLV3ol3EkVlaLNNg2fjbKQr54uIej ytOn0RXwnIow7DtnEpBU1FlEeKtsiDUvaHKOtOJypODUQKXveGuQV/rjEiV7i4G2cgvX +6JFnlhvyztTE5FAFu2CD4d5xkUnGj/Cgfwh4UYzuqKUGCPpW9QQeDlSYvfKMb7syVKV lmmBcu+h9VSgIn5hL7MDBxqDxrIgqZhiQQ17koEWFHPQjT4jz9vst07OyJad8ULv4z54 9DEDzkf5iOgyXZ4eK+SyvDdYM/E8wJq5p1eKXJELDQufi+luPkoinaAfr8RtaXetW6Z6 svLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=Norw+owmM6rn5lSCUlrOvwgy6pCb3eyqbubCHvK4SnY=; b=HRtrujAMImymUCowMZZntv7I2qlwy4snkHCmyY/R9bs8k6magw06eb9VTbYuso9Oib F5x9JTzacJ7UJBG86SvqH6cMHs0YMmSd32P6QI6PwKzEF2D/p42zUBIR51GupOzZyWbp xs+pY6jUYOn6G5N9Np93RX8J6D2i5cwt1CcJ67r+OnglUpqwTC0eCv8LnGk4q2r/wzlL X9Dy68k1R6LUNzcMQJtA2O+cF4SRjDRIUSkmMR3iobEqiPxHWnS97t+F/YWuOXi2mFoe enU6xfRUVwQmRixGTiqt+JTPH55wzaSBei/Ei3iuQ/5EU8V1//w1gu1SW5HiipmlyGy1 92Zg== X-Gm-Message-State: AOAM530LwrajhvZSoegEEbEuWU+CiggCAulVseMRDxRAE0sudtiwTS1L 209HY+kTUH7fCSUJfS3YtYjdF2wFBuc= X-Google-Smtp-Source: ABdhPJw4w7xI65ZZulTQroSjlIucZ22vJWPVGaZU3p3ln7FgY4/BkezEfsAnn4IQbmjzPDrrmMAfKw== X-Received: by 2002:a5d:5849:: with SMTP id i9mr2132146wrf.148.1640180052188; Wed, 22 Dec 2021 05:34:12 -0800 (PST) Received: from jack-Precision-7820-Tower ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id i15sm6693571wmq.18.2021.12.22.05.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:34:11 -0800 (PST) From: zimoun To: Julien Lepiller Subject: Re: bug#52729: [PATCH] gnu: ocaml: Update to 4.13. References: <20211222041609.2fde841e@tachikoma.lepiller.eu> Date: Wed, 22 Dec 2021 14:33:55 +0100 In-Reply-To: <20211222041609.2fde841e@tachikoma.lepiller.eu> (Julien Lepiller's message of "Wed, 22 Dec 2021 04:16:09 +0100") Message-ID: <86r1a4n4qk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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: 52729 Cc: 52729@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 (-) Hi Julien, On mer., 22 d=C3=A9c. 2021 at 04:16, Julien Lepiller w= rote: > This patch updates ocaml to the latest version, without the need to > keep the previous version around like previous updates :) Cool! I have not looked into all the details, from the surface, LGTM. However, I note that: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build ocaml-ppx-tools-versioned [...] starting phase `build' ocaml src/ast-version,src/compiler-functions-file (exit 1) (cd _build/default/src && /gnu/store/xp09a2invgrnah62sf9carz9bkld1w6f-ocaml= -4.13.1/bin/ocaml config/gen.ml 4.13.1) Unkown OCaml version 4.13.1 error: in phase 'build': uncaught exception: %exception #<&invoke-error program: "dune" arguments: ("build" "@install" "= --release") exit-status: 1 term-signal: #f stop-signal: #f> phase `build' failed after 0.9 seconds command "dune" "build" "@install" "--release" failed with status 1 builder for `/gnu/store/vbmvzq7if77zsl29945pyw7s2jbsmg7s-ocaml-migrate-pars= etree-1-1.8.0.drv' failed with exit code 1 build of /gnu/store/vbmvzq7if77zsl29945pyw7s2jbsmg7s-ocaml-migrate-parsetre= e-1-1.8.0.drv failed View build log at '/var/log/guix/drvs/vb/mvzq7if77zsl29945pyw7s2jbsmg7s-oca= ml-migrate-parsetree-1-1.8.0.drv.bz2'. cannot build derivation `/gnu/store/l3575b4ici05g7b8d9dc55wbbddmblwp-ocaml-= ppx-tools-versioned-5.4.0.drv': 1 dependencies couldn't be built guix build: error: build of `/gnu/store/l3575b4ici05g7b8d9dc55wbbddmblwp-oc= aml-ppx-tools-versioned-5.4.0.drv' failed --8<---------------cut here---------------end--------------->8--- On a side note, have you tried to replace boot/ocamlc (and friends) with the bootstrapped ones (camlboot -> ocaml-4.07 -> *). Other said, what is the most affordable path to exploit camlboot and have a good bootstrapping story for OCaml. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 22 08:43:16 2021 Received: (at 52729) by debbugs.gnu.org; 22 Dec 2021 13:43:17 +0000 Received: from localhost ([127.0.0.1]:57125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n01tk-0002tx-IQ for submit@debbugs.gnu.org; Wed, 22 Dec 2021 08:43:16 -0500 Received: from lepiller.eu ([89.234.186.109]:55100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n01th-0002tm-FV for 52729@debbugs.gnu.org; Wed, 22 Dec 2021 08:43:14 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9464c954; Wed, 22 Dec 2021 13:43:10 +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=MAtL/YqbzY6a 2jTfSBpJXMz5i8XgsJz7spnLBoXFlMk=; b=KFKX7qSZovebc8VDoFckoPWeN1wO 0fzecUa6z/gZvaz6k4ACLxfnfS0EPMWYTJONiy94pnSjH7iPnXLThFj5E5Gyj2ai IT7YMnJUbddWhTVZ+SIvEBgUoNlcJ0fpxVt3gLO+HDRXhCUh6VEpkKfau87WH7Gv 0NoPMrumJuC4kVwZPH89FK9tJ1eaFwGvWsxaqIgcYm6ORKsC9Y7GsVw8RgL8qGWo 3kO24/WEn0K7w5MRdk56KQif9qIzA8GInqp+ZRqBkM8EuWqoZj+u1afLQ0peIMrW ARvVlak90ObmYQSGO1TjqHYUMlGHcTnq/uaXnJzlwFjjNnKpVNkkm7go7g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f41a1ec3 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 22 Dec 2021 13:43:10 +0000 (UTC) Date: Wed, 22 Dec 2021 08:43:00 -0500 From: Julien Lepiller To: zimoun Subject: Re: bug#52729: [PATCH] gnu: ocaml: Update to 4.13. User-Agent: K-9 Mail for Android In-Reply-To: <86r1a4n4qk.fsf@gmail.com> References: <20211222041609.2fde841e@tachikoma.lepiller.eu> <86r1a4n4qk.fsf@gmail.com> Message-ID: 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: 52729 Cc: 52729@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 (-) Le 22 d=C3=A9cembre 2021 08:33:55 GMT-05:00, zimoun a =C3=A9crit=C2=A0: >Hi Julien, > >On mer=2E, 22 d=C3=A9c=2E 2021 at 04:16, Julien Lepiller wrote: > >> This patch updates ocaml to the latest version, without the need to >> keep the previous version around like previous updates :) > >Cool! > >I have not looked into all the details, from the surface, LGTM=2E > >However, I note that: > >--8<---------------cut here---------------start------------->8--- >$ =2E/pre-inst-env guix build ocaml-ppx-tools-versioned >[=2E=2E=2E] >starting phase `build' > ocaml src/ast-version,src/compiler-functions-file (exit 1) >(cd _build/default/src && /gnu/store/xp09a2invgrnah62sf9carz9bkld1w6f-oca= ml-4=2E13=2E1/bin/ocaml config/gen=2Eml 4=2E13=2E1) >Unkown OCaml version 4=2E13=2E1 >error: in phase 'build': uncaught exception: >%exception #<&invoke-error program: "dune" arguments: ("build" "@install"= "--release") exit-status: 1 term-signal: #f stop-signal: #f> >phase `build' failed after 0=2E9 seconds >command "dune" "build" "@install" "--release" failed with status 1 >builder for `/gnu/store/vbmvzq7if77zsl29945pyw7s2jbsmg7s-ocaml-migrate-pa= rsetree-1-1=2E8=2E0=2Edrv' failed with exit code 1 >build of /gnu/store/vbmvzq7if77zsl29945pyw7s2jbsmg7s-ocaml-migrate-parset= ree-1-1=2E8=2E0=2Edrv failed >View build log at '/var/log/guix/drvs/vb/mvzq7if77zsl29945pyw7s2jbsmg7s-o= caml-migrate-parsetree-1-1=2E8=2E0=2Edrv=2Ebz2'=2E >cannot build derivation `/gnu/store/l3575b4ici05g7b8d9dc55wbbddmblwp-ocam= l-ppx-tools-versioned-5=2E4=2E0=2Edrv': 1 dependencies couldn't be built >guix build: error: build of `/gnu/store/l3575b4ici05g7b8d9dc55wbbddmblwp-= ocaml-ppx-tools-versioned-5=2E4=2E0=2Edrv' failed >--8<---------------cut here---------------end--------------->8--- > Thanks! I forgot that one=2E ppx-tools-versionned is not compatible, and i= t's only used by migrate-parstree-1, which has no dependents=2E I only need= it for ocaml 4=2E07, so I'll remove them both, and keep only the ocaml4=2E= 07 variant=2E > >On a side note, have you tried to replace boot/ocamlc (and friends) with >the bootstrapped ones (camlboot -> ocaml-4=2E07 -> *)=2E Other said, wha= t >is the most affordable path to exploit camlboot and have a good >bootstrapping story for OCaml=2E Currently we can only use camlboot to bootstrap ocaml 4=2E07, which is wha= t we do=2E We plan to improve it so it can build newer versions though=2E > > >Cheers, >simon From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 22 08:52:10 2021 Received: (at 52729) by debbugs.gnu.org; 22 Dec 2021 13:52:10 +0000 Received: from localhost ([127.0.0.1]:57133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n022L-0003Am-Pu for submit@debbugs.gnu.org; Wed, 22 Dec 2021 08:52:10 -0500 Received: from mail-io1-f53.google.com ([209.85.166.53]:46018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n022I-0003AG-EB for 52729@debbugs.gnu.org; Wed, 22 Dec 2021 08:52:09 -0500 Received: by mail-io1-f53.google.com with SMTP id i14so2038816ioj.12 for <52729@debbugs.gnu.org>; Wed, 22 Dec 2021 05:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WURvG/IHqyoSTcsxSp+Xq3+WjTkbpmb/1YD8Iki4+Mo=; b=ZdLqP576VRFPOJ4wIGwxVCa8yeXUZ+y80yAuml1qcBYiSyclFLf1qgLzfiUG+glYCH sE7Tfcq603o3Ky/BkxY3n/peH84NWrU4Hmeo9yEZ2a76AIpePE7haU+8GqCC+q48rMdf 56m01cZREy35PVGzp7pLLpFyThfySYvD3mu91E+iZF2p1gmpHs5I+Uq0Nq5blTKzyk2b uQfI4Xk0mFXdDC16malGn4lhU1AlV+pi8KBalKLKeTy/h0UcZ6tA0YFqQwitsSHgAcha WC0F/x8eQ5c7CwOvvz9Qfdc3sNc/LzSS1vbq2VC/StJmIJynUExAi4+eD5ZuXFr9rAX/ tS1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WURvG/IHqyoSTcsxSp+Xq3+WjTkbpmb/1YD8Iki4+Mo=; b=vOcPDlShJHzpDNnpHPkk67CUGlE0oCKXaeU3GrRv/JGbrWVYbVICTrk+Cnb5aEgPLI j0bIRCutnfVfdLXhl76AQGn7krFd9iCfLyXyFjm/pxCly4xsjKsMOXFCThwCPmZ7hphK i3cM9mhntt9d7tkoy2NxfIc9QPum+krX0taZOsPr42fn5KSEbd2QE88Cjs2irdCmfodG rqNqvhlqNqqTT6tqaMjKfHxLZ5msFOE/8kxXRD/rC/hmbFzNRZ/4iBR+PQb2I5137X6U 2AKOCgdUmk9dND5/6iDL2Hvu8Az2mp2qBh9nO5jh8QQNpiKU/OHYg/yPMZwdTepLIz9t 5POg== X-Gm-Message-State: AOAM531XyQLzFyezSjfl/Ip4mSnhOsimiA7v3xcHBpEYovIWkM9KfeXv Eh8ZTMe5wNobYgjSyAMwxr9/l5zlLrgpj9uCX4CsQfv8q6g= X-Google-Smtp-Source: ABdhPJyjvfgIU+bKbFm3ZnJ5JFyCqML9tpY2r7pRpZqrlc2YYUgXylSEcmOHvfCnQ/gmvnjXYytJyCCiT0JH7f5MHT8= X-Received: by 2002:a6b:e917:: with SMTP id u23mr472022iof.211.1640181120674; Wed, 22 Dec 2021 05:52:00 -0800 (PST) MIME-Version: 1.0 References: <20211222041609.2fde841e@tachikoma.lepiller.eu> <86r1a4n4qk.fsf@gmail.com> In-Reply-To: From: zimoun Date: Wed, 22 Dec 2021 14:51:49 +0100 Message-ID: Subject: Re: bug#52729: [PATCH] gnu: ocaml: Update to 4.13. To: Julien Lepiller Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 52729 Cc: 52729@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 (-) Hi, On Wed, 22 Dec 2021 at 14:43, Julien Lepiller wrote: > >On a side note, have you tried to replace boot/ocamlc (and friends) with > >the bootstrapped ones (camlboot -> ocaml-4.07 -> *). Other said, what > >is the most affordable path to exploit camlboot and have a good > >bootstrapping story for OCaml. > > Currently we can only use camlboot to bootstrap ocaml 4.07, which is what we do. We plan to improve it so it can build newer versions though. Yes, I remember when discussing the patch adding camlboot and ocaml4.07-boot. :-) That's what you explained [1]. Well, a direct bootstrap camlboot -> ocaml-4.13 is better for sure, but harder. Instead, my question is: have you tried a chain of boostrap: camlboot -> ocaml-4.07 -> ? -> ocaml-4.13. I could be temporary solution waiting camlboot improvements, no? 1: Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 23 08:01:59 2021 Received: (at 52729) by debbugs.gnu.org; 23 Dec 2021 13:01:59 +0000 Received: from localhost ([127.0.0.1]:60626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0NjK-0006Ug-M3 for submit@debbugs.gnu.org; Thu, 23 Dec 2021 08:01:59 -0500 Received: from lepiller.eu ([89.234.186.109]:60160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0NjH-0006UV-Lb for 52729@debbugs.gnu.org; Thu, 23 Dec 2021 08:01:56 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id d7463fbf; Thu, 23 Dec 2021 13:01:53 +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; s=dkim; bh=rffQgl08S/ZzIhWQqqXgolS72EMRB6DujVOz13 BN+uI=; b=dox6e68Dm0Lp+Z9AkbjDuNcsXPvuLkGTrLrzZQIsaMkIMUXkDpY0kB ewa8rcaumdlSZvKBTo38hzxE21+yDPT446+sW550fDbhF0C54OXWn0+SHG1VBI8L Y60ooJPpqJj+P1gd5GBALlF1C0O74g4gYHiGOI/6ndaVWJpQW+Xie8rXJcuprj8B 6zjAIQIvGVP2cUORavEnVnc7+3tESrCpOfpRYLCwZS/vVZve4lqwmLINGI8fKFZD ezpPvFwrs6lpYtfT1zrF+nccx86L4vfrOlebcj7GREEWvb1NST6OqbXu5E4mp08H o4BXDvH8yNs3YWgbwJsVKmCTGt9SWoZQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d13e3765 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Thu, 23 Dec 2021 13:01:53 +0000 (UTC) Date: Thu, 23 Dec 2021 14:01:09 +0100 From: Julien Lepiller To: zimoun Subject: Re: bug#52729: [PATCH v2] gnu: ocaml: Update to 4.13. Message-ID: <20211223140109.7716a446@tachikoma.lepiller.eu> In-Reply-To: References: <20211222041609.2fde841e@tachikoma.lepiller.eu> <86r1a4n4qk.fsf@gmail.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/OuyeJwtTgQwrZxgb.AzriHV" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52729 Cc: 52729@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 (-) --MP_/OuyeJwtTgQwrZxgb.AzriHV Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Wed, 22 Dec 2021 14:51:49 +0100, zimoun a =C3=A9crit : > Hi, >=20 > On Wed, 22 Dec 2021 at 14:43, Julien Lepiller > wrote: >=20 > > >On a side note, have you tried to replace boot/ocamlc (and > > >friends) with the bootstrapped ones (camlboot -> ocaml-4.07 -> *). > > > Other said, what is the most affordable path to exploit camlboot > > > and have a good > > >bootstrapping story for OCaml. =20 > > > > Currently we can only use camlboot to bootstrap ocaml 4.07, which > > is what we do. We plan to improve it so it can build newer versions > > though. =20 >=20 > Yes, I remember when discussing the patch adding camlboot and > ocaml4.07-boot. :-) That's what you explained [1]. >=20 > Well, a direct bootstrap camlboot -> ocaml-4.13 is better for sure, > but harder. Instead, my question is: have you tried a chain of > boostrap: camlboot -> ocaml-4.07 -> ? -> ocaml-4.13. I could be > temporary solution waiting camlboot improvements, no? >=20 > 1: >=20 >=20 > Cheers, > simon Here's v2 of the patch series: the first two patches build only the 4.07 version for migrate-parsetree@1 and for ppx-tools-versioned. That way, they don't fail when updating to ocaml 4.13. I checked that everything builds like before. I still have issues with bap because llvm@3.8.1 fails. --MP_/OuyeJwtTgQwrZxgb.AzriHV Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ocaml-ppx-tools-versioned-Only-build-ocaml-4.07-.patch >From ed8cec81e6a30cc0a0e2f1562bb1a8f12e666dc1 Mon Sep 17 00:00:00 2001 Message-Id: From: Julien Lepiller Date: Wed, 22 Dec 2021 22:58:24 +0100 Subject: [PATCH 1/3] gnu: ocaml-ppx-tools-versioned: Only build ocaml-4.07 variant. * gnu/packages/ocaml.scm (ocaml-ppx-tools-versioned): Rename to... (ocaml4.07-ppx-tools-versioned): ...this. [arguments]: Use ocaml-4.07. --- gnu/packages/ocaml.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e6001ca37b..9fc3280f89 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1836,9 +1836,9 @@ (define-public ocaml-migrate-parsetree-1 "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (properties '((upstream-name . "ocaml-migrate-parsetree"))))) -(define-public ocaml-ppx-tools-versioned +(define-public ocaml4.07-ppx-tools-versioned (package - (name "ocaml-ppx-tools-versioned") + (name "ocaml4.07-ppx-tools-versioned") (version "5.4.0") (source (origin (method git-fetch) @@ -1851,10 +1851,13 @@ (define-public ocaml-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." + `(#:ocaml ,ocaml-4.07 + #:dune ,ocaml4.07-dune + #:findlib ,ocaml4.07-findlib + #:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) + (list (package-with-ocaml4.07 ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") @@ -1913,7 +1916,7 @@ (define-public ocaml4.07-bitstring (base32 "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned))) (properties '())))) (define-public ocaml-result @@ -2751,7 +2754,7 @@ (define-public ocaml4.07-sedlex (base32 "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) ,@(package-propagated-inputs ocaml-sedlex))) (properties '())))) @@ -6728,7 +6731,7 @@ (define-public ocaml4.07-bisect-ppx "1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q")))) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) ,@(package-propagated-inputs ocaml-bisect-ppx))) (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) -- 2.34.0 --MP_/OuyeJwtTgQwrZxgb.AzriHV Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-ocaml-migrate-parstree-1-Only-build-ocaml4.07-va.patch >From 77660206f96eef8dd91485e295abb35d14c9a346 Mon Sep 17 00:00:00 2001 Message-Id: <77660206f96eef8dd91485e295abb35d14c9a346.1640218270.git.julien@lepiller.eu> In-Reply-To: References: From: Julien Lepiller Date: Wed, 22 Dec 2021 23:01:56 +0100 Subject: [PATCH 2/3] gnu: ocaml-migrate-parstree-1: Only build ocaml4.07 variant. * gnu/packages/ocaml.scm (ocaml-migrate-parsetree-1): Rename to... (ocaml4.07-migrate-parsetree): ...this. Use package-with-ocaml4.07. --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9fc3280f89..fd410c1ba9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1810,31 +1810,32 @@ (define-public ocaml-migrate-parsetree (propagated-inputs (list ocaml-ppx-derivers ocamlbuild ocaml-result)) (properties `((upstream-name . "ocaml-migrate-parsetree") - ;; OCaml 4.07 packages require version 1.* - (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) + (ocaml4.07-variant . ,(delay ocaml4.07-migrate-parsetree)))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) -(define-public ocaml-migrate-parsetree-1 - (package - (inherit ocaml-migrate-parsetree) - (name "ocaml-migrate-parsetree-1") - (version "1.8.0") - (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) - (properties '((upstream-name . "ocaml-migrate-parsetree"))))) +;; OCaml 4.07 packages require version 1.* +(define-public ocaml4.07-migrate-parsetree + (package-with-ocaml4.07 + (package + (inherit ocaml-migrate-parsetree) + (name "ocaml-migrate-parsetree") + (version "1.8.0") + (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + (properties '((upstream-name . "ocaml-migrate-parsetree")))))) (define-public ocaml4.07-ppx-tools-versioned (package @@ -1857,7 +1858,7 @@ (define-public ocaml4.07-ppx-tools-versioned #:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - (list (package-with-ocaml4.07 ocaml-migrate-parsetree-1))) + (list ocaml4.07-migrate-parsetree)) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") -- 2.34.0 --MP_/OuyeJwtTgQwrZxgb.AzriHV Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-ocaml-Update-to-4.13.patch >From bb660bfc763b38747f67c8421663efd5acb7a1cb Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Julien Lepiller Date: Wed, 22 Dec 2021 04:13:53 +0100 Subject: [PATCH 3/3] gnu: ocaml: Update to 4.13. * gnu/packages/ocaml.scm (ocaml-4.13): New variable. (ocaml-4.11): Remove variable. (ocaml-dot-merlin-reader): Update to 4.4-413. (js-of-ocaml): Update to 3.11.0. --- gnu/packages/ocaml.scm | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fd410c1ba9..5eaa0836e7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -182,10 +182,10 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") (license license:expat)))) -(define-public ocaml-4.11 +(define-public ocaml-4.13 (package (name "ocaml") - (version "4.11.1") + (version "4.13.1") (source (origin (method url-fetch) (uri (string-append @@ -194,7 +194,7 @@ (define-public ocaml-4.11 "/ocaml-" version ".tar.xz")) (sha256 (base32 - "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) + "1s7xwqidpjwfhnpfma4nb93gxfr7g9jfn03s1j03iyavmpgph7ck")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -210,7 +210,10 @@ (define-public ocaml-4.11 (list libx11 libiberty ;needed for objdump support zlib)) ;also needed for objdump support (arguments - `(#:phases + `(#:configure-flags '("--enable-ocamltest") + #:test-target "tests" + #:make-flags '("world.opt") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh-references (lambda* (#:key inputs #:allow-other-keys) @@ -226,16 +229,7 @@ (define-public ocaml-4.11 patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" file quoted-sh) quoted-sh)))) - (find-files "." "\\.ml$")) - #t)))) - (replace 'build - (lambda _ - (invoke "make" "-j" (number->string (parallel-job-count)) - "world.opt"))) - (replace 'check - (lambda _ - (with-directory-excursion "testsuite" - (invoke "make" "all"))))))) + (find-files "." "\\.ml$"))))))))) (home-page "https://ocaml.org/") (synopsis "The OCaml programming language") (description @@ -250,7 +244,7 @@ (define-public ocaml-4.11 (define-public ocaml-4.09 (package - (inherit ocaml-4.11) + (inherit ocaml-4.13) (version "4.09.0") (source (origin (method url-fetch) @@ -261,7 +255,33 @@ (define-public ocaml-4.09 (patches (search-patches "ocaml-4.09-multiple-definitions.patch")) (sha256 (base32 - "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) + "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh-references + (lambda* (#:key inputs #:allow-other-keys) + (let* ((sh (search-input-file inputs "/bin/sh")) + (quoted-sh (string-append "\"" sh "\""))) + (with-fluids ((%default-port-encoding #f)) + (for-each + (lambda (file) + (substitute* file + (("\"/bin/sh\"") + (begin + (format (current-error-port) "\ +patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" + file quoted-sh) + quoted-sh)))) + (find-files "." "\\.ml$")))))) + (replace 'build + (lambda _ + (invoke "make" "-j" (number->string (parallel-job-count)) + "world.opt"))) + (replace 'check + (lambda _ + (with-directory-excursion "testsuite" + (invoke "make" "all"))))))))) ;; This package is a bootstrap package for ocaml-4.07. It builds from camlboot, ;; using the upstream sources for ocaml 4.07. It installs a bytecode ocamllex @@ -440,7 +460,7 @@ (define-public ocaml-4.07 ("perl" ,perl) ("pkg-config" ,pkg-config))))) -(define-public ocaml ocaml-4.11) +(define-public ocaml ocaml-4.13) (define-public ocamlbuild (package @@ -4739,7 +4759,7 @@ (define-public ocaml-craml (define-public ocaml-dot-merlin-reader (package (name "ocaml-dot-merlin-reader") - (version "4.3.1-411") + (version "4.4-413") (source (origin (method git-fetch) @@ -4749,7 +4769,7 @@ (define-public ocaml-dot-merlin-reader (file-name (git-file-name name version)) (sha256 (base32 - "1nwgc9nyy80dc9cgkskyfwv9c785yjyg39s005d4wiagj4fy68v8")))) + "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23")))) (build-system dune-build-system) (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests @@ -7621,7 +7641,7 @@ (define-public ocaml-cohttp (define-public js-of-ocaml (package (name "js-of-ocaml") - (version "3.9.1") + (version "3.11.0") (source (origin (method git-fetch) @@ -7630,9 +7650,20 @@ (define-public js-of-ocaml (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (base32 "1x5f1ph9wgx0mgyibssssnrcwp69ihw66gzhsnz9h79czgzyjpp2")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) + (arguments + `(#:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-failing-test + (lambda _ + ;; Formating difference + (with-output-to-file "compiler/tests-jsoo/bin/error2.expected" + (lambda _ + (format #t + "Fatal error: exception Match_failure(\ +\"compiler/tests-jsoo/bin/error2.ml\", 11, 2)\n\n")))))))) (propagated-inputs (list ocaml-ppxlib ocaml-uchar -- 2.34.0 --MP_/OuyeJwtTgQwrZxgb.AzriHV-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 08 16:48:03 2022 Received: (at 52729) by debbugs.gnu.org; 8 Jan 2022 21:48:04 +0000 Received: from localhost ([127.0.0.1]:48811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6JZD-000778-Ja for submit@debbugs.gnu.org; Sat, 08 Jan 2022 16:48:03 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6JZ7-00075i-W6 for 52729@debbugs.gnu.org; Sat, 08 Jan 2022 16:48:01 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7008B240104 for <52729@debbugs.gnu.org>; Sat, 8 Jan 2022 22:47:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1641678471; bh=wIjszAj8wJlTMfAvNn4gQIQvZVTO7pg0/rfjCBojuyY=; h=From:To:Cc:Subject:Date:From; b=c+qkyYDKLcrawdqfREbpqYLDSd2uOjs8vL4vORaHa1FRmFfax/OwvQRwIlWfirL07 PZh7ZkvPgT2Mt3j4ICz+4hC6UEL6F6RjvGGbthOw3aJiHokQ9dr+ExAOeN4Avnmfu+ 0CuwGgs2k3k7DcRcdg9lbvadZTQKnbGHt+b75jc4pxL9pAtc6ZZb1y0ogKE9ho+Rse J59FPMtaFm8DB/IZyuWrsSQumhyp1EvmapsRiMhrkn8cL1ifm1ojGc9LPD8ATJmmGU 1PGfd+a8ooO7EXMcV6sq0+XePfV5Ph/4JkNFiFezW81idXa9VmHS5iQOAePYy6Etyq CmwiufHeUrV5g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JWYbm0BcFz9rxP; Sat, 8 Jan 2022 22:47:47 +0100 (CET) References: <20211222041609.2fde841e@tachikoma.lepiller.eu> <86r1a4n4qk.fsf@gmail.com> <20211223140109.7716a446@tachikoma.lepiller.eu> From: pukkamustard To: Julien Lepiller Subject: Re: [bug#52729] [PATCH v2] gnu: ocaml: Update to 4.13. Date: Sat, 08 Jan 2022 20:45:45 +0000 In-reply-to: <20211223140109.7716a446@tachikoma.lepiller.eu> Message-ID: <86czl1garh.fsf@posteo.net> 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: 52729 Cc: 52729@debbugs.gnu.org, zimoun 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 (---) Hi Julien, > gnu: ocaml-ppx-tools-versioned: Only build ocaml-4.07 variant. Any reason for not using the package-with-ocaml4.07 transformation? > gnu: ocaml: Update to 4.13. js-of-ocaml and ocaml-dot-merlin-reader are also updated in this commit. Could they be split to separate commits? Other than that everything seems to be compiling and working fine. Thank you very much! -pukkamustard Julien Lepiller writes: > Le Wed, 22 Dec 2021 14:51:49 +0100, > zimoun a =C3=A9crit : > >> Hi, >>=20 >> On Wed, 22 Dec 2021 at 14:43, Julien Lepiller >> wrote: >>=20 >> > >On a side note, have you tried to replace boot/ocamlc (and >> > >friends) with the bootstrapped ones (camlboot -> ocaml-4.07 -> *). >> > > Other said, what is the most affordable path to exploit camlboot >> > > and have a good >> > >bootstrapping story for OCaml.=20=20 >> > >> > Currently we can only use camlboot to bootstrap ocaml 4.07, which >> > is what we do. We plan to improve it so it can build newer versions >> > though.=20=20 >>=20 >> Yes, I remember when discussing the patch adding camlboot and >> ocaml4.07-boot. :-) That's what you explained [1]. >>=20 >> Well, a direct bootstrap camlboot -> ocaml-4.13 is better for sure, >> but harder. Instead, my question is: have you tried a chain of >> boostrap: camlboot -> ocaml-4.07 -> ? -> ocaml-4.13. I could be >> temporary solution waiting camlboot improvements, no? >>=20 >> 1: >>=20 >>=20 >> Cheers, >> simon > > Here's v2 of the patch series: the first two patches build only the > 4.07 version for migrate-parsetree@1 and for ppx-tools-versioned. That > way, they don't fail when updating to ocaml 4.13. I checked that > everything builds like before. I still have issues with bap because > llvm@3.8.1 fails. > > [2. text/x-patch; 0001-gnu-ocaml-ppx-tools-versioned-Only-build-ocaml-4.0= 7-.patch]... > > [3. text/x-patch; 0002-gnu-ocaml-migrate-parstree-1-Only-build-ocaml4.07-= va.patch]... > > [4. text/x-patch; 0003-gnu-ocaml-Update-to-4.13.patch]... From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 09 04:55:51 2022 Received: (at 52729-done) by debbugs.gnu.org; 9 Jan 2022 09:55:51 +0000 Received: from localhost ([127.0.0.1]:49238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6UvW-0008Bk-JD for submit@debbugs.gnu.org; Sun, 09 Jan 2022 04:55:50 -0500 Received: from lepiller.eu ([89.234.186.109]:53064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6UvU-0008BZ-08 for 52729-done@debbugs.gnu.org; Sun, 09 Jan 2022 04:55:49 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 386f9336; Sun, 9 Jan 2022 09:55:44 +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=Rk+KBhYl5Xtw p59ZqvbM1HRvlOb0NFjiaqyTnCcrpFk=; b=IRRCP1smS9ijamcK9RIr1spOHOIV t80kUyomUwtMBNbA3Ugr8Qx4LhLydilntVsjwUjtUav6zaiyr70S95Blwl4uccpa 5ic4BtaIKu0oh5CgrxXuZ8/hEU8VML05kbjtVrOq+H6p3hIsLyynWKsupJzxVu0A 81yE9PbghbMapGrvdtgJ2+5VaTJyfXMbIP7RXgFGbMjfpKJJO66oFxKz7L8ZUBpF QdJPZSc8Hy5XeaS5cV8u7Oc4pknKj3XlzkFhP1aVNcPpccC8WUecQvQHTZJct2bL iChzfmFlPLzisGJhopTbTe+SJlFO7Qx6S6ZPptQPVgu7mTGgpKQd095odg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 91d2bb2a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sun, 9 Jan 2022 09:55:44 +0000 (UTC) Date: Sun, 9 Jan 2022 10:55:13 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#52729] [PATCH v2] gnu: ocaml: Update to 4.13. Message-ID: <20220109105513.25abe6ff@tachikoma.lepiller.eu> In-Reply-To: <86czl1garh.fsf@posteo.net> References: <20211222041609.2fde841e@tachikoma.lepiller.eu> <86r1a4n4qk.fsf@gmail.com> <20211223140109.7716a446@tachikoma.lepiller.eu> <86czl1garh.fsf@posteo.net> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; 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: 52729-done Cc: 52729-done@debbugs.gnu.org, zimoun 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 Sat, 08 Jan 2022 20:45:45 +0000, pukkamustard a =C3=A9crit : > Hi Julien, >=20 > > gnu: ocaml-ppx-tools-versioned: Only build ocaml-4.07 variant. =20 >=20 > Any reason for not using the package-with-ocaml4.07 transformation? No reason at all, thanks for noticing. >=20 > > gnu: ocaml: Update to 4.13. =20 >=20 > js-of-ocaml and ocaml-dot-merlin-reader are also updated in this > commit. Could they be split to separate commits? Unfortunately I cannot update these packages independently without something breaking. >=20 > Other than that everything seems to be compiling and working > fine. Thank you very much! >=20 Thanks for the review, pushed to master as 92c63bc491a4f3098e94e7e58ec83b89f771c13c to 3e8e6ebf000b1cbc4ff4b9ba84c7abdcbdf0ffb4 > -pukkamustard >=20 >=20 > Julien Lepiller writes: >=20 > > Le Wed, 22 Dec 2021 14:51:49 +0100, > > zimoun a =C3=A9crit : > > =20 > >> Hi, > >>=20 > >> On Wed, 22 Dec 2021 at 14:43, Julien Lepiller > >> wrote: > >> =20 > >> > >On a side note, have you tried to replace boot/ocamlc (and > >> > >friends) with the bootstrapped ones (camlboot -> ocaml-4.07 -> > >> > >*). > >> > > Other said, what is the most affordable path to exploit > >> > > camlboot and have a good > >> > >bootstrapping story for OCaml. =20 > >> > > >> > Currently we can only use camlboot to bootstrap ocaml 4.07, which > >> > is what we do. We plan to improve it so it can build newer > >> > versions though. =20 > >>=20 > >> Yes, I remember when discussing the patch adding camlboot and > >> ocaml4.07-boot. :-) That's what you explained [1]. > >>=20 > >> Well, a direct bootstrap camlboot -> ocaml-4.13 is better for sure, > >> but harder. Instead, my question is: have you tried a chain of > >> boostrap: camlboot -> ocaml-4.07 -> ? -> ocaml-4.13. I could be > >> temporary solution waiting camlboot improvements, no? > >>=20 > >> 1: > >>=20 > >>=20 > >> Cheers, > >> simon =20 > > > > Here's v2 of the patch series: the first two patches build only the > > 4.07 version for migrate-parsetree@1 and for ppx-tools-versioned. > > That way, they don't fail when updating to ocaml 4.13. I checked > > that everything builds like before. I still have issues with bap > > because llvm@3.8.1 fails. > > > > [2. text/x-patch; > > 0001-gnu-ocaml-ppx-tools-versioned-Only-build-ocaml-4.07-.patch]... > > > > [3. text/x-patch; > > 0002-gnu-ocaml-migrate-parstree-1-Only-build-ocaml4.07-va.patch]... > > > > [4. text/x-patch; 0003-gnu-ocaml-Update-to-4.13.patch]... =20 >=20 From unknown Sun Jun 15 08:35:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 06 Feb 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator