From patchwork Mon May 10 05:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29215 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 647B427BC81; Mon, 10 May 2021 06:19:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5ACAF27BC82 for ; Mon, 10 May 2021 06:19:14 +0100 (BST) Received: from localhost ([::1]:39402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK1-0003P9-Hw for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0008J9-N4 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0003Yv-EQ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ3-0000Uz-AQ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:13 +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.16206238701584 (code B ref 47768); Mon, 10 May 2021 05:18:13 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:50 +0000 Received: from localhost ([127.0.0.1]:57022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIf-0000PP-LJ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000JD-Qt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7CBD6240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=bZNK9NLv+wZv6ISXwd+PDTc+VCJuQ3gMSrffgiPMnas=; h=From:To:Cc:Subject:Date:From; b=W3Odmpt54CuxSYjRqh95EO3h2a8n/c3HavrIJGZSpjJI0EDhVZIWh770ozsDekyXN 6zsm6eRZ+JVlXr0X731bc5rHi5dSnZxrGCxKNCckBKKUcDOOsNo4IG5d40dq+UF6ll bTi/g/tJX/JZUXxQwPPaT+zP1APgAj58gH7DjHOQL6DG80KD4SpluORp6gQD3h/UWM 3Eg6EX03g/gF7KhNws5AwAi69mMydh0rbOKFAbg8DOCSi1dgP8wSHQoB6PwqLBIa09 I3zZJG1GLAODMfcbDmgFfy7ii5f8wZtanU3+JQ6xMdTZ7NJg365H2v/MlEgd7iiKDr nUZg2A1BzAoDQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J6672z9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:15 +0000 Message-Id: <20210510051628.15359-31-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 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 * gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. (ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp. --- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3fe5b51e9..e3856ac3be 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5570,35 +5570,45 @@ context such as function arguments.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp +(define-public ocaml-ppx-optcomp (package - (name "ocaml4.07-ppx-optcomp") - (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_optcomp-v" version ".tar.gz")) - (sha256 - (base32 - "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")))) + (name "ocaml-ppx-optcomp") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_optcomp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) (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-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_optcomp"))) - (home-page "https://github.com/janestreet/ppx_optcomp") + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optcomp") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optcomp + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-optcomp) + (version "0.11.0") + (source + (janestreet-origin + "ppx_optcomp" version + "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")) + (properties `((upstream-name . "ppx_optcomp")))))) + (define-public ocaml-ppx-let (package (name "ocaml-ppx-let") @@ -5944,7 +5954,7 @@ functions from type definitions.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) + ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)