From patchwork Fri Dec 16 13:25:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45356 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 4508927BBED; Fri, 16 Dec 2022 13:27:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE18A27BBE9 for ; Fri, 16 Dec 2022 13:27:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj0-0005mj-NM; Fri, 16 Dec 2022 08:26:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Aiz-0005kK-3X for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiy-00078m-QD for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiy-00034D-Jc for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 05/28] gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714911610 (code B ref 60120); Fri, 16 Dec 2022 13:26:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:49 +0000 Received: from localhost ([127.0.0.1]:49268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aij-00031A-CJ for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:49 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aig-00030I-Rj for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2A900240029 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197141; bh=3TSffpsmWxDDZ7O82Cs0DUB0TM4TPaPgdIxlWPGD0d0=; h=From:To:Cc:Subject:Date:From; b=c1rHvf3J+wZzbiDBQUcCAJ4rur+njtP6dqsjDWetzRzHyZD3DodleFdCEUlimmYa4 h1FmkCBSAKylMBPPYZ4Dkm5/+gR7zR+UKWcNoJy+0gRYaQFi0QMwdGjLRFwNyViqeW eAIyxQIZMJXGPoWxxxCynbj/zd2pEM/Mv6Q/34VPhsX1XrJvA6tK7UQHt9gLbrFGBB uaaOZbzvcoIr22piDTn/7I8ugvnqRdblrPyBmUExucJ244X0x990qZEYJce7DD+tlv jKqBUvybGowWxJhkAndmzFAroxSN15ftqAJwZk5bHhuwKJeKVm9d7FP94nRh31N98B 3bDvvpqHzPWQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGX42Pnz6tmS; Fri, 16 Dec 2022 14:25:40 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:04 +0000 Message-Id: <20221216132527.2539-5-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (opam)[properties]: Add ocaml5.0-variant. (opam)[propagated-inputs]: Move to inputs. --- gnu/packages/ocaml.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 605baa801d..7abb31d183 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -960,11 +960,12 @@ (define-public opam "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) - (inputs - (list ocaml ncurses curl bubblewrap)) - (propagated-inputs - (list ocaml-cmdliner ocaml-dose3 ocaml-mccs ocaml-opam-file-format - ocaml-re)) + (inputs (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3 + ocaml-mccs ocaml-opam-file-format ocaml-re)) + (properties + ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 + ;; compiled opam until opam is compatible with OCaml 5.0. + `((ocaml5.0-variant . ,(delay opam)))) (home-page "http://opam.ocamlpro.com/") (synopsis "Package manager for OCaml") (description