From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aFy4LVjdAmK3/AAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 22:15:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YGCSKljdAmJ52wAAauVa8A (envelope-from ) for ; Tue, 08 Feb 2022 22:15:04 +0100 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 29D5B2E746 for ; Tue, 8 Feb 2022 22:15:04 +0100 (CET) Received: from localhost ([::1]:55564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXpH-0005tS-DB for larch@yhetil.org; Tue, 08 Feb 2022 16:15:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0000er-EC for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0007ZH-4A for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuH-0002c0-0e for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 18/24] gnu: Add ocaml-ppx-fail. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16:08 +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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513219804 (code B ref 53882); Tue, 08 Feb 2022 20:16:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:21 +0000 Received: from localhost ([127.0.0.1]:48824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtU-0002Xx-H6 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:20 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtK-0002UV-87 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 20789254 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=TMQtXFZpBSK1WSba+CUd6zE6M U0IbfYPdCKESGaufqY=; b=DqMtK3NTxyor6DI38sOlQAE1FeGDxAmDgHcRz6RTJ eAJgs9piaSxkMe/WY4ByXZDpNVPmr5MsGWPUx1z83H9OS2aeyD/CV8HR/1EWHpq/ 6mwHsbm8e60XaX/gg8OXEpCYSGO9xL/qgO0RontgR3xLYGz4lheSpQAuTtmtbvnX tpLRirePzkNc42d4rUbGZ3wmEm6eAdHmArnvTf8+LNfLwkdYLnGM+jLkLClpupFG bP8RRkTGQcQp0MlrhQVe5l64Fmwwv69i2UPuQp+nYmwc14KHm02EOPtjFKgSLpe6 lSn2fPDCHeMQQFh6kPRHgia8T0LJcOeOlgoyfriXS07aQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0504fc60 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:44 +0100 Message-Id: <88f1724d45da07d7314aa3d7f3e0f4811b81d52a.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644354904; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=yua6Drz1SkC2BzexU6VYGM1CTRQXUaZdxlL5D4Anofs=; b=HUi1co+AIJ2USnMW9zYWy4CYVNR7yCGS99wYa41tBXQiZ+13pBVR+lyr6L93nPW1JjwFr+ 7iSbgzDEJJXDBaBRv+AdYK5ygH33S/FYAqJMaEuULwNoUuF66aMgf5fmzBc/8KqO69CRfo A1fBbsgrxlrBVgh4ohzP5m4FW/UHUzWuMyjWh5gwWB5RhA4M4EB5u+i1rp0TY5HEZlUaVM zxdvkfaHJo2Wm6ydRd63AglK/dC3dTsyOVhz9Cd97ELDcXiwpbF6RZpx+QEzFJZnd5Yfa9 YXJka2Og5UM4ZUiUNEfAxQuwVrfO0sZM9kuYLf/DTG6QBUtQ4fiXTo4EJHLrEQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644354904; a=rsa-sha256; cv=none; b=JIEOUBRbAw16sqKsHvTsDRLpBlPkBwADLy9WrP2AM51R74QrgPi1LTrRH3GDv5Spho3q79 64cPWw0SnB7XUzuQ7QwFxJdrFZt2aI72YYD19t0AQoNKtXe+5asafhTki35d6tqw939use +mk7XYFeWtT+JeWbHR3GR6qfFdupoBFdtWJUSV1EBSHXxSv7uJgAi0RO/dmfgt8UQAohju L0tfQuJFyG+WnkBLTlCGHaMJakj5njBIllSeh0s50MMjqVfLzGEyGVZSDWks6wbuZbDd1r q4gqAOpke81ZejsWQpI3kBkGkX1hR/HKZVZI5wuKFLC+xSlXpkAMN7XwY2qFcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=DqMtK3NT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=DqMtK3NT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 29D5B2E746 X-Spam-Score: -0.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: noXLRaI0mBZ0 * 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 d969e69384..ec05987e2c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6141,35 +6141,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 -- 2.34.0