From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GNUMMzHCmGDMVgEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:18:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eNy4LjHCmGAzOwAA1q6Kng (envelope-from ) for ; Mon, 10 May 2021 05:18:41 +0000 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 72BDDAE3B for ; Mon, 10 May 2021 07:18:41 +0200 (CEST) Received: from localhost ([::1]:35848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJU-0001Eh-Il for larch@yhetil.org; Mon, 10 May 2021 01:18:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0008Cg-PU for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIy-0003UL-JJ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TI-F7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:08 +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.16206238631487 (code B ref 47768); Mon, 10 May 2021 05:18:08 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:56999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000No-Rv for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000Iy-8R for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9D5EA2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623843; bh=jFoCoYW8TK7GS4D1zMYK4usmsUW0XF56qWb4gFvZtO4=; h=From:To:Cc:Subject:Date:From; b=PBj7IRzeDBt5qzm13Iv4pp2G0uX4/oEYJ8nvCGYbZ+h2UDzne2Yl/LZOToBgST+Ih lj/gR3c7a7fLoqLFK4/nzbwXGAEg5nWcy7LCdonDl52xrE/RlfLeZDEK31m1K+ZSzT fC1RQqvWBWvLgU9tG+q8KR+3a1F6PCvY5/kJ6ZGRul/952gfmK38pgJtoM5hO/fuNq StohnNsYwIZodSeN9Topg5DbFV5CZAYHfGFtLNqGQFC7Gg1AtHuwrPY6t+TFOqW+jZ elrY2qDYskZHOfdzDVHv+rdL8N4p+CqVdksvzVMeMmhJ7Stj1E3rvM92hUPkBjv6LD CSW9YTFdLYjnw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq766btWz9rxG; Mon, 10 May 2021 07:17:22 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:56 +0000 Message-Id: <20210510051628.15359-12-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 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620623921; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ozC5pjnVsA7Seu8uUl6jh/tRHUzwb6GQXmYUYinoCAE=; b=Uq4ECBvNDj84J9wZ7DTOqcwDzzFMGSaVEcem6h9h/+s7MkMsqhhI3zsEqNBTvOd1YzK10W KhKhzG8ID/BOFJHQXbtGEy/+7MjBgovOhXYIcatbOBR3B+OlQ59MOcy03vSup623rkcBCi a2bCmvtuJk64epo82Y6sFE73RhBSby+dX/+edluSw0+Y7Rucn9hOlPVlVNP9hZNYZZPfPa gfur1YIXGoproVPcMA3B1XEdY9XHeuHyDY+KrNkhrSNc6wqWzJjGA+R9W5jcLw8gVSTHuM 95q6e69pNlZqVh+Ws815X8ctT21lgtYxdAATAUNrZQ/fW91RWiSYi1/dXO+NIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620623921; a=rsa-sha256; cv=none; b=a7GP3rjOPjcSvwDavEAU6k+OnvZb75F1/muT76SSyP2T0yBpnTroF2IsQ+3hvyLXGUIHEB jGjuEDeLHvPtTirdGlYGyKeqnrSTfQf6EYw9PgdFYudr9XxuMjstqeSC1YZCNXUBTqF8Qa 1gJjVjOOcfn1lA04DjYfjgxVgAIdOeUwfDYhtLvkGFr3EKZ9YHzAOpjvx2Q182iKA8fuxO ia/IcWDSLJmwi2FRCtPHg54AZYeFGzTeblEVwJEMMRNY3+2TM12i6ibF6COlkQxSE7bVLa zAdqo2vijFrnID/+Cx+mxFY5/GRdc22Ut5eQHP+/x0Z8vUYGm8v0VvHEAxiAEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=PBj7IRze; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=PBj7IRze; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 72BDDAE3B X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: /N0LOwN8nWBy * 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 faa024b261..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.8.0") + (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 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + "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 -- 2.31.1