From patchwork Mon Jun 17 12:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 65425 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 5E20427BBE9; Mon, 17 Jun 2024 13: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C513C27BBE2 for ; Mon, 17 Jun 2024 13:27:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJBRv-0000Bb-I3; Mon, 17 Jun 2024 08:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJBRu-0000B9-50 for guix-patches@gnu.org; Mon, 17 Jun 2024 08:27:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJBRt-0006UZ-RR for guix-patches@gnu.org; Mon, 17 Jun 2024 08:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJBRu-0003k1-H1; Mon, 17 Jun 2024 08:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71492] [PATCH v2] gnu: coq-autosubst: Fix Coq 8.19 compatibility. References: In-Reply-To: Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2024 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71492@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 71492-submit@debbugs.gnu.org id=B71492.171862721114356 (code B ref 71492); Mon, 17 Jun 2024 12:27:02 +0000 Received: (at 71492) by debbugs.gnu.org; 17 Jun 2024 12:26:51 +0000 Received: from localhost ([127.0.0.1]:33017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJBRj-0003jU-8K for submit@debbugs.gnu.org; Mon, 17 Jun 2024 08:26:51 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:44507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJBRh-0003jH-1G for 71492@debbugs.gnu.org; Mon, 17 Jun 2024 08:26:50 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4217a96de38so31293175e9.1 for <71492@debbugs.gnu.org>; Mon, 17 Jun 2024 05:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1718627141; x=1719231941; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BmqtnqQyiLZMVERtrORkjeYhzuPdd5cO5oO+RJQIDAo=; b=oKdvop9vfSpiLZgfDTz0QOldrLnLM8s4zvpIcMsjAaBE0jnfXOJ+4R1PR4g3r9BYgQ 6ClKZeeVPsYtVgkc2US5Hd5JgtlggWKIywwyawBOgFaRcdXIFau6OhtE+QUKb5Vcyz/7 ZnRsKSZL1Z+jAXfM0F5kE+BCIdvr9ZVK45eVTOHeSOYrSFloc5QIvKeyMAzxtc2Xtaza wfR2Jz1b8uExaPHaGGYfqrtS6g2h3vDOAAfdL6lpRRe0bh7VPkmPc5tnsI4ofpnoMrmp ud/XweGo8aTMQy+IAnO+iY+bZ86finjwHt9743SJq5fGBKOI0+8vewqO7T+mv1gg6unT X0PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718627141; x=1719231941; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BmqtnqQyiLZMVERtrORkjeYhzuPdd5cO5oO+RJQIDAo=; b=QoLaATyY70UxjxGSx9zqVwcQhgMBkmQWDvsltnmM0OGkcLszQYQ31WsqIHBkl/0h8r k1iOGBc4k09RlppKvaM3ScsMqurY8w82wur5B1V/56vKd2CBsBpc7qDhnTIUXMZ5++fY HcdiniMMkNMf2tYWKOGh+elAZ3QlgSJ5rZ/Q6Jt73PiM9+Zs0JqR9FL/bO2SIBloCaYY Uv+0z6ebAb51+DRtoAqEMtw8sCbh3FE/GqKlCROwU+9NGFM8Vz8C8/gbux55B4FjIcwB iG6hH8vkb8XcKWZwGUrcm0TRjaLYri1uuab8xh3SyyJeSbzeAu2Uk0gmR1sYnox9lmoo 1DMA== X-Gm-Message-State: AOJu0YzECXlWWK8zNwx/VYiAeUn+/jHB9B87T8w+qDaeEArkfktu/M6R jdsoeT9v7v1QUaLqc9uSvPinDKFgT6De8q5T2INavwjFJWl6pB6j5nSZC8JCFtWMxEVr/qf776/ n X-Google-Smtp-Source: AGHT+IFlo97dqEY28gki+Lv08CL3uG9UdbBVD7Sul4smUF5OlzZsubcxw7nbN15Mq1IwrRgsj4miAw== X-Received: by 2002:a05:600c:444f:b0:422:5b78:1c8f with SMTP id 5b1f17b1804b1-42304811928mr73182155e9.8.1718627140913; Mon, 17 Jun 2024 05:25:40 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422870e96f9sm196983165e9.26.2024.06.17.05.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 05:25:40 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Mon, 17 Jun 2024 14:25:35 +0200 Message-ID: <241e20259f230e3e7d080fe209830957af0a5f8e.1718627005.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/coq.scm (coq-autosubst): Use Coq 8.19 compatibility patch. Change-Id: Ib705c92b5605c6b679224f471ff12c018842c006 --- gnu/local.mk | 1 + gnu/packages/coq.scm | 4 +- ...utosubst-1.8-remove-deprecated-files.patch | 43 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch base-commit: f9ed5788fda9288301550c641820d422e9ad1602 diff --git a/gnu/local.mk b/gnu/local.mk index 83b7402b09..f591317610 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,6 +1081,7 @@ dist_patch_DATA = \ %D%/packages/patches/converseen-hide-updates-checks.patch \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ + %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index f0c09bdef9..7a8a49208a 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -528,7 +528,9 @@ (define-public coq-autosubst (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz")))) + (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz")) + (patches + (search-patches "coq-autosubst-1.8-remove-deprecated-files.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f diff --git a/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch new file mode 100644 index 0000000000..cc76672798 --- /dev/null +++ b/gnu/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch @@ -0,0 +1,43 @@ +This patch compatibility problems with Coq 8.19. + +It was taken from the master branch of coq-autosubst as there is only +this change since version 1.8 of autosubst and they haven't released a +newer version yet. + +To recreate this patch: + +wget https://github.com/coq-community/autosubst/commit/97eea491813b691c6187d53d92ae6020874a82a3.patch \ + -O coq-autosubst-1.8-remove-deprecated-files.patch + +From 97eea491813b691c6187d53d92ae6020874a82a3 Mon Sep 17 00:00:00 2001 +From: Pierre Rousselin +Date: Sun, 15 Oct 2023 14:34:31 +0200 +Subject: [PATCH] Remove deprecated files in Coq.Arith + +This is necessary for Coq/Coq:#18164 +--- + theories/Autosubst_Basics.v | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/theories/Autosubst_Basics.v b/theories/Autosubst_Basics.v +index 477c87c..1940c3b 100644 +--- a/theories/Autosubst_Basics.v ++++ b/theories/Autosubst_Basics.v +@@ -5,7 +5,7 @@ + *) + + Require Import Coq.Program.Tactics. +-Require Import Coq.Arith.Plus List FunctionalExtensionality. ++Require Import Coq.Arith.PeanoNat List FunctionalExtensionality. + + (** Annotate "a" with additional information. *) + Definition annot {A B} (a : A) (b : B) : A := a. +@@ -240,7 +240,7 @@ Lemma plusSn n m : S n + m = S (n + m). reflexivity. Qed. + Lemma plusnS n m : n + S m = S (n + m). symmetry. apply plus_n_Sm. Qed. + Lemma plusOn n : O + n = n. reflexivity. Qed. + Lemma plusnO n : n + O = n. symmetry. apply plus_n_O. Qed. +-Lemma plusA n m k : n + (m + k) = (n + m) + k. apply plus_assoc. Qed. ++Lemma plusA n m k : n + (m + k) = (n + m) + k. apply Nat.add_assoc. Qed. + + Lemma scons_eta f n : f n .: (+S n) >>> f = (+n) >>> f. + Proof.