From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8GV+MOOXtmCmBQEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:26:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id w5OsK+OXtmDddQAAbx9fmQ (envelope-from ) for ; Tue, 01 Jun 2021 20:26:11 +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 60EDC24B13 for ; Tue, 1 Jun 2021 22:26:11 +0200 (CEST) Received: from localhost ([::1]:59472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAxm-0002VC-DL for larch@yhetil.org; Tue, 01 Jun 2021 16:26:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxf-0002Jn-9s for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxf-00016S-0p 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 1loAxe-000712-UE for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 23/42] gnu: Add ocaml-ppx-hash. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:02 +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.162257911726663 (code B ref 47768); Tue, 01 Jun 2021 20:26:02 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:17 +0000 Received: from localhost ([127.0.0.1]:37884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwv-0006vy-Af for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:17 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwu-0006vH-9M for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3DBB72400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579110; bh=ZVXd3FpRrP5UCHwICc1PJy2nv2FYUbTLvjKU4J41i/A=; h=From:To:Cc:Subject:Date:From; b=dHyfjpdMtqGPjcAAzMbLTYt8AteBfpL/puyJ8+7MpMjyx4xcFlCHNTtheF6c5awJV UmZRqvq/grMPJBf6/Q6gDVb1ObMI7RVjaPdvJ6T+AhaSMe6fHmmIXObhLujQl3bDHd PZ9dkSb+ljh/8oux+jwXRvpbw2Dx7k0ClzVJDWSEyxlZsNtxMIuiidJiqNC5NFtp3r fb6V5OWbbjXZE5r/C90uci0h9HMoa8JuM0w23I6ZNy5I4cJ6DP6DBqEbGGmrALh9vQ 0LVQTzQtcWoB+ie7sAb0zb9jO3tbfpvyPQgzy5qus7IClupgKf9wObv3WjRT/KT1hh 2uNiDEcCzHM9Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDM2WSzz9rxD; Tue, 1 Jun 2021 22:25:07 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:06 +0000 Message-Id: <20210601202325.8777-24-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=1622579171; 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=Q+3Flv88HrQXWp69kdhSyoPsQO9gF/5lDFhGVq9RtqM=; b=top3yxW+BmVvVr2EIlrGZjW+uvPcFUBsMQr7GPhyLLDXH+qyakzb6GXpDJ49meu0PUX39R CAJY+WFrPwj/MaUNe+4mLptrtvVU/BHzQLpwlAbBRuAxa6Y0WxmVidjQfmWifHYnnM+sXY teY8OdIZ1JETPXsKC79tTqsAkH68uUbjeh5/1NXNeTAf/9lXXl5RWFgwWH4yYbhDkj4kVI 3IVPaWszhMyF8E0SZaLtXK5/0Eb898Q38pvd8T8juMSSdEtOUTuz6TufH8bkDs3eKARva1 3MEJOzAfc6jEsvA02UEbzjEJX5/yQ9LUFLCi5o05bm8OpH4BsJxIhqGwz/DBxw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579171; a=rsa-sha256; cv=none; b=C1IxGqEqFn0Z7s8SErCDX5raMjlMOsTjBkyGMcR9vYPNBXO/kKUAB7ITYT2btwUbCLDm9A /1niRp3M6uw4yaQeCYHvonNEQu3JmgiBrmCPY/5EGNM9DJ40Gr0t/4bIRHdCYnl/pRvmes 6EyzWpZCg3Dmqzy0u59Ie9boDs4ncdtyjwjuqBxg37hbr56OZ21heBdlIY9YkeQiWgTaUY 1CX4LoK0KPw0r087Ui2P4pqMuC9FaW/jdnZbdGRc6M6C58ql5ZbZAWRxPexQvlCAGGmFGy MHrWa6lnIMpW47ZiEfWdK3X9RjaWe6lcwlq27KpRhZzf1JyxJJWfmn5aMD4EBg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=dHyfjpdM; 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=dHyfjpdM; 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: 60EDC24B13 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: U77P/ojCVtS8 * gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. (ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash. --- gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d8af57fdcc..9696180af3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5280,38 +5280,46 @@ storage of large amounts of data.") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) -(define-public ocaml4.07-ppx-hash +(define-public ocaml-ppx-hash (package - (name "ocaml4.07-ppx-hash") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_hash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (name "ocaml-ppx-hash") + (version "0.14.0") + (source + (janestreet-origin "ppx_hash" version + "0x4wgdvhgd8a49bzari52jpkykxpv6ncgp5ncda3xgg0a9r49s8n")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_hash"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_hash") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-hash + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-hash) + (name "ocaml-ppx-hash") + (home-page "https://github.com/janestreet/ppx_hash") + (version "0.11.1") + (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 + "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (properties `((upstream-name . "ppx_hash")))))) + (define-public ocaml4.07-ppx-enumerate (package (name "ocaml4.07-ppx-enumerate") @@ -5319,23 +5327,23 @@ hash functions from type exrpessions and definitions.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) + (url "https://github.com/janestreet/ppx_enumerate") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no test suite + `(#:tests? #f ; no test suite #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (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)))) + `(("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"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5839,7 +5847,7 @@ from type definitions.") (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("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)) ("ocaml-migrate-parsetree" @@ -6147,7 +6155,7 @@ standard library that was developed by Jane Street.") ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) -- 2.31.1