From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8N2rOpu4dmAhCgAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:40:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mFOjNJu4dmADPgAA1q6Kng (envelope-from ) for ; Wed, 14 Apr 2021 09:40:43 +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 7A7F7240C1 for ; Wed, 14 Apr 2021 11:40:43 +0200 (CEST) Received: from localhost ([::1]:39250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbm-0006VC-49 for larch@yhetil.org; Wed, 14 Apr 2021 05:14:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb9-0005fn-Dp for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb9-00028i-4e for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb8-0007Fo-Vn for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 19/37] gnu: Add ocaml-ppx-compare. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:10 +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.161839163727605 (code B ref 47768); Wed, 14 Apr 2021 09:14:10 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:57 +0000 Received: from localhost ([127.0.0.1]:33497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbau-0007B4-Ml for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:57 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaV-00076F-Gy for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id B4ABA1A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391605; bh=vzCZynhMVnVKD7CwMqlDrA9Ll+8TyRt2zQZYwV9FEkw=; h=From:To:Cc:Subject:Date:From; b=Sl2mMaTJveBOSqzeYMRY1Q2cBc2HzqcrRxTI/wfuLLf1nfetrOz6KQfQ9OjX65VPk YdJucUaOPctthZ8vIK4qSe3s0lhFzn3uVLT3KcvpQQJJTerPy6chHrFrYbfNIcLLNE abOtJw/DJwJO9TYPNUyDKSgMBIGf08usIRzZgA16cUY9zqqtsvktVzUGxE5FturXHF PaO/Ef0TtvNYkA++JnqEA4s4/U2azbERfdh+GhG5UEKPg0DHgXHzLwpc4JnbL/3Tm8 UdOFr4hshgXvgVS0Lrk1QG/CduyWKaZtjXA7zHUBheZUD0ONrctfRfd5Fi+/P0/xnn yXCGlPpqhfqLw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbT08FWz9rxs; Wed, 14 Apr 2021 11:13:24 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:45 +0200 Message-Id: <20210414091303.6990-19-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=1618393243; 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=Emf6aHuKlfLhmBSA6P++twliTIZ638Ut5VjlIj3t88Q=; b=APfZ2aEgoHUcy16Ujl831y1u27yozfn2aDAbVcMfdCYmM8zFl3M+zIJZMkVCb6rw+OczpG LF94XJAdyQVCqNWIbjuuH1/mRwZYFcUM6MwYWhW4bFyiU4neP5nb3115fTOeJGFKG6WKi1 orHKvQ++cfExiDSNmy2TxNQPBRVZErsjZdyKOnbqM0RJn7+1ifBR31lUE/rglP8MTqdwfd lVKcXgFyeWQQ3eNBVicTgvreBvnrMSFn1/DCJqxV7kiAhslBDSH3duqKRvCTaN55Q6tcWV GoL38BpzZBYTaepR0nhEbq1HqCU0JudRDgrQNoF4PpTKMbZpLpIQ8PbsYHzxMA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618393243; a=rsa-sha256; cv=none; b=RQRtYMKugWX0GvWyw5Bg4A/+fIpqwaPvOSXiEGP+3M2rUY8YpnkKZQ3dBAwxzspDovVGmr qc5MFIFeFIzAxQTwaHicc0sy3THEL1/MmQiwwvhPTxspvnkW0sjWLouOtpnoVq9Wip1iiU 5bT3xUzwHJKTP4FGG6spPQ+ks1IcVRD4o/bEajbe8Ia8q2SPDRct2bEXhcYGe3p0M627jU Qd5FLlC+tUkjHv3NPPfQcAfV88/+NCz+UX3vI0RAVsthRg/BNb+kkFqDNdSTzYorsctzSr j4GpbVXAErIG11yyEVf0tO26UskddqlpVyLJt7QwlZG3VS98uyR+M0DWaVXEjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=Sl2mMaTJ; 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.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=Sl2mMaTJ; 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: 7A7F7240C1 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: Z0xFDnJzv41p * gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. (ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare. --- gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e5b304fa81..271627ff1b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4941,30 +4941,24 @@ OCaml AST in the OCaml syntax; #t))))) (properties '())))) -(define-public ocaml4.07-ppx-compare +(define-public ocaml-ppx-compare (package - (name "ocaml4.07-ppx-compare") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_compare") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (name "ocaml-ppx-compare") + (version "0.14.0") + (source + (janestreet-origin "ppx_compare" version + "0mqxa2s194nif7x4fjn1p5gd9i3bakr8nv27gf8x1g5nmi8q9pmp")) (build-system dune-build-system) - (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)))) (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_compare"))) + ;; Tests are currenlty failing + ;; (see https://github.com/janestreet/ppx_compare/issues/10) + '(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_compare") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -4975,6 +4969,24 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-compare + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-compare) + (name "ocaml-ppx-compare") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_compare") + (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 + "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (properties `((upstream-name . "ppx_compare")))))) + (define-public ocaml4.07-fieldslib (package (name "ocaml4.07-fieldslib") @@ -5193,7 +5205,7 @@ string conversion.") (build-system dune-build-system) (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5262,7 +5274,7 @@ storage of large amounts of data.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("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)) @@ -5630,7 +5642,7 @@ position.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" @@ -5664,7 +5676,7 @@ useful errors on failure.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -5770,7 +5782,7 @@ from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + `(("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-js-style" ,ocaml4.07-ppx-js-style) -- 2.31.1