From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CDHGFEXfZGTBOgEASxT56A (envelope-from ) for ; Wed, 17 May 2023 16:05:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EH+dFEXfZGSbAwEA9RJhRA (envelope-from ) for ; Wed, 17 May 2023 16:05:57 +0200 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 0BE58206EB for ; Wed, 17 May 2023 16:05:57 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzHm5-0001Mu-5A; Wed, 17 May 2023 10:05: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 1pzHm2-0001MR-EB for bug-guix@gnu.org; Wed, 17 May 2023 10:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzHm1-0001vm-V9 for bug-guix@gnu.org; Wed, 17 May 2023 10:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzHm1-0002B8-MJ for bug-guix@gnu.org; Wed, 17 May 2023 10:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#20255: [PATCH 3/4] system: Only source system profile's settings in '/etc/profile'. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 17 May 2023 14:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20255 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 20255@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 20255-submit@debbugs.gnu.org id=B20255.16843322678267 (code B ref 20255); Wed, 17 May 2023 14:05:01 +0000 Received: (at 20255) by debbugs.gnu.org; 17 May 2023 14:04:27 +0000 Received: from localhost ([127.0.0.1]:50518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzHlT-00029H-Af for submit@debbugs.gnu.org; Wed, 17 May 2023 10:04:27 -0400 Received: from mail.envs.net ([5.199.136.28]:38260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzHlR-000298-Oo for 20255@debbugs.gnu.org; Wed, 17 May 2023 10:04:26 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 4026338A1436; Wed, 17 May 2023 14:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1684332265; bh=YP2DkoVYFV4PeI6NhD8VZsmXIRRZDMihEIw6QFO7I3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/FDCfaDlAw+HVun+YiqnmAqfXrH95fpDncQhm0hnvfIu7Ro55dBMNs+T8jyLmUxU Jo28I7vsVIZvjCwsoefmUnJ+0FIFf1lIfnlxGyo7jvIXWZDoAdVEIaOlUS2jUvwwig M97bi7J86TWRuS4CGcSvcg1ds1giJ+RMaDvcKK14BdjQNN2Wcp4xPqFpN7qH7YjZ3v OqFQMgP7LE35L7+k2kmUcFOiqT6sjta9IMxZ/fUT5ppZV2eKaFISb5ik/GMesVaQSQ 1wrMbx+2T7m0vkaLb4SAeeY9x7epheaBPfwmAphwxC6CfsrlkLlX3yKpdym8Ga/Wnf 2nOjBJIQIsRqkPgjsyG9gd9qbru1YR3CddDE4ilPcotgFayT0Yxi5p0jbCX1o5cldo eaW798IGT6QXRxWaqN3yWfU26Vq7KAFrWS1YlW8J/T4jnQh0ANJ4tajEb9XtWhNUQS Iu7SG8aXM78Udm5dpFtVMNbommNPMMRmYsL6OYAzfVD8ie2NJytVg8E0cGBVDj8xm5 OFakjBMAOaXSmvmk1Sa0ZSKGUyExbMS6omRXypleI1YzJoBkAcbns1/eMNoAYuSuWX 8tc1SUN1E7ktZmIT8Iudd5uKturGjvoJLcn0hcfZb0gYiCfrcTBofGuVBjX4OVqUK6 2YhhqWd592y1J/DQAjNyqgS0= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id SZdiYRM71J3d; Wed, 17 May 2023 14:04:22 +0000 (UTC) Received: from localhost (unknown [36.170.57.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Wed, 17 May 2023 14:04:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id dcd4eb43; Wed, 17 May 2023 14:04:19 +0000 (UTC) Date: Wed, 17 May 2023 22:04:10 +0800 Message-Id: <2e888b4d07c67ad74fbb4ec9afb812a236852027.1684331588.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <10665650174637a1b70629b864509a0a68920154.1684331588.git.iyzsong@member.fsf.org> References: <10665650174637a1b70629b864509a0a68920154.1684331588.git.iyzsong@member.fsf.org> 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: , Reply-to: iyzsong@envs.net From: iyzsong--- via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684332357; a=rsa-sha256; cv=none; b=os6SbKkA9c+onFgb7uZ8SMHbDuVfekPbogP+CRulBdWRNlte3yfMeWil1oV47L1jqEF7zH NZZYkp3MPRjTuwUL8NvlCFwT57m6hQHIP8pCQUTMvCq7F85T3DJkovK1LpiqCioQUOP6Rz 5j7ZUo4T2I2/0e3AX3ZlAf9O7Pn/VYwsGhUZj5s2gdvuCGi6arE4snUKXy1PQTzWOAi6/C llt2oJGRWkNfKTmgF5TxEYzYKktzAQjcoPfp6lrREsjM+lSKcI8dyFREV3ievjlbLkkwQg 8ZHsVv5iOZK6hL1yfxW752s+oUpUHpCQiHSEDxMDB+X/XukS3e8ZPTpdCXRgcA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b="E/FDCfaD"; dmarc=pass (policy=none) header.from=gnu.org; 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=1684332357; h=from:from:sender:sender:reply-to: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=YP2DkoVYFV4PeI6NhD8VZsmXIRRZDMihEIw6QFO7I3s=; b=GfpVf/U9l/c2tAzPndUVQb9ECiQI7V2xg/hpbOOohDUEO9zfU67RNh+cTIDXr8uabgHdgM +/Nx9Vvw5HcUg/h5IR5MxzpebLfw1b0EM3M3Z1bqorqfocW2tzxnmdhw0Ea7kyHe9pOZxs eIw8NKw01InjupjZtS/b9LtabZA9/6dJ2rj4uXVvd0ofq1/U+UH8ZASCEhS1Ts8T9/12gf 95j3LMy7s2WF6phpQfFZVkuxU+MOI/F2n+C6+dtcX+RJprDWzdpCu7kz0jYNaLx54el4Y3 mpY6CGzdk5fc0y2U+cdEsfrgxs4RS3AJaxAmgHmIa2dU8ZWXdBlgeXa952ZQNQ== X-Migadu-Spam-Score: -2.99 X-Spam-Score: -2.99 X-Migadu-Queue-Id: 0BE58206EB X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b="E/FDCfaD"; dmarc=pass (policy=none) header.from=gnu.org; 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" X-TUID: +WJNXSDiMnul From: 宋文武 This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6. * gnu/system.scm (operating-system-etc-service)[profile]: Don't source profile of '~/.guix-profile' and '~/.config/guix/current'. --- gnu/system.scm | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..a48c206e18 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1009,8 +1009,8 @@ (define* (operating-system-etc-service os) ;; environment variables. (profile (mixed-text-file "profile" "\ # Crucial variables that could be missing in the profiles' 'etc/profile' -# because they would require combining both profiles. -# FIXME: See . +# because they would require honoring search paths of dependencies. +# FIXME: See . export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share @@ -1037,27 +1037,12 @@ (define* (operating-system-etc-service os) export `cat /etc/environment | cut -d= -f1` fi -# Arrange so that ~/.config/guix/current comes first. -for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\" -do - if [ -f \"$profile/etc/profile\" ] - then - # Load the user profile's settings. - GUIX_PROFILE=\"$profile\" ; \\ - . \"$profile/etc/profile\" - else - # At least define this one so that basic things just work - # when the user installs their first package. - export PATH=\"$profile/bin:$PATH\" - fi -done +# Make basic things just work when the user installs their first package. +export PATH=\"$HOME/.config/guix/current/bin:$HOME/.guix-profile/bin:$PATH\" # Prepend setuid programs. export PATH=/run/setuid-programs:$PATH -# Arrange so that ~/.config/guix/current/share/info comes first. -export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\" - # Set the umask, notably for users logging in via 'lsh'. # See . umask 022 -- 2.40.1