From patchwork Thu Oct 1 13:41:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24412 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD51727BBE9; Thu, 1 Oct 2020 14:50:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 891E927BBE8 for ; Thu, 1 Oct 2020 14:50:35 +0100 (BST) Received: from localhost ([::1]:38754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyg-0003r6-JC for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002fe-Po for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxK-0002yW-6R for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxK-000219-5Z for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 24/27] gnu: ocaml-compiler-libs: Build only with OCaml 4.07. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601117540 (code B ref 43745); Thu, 01 Oct 2020 13:49:10 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:31 +0000 Received: from localhost ([127.0.0.1]:34951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywh-0001xR-2c for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:31 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywT-0001t4-QK for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:18 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 41758fba for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=vQC2lkzo9YE81ld9uLzQSQCsE gL4jqnV+eC2wCGvUiQ=; b=Li7S0oa0TdR3iUHJT30Gf7k3uuyLBnW7LhCwISxFT 3Ixr7ODHMf8/hwfPmXrMbVB0Ab4IDKDSrPYJexWl51Q4axwV+lXLr323UgDdBkIm zUcpVmiiSFNcqwmK023kiaSOSSDkIwBmp9J6zwZHb20ywjxT5j9X2Lp0LmbUoYkv NtWBsLGLWylVGaO4+TtTuc41OIOeJwrCBABSAXodjsXekU7LU66UPuTficy0P25H HjzMLtHqTY9eMJuvjOi46mgFm7g6XW72Y7NsjX+l34JEJTFZhDGPkXq8cofAzVRM U2oBpmuPWV8JwFogL3yWCMegP4PTkxXLf5JznX3TaLOeg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 8a2c2841 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:30 +0200 Message-Id: <20201001134133.32105-24-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-compiler-libs): Rename to... (ocaml4.07-compiler-libs): ...to this. Use OCaml 4.07. --- gnu/packages/ocaml.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 55496f8ca4..96ef6fbd17 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3598,7 +3598,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,ocaml4.07-sexplib0) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4116,9 +4116,9 @@ provided by companion libraries such as @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) -(define-public ocaml-compiler-libs +(define-public ocaml4.07-compiler-libs (package - (name "ocaml-compiler-libs") + (name "ocaml4.07-compiler-libs") (version "0.11.0") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source @@ -4133,7 +4133,10 @@ provided by companion libraries such as "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) (build-system dune-build-system) (arguments - '(#:tests? #f)) ;no tests + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ocaml-compiler-libs"))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries @@ -4216,7 +4219,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers))