From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 KJ6PBKvTZWfkYAEAe85BDQ:P1 (envelope-from ) for ; Fri, 20 Dec 2024 20:29:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id KJ6PBKvTZWfkYAEAe85BDQ (envelope-from ) for ; Fri, 20 Dec 2024 21:29:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Vdu/Xw5r"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JIA64GKi; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734726571; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=K+9zVLFoawM1UZjerunh3fQYkHSgbglWuFEr4qmhnmQ=; b=tnbkb5LLSDkKLdvvJP83MtiiCpY0YKWkLDYTW7AvVe4sWjYcgftBkAys8Rtdi1/u8Oh+gH 8Budyjk2ukmhlMnH/6kFOzLQaPo3FH0NwUEqUzRbsg+yUqrP/FjthKbefzrQnADF2/q/Qi Q8T1m7o+ZAjAE42s9J6JQB+L93tRucTnZPQK+igXg20XZKEZQPB6O5XsAF8abPKFabFdIK AmSuAAUMGAZ/cU/xDES0/glGglwWXc86e9L1iAneEUi4802xi7B31HkiACXgb0p0NCdR6t ZsirgMOxxUwhkdjIQvOY+HFivpBNVm8RJ5Xjh/e+qciKgZZkMdQoJiu1sihELA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Vdu/Xw5r"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JIA64GKi; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734726571; a=rsa-sha256; cv=none; b=B7MmhjUoEqQOTDOdDFU+GroRK6Ckji8w+rnZfdfxC47TH2NVoe9zOuhhSJln/8En+4khku hXiwkPFJqwrAiEkPVdVTk90wS/hE8oZYl6X5MhHFGOwJk24AVDMCgc3cZf8Z6WhIspkfIO wYt9zV/IloEfvh2M85WhmvOUDIcQqwxF6gjV+KmsFrMBHwEJHF6W/tC3ZL4VBBx3dC45xw pz6inpP59L5DUbf0YzwK9BVNKDo3Y4LhPKIk76J9M7aCtNHdqQNQa1xVDddUznzQaywnkl 44xXDFIEu/0z01JtxmrN7NNZPa6w4H+Y+ahdxC2+6nL6uqnsbjmko5guvhDtDg== 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 D5FCE7193 for ; Fri, 20 Dec 2024 21:29:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOjcO-0004v7-DO; Fri, 20 Dec 2024 15:29:04 -0500 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 1tOjcN-0004ub-3g for bug-guix@gnu.org; Fri, 20 Dec 2024 15:29:03 -0500 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 1tOjcM-00085J-OJ for bug-guix@gnu.org; Fri, 20 Dec 2024 15:29:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=K+9zVLFoawM1UZjerunh3fQYkHSgbglWuFEr4qmhnmQ=; b=Vdu/Xw5rgEuc+bmWf1WECetKm2cF3ZrfFc3nS8JITMgJvtkBAyRgWn5vb/0c0R9XSXZz/0/xnCZbVGxlrYIyAvouebeA4ynpQyqopRiimJvM8KyJmmOhUMZpnkMUCFQgNpvmPfS7c12I16t3YIcYqicFn57/EWMKZiUDpYX1R5sNc7LqEHKUSEAAmAln01Rkz+6VPccGP+2YoW19i5vMQ5+PSgJF0Kk07PIrz9c6O7r+rKYYGHK6obE7G0tct2Dq3S4KSItBAh4+veyRoE1iw1ofU4HygZP56YXVYEsMdTi0D+3AKhyw1cRMjk6tOSM4mOO18aNe5GTZZhM3cvGJdQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOjcM-0004Ya-Hx; Fri, 20 Dec 2024 15:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#67292: [PATCH v2 2/2] profiles: emacs-subdirs: Also expand native-comp-eln-load-path. 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, "Suhail Singh" Resent-Date: Fri, 20 Dec 2024 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67292 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 67292@debbugs.gnu.org Cc: Mekeor Melire , Maxime Devos , Suhail Singh , Simon Tournier , 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 67292-submit@debbugs.gnu.org id=B67292.173472653617495 (code B ref 67292); Fri, 20 Dec 2024 20:29:02 +0000 Received: (at 67292) by debbugs.gnu.org; 20 Dec 2024 20:28:56 +0000 Received: from localhost ([127.0.0.1]:44188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOjcG-0004Y7-94 for submit@debbugs.gnu.org; Fri, 20 Dec 2024 15:28:56 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:49525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOjcE-0004Xi-Hm for 67292@debbugs.gnu.org; Fri, 20 Dec 2024 15:28:55 -0500 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso16040115e9.3 for <67292@debbugs.gnu.org>; Fri, 20 Dec 2024 12:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734726469; x=1735331269; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=K+9zVLFoawM1UZjerunh3fQYkHSgbglWuFEr4qmhnmQ=; b=JIA64GKiqw0IAqe2DQco0Ku7yb1/yBAadSQm9dCrYtqt8KkshmnFDIW/mLTqZnAa9v GV4DWWTRn+JWpGCuPzP4QRbERzrxNUbQhpPCBmPC6ihvYwc9fKb7RHaiOIwecmpKVM/B qrB5ydoLsNhVI2WNqCneztLQWG6q2+xCsE1M6bZjmyd9xRBxzjWhD4nIimCRgjIDgYTY isL+AC+g9JXwKjxWolvfOAqkGk71vz7ZNvRiJg92r/WxfFBg0aKxonXmclA9/f3aU+0A 5FhNY5N2uXqlA9DeDlGqiTeq5TZfyoh4BVzyq7lKw00QoiSLyCgJNItGVWU2L5VBzz1L idTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734726469; x=1735331269; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K+9zVLFoawM1UZjerunh3fQYkHSgbglWuFEr4qmhnmQ=; b=AfxGSWwJnY3EX3tqTQzfJCnrFaIKycZJuPXKlD+cnv7kEgKPkf7KQWZ8x3MS2lDdVB nl4adUHTAgVWEQCfyKsxk91CjqhkWmGqxk5oLkRRSdgCVapryk+yGpTY7WOdU829HfJV yXzWHQYHo3Ee4IxONNle0VpBqUMSwDVnAdALT1GedNeKQ5DRo+Bmnuy0RsA1mWuwQS83 m4hWAc3/aDlVyPu208Jcjdm4c9nf9YfkAirm09H1sE234xPDzVKW0Dut+81J+YM7GAQj VVP4n6j1VdEDpmPbQ2MT08WhmEWkjVbBXQqw1b/0ziNR7PeY9g+CP1AgdyS3y5i0+yON 962g== X-Gm-Message-State: AOJu0Yxo22IScn7YuI/pOUjrsgM2YoSHHDt/sqJTrUVjJvCsq6Wwoyui es99g1CnzPUkEnHH7pd19o9AC0WFV5rbsuEDd50ooZ3v3o6QelbioFvDdt0w X-Gm-Gg: ASbGnct336kvX2wn+segxHLsNzcNybwT6jjl16mzAOIlwOeqBUrnUeZ7bg5vL6TaZuq 54K4TDwCnf74jCS4F8wBr8bURdyohydfOiC1cEWSIvzsrix+zX9GrVVuXE3I/R5KF/rg9EfZabo HKdH0zVO9H9MtbnYzMvnmw6K8Sx0Cm8vDneGTbk3kRqx5G9p+fIE06ThF34SKnBkD/YEork5e2W ka5rBGsog1GL3BUsN9kBrlZJmFUiC5dhLg6m+3w+qjU2DcSgsYpoTK08IYJlPljO6617zCCVMMW hqN6RJEO65L82sFWEOqJaxTVvyMHKGg2 X-Google-Smtp-Source: AGHT+IGABtkr7IyEv3PdqGWzc8QeSgns1SUIDS7VbwGYakCe8R9gc3efobfCHWxBZR89x8d4+kvaFw== X-Received: by 2002:a05:600c:450f:b0:434:f5c0:32b1 with SMTP id 5b1f17b1804b1-436686461f0mr42060235e9.15.1734726468688; Fri, 20 Dec 2024 12:27:48 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4366a093cbfsm27285025e9.22.2024.12.20.12.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 12:27:47 -0800 (PST) Message-ID: <5b28731e904eed2909946cccedb27d1a1bdd7558.1734726526.git.liliana.prikler@gmail.com> In-Reply-To: <01f9481f9ab86a21bc85e82a6f2a7e3457d2709e.1734726526.git.liliana.prikler@gmail.com> References: <01f9481f9ab86a21bc85e82a6f2a7e3457d2709e.1734726526.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 20 Dec 2024 21:10:47 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 3.81 X-Spam-Score: 3.81 X-Migadu-Queue-Id: D5FCE7193 X-TUID: De38gC15GEgB This patch ensures that the pinned natively compiled Emacs packages can actually be found in the respective load path. The rationale for expanding it mimics the rationale previously applied to load-path for byte compilation: We want to be able to `guix upgrade' emacs (or similar) without yanking compiled packages from underneath. * guix/profiles.scm (emacs-subdirs): Write an additional “line” of code to deal with ‘native-comp-eln-load-path’. --- guix/profiles.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index a28cf872cf..87b9543ac0 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1206,7 +1206,15 @@ (define* (emacs-subdirs manifest #:optional system) (scandir dir (negate (cute member <> '("." ".."))))))) (filter file-exists? (map (cute string-append <> "/share/emacs/site-lisp") - '#$(manifest-inputs manifest)))))) + '#$(manifest-inputs manifest))))) + (native-comp-needle + ;; Dynamically find native-site-lisp relative to profile. + ;; We can not hard-code the path here, because the output + ;; isn't known yet. + '(expand-file-name "../../../lib/emacs/native-site-lisp")) + (native-comp-dirs + (search-path-as-list '("lib/emacs/native-site-lisp") + '#$(manifest-inputs manifest)))) (mkdir-p destdir) (with-directory-excursion destdir (call-with-output-file "subdirs.el" @@ -1216,6 +1224,18 @@ (define* (emacs-subdirs manifest #:optional system) (list ,@(delete-duplicates subdirs))) port) (newline port) + (write + `(when (boundp 'native-comp-eln-load-path) + (let ((needle ,native-comp-needle)) + (setq native-comp-eln-load-path + (mapcan (lambda (dir) + (if (equal dir needle) + (nconc ',native-comp-dirs + (list dir)) + (list dir))) + native-comp-eln-load-path)))) + port) + (newline port) #t))))))) (gexp->derivation "emacs-subdirs" build #:system system -- 2.46.0