From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AJ4UG+eXtmDJBgEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:26:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +IKRFueXtmDRUAAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:26:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2763824B16 for ; Tue, 1 Jun 2021 22:26:15 +0200 (CEST) Received: from localhost ([::1]:59454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAxq-0002UA-4B for larch@yhetil.org; Tue, 01 Jun 2021 16:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxf-0002Ky-Ny for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxf-000173-Dr for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxf-00071C-9z for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 24/42] gnu: Add ocaml-ppx-enumerate. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:03 +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: Xinglu Chen Cc: pukkamustard , 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.162257912126687 (code B ref 47768); Tue, 01 Jun 2021 20:26:03 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:21 +0000 Received: from localhost ([127.0.0.1]:37888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwy-0006wM-PB for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwx-0006vf-95 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:19 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BA353240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579113; bh=uoVAtLY1p1hwG0VR4mvPiQJiEU2cFHjVOU/EpWUMKvI=; h=From:To:Cc:Subject:Date:From; b=Ribc7G1K+GvQhxRoRvASRbaAfLYqtOHyvyHUrU2E+Vl+CPUC/EXQ7x6Gfs/3KUjgZ f+/btMX7kdutGZyavAntvbvJG1d/WsBB59fbKKZS932Pin3j74vK63ow+fUYbXHjJB kU8GBcdw5Y2SwJM4G8UP7z9+Qbiwq9EY9mljpDW5OxpgWOOEX0h7f0/cgZWsOl/adI ORCLUGEs5ysGLDyDGHvMJUMKqG4eC5nVq4IdyrGXwxFoJ2knfW9SKgn9ckCNzIueDZ aMiULTS9JCkaR3TbC7PGpHZE9U25S/DXfkM8sflGnN8NfvfRCxoOVwZrGkj5LHzcyL 5k459fuwt/NRQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDQ603Tz9rxK; Tue, 1 Jun 2021 22:25:10 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:07 +0000 Message-Id: <20210601202325.8777-25-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622579175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=saTc3KaEGiNESjhLBy/sXppjr+E0Kal8bUxGU+6LmR8=; b=V7rwT+OeY627wWxZM9Z3Ozx1H94Rhqf6Bgob8JXjuhuzXeRKRjcI3mq1bqmwZZX2l/ZBuz k5u3eBoqZySXEgdrbH7lFg5Mw/dV6f6G7OOXmH+BB+hOxmpIeK7RfePjmkqQ0XmKaAa8DY fRXCEJOYlj28F550F4b8mqoKYPvSWgjkr95lVeysVozTH0wqBNK1fBdnsM9WVLTYhurwSU N3oAyVbZmY1SQ7tU2HN+isoITDxvDueZ81K5Lyz9BNXVmqwyR4PgYHaikFsXSyfthwiMe7 DvM6bKaDx85VQzprun6b34ZtG1F3HgxzCB9uOEWzcrXPfw9g/bT7awTcXOJeUg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579175; a=rsa-sha256; cv=none; b=iSno3IVj9MwJ1TJ6Ht7Jw86Pu3h7YkpvxyTvilvhOIEZ9Uyy4rGNgNuEuWhyVeXfpUQxZT HJFtDPsmAwlZ5tUO3LGPfb944YEHh6HkYgXIhF5TY1k23N3R0v8V0K1c4CWjZPu4HfRlx3 Q2YRVCnIF7b4OhdIyCJHcUEQDqlVFjYWuODzpGHKLd7VQTPQF/S12T6puA0nY4ZKwqXKaz QXsX83DGtKg62e//ULevvsQSz58K8d7SJ5LHi2VsDxWOtzTP0YyMvMQcjO9o8lptv3zX8N jYHNPp0mkypUws3LXgfgAJ+1+Kva/uEg2LQ1Xy7I8D+sVMMBKFcWCTSPEiPaRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=Ribc7G1K; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=Ribc7G1K; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 2763824B16 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: BNOULWQoASLf * 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 9696180af3..44ae65c345 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5320,31 +5320,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 @@ -5352,6 +5344,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") @@ -5846,7 +5856,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)) -- 2.31.1