From patchwork Fri Apr 8 13:22:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38412 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 501E527BBEA; Fri, 8 Apr 2022 14:27:31 +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 D435B27BBE9 for ; Fri, 8 Apr 2022 14:27:30 +0100 (BST) Received: from localhost ([::1]:37730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoeA-0000Is-1J for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Yg-CP for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaw-0001RT-0P for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoav-0007uK-T9 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 19/25] gnu: Add ocaml-ppx-fail. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:09 +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.164942423230203 (code B ref 53882); Fri, 08 Apr 2022 13:24:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007qz-7w for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:35587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007n0-MJ for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wm1-f54.google.com with SMTP id c190-20020a1c35c7000000b0038e37907b5bso7604163wma.0 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -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=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=HrwVMDsvx8XIE4gVT5utUOWcpsmY9p1Q11z4ap9CcTT1cCUwQWgM3S3h8VaMJrPApO 5MlM9TFJkx7s/scdbMAVP7epO/JLp97pa3738UwNXqgZWowq8pJewXQoapphOAW1xMO+ jN4NapE78J6CLJArwt1mLG5aFsjarHzenJnkpREFXlvMIMrSIcSGoswZ85i6zAZ7yWkt 45i+TsRUnIOrTCSQsq76e7cXdoqAV3jq9KcSk7hhP0dtaEJxeNs6ROt5dROCXQjKH4fv dM9uEeCndJkCja+q+l8XxifjZHLPjZOCE+O9tx0byxEnbk5B0y1rUcYgsStjdcU+DPnF BoRg== 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=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=6W3T7Zt7nDklMmZiHuKM6+kEhHlm/xRdF1GtHY+lpt9Mtk7ilHED8JZb4cmPCFM0ms ZorCM6sRq+tnTHj8VgmazJo6+0Vu54O+sKXeC4l0Z9sOnrpp6r4TlTk/YkiJFlwt3dit FcKGmWIiMrGw5kYHuKvWS+i6VkKqeC+zG89X3HuGxXRnmJ1FM1+qPLEodOkUAuZNGW4K c9ywKhdYqYWNMBU6WM1Gjlhb0Stze9hZgtlO0WqVjlmWhkvrkzIT3XgZOxmOU+rpDacY W9Z+bv1wPlj5H0/QqXUiXuseWv07KCbLVib61gJvp8wri8galSzv7h6fWB0NRM2GkMCa bQQw== X-Gm-Message-State: AOAM532ieBbmoZXb9t/oXyqnGYTW72f3Dl7OxzmguXbV6TbwIZYVPtQD DNLsC6sTDQUIYVShqhWroty7JAN8PpY= X-Google-Smtp-Source: ABdhPJxfcFpSjmjn64aIumMsFv7NUlHzRlGNI2vRAnOeYv212q1AJv7SgSIHZq1LHubLBD9+0giRiA== X-Received: by 2002:a05:600c:1990:b0:38c:c0a2:c0ab with SMTP id t16-20020a05600c199000b0038cc0a2c0abmr16893959wmq.72.1649424214158; Fri, 08 Apr 2022 06:23:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:59 +0200 Message-Id: <20220408132305.3301350-19-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-fail): New variable. (ocaml4.07-ppx-fail): 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 a57ec2b05f..1c81f2de1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6139,35 +6139,46 @@ (define-public ocaml4.07-ppx-let (properties `((upstream-name . "ppx_let")))))) -(define-public ocaml4.07-ppx-fail +(define-public ocaml-ppx-fail (package - (name "ocaml4.07-ppx-fail") - (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_fail-v" version ".tar.gz")) - (sha256 - (base32 - "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (name "ocaml-ppx-fail") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_fail") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "012p9gv7w4sk3b4x0sdmqrmr2856w8xc424waxb6vrybid7qjs95")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_fail"))) + (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_fail") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fail)))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-fail + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fail) + (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_fail-v" version ".tar.gz")) + (sha256 + (base32 + "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (propagated-inputs + (list ocaml-base ocaml-ppx-here ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-cold (package