From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kCWeH3bCmGAXVwEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:19:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WAsxG3bCmGCaPgAAbx9fmQ (envelope-from ) for ; Mon, 10 May 2021 05:19:50 +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 24EA0BE7B for ; Mon, 10 May 2021 07:19:50 +0200 (CEST) Received: from localhost ([::1]:42370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKb-0005Dj-B1 for larch@yhetil.org; Mon, 10 May 2021 01:19:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-00005t-Dh for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0003dh-4T for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ8-0000WI-05 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:17 +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.16206238831695 (code B ref 47768); Mon, 10 May 2021 05:18:17 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:03 +0000 Received: from localhost ([127.0.0.1]:57045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000R4-OZ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ka-Es for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DB9082400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623850; bh=UKmIulycFBabQ6rW6xwAlVOgt7x3Ely9KPkMkHrKCqM=; h=From:To:Cc:Subject:Date:From; b=em3TxDqP7jCcBIPSUNhfrOUbGzmHsgXSqPFswOjbc2JSKw6QmNUl2UeksIG/z4axl rVN8IgJYUNFQuP/sFgUYgQNKTxJhwMUJhh5gdC2gLUOOBUmMYAOp9YWey2m7Gui6I2 oblWo1RJr4OstGvQ8FZIHzocYR46SLWs3jADcntqf+5XKb8nBIm0IaUXIJGjPN/zGF ryFlOwc5OxMDygDEBDEa2UOQBx0PNsPBzkR8p5nvlbOS4wyfIQPVzTbWyZ42wvsJ+Z sAlYhYl5CCY3zk/RvuKZHfAC4mytdq21iODi/5CChqR4UDZ/0XsehZHAWX5suZPzyQ 1S7Ab8GJzi/sA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G1SRkz9rxg; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:10 +0000 Message-Id: <20210510051628.15359-26-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 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=1620623990; 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=wPYvYc8dyGe7KC7q6nAKAysnOS8IxWyoAELjtW1DASY=; b=ZlmYrsdG6/Gf8VUdRS+oFrdQt88O4j5iHX1MKGA5D4eSAjRekHaaxBK/w2u3EWk0mgTINd ok5AAHMl9VDqg4/ePcv8hLX5+i8RmcR14G6GxxF7oMRTtDrGl6eXHT5dGC9ALXZBGH7hB7 O7yxS/Q0YVOrAU0rT6o4fykoP3bFjFlin0LcBkzcnoH/bcxrrP7plHfRiEc/IkTb7F5UE4 F/tsUGDSaX/5uDbuoqxCwGdXf+VNIKF3S/huMeqmCaDIkBKhd1KNR+yQQRmswuPoh3cEqK /t2yZ9Qy5IEOgF8viZPCifjRDTZONbxaSue/kjd/tvFPoyXeVzKOZjPOzlAGpg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620623990; a=rsa-sha256; cv=none; b=YSxTQrEeBEDP8LHLCOXnNAGiSruT6hoeG1X92fwqlh4/A8nMgKCDkqEZbgy8Ahu9/FKjwp BYcl1y+vv1i5L5T51oT+D7CQJJjDdtMaKEigVBe91yk3LxyqyI8F83UszGupYMC57n+VR0 T4UHO8dfctIjCYchnCg5JRN6VZmdzcw8R2mFeA9ZI3GJxpPhj514sK6DYkMr356sszwtMG OAwtRVb9tt3Wa3XUdcEzElb8ju/PcsVIwXLrfM4A5KH6EeqkiYVIWW+CxEBE+8wOnlYICt wzCM2GeLQgLZVPB8xsg+QjDnnN6TRJTEQqKBnRH3xBr8vcubl2m5zwam5ATAjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=em3TxDqP; 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.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=em3TxDqP; 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: 24EA0BE7B X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: UXAsBdbD8V+q * 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 792cf38447..8bed1ae1a5 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)) -- 2.31.1