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 SNPjDxmYtmA+BQEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:27:05 +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 oJ44CxmYtmDOUgAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:27:05 +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 D0C4D24B58 for ; Tue, 1 Jun 2021 22:27:04 +0200 (CEST) Received: from localhost ([::1]:34268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAyd-0004ez-TJ for larch@yhetil.org; Tue, 01 Jun 2021 16:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxe-0002IY-Ty for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxe-00015r-Km for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxe-00070q-HG for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 22/42] gnu: Add ocaml-ppx-custom-printf. 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.162257911526646 (code B ref 47768); Tue, 01 Jun 2021 20:26:02 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:15 +0000 Received: from localhost ([127.0.0.1]:37880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAws-0006vh-Uq for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwq-0006u2-Ho for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:13 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 07EC924002B for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579107; bh=lu8HeivCkOQhvPGGhcevF3LVNXwCSYApp8IBioNQcLQ=; h=From:To:Cc:Subject:Date:From; b=OpbpveIyv/ZG5DUO0q0FU5vbVL/3dI9rONo81lfz5MstzFtzJYhYFXs6JmBh9V96k F4kcl0ovcF4IttIM1iWKqCrigmhcwfRyKvLK0PYp4btryZrRC1iT4ZxwGguztJmFfg HcbhYtyeIqejOAcDpnCVIHAlbvmwbyuNqZhcTLa74x0Gyxv7ILi2TeExEqFOLr1xDo 9SJC/fObODj/BcDJPs2D+Fn6UTwmJrqvgCKVGVRxzOHVR5sAlX+GC3Li4+Pzu1S812 UMLaT6mcREXB5WRArzKONkmUehG7FMoR5uI0O0/eMuBzvTvDo2hsHsxpHYn/6iUoRb KCPAMZl0ZFiMw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDJ553cz9rxD; Tue, 1 Jun 2021 22:25:04 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:05 +0000 Message-Id: <20210601202325.8777-23-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=1622579225; 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=uAc7ojXacerH9/qea5OE2GABNHhCtYg9alALm09S5yk=; b=qyxNUlclocJdk7v+cIYhQmGAPPIBtLyAlM0iyMRzowHNv7LovPciybppDAKMxAOA2b+qFH CARoEfzB6vwodnmn1nTRdgzLXGTCLSsrJ50+GkZlXnimwQubhJ+WOvTU2o45X1BiBbQ/Lh 4xCHDxwRlHlqEt8yLNF2n0Q3IYLt7Qu21QbTmU3OnW1dpQdYPurKf06YhLi2tnvSqy1UNi TaHJXPcINWAS7LPFMZHS+eReuF6rybiNa4jWrGnZ26KnMhaJmnsbuiU0Tb56pHiwJmdLlb LQGwB5IU/ngDT9d2oFo2RTKvElKnCl/lKy/XgE6QBRp8gHywbLussPm71ZV5zw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579225; a=rsa-sha256; cv=none; b=V/YlfHegYGAHS2ff8df7Jn2AAl3kxJBFkMeydTLWsqoc0gJAbeRJpynQIJurlHbF2OyurD eABh0jrBwVV5OpZMv+Fgd2JkOdHHpPuZkfwRezdSVYp8TnoME2kBGOtVwHUYcyyjpbjGvo v4eBUFHUB4Np9kdVOLPgjvChmC6CF+qIMBQVKB9SDfJP1XuFGVIp7MNLNymouhxvDv7KcU 985PG0t5pnTSg/c1PF9/UwWUS+qJ5LbC37PX2Z0MCLHsuOVEG2p2H1SEKF7Ww64t6H3R4o j+oNphgKegzO781iS8bR2JjTMTr8sI5MRPC+Dr6j52xv/4pbsoGUM5Jk1fGYjg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=OpbpveIy; 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=OpbpveIy; 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: D0C4D24B58 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: FhLcvQc4r1yZ * gnu/packages/ocaml.scm (ocaml-ppx-custom-printf): New variable. (ocaml4.07-ppx-custom-printf): Inherit from ocaml-ppx-custom-printf. --- gnu/packages/ocaml.scm | 59 ++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 61db4d1747..d8af57fdcc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5173,36 +5173,45 @@ definitions.") variant types.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-custom-printf +(define-public ocaml-ppx-custom-printf (package - (name "ocaml4.07-ppx-custom-printf") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_custom_printf-v" version ".tar.gz")) - (sha256 - (base32 - "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")))) + (name "ocaml-ppx-custom-printf") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_custom_printf") + (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 + "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("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_custom_printf"))) - (home-page "https://github.com/janestreet/ppx_custom_printf") + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_custom_printf") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf)))) (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-custom-printf + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-custom-printf) + (version "0.11.0") + (source + (janestreet-origin + "ppx_custom_printf" version + "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) + (properties `((upstream-name . "ppx_custom_printf")))))) + (define-public ocaml4.07-bin-prot (package (name "ocaml4.07-bin-prot") @@ -5219,7 +5228,7 @@ string conversion.") (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) @@ -5723,7 +5732,7 @@ useful errors on failure.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) @@ -5902,7 +5911,7 @@ functions from type definitions.") ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) -- 2.31.1