From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uBEgOW3DEmHd7QAAgWs5BA (envelope-from ) for ; Tue, 10 Aug 2021 20:20:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id Jp/LNG3DEmFgWQAAbx9fmQ (envelope-from ) for ; Tue, 10 Aug 2021 18:20:29 +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 08E6E3686 for ; Tue, 10 Aug 2021 20:20:29 +0200 (CEST) Received: from localhost ([::1]:57146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDWMW-0001QA-2n for larch@yhetil.org; Tue, 10 Aug 2021 14:20:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDWM6-0001Nc-Fr for guix-patches@gnu.org; Tue, 10 Aug 2021 14:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDWM6-0006rg-9F for guix-patches@gnu.org; Tue, 10 Aug 2021 14:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDWM6-0004ZU-4Q for guix-patches@gnu.org; Tue, 10 Aug 2021 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49984] [PATCH] gnu: Add ocaml-4.12. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49984@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162861955417505 (code B ref -1); Tue, 10 Aug 2021 18:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2021 18:19:14 +0000 Received: from localhost ([127.0.0.1]:60800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDWLJ-0004YH-Q9 for submit@debbugs.gnu.org; Tue, 10 Aug 2021 14:19:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:43214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDWLH-0004Y9-S4 for submit@debbugs.gnu.org; Tue, 10 Aug 2021 14:19:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDWLH-0000Pp-Fy for guix-patches@gnu.org; Tue, 10 Aug 2021 14:19:11 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:50976 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDWLF-0006Ex-7O for guix-patches@gnu.org; Tue, 10 Aug 2021 14:19:11 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1628619540; bh=M2knuSmQkrWxe65qeohlnWXaMpJYkWulO42rQeJr+xQ=; h=From:To:Subject:References:Date; b=G3HtvijmrJkoXKD11fnenPm+PXHM+9tb8eIvgNJGhosCaEwogNjSXTzRmK4x2xRh9 OUTeRqponHmIvV3MEZVFGCpG4OtIwwzMNSZ8y/tAGfVdOZjWGSj34kJpYBr3DWCHdW mct/fHBJgqIKPIVf4xpeMVsB1Dh2QZSX5AxGQWrw= References: ~a: changing `\"/bin/sh\"' to `~a'~%" Message-Id: Date: Tue, 10 Aug 2021 20:18:55 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 18 X-Spam_score: 1.8 X-Spam_bar: + X-Spam_report: (1.8 / 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, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=0.386, PDS_OTHER_BAD_TLD=1.997, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628619629; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=YbPm2L2DJCP86lF5k7EUHRb0EpeiVehpElBhbDsmlDg=; b=RoutbXzl+ZIhMlY30aUX9XoFO0jKDLjxo1Q3roXC7p5HX3+8ge38A1WdXnh1Wh8ZlUrNpQ AcJJm0GdE4nFUc9O/UokswdFluCBVZQX32aokS//0uwTJwxCY133GDhiAluC0/NlASnocM Iq+OJ7M6M6IMIXMjvzS/3LNZ+x8cE4J548P2sW2enFfe/aLBGeXWjjCrrVrJfqSw3lK8rr lC92CQEvMQrj4WTraHP796roGpqZiVYFZFh7cwXFCPBpffpGHbOkHyJGXL+BAOnmYWjCNV 6WA3DYz0ziuPVO+/zCkuy3+9/eeIefPJKsUMMQN02wg+0fjQVtNADgOdhH6/7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628619629; a=rsa-sha256; cv=none; b=C3w/9r/Im9MkA+T0GnC2kUZ4sJRDJ2/bLDpFsCd3PEDuiMv5Jb+yQe4KMy8k00WhVf509y YTmvamMLMQLFiZst/yeC9/VziySUqS1hyhcp/uX0dIrSZQtLQf62P70tCnM8Wnv8z1SVrS VTggTyN8p09Ct1NU81pFtaznQxZtoQpntH3Sk4G10m66oX/RHqeRVb75m1YFnPXjSSWlpU DFkCFhzzKwSvUYj3OdXUq9yMuoghU1ke4l29LgTl5eEnkHtBLEv7upfEsrYP0pxP6xzMCJ ghC4GFKvFGxqRytJiHj+Jffy0Wg9XTlH2ajlEO3X8rx/I9dW0SpbYxzdaFwKjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=G3Htvijm; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=G3Htvijm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 08E6E3686 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: ESlskklZiMff * gnu/packages/ocaml.scm (ocaml-4.12): New variable. (ocaml-4.11): Inherit from =E2=80=98ocaml-4.12=E2=80=99. --- I tried to inherit as much as possible without having to rebuild =E2=80=98ocaml-4.11=E2=80=99. gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 112751ddec..4108bc0b5f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -176,10 +176,10 @@ OCaml and can effectively bootstrap OCaml 4.07. This package produces a native @command{ocamlc} and a bytecode @command{oc= amllex}.") (license license:expat)))) =20 -(define-public ocaml-4.11 +(define-public ocaml-4.12 (package (name "ocaml") - (version "4.11.1") + (version "4.12.0") (source (origin (method url-fetch) (uri (string-append @@ -188,7 +188,7 @@ This package produces a native @command{ocamlc} and a b= ytecode @command{ocamllex "/ocaml-" version ".tar.xz")) (sha256 (base32 - "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) + "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -205,6 +205,44 @@ This package produces a native @command{ocamlc} and a = bytecode @command{ocamllex `(("libx11" ,libx11) ("libiberty" ,libiberty) ;needed for objdump support ("zlib" ,zlib))) ;also needed for objdump sup= port + (arguments + `(#: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) + (let ((sh (string-append (assoc-ref inputs "bash") + "/bin/sh"))) + (substitute* (find-files "." "\\.ml$") + (("\"/bin/sh\"") + (string-append "\"" sh "\""))))))))) + (home-page "https://ocaml.org/") + (synopsis "The OCaml programming language") + (description + "OCaml is a general purpose industrial-strength programming language = with +an emphasis on expressiveness and safety. Developed for more than 20 year= s at +Inria it benefits from one of the most advanced type systems and supports +functional, imperative and object-oriented styles of programming.") + ;; The compiler is distributed under qpl1.0 with a change to choice of + ;; law: the license is governed by the laws of France. The library is + ;; distributed under lgpl2.0. + (license (list license:qpl license:lgpl2.0)))) + +(define-public ocaml-4.11 + (package + (inherit ocaml-4.12) + (version "4.11.1") + (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 + "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa")))) (arguments `(#:phases (modify-phases %standard-phases @@ -232,18 +270,7 @@ patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' t= o `~a'~%" (replace 'check (lambda _ (with-directory-excursion "testsuite" - (invoke "make" "all"))))))) - (home-page "https://ocaml.org/") - (synopsis "The OCaml programming language") - (description - "OCaml is a general purpose industrial-strength programming language = with -an emphasis on expressiveness and safety. Developed for more than 20 year= s at -Inria it benefits from one of the most advanced type systems and supports -functional, imperative and object-oriented styles of programming.") - ;; The compiler is distributed under qpl1.0 with a change to choice of - ;; law: the license is governed by the laws of France. The library is - ;; distributed under lgpl2.0. - (license (list license:qpl license:lgpl2.0)))) + (invoke "make" "all"))))))))) =20 (define-public ocaml-4.09 (package base-commit: 1fa4485fb033874fd56b025e8ec998aebc245fe5 --=20 2.32.0