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 GMiQDF/CmGDzVgEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:19:27 +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 qCVXCF/CmGBiOwAA1q6Kng (envelope-from ) for ; Mon, 10 May 2021 05:19:27 +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 BF42B35953 for ; Mon, 10 May 2021 07:19:26 +0200 (CEST) Received: from localhost ([::1]:40996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKD-0004MH-Sy for larch@yhetil.org; Mon, 10 May 2021 01:19:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ6-0008NP-70 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0003aX-TC for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ5-0000Vh-Ol for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:15 +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.16206238811638 (code B ref 47768); Mon, 10 May 2021 05:18:15 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:01 +0000 Received: from localhost ([127.0.0.1]:57034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000QF-KP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000KJ-At 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 C14492400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=H4PjNVdbidQ3nFTlRiqJfs/POltWUMzLjVLH9CVDzJw=; h=From:To:Cc:Subject:Date:From; b=S8FcNZxX1sb29iqzEF4U4dAOM7yHB05uOMsxMzoyQu7+vAa/xgTo78OYdCATLWejk D9IkTgF6rb8KuYXPjMLhAGxYa8YTuM/EO/9BpfuMwwmhELpujLqHiLhjf/FuhExhIW EW4TVBJOR+6JgEGwU30q407ApbcTU7db8wlNMKanRphmKn/DZfkDFhBdY+pKDMf/LY rVH1leKng4FNBGU9KXSIkp/TBl72wfbumQu+ew3Xu6rWO2T7EXIdgvrqQ3hokXrkQb yzTBRw/7OUC6ujO+Kv+YzdEfHhZnciZibQRnEG783fyegMBwzn2oK2I/anBqp/uwe6 gDX0HsRmvsKlg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7F1DfRz9rxR; Mon, 10 May 2021 07:17:29 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:08 +0000 Message-Id: <20210510051628.15359-24-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=1620623966; 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=e7EM2OT73jiS5lPuAm+baR3jlg0olFfpjWo766ex2a8=; b=pxGlnp9bUTww7IKusMlRjdgynxvDcPGGzR35NSySAczLA5JTLrsNKolOWllcLEN+Uh35Yi CNpNC2m+wlg8+5ZlM1yADdnXI5Yh3PQj7TpbVzaEg293nqlUszyIAHUDMaMs5Uxzba28Zs 0alWG5fwcSoEee3x907hwhXC8IO7E7SJVRHOPmYYO/vmTTuca8PfkASRUTrv02JyCTyDBu sSQL1WyojdqORTAEOsGsawYZF0R1harD5sewwXgNMc4Sfxtl44+mVbJDbot3Vi6a34q5oP ntkdRrVcLkII291ZvtA7kovt/oMFRHpR2xlPjYjw2eI+Z/AjmfIYkKXHB159HA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620623966; a=rsa-sha256; cv=none; b=iAfHyqs/tY/S/Kwnt8XOPsctfdJuGdEIibRuAOVEAgW0EmdbjdqjbFwSEcBuSQlJi+QmvN 21WP+LpD5+Ijx/pbYh4/JMHmP5mQwuSGDSc3DqlPRDXFJ1kNM6IWp0/dMZOuYyOYxICWcx Dv7wvNJOQAjS13CA1mslrvofTLs7zqLCLCnrMqiaCkngpOn4x8k1mVSyHCexnO6a+hF1/W hdVL8cIblyip8N6usd8Ou599of8XzMgUuohA3Wk4sRk8PevIodZ4eNPoSr+3IyWvdIZNgs 8yedVU7E+hvd5zJN990gRxhZ7HfwC9UJkL40cHgtqsbJY+e5dhdOPlyHdAlfhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=S8FcNZxX; 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=S8FcNZxX; 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: BF42B35953 X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: MC2G+oUa+JoN * 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 799bebeba9..c4babb30f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5160,36 +5160,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") @@ -5206,7 +5215,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) @@ -5710,7 +5719,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) @@ -5889,7 +5898,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