From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GPB+AIHCmGC3VgEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:20:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ML2eN4DCmGCaPgAAbx9fmQ (envelope-from ) for ; Mon, 10 May 2021 05:20:00 +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 AD422AEEB for ; Mon, 10 May 2021 07:20:00 +0200 (CEST) Received: from localhost ([::1]:42888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKl-0005YK-Pz for larch@yhetil.org; Mon, 10 May 2021 01:19:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-00007i-Qv for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0003dy-HH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ8-0000WP-Cb for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 26/43] gnu: Add ocaml-ppx-js-style. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:18 +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.16206238841709 (code B ref 47768); Mon, 10 May 2021 05:18:18 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RI-9Z for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ko-Vt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 61CDE2400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623851; bh=XGAYmwooBITMRLIhWuUSrJ8L7uJkoek5J5FdoHRY3PE=; h=From:To:Cc:Subject:Date:From; b=d5qJbdSWsDE2106Z32vl+iiExkYiBzgWmuOt/zN7i+e0EzupRc7jj6eLt9eIfIxZJ 3+QGWT37W8738vM/xxAzRQS/gCPLAbQxaZGWHdsVPncSqS1MQfdwDkJjq/OBxG735P NkWNTSfTk64jQVOUdsBKEVh3JSldXtFiRNTACHMsYTmYDY+uuMkMGZrgBR3l65NsM6 2c8XHemFyMjiVdIE9/jfeIs3vbagBr0xeQfc9GgFwThA7w5oKoRSPTIMDD8LKaiIdC nny5GUBtw02GM9sMKSoLHPZRZV/nY0n6eUqw5Dv5xtZ4GUiQkazJdqcsvMHv1LqlNb DW8UNqZIZkgNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G5mz7z9rxf; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:11 +0000 Message-Id: <20210510051628.15359-27-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=1620624000; 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=ILU2A7OQywaT0tdkMVH0pewgrL2pZ3/l9Pt5Z6Krag0=; b=OFm9sx61jUYom8ujpPvRxmUPY3lNlKEWK94/26SUOWPtaRpF73mhinSdDM3wZb2ElUn7As Ru3gPCMNNPRCrM4Y+3zqLcgO9HJ8kOuNos7W5Kr4aGGsrJsiUnR3aRtPb+3CDpilldeOTJ 84rdqjlgKbGieHKvsAPrv7m4ZsP1McsioCYbXRoGmrFUNRVHEOAnbzQKHFWT2SVP9t2IwV hLVRm+6RHEX2xwbqk+81YifOO2pIN+I2NvaLD51i37LKhAem5nYG0LXH0l6GrHzL66yZoL HGSQaLK88//E5l6b1CjImGKER1HXicCzOfMqcmKGCbzw4u5KDLKGa1ZPaiqqtQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620624000; a=rsa-sha256; cv=none; b=Zl6MRtby9rSuY1HeBYXki0ZWIePzHhN2iIHR1nlLm51BXIkEwMDz28QfHS2qO8u2Leqyh4 BvTw0cEbDgE38mxk/LhnJeezqbtKIU1Nq8TlW/qTPur6jqKbq6Rjz+5sCo6/in+J4olBe4 PxYn9v81f26Tk2sLmDPhjc2udIkoZoyBlfCnQGhtbIp8droUmiLdownA+YTulNmExaf+Th ym09dw2KhPBHFdvsOrH8XRilHBQ+c+zC5t+MyTVIrhFq9LDIPATm59K1Civ+oBgtgdVG8D xXCRAhXsDgkc/JAltCDUpeB0XtdttTD5zjh/tYQasCRrkkDJazyoAm/YZlcFcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=d5qJbdSW; 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=d5qJbdSW; 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: AD422AEEB X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: bKw3TKysmuy5 * 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 8bed1ae1a5..309e9c7601 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