From patchwork Tue Jun 1 20:22:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29773 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 54FC927BC81; Tue, 1 Jun 2021 21:26:57 +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 C5C9D27BC78 for ; Tue, 1 Jun 2021 21:26:56 +0100 (BST) Received: from localhost ([::1]:33484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAyV-00048G-SP for patchwork@mira.cbaines.net; Tue, 01 Jun 2021 16:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAwl-0007vG-SE for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAwk-0000B9-IM for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAwk-0006ti-FC for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 10/42] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:25:06 +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: Xinglu Chen Cc: pukkamustard , 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.162257908026276 (code B ref 47768); Tue, 01 Jun 2021 20:25:06 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:40 +0000 Received: from localhost ([127.0.0.1]:37813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwJ-0006pk-Ut for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:40 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwI-0006p6-Cl for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D729A24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579072; bh=fFsrHPVO5dc0JdsdDEgEkNZ/UILhxynaFNKOImv8p5U=; h=From:To:Cc:Subject:Date:From; b=LxDHpTaRii60h7CGpIFtZm5Lui1rUaxHzsCSG3Ak+I0Qukg+TRT0xsPUVfW4Kos7E uSdk+SsJnfjPo8OFNZf0DvrM3+zxC712Ls07QcNmXdzti3QKHtah5msy/9Zhm6C5th 1a0qfGU9ImS0rCVz87vZLMWnw2BLZOhS/+ghtCVWAcepw2AMHp8USEYhztfz/aAy8u Zz5mPb+XvTyUlwTl5HDQ1aV2J73qWWRtXxnv8siDeQdQJ86fye5wFSBzRkg+Cewehu c2PlSW24s0v5TlkzRajsPcqQZeaNxQleMg67SR+leLa8GkHxaqo4OokCs06oYnVHMr CSEEwU/ZgaU/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCf2PlHz9rxF; Tue, 1 Jun 2021 22:24:30 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:22:53 +0000 Message-Id: <20210601202325.8777-11-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> 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-migrate-parsetree): Update to 2.1.0. (ocaml-migrate-parsetree-1): New variable. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 93cfa8f54b..0b606e296c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.7.3") + (version "2.1.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) + "1cpgdqcs624nd1p271ddakgyibl0ia4f6dzivnz9qdwszsinwr89")))) (build-system dune-build-system) - (arguments - `(#:tests? #f)) + (arguments `(#:tests? #f)) (propagated-inputs `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers) ("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result))) - (properties `((upstream-name . "ocaml-migrate-parsetree"))) + (properties `((upstream-name . "ocaml-migrate-parsetree") + ;; OCaml 4.07 packages require version 1.* + (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) - + +(define-public ocaml-migrate-parsetree-1 + (package + (inherit ocaml-migrate-parsetree) + (name "ocaml-migrate-parsetree-1") + (version "1.8.0") + (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") + (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 + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + (properties '((upstream-name . "ocaml-migrate-parsetree"))))) + (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") @@ -1815,7 +1834,7 @@ functions to the next and/or previous version.") `(#:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") @@ -6121,7 +6140,7 @@ combinators.") "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) (arguments @@ -6360,7 +6379,7 @@ variants.") ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-version" ,ocaml-version))) (native-inputs