From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SLHuHOodkmZTigAAqHPOHw:P1 (envelope-from ) for ; Sat, 13 Jul 2024 06:25:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id SLHuHOodkmZTigAAqHPOHw (envelope-from ) for ; Sat, 13 Jul 2024 08:25:46 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dWce4hgX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720851946; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: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=k0SDjyaMKpzX+ym9oSFeipiFMSkzUZ1y37GRBnHxQI8=; b=Z1+UO+WxY0XuRfq0GqL+0z6DFVmYEIlOifA43bPcBw2nYJLoRnqPf3kpW3DHACr24zAcJL xOLn2CgRnhYn0ZoE0/8l6r0m+AgZ3i65G6DoxN1YhA9INrwhg3R9N5NBe+2PmPVy+Yyk/x peATvydeiNcuXqVRocjVW7itJ0RmcXhg/Cb48NbaPhuw0QCEQbIV2Jol08GBON944h0jk8 obgxIhMB0yaNBpkiY+Lf82lujPnkMkRTz0PKTEuRhKoljWRboLGOl3a2E8fcBlq2PgoOuV lvP9m4XkBepJmsbKcrSCEGHUAjTJQtCFm2Z+08X1Y4OlhBk0BDWoLGnTZ7o7ag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720851946; a=rsa-sha256; cv=none; b=RDyMx5wwHRy75xhFOwh3+MYAYNj9ZJKkeLSfG4ZbV6BIPq3SQjXxqtcBGrWudZlOld4GUM pJKME8qT28aNSzQuZWQ80SkPr7dPnSxJjbqRAiySMfs+nqU3sgmGmZ6KJw5lDxCl+K3KCP /OhHioxtqMSp/+GX0MS2HoQKuP6JlM/6I6IJ9G0o2JB9+pQZ+FNAJH3roIFUdfJJeOzv2h zQpCq8qukR6yp+OwF4A26xYmSJXOkOOdgC1PZCV2Z+Zf2vtScMF3FpO9rwyObecrDKLHc4 I3wj/UAtF0pHIH83NptOWlCU1wZwpHUWo/f+ctXw2155Cooe6dzXvIS/72sKlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dWce4hgX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" 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 453316A2BA for ; Sat, 13 Jul 2024 08:25:45 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSVtV-0005w6-Qv; Sat, 13 Jul 2024 02:06:05 -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 1sSVtU-0005uz-7b for bug-guix@gnu.org; Sat, 13 Jul 2024 02:06:04 -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 1sSVtS-00038V-Q6 for bug-guix@gnu.org; Sat, 13 Jul 2024 02:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSVtS-0006Xx-Vz; Sat, 13 Jul 2024 02:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#72045: [PATCH 2/2] gnu: emacs-minimal: Ungraft. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, bug-guix@gnu.org Resent-Date: Sat, 13 Jul 2024 06:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72045 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 72045@debbugs.gnu.org Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72045-submit@debbugs.gnu.org id=B72045.172085075525142 (code B ref 72045); Sat, 13 Jul 2024 06:06:02 +0000 Received: (at 72045) by debbugs.gnu.org; 13 Jul 2024 06:05:55 +0000 Received: from localhost ([127.0.0.1]:54986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSVtK-0006XM-KP for submit@debbugs.gnu.org; Sat, 13 Jul 2024 02:05:54 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:61620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSVtG-0006X0-IR for 72045@debbugs.gnu.org; Sat, 13 Jul 2024 02:05:52 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a797c62565aso295402966b.2 for <72045@debbugs.gnu.org>; Fri, 12 Jul 2024 23:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720850684; x=1721455484; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=k0SDjyaMKpzX+ym9oSFeipiFMSkzUZ1y37GRBnHxQI8=; b=dWce4hgX6c+Yz+axlk+70bsLMpW5Tn/ZTl4UGMR6gPSaViYBX/F9fHkZ2YN0icrCNc qxhamsrUNexM5vDiZEbGKgIkNaVrRan0oyWPG9a0CskS36niyJgpTGZt2+QB4IrnwXGY FkERB/jiYdBMg8/BnQWteYURUZPcjXfcQFm3wSXlXl+YMerkPRaiJ/toDd6FeJzYhm9D nIBo9/CgkTGiLTcquwN4nQj5ZcxaUridSqSo1Z45x4LkYG0XwStHcvvz2kdjFSqQ9UCE wZOSmfo6UrtjCcCo8NsnwYpzmvwwW/ujZnSbjnsH0qPFWC+9gX7vvlzhtYg0GSWC+C34 nY/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720850684; x=1721455484; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k0SDjyaMKpzX+ym9oSFeipiFMSkzUZ1y37GRBnHxQI8=; b=Ow/bTfMqEVw0lMbbE5fn8AZU1lG7fz0IERDciAeI1feKTaWwW7gg2ZkP802lBrFgiM WVRvJhf5ULtysLqNkd/kfyznk9jpdl2sGjy7gb3lM9rh6YkSq8muT3floQ1bQTLTgNMa EJcaV+rnGrf//592XO4uawqeglRFtZ0CHJZVS8MCCKj/rNw0yJcXLcUfyqEpPRZM+ist tlgq49C594SrkFzZ6dwkuWIMnQYofjRE3ohRRZFfRezBRnPmG1TFhyjCvG8rH/Wwd5n+ 2tPB9FJeWfjqDDNluwZAqmrVa9qgVHvsniD/QGDrsx1onzZpwpEgkzdUabUwql2asjGl ingw== X-Gm-Message-State: AOJu0Yyun0keOPQeBubxjqhEdFnud9/3iQaoVPfws834TA9wirQ9NihS TNkPpXrx9qUn9RHa9qyVqLTolNVr42v0G3dIxVeI8cHeHrA/xQmKZvZXi4SI X-Google-Smtp-Source: AGHT+IFs9mRgkpLHIhRvsEG5OaQ3Wvd+4drH4kfIUA+LDhHPCX3xGiXPAjGtz7SGdYX04sv4X0W7iw== X-Received: by 2002:a17:907:9687:b0:a79:81a4:faff with SMTP id a640c23a62f3a-a7981a4fd08mr830578766b.66.1720850684112; Fri, 12 Jul 2024 23:04:44 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc7f1e5asm21053466b.109.2024.07.12.23.04.43 for <72045@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 23:04:43 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 13 Jul 2024 07:53:35 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 453316A2BA X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.30 X-Spam-Score: -0.30 X-TUID: bh5cCzYk4OF6 The current graft breaks native compilation and would do so even if reduced to an ABI hash. Thus remove it, and rebuild all Emacsen. * gnu/packages/emacs.scm (emacs-minimal): Update to 29.4. [replacement]: Remove. Add note for future replacements. (emacs-minimal/fixed): Remove variable. Fixes: Emacs native compilation across grafts --- gnu/packages/emacs.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ed186d221c..33bb0dd542 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -100,15 +100,16 @@ (define (%emacs-modules build-system) (define-public emacs-minimal (package (name "emacs-minimal") - (version "29.3") - (replacement emacs-minimal/fixed) + (version "29.4") + ;; Note: When using (replacement …), ensure that comp-native-version-dir + ;; stays the same across grafts. (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "1822swrk4ifmkd4h9l0h37zifcpa1w3sy3vsgyffsrp6mk9hak63")) + "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")) (patches (search-patches "emacs-disable-jit-compilation.patch" "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -335,18 +336,6 @@ (define-public emacs-minimal (files '("lib/tree-sitter"))))) (properties `((upstream-name . "emacs"))))) -(define emacs-minimal/fixed - (package - (inherit emacs-minimal) - (version "29.4") - (source - (origin (inherit (package-source emacs-minimal)) - (uri (string-append "mirror://gnu/emacs/emacs-" - version ".tar.xz")) - (sha256 - (base32 - "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")))))) - (define-public emacs-no-x (package/inherit emacs-minimal (name "emacs-no-x") -- 2.45.2