From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iPR3GtYw42Nx4AAAbAwnHQ (envelope-from ) for ; Wed, 08 Feb 2023 06:19:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KPh5GtYw42N7UQAA9RJhRA (envelope-from ) for ; Wed, 08 Feb 2023 06:19:18 +0100 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 E113A9405 for ; Wed, 8 Feb 2023 06:19:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPcrL-0007Uu-0m; Wed, 08 Feb 2023 00:19:07 -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 1pPcrG-0007Ud-Se for guix-patches@gnu.org; Wed, 08 Feb 2023 00:19:03 -0500 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 1pPcrG-0000aw-BY for guix-patches@gnu.org; Wed, 08 Feb 2023 00:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPcrG-0001de-1C for guix-patches@gnu.org; Wed, 08 Feb 2023 00:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61358] [PATCH] system: default-skeletons: Merge search-paths of multiple profiles. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 05:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: iyzsong@envs.net, 61358@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 61358-submit@debbugs.gnu.org id=B61358.16758334956223 (code B ref 61358); Wed, 08 Feb 2023 05:19:01 +0000 Received: (at 61358) by debbugs.gnu.org; 8 Feb 2023 05:18:15 +0000 Received: from localhost ([127.0.0.1]:54531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPcqU-0001cJ-Md for submit@debbugs.gnu.org; Wed, 08 Feb 2023 00:18:15 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:44608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPcqS-0001bz-NR for 61358@debbugs.gnu.org; Wed, 08 Feb 2023 00:18:13 -0500 Received: by mail-ej1-f67.google.com with SMTP id hx15so48280140ejc.11 for <61358@debbugs.gnu.org>; Tue, 07 Feb 2023 21:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=suLX/fZfInbKVzGvhyFTcOcaKtMjOofJvxqwVAToMV0=; b=huInw8EU3B9OeairjGRpbHZLHa6jamVDnMwCsJSh9AgXVQ6q06qCEWgky4WZyyq5/k fEU+tmb9HE2jJ/byxAYkbRnRAhFz5UTehTXCFptms0uLAqhOtyCcoilMjtyvrvkiZZSG HoLPVrmBpzfbnJqr6CflTSxX8nDeQwsReyLjj5h4fgbobtOf58PQfIrzvezbqHzeCUqa n5Gu1iSnisFm81rwkvdVTE/TFoS8pOaspulj136NdtfO3qjrsYiNenjKvgmsNBh2cqiN aihy5cqIQNAGgiG2Pclm5PDDiCqPHg4+vAjgPwBoG+pEMpxHdNjc2+ufvvVzycNQrPTV 0VeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=suLX/fZfInbKVzGvhyFTcOcaKtMjOofJvxqwVAToMV0=; b=jSiZeYwVpB5/kUcg5ybx6J0BLMEGGJ/aWL1BvfHHCKXTWPH45PvGcwWygyFem/RX22 G1YmEchgzYND7cWssFb1vSSTjOAwYy8UxvB1c1G/5Mw8KNhshNtbDZT9WBrZfMf/AvrB ZJ+rXKp224OHjZvcH2wxlFppI59bX+5gHx5raO/wVTMlrdMj2HlU2uKRD/K8YacfAyFB Z6DZ1D00lknnb6UxFn6j6Md+tD00gId+dV/10CcmTbmrN8vyxm8hXBqTU60QBVpllPhI zJkUwRrlJaykQie3u9m+hUnLS9BZh6cy7VKESUdtX3ChpxH6RqGCwC1htwII6HEAtA81 JSfg== X-Gm-Message-State: AO0yUKXRG0adKojksp9IqzLSfycuF2gtvJuGjXAjQ6tVE3SxSx4wJ+tw UV4aJhapV1LpoRe/zsbGehs= X-Google-Smtp-Source: AK7set8QwiUC8qH99nJ5t5f1kQp3J9bc6z/Rc+4KTYZGvyuM7HUsfhHxh45OKINOTi66KCYJYVscZQ== X-Received: by 2002:a17:907:318c:b0:8aa:c0a4:2aa5 with SMTP id xe12-20020a170907318c00b008aac0a42aa5mr3231889ejb.16.1675833486576; Tue, 07 Feb 2023 21:18:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kq9-20020a170906abc900b008aa4705adb0sm1489110ejb.5.2023.02.07.21.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 21:18:06 -0800 (PST) Message-ID: <86b3b6506962488fece3f01497b6d63b880419b4.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 08 Feb 2023 06:18:04 +0100 In-Reply-To: <20230208023735.8388-1-iyzsong@envs.net> References: <20230208023735.8388-1-iyzsong@envs.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=huInw8EU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675833558; a=rsa-sha256; cv=none; b=oxTKP/qzZSxF5aqnuRnQD/z3gx9LpFG/H5/1M9ycXTyR1kzVSzPtM/F16UG5W995bGYghm CEkQ6II1q6kbQm1JKiraQkfUNcVkCA8zOoohLR8bNkzgNAiyrYd9ZmXpy4gWksaKwULVba rSO1aSXYq6QLhq9shGOBcFBaFGq9ltCHyCrTJLyZs9+gYmpjOouKR+16QWfTs8SQjrpg/U DbCkpTotDOtqCvcIqCoPF2u93DMai3+iqFSD/5Xp3DFJLPgMetWY90o1FHRzWj/2IXwsfN VR9sBz2uwv6cL/RaXqJmG6u+Ht2s8Bu8uxGBHNzAJ4Ld+TU4cscoMTiNXw4uhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675833558; 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=suLX/fZfInbKVzGvhyFTcOcaKtMjOofJvxqwVAToMV0=; b=XZ+6yLax+w6c22w/lQfJfztD+wWAxy52iS+EqEOwrb1wA+Fq+cUHzrgdRx6fcpMciPKZzJ gRtrk/Edg+3eeHQPRcTsSAIjzE9rH06BUPdDhEZWSUWS+BnRB6rUWz/0fkzAR3gPYz7JMb cJRTsjgaEvfGPuIDrbVpgKPu/SPO9TKaRlyIwx4iq9pctHrNZuaajldnmdnXZkT0STfPIE FQ0mC8omr/CdZRfB0074rZL6Y1UVbBA0eC0g2LucMarJwLyYfXAeke8Ya0OmHUvhHUlpmN zqEDtiCmnxtKPPhfxaCY2o+EtebaNuLkV+AnJ5WZyo60rZhyjK2SnX6wVU25Zw== X-Migadu-Spam-Score: -0.49 X-Spam-Score: -0.49 X-Migadu-Queue-Id: E113A9405 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=huInw8EU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: 4IHvN9X4K34Z Am Mittwoch, dem 08.02.2023 um 10:37 +0800 schrieb iyzsong@envs.net: > From: =E5=AE=8B=E6=96=87=E6=AD=A6 >=20 > Fixes . >=20 > * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]: > Merge search-paths from multiple profiles via "guix package". > --- > =C2=A0gnu/system/shadow.scm | 24 ++++++++++++++++++++++-- > =C2=A01 file changed, 22 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm > index 2e87928368..a46f53e784 100644 > --- a/gnu/system/shadow.scm > +++ b/gnu/system/shadow.scm > @@ -152,11 +152,31 @@ (define (default-skeletons) > =C2=A0 > =C2=A0=C2=A0 (let ((profile (plain-file "bash_profile" "\ > =C2=A0# Honor per-interactive-shell startup file > -if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n")) > +if [ -f ~/.bashrc ]; then . ~/.bashrc; fi > + > +# Merge search-paths from multiple profiles, the order matters. > +eval \"$(guix package --search-paths \\ > +-p $HOME/.config/guix/current \\ > +-p $HOME/.guix-profile \\ > +-p /run/current-system/profile)\" > + > +# Prepend setuid programs. > +export PATH=3D/run/setuid-programs:$PATH > +")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (bashrc=C2=A0 %default-b= ashrc) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (zprofile=C2=A0=C2=A0=C2= =A0 (plain-file "zprofile" "\ > =C2=A0# Honor system-wide environment variables > -source /etc/profile\n")) > +source /etc/profile > + > +# Merge search-paths from multiple profiles, the order matters. > +eval \"$(guix package --search-paths \\ > +-p $HOME/.config/guix/current \\ > +-p $HOME/.guix-profile \\ > +-p /run/current-system/profile)\" > + > +# Prepend setuid programs. > +export PATH=3D/run/setuid-programs:$PATH > +")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (xdefaults (plain-file "= Xdefaults" "\ > =C2=A0XTerm*utf8: always > =C2=A0XTerm*metaSendsEscape: true\n")) Why not do this in /etc/profile?