From patchwork Fri Apr 8 13:22:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38394 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1213E27BBE9; Fri, 8 Apr 2022 14:25:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5895927BBEA for ; Fri, 8 Apr 2022 14:25:07 +0100 (BST) Received: from localhost ([::1]:58694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobq-0003l3-E3 for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NP-U1 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoar-0001Q8-7O for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoar-0007st-3w for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 09/25] gnu: Add ocaml-ppx-pipebang. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422230093 (code B ref 53882); Fri, 08 Apr 2022 13:24:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:42 +0000 Received: from localhost ([127.0.0.1]:34251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007or-B2 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:37504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaN-0007lz-B5 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f41.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125774wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=C6jLyLgePtr3sbygIJSNbBp8gavSVUi9TRC4sQSY34Cp1c6Ey3bwRtNZQPC8ajdu53 +yhYqqI66mVrN+OY+aqCbqkFTxa4j9cWW8/epIf7tfeZlNEDaS2SiEEqzI6uf3kTRBik AueXgk0XLbgYPG+VkX3YjRn1a+fOUjXYMJS+lqi7vF+nmjrw+5oDUV2DdKuXkNc3gfHX NNXydlm/qNdGNKwFqYVYp3LOJhlVs/NOTnzhUywxBsOTZeqisLNa5tD9bSy3Bn2lzCB9 lhOG8bWqQkRvdUa+gSu1ZFSdKnSB9lnV2+Q8A/xUOHrt26RB8sm61AOMX7vgzUaCThOI FibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=mGjhjKJj8DAsYQQXcf0Wx1jxf0Vgpru18uN4Fwe3dFsaxd94R7FckAIiWezwBky1Ch s1FKEcxCMCEfWoLznFo2qEUYxXv6vt/THKMvasGsiwE+zTJn8/MN+D3CN/kFK3TYXEKB dDrOWEXJ7/9suZSToOSDWnILvGsrm3sd+IWlASe1Ep689vfuvjdv5hjLIGy+bDYPnfEi GUilGwHiCcW/C843D4HDuNm0sAudNq/fIE6/uf+loYiVcUTQW+13/mkmIv7j55ByeQl/ RvkHWaABi2NiE0epJ5hlygs71fL6Ss3RQWI4M/3efTYpl2baim8BZ1GXt3PksJ56Kikr 5wRg== X-Gm-Message-State: AOAM533uZTI4FefG8zMsbMpame7OBawinEPoOQkLdbsId2aZWEdH8qXh lzTxJH6IWrpDWqI0ceOZ2p+ebDpu3bk= X-Google-Smtp-Source: ABdhPJwgOihb5BibhFb9hldYrR7oUNFChAhRGWlKveCgxBV0SYZL3u0BB50IDSD6Shqe4JNLcsYJBQ== X-Received: by 2002:a7b:cb84:0:b0:382:a9b9:2339 with SMTP id m4-20020a7bcb84000000b00382a9b92339mr17298911wmi.91.1649424209764; Fri, 08 Apr 2022 06:23:29 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:49 +0200 Message-Id: <20220408132305.3301350-9-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-pipebang): New variable. (ocaml4.07-ppx-pipebang): Inherit from it. --- gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d202d45474..c2924fc59d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5888,35 +5888,46 @@ (define-public ocaml4.07-ppx-sexp-message context such as function arguments.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-pipebang +(define-public ocaml-ppx-pipebang (package - (name "ocaml4.07-ppx-pipebang") - (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_pipebang-v" version ".tar.gz")) - (sha256 - (base32 - "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (name "ocaml-ppx-pipebang") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_pipebang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf")))) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_pipebang"))) + (arguments `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-ppxlib)) + (properties `((upstream-name . "ppx_pipebang") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-pipebang)))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-pipebang + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-pipebang) + (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_pipebang-v" version ".tar.gz")) + (sha256 + (base32 + "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (propagated-inputs (list ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-optional (package