From patchwork Mon May 10 05:15:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29191 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 9C50827BC82; Mon, 10 May 2021 06:18:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66D2527BC81 for ; Mon, 10 May 2021 06:18:22 +0100 (BST) Received: from localhost ([::1]:33964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJB-0008Fp-HR for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0008Ch-Pl for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0003VX-BI for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIz-0000TX-7W for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 07/43] gnu: Add ocaml-gen. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238631494 (code B ref 47768); Mon, 10 May 2021 05:18:09 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:57001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIZ-0000Nw-7b for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JC-8O for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2CF91240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=0Uva56yGIO+qAi1+GBDnBMeyZhDwZkcQupmzXLq1vZY=; h=From:To:Cc:Subject:Date:From; b=R/tNK8tCe7mGLEqlLEuDAVmieK5dv+iE03f+M0+o2Xmz4W0Qd4zeG88hc141P8lkw /8+mNuxyKmtlD4iGif12dImS2ZuF4oe6J2Nq4w42hSe/Xa9VTnu8VZ+LEvR3ZpkB0d Irabe155p26GyyXIyDGhTHv0DrXBLTuIm1PFjEnLOgD72AmKGlaQDHkZT6dnN9Akwb ErzXD7+EuWdBj3rkC4ofO1ZyAvuuTDEmOTAu8sfBXMZEGYKaoA0ZfWVFtGHILgFq84 9H2ALP97hFXJ096Ttv37B2TDcLVXrtt7NxdLcp5kjq1B3Rc6BHbf3uSq3v1twoHYlv 7moX/wmLnc8JA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq746ZNtz9rxf; Mon, 10 May 2021 07:17:20 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:52 +0000 Message-Id: <20210510051628.15359-8-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34e1b954d2..877b9284d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen +(define-public ocaml-gen (package - (name "ocaml4.07-gen") + (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch) @@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:package "gen" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:package "gen" + #:test-target ".")) (propagated-inputs - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) + `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) + `(("ocaml-qtest" ,ocaml-qtest) + ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable @@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs - `(("ocaml-gen" ,ocaml4.07-gen) + `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))