From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2EAFLae6dmBLEgAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:49: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 mp1 with LMTPS id yF7fJqe6dmBVcQAAbx9fmQ (envelope-from ) for ; Wed, 14 Apr 2021 09:49: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 2BEFB2B44B for ; Wed, 14 Apr 2021 11:49:27 +0200 (CEST) Received: from localhost ([::1]:40034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbu-0006o4-1J for larch@yhetil.org; Wed, 14 Apr 2021 05:14:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb7-0005bC-Uc for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb7-00027S-Iq 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-0007FK-EU for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 23/37] gnu: Add ocaml-ppx-custom-printf. 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.161839163527569 (code B ref 47768); Wed, 14 Apr 2021 09:14:09 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:55 +0000 Received: from localhost ([127.0.0.1]:33489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbas-0007AU-TU for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaT-000752-GF 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 DDF71240100 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391608; bh=/obmy4/ZguoK6dqFTj0rZyo8fsg+xd9eD8YtKRqW1q4=; h=From:To:Cc:Subject:Date:From; b=qeUPVGmi73Eyd75HZDcNPjOiPNfzwOElWD3VAXY10jVBCij+0XdNrgUToyIqpcDwD 2qEqPW2BCxFPcKoKF+fPi41MFaSZk33iG5L1ld/rR5a2UHzOg+l5Fc7sWAGleEyc/v ouUpoeRKO7yyoEbGixcgrvNT7VmOLCLw5FO0dKtHg+PoVTxIRHCUMo8LQK1P2qH8ED hHcjlipxvaCzU/LKpDDj9l7hlkWxEfo9ZkwlxJqZvney33iVfgxfTn/DHbclxxhKru zY/XA3fRKrnr2qUvRNxRO1hazrokVQC3w1g/eiWL5SyFQplA++AcalxNnG+BALP+Xb Bjphfa9vgkByw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbW6rVNz9rxl; Wed, 14 Apr 2021 11:13:27 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:49 +0200 Message-Id: <20210414091303.6990-23-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=1618393767; 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=MpLPfA5IZLvW+owmHbGUt0eaYphEzy8XrSVZbLCLm/E=; b=gxQ4BfbP153zUITVRs9OelwdUhP3j43U9xOuWeWS5tFXqkBOu9Z4x2yyUutBxrmCn9xFKj cUKFE1BJ40Fa8iVtBv04DaB9S18YOgIUyph94U7G3MT080g8meR4p9Ak0rssxQm7c/vm6P iDhr2mekPEvGQlIJA0i2RLyIXzw5IApqkE+scbd/45Tq8t9XpYIhmTTVBkVkEuW+wLgYDW nkucDYSPUjFBh1G3o+NqJm7nT3RCQlvGmMqT9KoQ6rp5xH0YFsN/imrLBwDZl0kB0i2xqr csEpgGRljK8UKSUrnQjoccHUFvknE3jZ29GJ8Qys+W+LViW1QRZ7is0/746tZg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618393767; a=rsa-sha256; cv=none; b=sDDkhY0p6SxqCakMyCQac699nYT3/0SBH71BdQSyI+E9plLmJAXNWW6BAhr9U57f0H19J2 J3iVUARSiCo8fkvkBVDfzQkWJnmCZi1dfdN0oF4ibETTa5nQuoyUQvlB82A8dnxuETzwxi eoBY8ssyfvsdQ0QHVbB9y+eWL/LIKHTfR5cbOQirGwvMSEiORGvcAGuOJTTAgK7CHAoQWU sSYSEo17xxlitRVcYUWAKj6T09GXwJ8H61b5hEpjUIeJnPwNyRNEQ2PL8XoCMPhS6S+xuJ L/F1pimXcm/+jnMDKe3SN6OpdzRjwmmptaXmyAuABbGdQ0Fy8AxTKpQnQGrxfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=qeUPVGmi; 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=qeUPVGmi; 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: 2BEFB2B44B X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: A2hYtH5+PGri * 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 7f3599bd3a..ae6f393130 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