From patchwork Wed Apr 14 09:12:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28512 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 F12F327BC77; Wed, 14 Apr 2021 10:16:13 +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 C6D2627BC74 for ; Wed, 14 Apr 2021 10:16:12 +0100 (BST) Received: from localhost ([::1]:42812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd5-00083m-Tz for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hk-4Q for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbB-0002Ad-Eg for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbB-0007GX-AR for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 25/37] gnu: Add ocaml-ppx-enumerate. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:13 +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.161839163927649 (code B ref 47768); Wed, 14 Apr 2021 09:14:13 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:59 +0000 Received: from localhost ([127.0.0.1]:33509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbax-0007Bn-38 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaZ-00077M-RX for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0CD801A0231 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391610; bh=CnpsiAMYG5+eex8Cck+0ln7OFfjTHBMJS7Gvb0WfGQw=; h=From:To:Cc:Subject:Date:From; b=U62v5jfde5z9fXeJyNq4fxVjA4TBVmEWOgj+ekj+tGocRZHRLGVphkx7o4yKMTRN0 3wXql0ArouPO8BTDQ3PSYw0pplGDay3OpiXVOQwr0E6Ptop1sV6Zug3c1cvnCz/9+n LHufAoXLHzUPqHYtIMabFBDXQff5bZhbqIVK0J65CJR4EsnNfNHekoYMdfUjCXyUGd eWIcHLf0h2J/G9PoBC7zKaRlij8soPnywKKOQup5hbX/NVxyaGk43/DYbW1HnWkTVw uvsy6cx2TP5NbDt/SS+O8qKN/vpL/ZVc0P3daZKT5CU4O7yU6XkxtAoNxsH4RWDrPQ LLGqEikkgxazg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbY2V2qz9rxq; Wed, 14 Apr 2021 11:13:29 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:51 +0200 Message-Id: <20210414091303.6990-25-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-ppx-enumerate): New variable. (ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate. --- gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fd85e2614e..0e2b632ae2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5307,31 +5307,23 @@ hash functions from type exrpessions and definitions.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (properties `((upstream-name . "ppx_hash")))))) -(define-public ocaml4.07-ppx-enumerate +(define-public ocaml-ppx-enumerate (package - (name "ocaml4.07-ppx-enumerate") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (name "ocaml-ppx-enumerate") + (version "0.14.0") + (source + (janestreet-origin + "ppx_enumerate" version + "1ij6sffgqhnjwnj9brhrrw1c6xgxlh0s6r17x1qkgnyrc73gfsz8")) (build-system dune-build-system) (arguments - `(#:tests? #f ; no test suite - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) ; no test suite (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_enumerate"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_enumerate") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -5339,6 +5331,24 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) +(define-public ocaml4.07-ppx-enumerate + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-enumerate) + (name "ocaml-ppx-enumerate") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_enumerate") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (properties `((upstream-name . "ppx_enumerate")))))) + (define-public ocaml4.07-ppx-bench (package (name "ocaml4.07-ppx-bench") @@ -5833,7 +5843,7 @@ from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) + ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))