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 +HvoIOq5dmCnEQAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:46:18 +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 0BuoG+q5dmCUcwAAbx9fmQ (envelope-from ) for ; Wed, 14 Apr 2021 09:46:18 +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 0551B2AB6A for ; Wed, 14 Apr 2021 11:17:20 +0200 (CEST) Received: from localhost ([::1]:44898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbe9-0000cw-UT for larch@yhetil.org; Wed, 14 Apr 2021 05:17:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb9-0005gW-Qb for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb9-00029H-H3 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 1lWbb9-0007Fw-Bw for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 26/37] gnu: Add ocaml-ppx-js-style. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:11 +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.161839163727612 (code B ref 47768); Wed, 14 Apr 2021 09:14:11 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:57 +0000 Received: from localhost ([127.0.0.1]:33499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbav-0007BC-64 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaV-00075h-MS for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D9562400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391611; bh=6JdCSWVnPCPVJJHQ+RlN+UjXFZMduOrbbtbyugGcDjU=; h=From:To:Cc:Subject:Date:From; b=FG9IhfLGUzu8pyDSVTaWHyfnguzhfZsXOG13kv609v1AtAuCTlQm0+hjA+XNuu8oH cdcdDHAQ94RAt5PWbkdppDTlF+OtoJ5++OArzgsGyZqbODwUn/QmpuJDeCNdZhxFJr idHuoSF9rB2mB4xz8C8uw/rAgtTyWr0cr7HGf02fTaqOi43YMNp5fcKijxiy/3prVi 3KNwpLdxJK+rBsF5j6+4UcfLIjRgqC1HDpfQbWC97ibO4o/Jro4DPKhV19N8rZxBng ugmIkqPmjahab6IsMN2fJjZ88mmquMfV2ejqf18SdKFnXB75Z3mSiSU98hbXHwZ36z NQHgLyKoKCFOQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbZ33Tmz9rxP; Wed, 14 Apr 2021 11:13:30 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:52 +0200 Message-Id: <20210414091303.6990-26-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=1618391840; 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=HPs7GirPW+Y2FmhV9Q5RD01AeA6r72Q3pek9qLndmgM=; b=CTgQ55qhcfF6sI3k+sZlVyDv+GFowRi9OHFA4syt7hxuwDtrgCH3gVMUqlV70p94xXfksS M9CfnMFhOMBLPG3clndFVMVU7G8RzWlAS5Z7gBakBF+GU7VQBCv3Fs7okmBs3HR2RnAv/3 L/MAMltaUVZfKuEHjSO/le3Bc1kyWR0XWTDLfyedUCmP+Eblj2U00JM8XLoxwPh7RzsY7m l9zD5sK5bCpitymXDqRiXjiuKfO07IFp3mGtRcY4uAI5jxgw+4y79beJf6vfwRspetS9mV O+ckMobPMojqoezMnUQclr9kMZpuZKPVMTtE+A6xtuNwPBQNoLhggyayM4X0Xg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391840; a=rsa-sha256; cv=none; b=mmz5Y1nHuQLqcka4EV4ZYnUyHKwdbKZG152fG0cjlHvva2VBQ9FPg/Ic3oTzllhRNfVP+y mxntOxifqUxR4fFkfuJc2tnY9IhCG6lqF8j6gstvlOzKbUdbdw/4f6GtxdjVq5lCDiCm8g yNKgvGyvsA6G0DhNXHfC0Xy2601+k9y42IoZzfrWIojLiSvlIOgvcrEGO0W37bI4AbEE4o U2aOIzx9dOeoLt0WyKS4+BZBUmvLVF/hxUzeo639V3AmiFpnecx+bXeU58/Vd37VZ2ZwbT ny+ve1t43F8V9nGKE9Q0XWjuMWALyJWqTc9yQ6IoWWqFfu1FjpUsxkL/soFdGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=FG9IhfLG; 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: 4.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=FG9IhfLG; 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: 0551B2AB6A X-Spam-Score: 4.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: PoAgh18QWFte * gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. (ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0e2b632ae2..1fb620faa6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5758,32 +5758,22 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style +(define-public ocaml-ppx-js-style (package - (name "ocaml4.07-ppx-js-style") - (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_js_style-v" version ".tar.gz")) - (sha256 - (base32 - "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")))) + (name "ocaml-ppx-js-style") + (version "0.14.0") + (source + (janestreet-origin "ppx_js_style" version + "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) (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-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_js_style"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-octavius" ,ocaml-octavius) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_js_style") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a @@ -5791,6 +5781,16 @@ to denote the expected output.") packages.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-js-style + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-js-style) + (version "0.11.0") + (source + (janestreet-origin "ppx_js_style" version + "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) + (properties `((upstream-name . "ppx_js_style")))))) + (define-public ocaml4.07-ppx-typerep-conv (package (name "ocaml4.07-ppx-typerep-conv") @@ -5845,7 +5845,7 @@ from type definitions.") `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) + ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) -- 2.31.1