From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WDMlDkuYtmCPBgEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:27:55 +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 mNNsCUuYtmCjUQAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:27:55 +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 A7ED522072 for ; Tue, 1 Jun 2021 22:27:54 +0200 (CEST) Received: from localhost ([::1]:36874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAzR-0006QL-Oa for larch@yhetil.org; Tue, 01 Jun 2021 16:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxi-0002Us-82 for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxh-00019W-Uo for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxh-00072G-QJ for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 30/42] gnu: Add ocaml-ppx-optional. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:05 +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.162257913726787 (code B ref 47768); Tue, 01 Jun 2021 20:26:05 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:37 +0000 Received: from localhost ([127.0.0.1]:37912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxE-0006xz-VL for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxD-0006xI-1e for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 748552400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579129; bh=FDPk/jsTgdiHwwD3AOrKPIlLMY0D8DT6LBB2IxteRbY=; h=From:To:Cc:Subject:Date:From; b=anoSVHwWH8UsxX/4zohlQQxF0Cc2psw9rTFi6b51mCsEcy++Cmv2Ta2lXMfHOX717 xUZSCJVeWSRSfiu0T2B5MwkSWIbfohWrFc8B67lvGIVvLcYF7vhrU27684o/pYz7q7 0IFZvA2VTU/+up8bJ3iuG0Fw6r4tk1CDBFNBaRCoS8JNaX9YO8buDHOt4cn0Ug5TBP ROLSMahOykmLz0qBDyES96ipBBFE7Z3lbKp7Oz6o3BcL+IpYyCay9CGy2mnXAm3M2y LWP2cav+dmxXDMQDiF0kxS05rvhUc14R6vGLcFpEZEepviZr9D95xcUPJDzDKbxDFV cEH7iY5atRFnQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDl1Zm8z9rxG; Tue, 1 Jun 2021 22:25:27 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:13 +0000 Message-Id: <20210601202325.8777-31-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=1622579274; 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=P21Uh7Aa/vxn759Gni+oAv3H41T6CBmjGylEFD5zOlI=; b=p1s2IlF4bgUVNT6frjee5gp6yTLlNk6QD+fkn9DKqUkybWVUjgGGgeUsjDGUKvw0221trp ggyUclntc5tgmzsVWYWDVJU7RcRk2wV13kfmmEj4msAkUe1q4hnKpBPgy/0pAGKxwp4+/g W1u79CnhAxh26RmKwPF82a9AKobbGaK9F9dfTrdgEyCJZDdy68sSfaTiaxgO5htNKwJKlw CN955d8ux/Wja/AjDr6wYlHlWdcGHsoX8KBHeQQ+9LXSyBsjb8PU9KuZfWU/JQLORhNGOk S9mVALJm/8YFszczmNONhsgqpv5zMQ6Qz9e4fhov/XCJuK7T6ytgex0PCxWxVg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579274; a=rsa-sha256; cv=none; b=HG4G1oJ/whRBCdYaLisnnyy57zNhG60fEGHh5QUjtPFa5gkii2XGo6qnrhkWUOg7N0OdOA KYElHc6nAQnp+Z2uxkPS9T7n9vkgpnPdSIKvMw7TuVp2TOWSj8PzdXmIuuAEWaDqsLx43N VNwlGrDAVXhS1inxOpezCVDxUVmfKH+VxdRoPymvtVjV8DptT0ztiBZJfvb/Q3AeTqlEsH IhhHTqMcRSu387s22aVGggYcRJSNUPjoTYh8sU8+BB7boGiJ/im5Ddqvv3/8zmYuwIgUaG J6iWaRfB7dH7b/MLeRqNNakE2EeZXsyc0/bYK8wyqdaI2SKTMhXzUalVoF35Gg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=anoSVHwW; 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=anoSVHwW; 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: A7ED522072 X-Spam-Score: 3.67 X-Migadu-Scanner: scn1.migadu.com X-TUID: lTC6J77OPDDe * gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable. (ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional. --- gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a40ea8c124..d8cea8e73f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5551,31 +5551,22 @@ context such as function arguments.") @code{|>} and @code{|!}.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional +(define-public ocaml-ppx-optional (package - (name "ocaml4.07-ppx-optional") - (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_optional-v" version ".tar.gz")) - (sha256 - (base32 - "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")))) + (name "ocaml-ppx-optional") + (version "0.14.0") + (source + (janestreet-origin + "ppx_optional" version + "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz")) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ; No tests (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)))) - (properties `((upstream-name . "ppx_optional"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optional") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description @@ -5583,6 +5574,17 @@ context such as function arguments.") else expression.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optional + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-optional) + (version "0.11.0") + (source + (janestreet-origin + "ppx_optional" version + "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")) + (properties `((upstream-name . "ppx_optional")))))) + (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp") @@ -5968,7 +5970,7 @@ functions from type definitions.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) + ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) -- 2.31.1