From patchwork Wed Apr 14 09:12:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28495 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 BDDA427BC74; Wed, 14 Apr 2021 10:14:44 +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 B8FAF27BC75 for ; Wed, 14 Apr 2021 10:14:43 +0100 (BST) Received: from localhost ([::1]:38218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbe-0005tk-Td for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb3-0005QZ-Rx for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb3-00023Y-J0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb3-0007E6-EQ for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -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: Wed, 14 Apr 2021 09:14:05 +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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160727314 (code B ref 47768); Wed, 14 Apr 2021 09:14:05 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:27 +0000 Received: from localhost ([127.0.0.1]:33417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaQ-00076O-Jn for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00074W-U8 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:23 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 254011A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391597; bh=4+bMS74/t71Z3sNeXUjxrmXXBidPafAo8CA2I/RzBOE=; h=From:To:Cc:Subject:Date:From; b=iaFbnJ5X/i4ekg6tLRicpKSJvTQMTvddYU5xWlCTazsne/OVUNHtJQYTsf60BU8yb oaSSBnFSyrSpF0fCAC9N5MKuu/w2Rfqenqg/qGTmRrnVdfbyRMJ9H4kae8iLCduIu/ kbAznqN7K0UzkXuSfko8nQ4Bc7yzd5fZ3WW5dZEtpvlhp3pdhpTnmZTMSwrX7Y18Y2 4QDSkVZakCg6pgSbd0qS9x8+17ICu5UvxKpjE7zrSxQ3YqZs9SUxU60vuUgKiIfmcb LxQ5K19AE/odEmUtLMH9veX2S8DfEOso+a0yI1pFQrUKf0wew709zELslRGKvKNS6T +j98NXP0DhJNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbJ49Grz9rxS; Wed, 14 Apr 2021 11:13:16 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:33 +0200 Message-Id: <20210414091303.6990-7-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 503913c8fd..43a3bc1d40 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) @@ -2524,15 +2524,12 @@ representation of the data.") (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")) (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))))