From patchwork Fri Dec 16 13:25:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 8383 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 BEE2127BBED; Fri, 16 Dec 2022 13:26:24 +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 4364F27BBE9 for ; Fri, 16 Dec 2022 13:26:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj9-0005w2-CP; Fri, 16 Dec 2022 08:26:15 -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 1p6Aj6-0005rh-0i for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -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 1p6Aj5-0007C1-Ht for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj5-00036S-CT for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 17/28] gnu: Add ocaml5.0-ctypes Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:11 +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.167119716711842 (code B ref 60120); Fri, 16 Dec 2022 13:26:11 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:07 +0000 Received: from localhost ([127.0.0.1]:49314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj0-00034f-7p for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Ain-00030q-RB for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:54 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7C8C3240028 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197153; bh=1nWCi+yAb2UUZWIFfMgL7LL6CdpwiXA2wiEX8jrW7N0=; h=From:To:Cc:Subject:Date:From; b=lFe9S/lWN8wmJpqaW23zWLSzlt2n8WpaX5rUVakrlgUjMINyMYxDW7VK5lfbs93kY M1BTM20YWsRyLpFOeGHfv2so3ePCKATWJfEM+RkE4Xt0ei8Fjxq/ZaViHwmmIhpMFr F/Tw1MZSYnPzR2pJmm7HHHHRkRV3QTID/sMjPOvFf3mGiLvN/z7Qray9G1c90MiwAf +c7f1GWlbcB1U0y8Q/SAlGlrhFzBEwUbY6QOg8FsyK4NT1HxTEeO34ijg9SZt+B4nT cpNCMS8gPg7XJRgD78sA4eP5ltHxTfGiSx4VnOGaBd8YqE/BoHi+KLbloZruaFk4pb b61cizmV/yAUg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGn0N8lz6tmc; Fri, 16 Dec 2022 14:25:53 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:16 +0000 Message-Id: <20221216132527.2539-17-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 (ocaml5.0-ctypes): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bcd88c8637..7fbaed69ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4797,6 +4797,7 @@ (define-public ocaml-ctypes ("integers" ,ocaml-integers))) (inputs (list libffi)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-ctypes)))) (synopsis "Library for binding to C libraries using pure OCaml") (description "Ctypes is a library for binding to C libraries using pure OCaml. The primary aim is to make writing C extensions as straightforward as @@ -4807,6 +4808,33 @@ (define-public ocaml-ctypes without writing or generating any C!") (license license:expat))) +(define-public ocaml5.0-ctypes + ;; Contains fix to support OCaml 5.0 + ;; (https://github.com/ocamllabs/ocaml-ctypes/pull/709) + (let ((commit "52ff621f47dbc1ee5a90c30af0ae0474549946b4") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-ctypes) + (name "ocaml-ctypes") + (version (git-version "0.20.1" revision commit)) + (home-page "https://github.com/ocamllabs/ocaml-ctypes") + (arguments + (append + ;; Some tests fail. Failure seems to be due to OCaml 5.0. + `(#:tests? #f) + (package-arguments ocaml-ctypes))) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vyiryqchz0mdfhal7bdivqsk5yhvzzckrqv495rlpbdxzklcp7g")))) + (properties '()))))) + (define-public ocaml-ocb-stubblr (package (name "ocaml-ocb-stubblr")