From patchwork Fri Dec 16 13:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45373 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 992AB27BBEB; Fri, 16 Dec 2022 13:28:09 +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=unavailable 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 E11BC27BBE9 for ; Fri, 16 Dec 2022 13:28:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj2-0005pG-S4; Fri, 16 Dec 2022 08:26:08 -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 1p6Aj1-0005n8-0D for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:07 -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 1p6Aj0-00079s-NC for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj0-00034m-Hq for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 13/28] gnu: Add ocaml5.0-ppx-expect. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:06 +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.167119716011707 (code B ref 60120); Fri, 16 Dec 2022 13:26:06 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:00 +0000 Received: from localhost ([127.0.0.1]:49291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiu-00032f-Fe for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:00 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aik-00030P-D7 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:50 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1853D240105 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197150; bh=lIZ1ocu3yqxY/Oa/FOEiVeAvfEZ6x8mmJeEUgBdJk7E=; h=From:To:Cc:Subject:Date:From; b=feMhbrmN39uj2mKWueRZk6IqPRuJPuVW0av/VEcaEWIGCeA6BNJFARVNLGG87/u/C ElWaBYGzqSeA8hShiROM/3fVPhqSawE2VSZCnS4lcMkUEmcILkdg6V2HZYT1REMI/n ELCz3DfsmZCJwVcWWsKvXnQ9OZRNNEB8/W2VjwAd/oY8/KmP0jNF3wc+4ITaiP46RQ A1T0xG5plVJPICl9Z2WnpErJkClFtVyAfeEwfOuHG7ZcUkT8SzMIxQgOFDCTaxKTl1 hLBRWQGVOBZavqXgCemo5svoEgfPf+CM7rpzjFlUlabvuvU40VaOS+vq4aWeyUYhFW toU1vxbLJoTVA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGj4mxjz6tm4; Fri, 16 Dec 2022 14:25:49 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:12 +0000 Message-Id: <20221216132527.2539-13-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-ppx-expect): New variable. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3e0e0dbc3..057c062879 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6754,7 +6754,8 @@ (define-public ocaml-ppx-expect ocaml-migrate-parsetree ocaml-re)) (properties `((upstream-name . "ppx_expect") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)) + (ocaml5.0-variant . ,(delay ocaml5.0-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -6764,6 +6765,28 @@ (define-public ocaml-ppx-expect to denote the expected output.") (license license:asl2.0))) +(define-public ocaml5.0-ppx-expect + ;; Contains fixes for OCaml 5.0 + ;; (https://github.com/janestreet/ppx_expect/pull/39/). + (let ((commit "83edfc1ee779e8dcdd975e26715c2e688326befa") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-ppx-expect) + (name "ocaml-ppx-expect") + (version (git-version "0.15.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05r7wlmrhb5biwyw6bjcpmr77srglijcbf7nm7h2hiil0d0i7bkz")))) + (properties '()))))) + (define-public ocaml4.07-ppx-expect (package-with-ocaml4.07 (package