From patchwork Wed Feb 15 22:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 46976 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 93C4B1688B; Wed, 15 Feb 2023 22:02:55 +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 0416A16876 for ; Wed, 15 Feb 2023 22:02:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSPqo-0001mP-9o; Wed, 15 Feb 2023 17:02: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 1pSPqm-0001jf-6a for guix-patches@gnu.org; Wed, 15 Feb 2023 17:02:04 -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 1pSPql-0002R6-JD for guix-patches@gnu.org; Wed, 15 Feb 2023 17:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSPql-0006zG-6W for guix-patches@gnu.org; Wed, 15 Feb 2023 17:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60673] [PATCH v2 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: Wed, 15 Feb 2023 22:02:03 +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: moreinfo patch To: 60673@debbugs.gnu.org Cc: raingloom Received: via spool by 60673-submit@debbugs.gnu.org id=B60673.167649851226631 (code B ref 60673); Wed, 15 Feb 2023 22:02:03 +0000 Received: (at 60673) by debbugs.gnu.org; 15 Feb 2023 22:01:52 +0000 Received: from localhost ([127.0.0.1]:34247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSPqZ-0006vS-K9 for submit@debbugs.gnu.org; Wed, 15 Feb 2023 17:01:51 -0500 Received: from mx1.riseup.net ([198.252.153.129]:60796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSPph-0006oN-AQ for 60673@debbugs.gnu.org; Wed, 15 Feb 2023 17:00:57 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (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 4PHBpx0qGbzDqph for <60673@debbugs.gnu.org>; Wed, 15 Feb 2023 22:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1676498457; bh=Go/q2FXOXREgFsUrvYGk/twWePakMqwfAiRRi9Eyvbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s2CuOANdeTiW/db5SI63hA+arbxci2fevso1ejbLrMSGGywtqCFjk220XDEY9fOVO cVMiB1sjkJMzeQXoq/FAhcV8RYfUsK7vFNi8lEnfWKwdftCmgJ8OISCsS7XtEcQqBr lvBdjQ5Um1uH8f7TOGmSPMAgjsCnSwa5Ih6r5MCo= X-Riseup-User-ID: 608D65D5C790C2AF7A4081E109981C0E43C76AFF276EBC56B6BA5C26C2FD1D4B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4PHBpw1d2Hz1y8Z; Wed, 15 Feb 2023 22:00:56 +0000 (UTC) From: Csepp Date: Wed, 15 Feb 2023 23:00:03 +0100 Message-Id: <20230215220028.18575-15-raingloom@riseup.net> In-Reply-To: <20230215220028.18575-1-raingloom@riseup.net> References: <20230215220028.18575-1-raingloom@riseup.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 From: raingloom * gnu/packages/ocaml.scm (ocaml-lwt-ppx ocaml-cstruct-unix ocaml-cstruct-sexp): New variables. --- gnu/packages/ocaml.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index affd0c194a..552759a171 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2963,6 +2963,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") @@ -4453,6 +4458,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")