From patchwork Tue Apr 20 06:11:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28710 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 BD0E727BC77; Tue, 20 Apr 2021 07:20:27 +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 8D1CF27BC6C for ; Tue, 20 Apr 2021 07:20:26 +0100 (BST) Received: from localhost ([::1]:55484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYjkH-0004wb-R5 for patchwork@mira.cbaines.net; Tue, 20 Apr 2021 02:20:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYjju-0004wQ-58 for guix-patches@gnu.org; Tue, 20 Apr 2021 02:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYjjt-000479-UT for guix-patches@gnu.org; Tue, 20 Apr 2021 02:20:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYjjt-0000iy-Q8 for guix-patches@gnu.org; Tue, 20 Apr 2021 02:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Apr 2021 06:20:01 +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: Maxime Devos Cc: 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16188995462713 (code B ref 47768); Tue, 20 Apr 2021 06:20:01 +0000 Received: (at 47768) by debbugs.gnu.org; 20 Apr 2021 06:19:06 +0000 Received: from localhost ([127.0.0.1]:52768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjiz-0000hh-Rr for submit@debbugs.gnu.org; Tue, 20 Apr 2021 02:19:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjix-0000hC-8x for 47768@debbugs.gnu.org; Tue, 20 Apr 2021 02:19:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 24FE32400E5 for <47768@debbugs.gnu.org>; Tue, 20 Apr 2021 08:18:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618899536; bh=UtmY64bnKdnOZER7qc/oAUDiUhJvQCGbDo4cOJ+1hnI=; h=From:To:Cc:Subject:Date:From; b=mR4A8DUSn8MEiqo/PNHUXnNhgCcIfxalFA9w2SVsdW1UoUkA/Qmym+lvrXLejS4Z8 9WRxI1RyZGgDaGl1JchBaEIUKkOf3KlnQODQ+8/S/Ib4NRjImI19SqNCXveNbdb5N6 PtYJwgOcZvyGYQXJ75NmznpY7cCIohccb3B4xK9p4oFabMZmRWN+yvQHzqVHRe1f9y fjGB1/+kPWOhYvigJOTmrQ0yBxpGNPReCpJkjkEfBv6YvikTB94/op6uL7wJVSM6KS y5iA8Dh66zzighaGz/I3UN+sl6LZIDc7l7lkx04xJaySqNDO8tQaETPNpI4iF7jXVC B+ll3tRaEeP2A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FPYRL4HwBz9rxL; Tue, 20 Apr 2021 08:18:54 +0200 (CEST) References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-7-pukkamustard@posteo.net> <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> From: pukkamustard Date: Tue, 20 Apr 2021 06:11:29 +0000 In-reply-to: <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> Message-ID: <8635vlfpgy.fsf@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 Maxime Devos writes: >> -(define-public ocaml4.07-gen >> +(define-public ocaml-gen >> [...] >> `(#:tests? #f; no tests >> - #:package "gen" >> - #:ocaml ,ocaml-4.07 >> - #:findlib ,ocaml4.07-findlib >> - #:dune ,ocaml4.07-dune)) >> + #:package "gen")) >> (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))) > > I'm confused what's going on here. > ocaml-qtest is for unit tests > (https://opam.ocaml.org/packages/qtest/qtest.2.1.0/), > but for this package we have ‘#:tests? #f; no tests?’? Excellent catch! There are in fact tests and they also pass. Please find attached updated patch that enables tests (I can also resend the entire patch series as v2 if that is easier). The `#tests? #f` was introduced with commit 5a4003f453ee8afdfe21d959e105250bfc876063 in 2019 and I blindly copied it. -pukkamustard From 3036a81329f65c6c9ffe2117744590a7e52aee01 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Fri, 9 Apr 2021 14:59:36 +0200 Subject: [PATCH] gnu: Add ocaml-gen. * 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 503913c8fd..1acde9c0ee 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)))) -- 2.31.1