From patchwork Mon Jan 9 00:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 45957 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 D89B627BBE9; Mon, 9 Jan 2023 00:37:23 +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 C3FC027BBED for ; Mon, 9 Jan 2023 00:37:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEg91-0005PZ-UT; Sun, 08 Jan 2023 19:36:07 -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-0005OW-4n for guix-patches@gnu.org; Sun, 08 Jan 2023 19:36: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 1pEg8y-000458-Sq for guix-patches@gnu.org; Sun, 08 Jan 2023 19:36:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pEg8y-0001iO-Oe for guix-patches@gnu.org; Sun, 08 Jan 2023 19:36:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60674] [PATCH 04/39] gnu: Add ocaml-opam-monorepo. Resent-From: Csepp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Jan 2023 00:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60674 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60674@debbugs.gnu.org Cc: raingloom X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16732245586481 (code B ref -1); Mon, 09 Jan 2023 00:36:04 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2023 00:35:58 +0000 Received: from localhost ([127.0.0.1]:35062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEg8s-0001gN-77 for submit@debbugs.gnu.org; Sun, 08 Jan 2023 19:35:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:49582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEg8n-0001fc-3P for submit@debbugs.gnu.org; Sun, 08 Jan 2023 19:35:53 -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 1pEg8m-0005Lr-Ui for guix-patches@gnu.org; Sun, 08 Jan 2023 19:35:52 -0500 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEg8l-00040C-9l for guix-patches@gnu.org; Sun, 08 Jan 2023 19:35:52 -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 mx0.riseup.net (Postfix) with ESMTPS id 4Nqw3B2Xrpz9tJn for ; Mon, 9 Jan 2023 00:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673224550; bh=95NTfFvZWpQ2TE/yUnRVK+UVt4trulv7Y42yEmUECLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mu3EjW78CLgm7Z6HwyrsIhrjRA9arz0ediINFm0G0yKDmFT2MPO+zU5DtVzmxk1kf KOOfECiO1ZEtDHzBVlZmN81XQ/aUSJBJV7qJ6slZTu1vcGnTvWv/t4zIa1VYd2hA9w 3nmG/AoBBCpKTLO3FIv5W6CQmBLyskEr2xkUOSWM= X-Riseup-User-ID: 744DCC8DAE346E2596884B8B87BFD1B73509A193DB1BCAF323DB7A7D482D9037 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Nqw393c8lz5vjc; Mon, 9 Jan 2023 00:35:49 +0000 (UTC) From: Csepp Date: Mon, 9 Jan 2023 01:34:54 +0100 Message-Id: <20230109003529.23375-4-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.6; envelope-from=raingloom@riseup.net; helo=mx0.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, 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-opam-monorepo): New variable. --- It's possible this should also omit the ocaml- prefix, like opam, but then it will also require special handling in the importer. gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f36df6111..1082103504 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -976,6 +976,39 @@ (define-public opam ;; The 'LICENSE' file waives some requirements compared to LGPLv3. (license license:lgpl3))) +(define-public ocaml-opam-monorepo + (package + (name "ocaml-opam-monorepo") + (version "0.3.5") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/tarides/opam-monorepo/") + (commit version))) + (file-name name) + (sha256 + (base32 + "09lq788b1sai4v1nxd16b00pw0m55plcwrx3f9v5a90gpxg0a6sc")))) + (build-system dune-build-system) + (arguments + ;; TODO + ;; Too many tests require a fully initialized opam, disabling them would + ;; be a huge pain. "Mocking" opam init is difficult because it requires + ;; networking access. + '(#:tests? #f)) + ;; TODO: not entirely clear if these should be native, test cross-building + (native-inputs (list ocaml-odoc + pkg-config)) + ;; (propagated-inputs lablgtk3) optional and is currently failing to build + (home-page "https://github.com/tarides/opam-monorepo") + (synopsis "Assemble and manage fully vendored Dune repositories") + (description + "The opam monorepo plugin provides a convenient interface to bridge the +opam package manager with having a local copy of all the source code required +to build a project using the dune build tool.") + (license license:isc))) + (define-public ocaml-camlp-streams (package (name "ocaml-camlp-streams")