From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6NZDKmN1xGFvAAEAgWs5BA (envelope-from ) for ; Thu, 23 Dec 2021 14:10:59 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WD8QJmN1xGHBXAAAB5/wlQ (envelope-from ) for ; Thu, 23 Dec 2021 13:10:59 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 02BC426CF1 for ; Thu, 23 Dec 2021 14:10:59 +0100 (CET) Received: from localhost ([::1]:46146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Ns2-00037L-66 for larch@yhetil.org; Thu, 23 Dec 2021 08:10:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0NjU-0000vM-Oc for guix-patches@gnu.org; Thu, 23 Dec 2021 08:02:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0NjO-0002Mu-MP for guix-patches@gnu.org; Thu, 23 Dec 2021 08:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0NjO-0006Ux-GG for guix-patches@gnu.org; Thu, 23 Dec 2021 08:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52729] [PATCH v2] gnu: ocaml: Update to 4.13. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 13:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 52729@debbugs.gnu.org Received: via spool by 52729-submit@debbugs.gnu.org id=B52729.164026451924971 (code B ref 52729); Thu, 23 Dec 2021 13:02:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640265059; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=dSlHYwR1M12sRYu3agqqQxq1X+AUpU1jcRTVUOAUEeE=; b=BKxy7GQ7d5f1obk4s6XJVhPVi4PysMTbEYEky64rpr9juh9ApSK5nm0rDzfp6wkurJGcDL tppCMezhSyS0vQGvaA1jFuutEdPg6MIYNvYZJQrEFtKHwCZQTw8yo7FTYf6O7UnvGiqawh u6kAOnBXM/7BJw+L0MlrZoEvfoWM2KO0X0vrsokrtDMsiduHgBHGn3mwPAFAOJ6yu4uqs7 WwjEalhPhHT+AflVLv4GS8MkvplKCsWgzXgCKNexghOywANtj/cIcjrjysVxx4OUHaCJr+ wiOJMSWmNQ6NQ4cQC7YdmPYLN9rrTegR8kra/eADo6xASohLayI/dQ659XQP8g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640265059; a=rsa-sha256; cv=none; b=gGtKqYLubNIahMEnhgWM2xK6UvhzJ3F/NMxHRXFTtuMQYsS+LRljwh0KRlG5tTWrCSdE/e XuPQEJwA5NWDKv5L7nmYf1jQ75CGHw+KBh63St5C5QKOL5M+aHiSC5WT/zrfNddOZMBp4p llQYQjA7CoU03g3lYHYb1vf82sL6fofDHg/TnLA+bzS/yJFCVB4JlFF3EkAlueCvQp8WAo 5Lv7o/aCV4vFJhRbdJhGJ12sWDfGrXy7952Mwm1kzoNPZPLdhtcHJN14KjhNVJz6Hdk8mb xZW7H13VlyA37rUAgNTsiYiJaKduZGOrpPgPScUYlrPnP13ptrMGlWFln0y+9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=dox6e68D; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.95 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=dox6e68D; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 02BC426CF1 X-Spam-Score: -1.95 X-Migadu-Scanner: scn0.migadu.com X-TUID: OQAcgIk7Sudf --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--