From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0P+MIhi7dmCsFwAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:51:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id CBt2Gxi7dmBhNAAAB5/wlQ (envelope-from ) for ; Wed, 14 Apr 2021 09:51:20 +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 0E0A623938 for ; Wed, 14 Apr 2021 11:16:14 +0200 (CEST) Received: from localhost ([::1]:42816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd7-00083r-64 for larch@yhetil.org; Wed, 14 Apr 2021 05:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb8-0005cQ-7M for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb7-00027f-VV for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb7-0007FR-Qo for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 24/37] gnu: Add ocaml-ppx-hash. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:09 +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.161839163627578 (code B ref 47768); Wed, 14 Apr 2021 09:14:09 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:56 +0000 Received: from localhost ([127.0.0.1]:33491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbat-0007Ab-Am for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaU-000759-6p for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7C2A82400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391609; bh=xyMcz2a9n5hv7ToKgMfYc51/eXv0q5i0d5p1mxJdy2s=; h=From:To:Cc:Subject:Date:From; b=RPeoIFwKkLq02AI2RrMXMAXk0XRHSLWblwhNa2Vl8gFcZMPHRUFlVXqL0lXehByPs O4jNh4+JhlBMU3tYUfoGNcpQZmcgNxZZNz1sf3+ioHt6ZwF4CgOz+uIIbIvX3kkD0h GebJLwOPb9M7BKwkuC6ys7+2pbakoNRamisd0poiSYspNrQbOWnqGIVyd6NzC9Qk1X C/TUOTIQJsfacutIIo6wW7LVfdLqng5FX2+Uo6uWYUnidM+K5g0VUF5kBA24fulqQM /vgMMgfBiFZ09B/PAU12L8N/Yx6ui1eh910choca2dFwqIyHmbp9GDXrKeQYIHpCEd kPcJhlAvrq62g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbX5sx5z9rxP; Wed, 14 Apr 2021 11:13:28 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:50 +0200 Message-Id: <20210414091303.6990-24-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 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=1618391774; 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=9h1a24RdaUK+femIcS5M62004eDTU+K+TNQcLHHQS6Q=; b=FPa7EejDjeMYd8noypLq/o+SBoXhsfV/yj3IWCw5lR9BScELMaxZtrD0ThFZpFVceREIJH OMSwoK5Y2Hf58KD4LiRZw0+tvMx2MZv7WOkUaqRpsvFxdYCKpu+ClLwVJe+O/S3scYhZSC ulhUYUYkVh9mufNSNHku2F4Kwk0g5UrnMjqcLo+La5SDJTxA9VMBUgOByXI0jG1PhbwwsF JCxxNUxd4+ftr86FKuhaWvGcpj+6UFMfvX1m51ehx76WSIvwZEtRVkg8cFtXk5r2Y/un9r 2c2roOsnf0cqLvWDX/3WNb98DC56wyIxyIYh3m6IbU9Q70UWLB70BC38JswR4A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391774; a=rsa-sha256; cv=none; b=EkiabebFcCnXW3uAgOFWyu3SURWGhJTG/HK7ithmRa2JEkb9M30g9QzeWo8C3+A6Ogm8OD u9lyBChR6CvIa8stmUta04kZEw08R81VSAcSQWk+4WSObquCuNb3UlgQivFGN/G4eX9N/E qJrgVTAVkAh0b0uctHoeruJ79J52g9qdIfRvzrIE/oE4Bzei91S+rqwpiUDVq2yonXit2e vWYTAaVQtT6nemctqF/I5Jx+0XTEy4qes15cqvWkw2W7aCiB5dysa8FAt/arwYEPnOqKm7 J4gJNspjlJ9lE4EI5+JbRLahzf4lXdqMZXITvDWpOCBa4zlB+RBfJYlkVlDdAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=RPeoIFwK; 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.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=RPeoIFwK; 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: 0E0A623938 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: a/RvfKvAjx5Z * 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 ae6f393130..fd85e2614e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5267,38 +5267,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") @@ -5306,23 +5314,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") @@ -5826,7 +5834,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" @@ -6134,7 +6142,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