From patchwork Mon Jan 9 00:35:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 45953 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 2F62F27BBEB; Mon, 9 Jan 2023 00:37:20 +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 0594927BBED for ; Mon, 9 Jan 2023 00:37:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEgA1-0005xa-IJ; Sun, 08 Jan 2023 19:37:10 -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 1pEg9u-0005uq-Ok for guix-patches@gnu.org; Sun, 08 Jan 2023 19:37:02 -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 1pEg9u-0004Rn-GU for guix-patches@gnu.org; Sun, 08 Jan 2023 19:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pEg9u-0001sp-C7 for guix-patches@gnu.org; Sun, 08 Jan 2023 19:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60673] [PATCH 14/39] gnu: Add aliases for ocaml-cstruct and ocaml-lwt subpackages. Resent-From: Csepp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Jan 2023 00:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60673 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60673@debbugs.gnu.org Cc: raingloom X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16732245746867 (code B ref -1); Mon, 09 Jan 2023 00:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2023 00:36:14 +0000 Received: from localhost ([127.0.0.1]:35125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEg98-0001mW-Co for submit@debbugs.gnu.org; Sun, 08 Jan 2023 19:36:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:59600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEg8z-0001ih-AT for submit@debbugs.gnu.org; Sun, 08 Jan 2023 19:36:05 -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 1pEg8z-0005OU-43 for guix-patches@gnu.org; Sun, 08 Jan 2023 19:36:05 -0500 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEg8x-00044H-IA for guix-patches@gnu.org; Sun, 08 Jan 2023 19:36:04 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Nqw3Q3WplzDqJM for ; Mon, 9 Jan 2023 00:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673224562; bh=DPZvSpx7Tu1i5sNEtRwH4zlw2wpqavm3d3up0EnBLSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mm0Ac6n4uieWz2NOEroEd8t77gdMNWfnZ9Xj1puyFCeiUSBiTgomgdYNTrhAl3oYT 4o5Q0USIcIsYkcBhSLgtxiqP4+76dY6/u6KN5NeZrQ7LMuYtSV49WgmzW/n+RurTRZ aPs5HeA9XvdtiPsnmlwxNthwc/HudegvQD66Hbwo= X-Riseup-User-ID: E1FF5932FCDD04C803CAAF8D980AE79110F5183ED3668B79A23CB95E520381C9 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Nqw3P4Zpyz5vXJ; Mon, 9 Jan 2023 00:36:01 +0000 (UTC) From: Csepp Date: Mon, 9 Jan 2023 01:35:04 +0100 Message-Id: <20230109003529.23375-14-raingloom@riseup.net> In-Reply-To: <20230109003529.23375-1-raingloom@riseup.net> References: <20230109003529.23375-1-raingloom@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: raingloom * gnu/packages/ocaml.scm (ocaml-lwt-ppx ocaml-cstruct-unix ocaml-cstruct-sexp): New variables. --- We've discussed aliases vs variants with Julien Lepiller and yeah, these are not ideal, but also it's unclear how variants could be used when the original packages already explicitly specify which subpackage they are building. But, perfect is the enemy of the good. So I'm gonna leave these aliases in for now because I have a lot more MirageOS stuff to work on for my thesis project at uni. gnu/packages/ocaml.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 53252aac03..ee4c1cf91a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2971,6 +2971,11 @@ (define-public ocaml-lwt locks or other synchronization primitives.") (license license:lgpl2.1))) +;; TODO this alias is not ideal but ocaml-lwt already explicitly specifies a +;; package argument and at least this way the importer doesn't try to +;; re-import it. +(define ocaml-lwt-ppx ocaml-lwt) + (define-public ocaml-lwt-dllist (package (name "ocaml-lwt-dllist") @@ -4458,6 +4463,12 @@ (define-public ocaml4.07-cstruct "0jj3whs8r3jc524i9bb67rffh7y7r157hjgvws0bkxijxpjzwkbk")))) (properties '())))) +;; TODO again, the "parent" package already has an explicit package argument, +;; so a variant package doesn't make sense, at least these aliases help the +;; importer out so it doesn't re-import things. At least hopefully. +(define ocaml-cstruct-unix ocaml-cstruct) +(define ocaml-cstruct-sexp ocaml-cstruct) + (define-public ocaml-hex (package (name "ocaml-hex")