From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 18 11:52:02 2021 Received: (at submit) by debbugs.gnu.org; 18 Jan 2021 16:52:02 +0000 Received: from localhost ([127.0.0.1]:48148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Xl4-0000lX-8e for submit@debbugs.gnu.org; Mon, 18 Jan 2021 11:52:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:39066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Xl0-0000ke-LZ for submit@debbugs.gnu.org; Mon, 18 Jan 2021 11:51:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1Xkz-0002Uw-7m for guix-patches@gnu.org; Mon, 18 Jan 2021 11:51:57 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:36252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1Xkx-0005d7-8Z; Mon, 18 Jan 2021 11:51:56 -0500 Received: by mail-qt1-x82a.google.com with SMTP id e17so2570982qto.3; Mon, 18 Jan 2021 08:51:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OT+qmkYntdzslMt0aEa0WPokhkPkZCvzMN7Y3wqDnes=; b=MGIIzkkXNRDniu9tx6tBn4mtgzV58V/BdDbuln+Auo/2t3wpbwSWkqyu0y9RR2GjYJ CNnp0qZn6zHTaO389bUYy1c5ulSBKKwrXm/vkcn3hOId+GM89NIKCEE2y9UFl6liTQ05 cW6hKgmGJdyViAw0zoi17bOc2f3a8mktZMM1C/bn8x9TMeJVfHb4rlsVGbF8p2MsqZHq DZB8gEG8RLfbL5WWNxsNl3zSy+k50HdokJ0B4KC3leuv4L5mm8oQTSYAo215mwDR867/ DkHRO6OeSlHLVYxJqV2bNdJWozcKxlGKo5DBRY45DNimf8h6hq9Kf3gW9IAwA0yqsTn6 cqhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OT+qmkYntdzslMt0aEa0WPokhkPkZCvzMN7Y3wqDnes=; b=oihy9Up3aCoAc/pmfs0ibDCcpkG8NXvemaea8LspzHSYoMVbiENYHIBnnKQufuLYIc QUBXEJAfIoqZ6fLeYZvsFwdN5QJRaZoQ+/mDwJ6GLVznhF+GALMqIsSwY0VzWPWcak4f g/OvAKSP3Bj1HyAYS6F3+Pw/whEtWdyfu24GEFiMDfc0QlXgMbPhZWdjXiTWuU7YuJ96 OeNf/VUjDD4dWUGSzdPQDtqIt2mFDR7/QpjbOKnyDB+KyBamP+VL3O73lTcv7qJRC8uH iYmOiDSVYMC/2gg/FdyRajf26o5xdL/jGXiEbB/KV5yY/uBI/770vI5k9BISIAB6vtao BU0w== X-Gm-Message-State: AOAM533si0pismHuDa5yPUzKRy0LxAZCdZvASIcwxi/l8P25aC3YtymJ m0RCgPcM56Dfhh3IdM3EW3lFWXN/JDc= X-Google-Smtp-Source: ABdhPJyfKMzqWFsk/bgqojpzFO8Y4j46+Op/f5deK+0ZPoI3p49cLfQ1DPxnDQAIXRpUlNxBr/2k8Q== X-Received: by 2002:ac8:6edd:: with SMTP id f29mr454223qtv.213.1610988712453; Mon, 18 Jan 2021 08:51:52 -0800 (PST) Received: from localhost.localdomain (dsl-149-228.b2b2c.ca. [66.158.149.228]) by smtp.gmail.com with ESMTPSA id m64sm10992602qkb.90.2021.01.18.08.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 08:51:51 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org, 45774@debbugs.gnu.org Subject: [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. Date: Mon, 18 Jan 2021 11:51:20 -0500 Message-Id: <20210118165122.25813-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) On the daemon side, nixStore gets set to the environment variable NIX_STORE_DIR, else the environment variable NIX_STORE else the compile time macro NIX_STORE_DIR (see the Settings::processEnvironment method in nix/libstore/globals.cc). Hence, it is more appropriate to lookup the environment variable NIX_STORE_DIR than NIX_STORE in (guix build utils). * guix/build/utils.scm (%store-directory): Call getenv with NIX_STORE_DIR instead of NIX_STORE. --- guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 76180e67e0..2cbdb31505 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -144,7 +144,7 @@ (define (%store-directory) "Return the directory name of the store." - (or (getenv "NIX_STORE") + (or (getenv "NIX_STORE_DIR") "/gnu/store")) (define (store-file-name? file) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 26 22:59:01 2021 Received: (at 45958-done) by debbugs.gnu.org; 27 Jan 2021 03:59:01 +0000 Received: from localhost ([127.0.0.1]:43276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4byv-0006gu-6a for submit@debbugs.gnu.org; Tue, 26 Jan 2021 22:59:01 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:41445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4byu-0006gc-3X; Tue, 26 Jan 2021 22:59:00 -0500 Received: by mail-qv1-f51.google.com with SMTP id h21so483879qvb.8; Tue, 26 Jan 2021 19:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Zt9DiiPCWqltC7WcZm2o694F5WAmWxbhJfqf1wqFUnk=; b=Sg7I4n/+q4aBhc6LuB/Mw8Vfw0VCvHvbzc+IgKaqZoG/Z0sWQLf6JVgZPAlkvUo1rY Q/W6wVYqKa5NoOFLOy6Qb8X75rc8wovCFcJAOs8fjJqBLJ0/vCT6voqTuo/XHWAtZEf9 VaKme7amAjKEw6xyMrkeMY6VmUek50E9W0GcF3bYzeH2dx8UMaXfuet28nU8ZIZN5E7G M2xyNzpuUvN+EkIZzQvVUw9mGpLguQMuBfIghXfQLulEpt0LEb6YIPmyb5BFn2nZuwEE m8BE41BzLoOCBY3vbGH3KLop3yk49fjAAV15zIrAai1Zo4VRPOnk0zAZwpjMrusw4nfd +OFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Zt9DiiPCWqltC7WcZm2o694F5WAmWxbhJfqf1wqFUnk=; b=XgB9QdZCpDwNC+IyrAdNtugEyhYlsWGhTEiUscA1VGAPSp5muJTLHmf2w6B6lCRvsm evAjFKNrwY+0imMMKKip24vrcQngZfxXK3h8LmsAyfHL2XST4p4qjFjoLmBt1NOOWglw X21IVDGpsA2iNKYIeGY5yDJIC/BQGOxuEo7v/GWcMPuBBo00jXlJz7GETIKCEJ+DVc2g Ym4x2KwEejCAWs0aaqFn3SO9oepzZLvmyeV+9wZM6kEnFURLUM1gCFkX2MOAdod535S2 7kr7H9/Fg4NK4vDStapGJPsHk36cvYnYYs1B0cGPcLezlLtT9DuY7JQWVAK6UMPMBQ9k gW3Q== X-Gm-Message-State: AOAM531vMtHWJy+DcOEgEoYOMC58yqV4GgfhBl6pyq199g1VzrHGbnuK 8j8Q6QeaXOQ/C4bcgJ41Z3k= X-Google-Smtp-Source: ABdhPJzu/n/90ZMYIIIC+HPqkL6/Yfs11EzuqyFA2HD6jwJYaddoxN/MnzFJq+qqv/SrP5bE+uGlzg== X-Received: by 2002:a0c:b38b:: with SMTP id t11mr8827143qve.58.1611719934559; Tue, 26 Jan 2021 19:58:54 -0800 (PST) Received: from hurd (dsl-10-132-34.b2b2c.ca. [72.10.132.34]) by smtp.gmail.com with ESMTPSA id e185sm405684qkb.127.2021.01.26.19.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 19:58:54 -0800 (PST) From: Maxim Cournoyer To: 45958-done@debbugs.gnu.org Subject: Re: bug#45958: [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. References: <20210118165122.25813-1-maxim.cournoyer@gmail.com> Date: Tue, 26 Jan 2021 22:58:53 -0500 In-Reply-To: <20210118165122.25813-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Mon, 18 Jan 2021 11:51:20 -0500") Message-ID: <87sg6nyqrm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45958-done Cc: 45774-done@debbugs.gnu.org, ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Maxim Cournoyer writes: > On the daemon side, nixStore gets set to the environment variable > NIX_STORE_DIR, else the environment variable NIX_STORE else the compile time > macro NIX_STORE_DIR (see the Settings::processEnvironment method in > nix/libstore/globals.cc). Hence, it is more appropriate to lookup the > environment variable NIX_STORE_DIR than NIX_STORE in (guix build utils). > > * guix/build/utils.scm (%store-directory): Call getenv with NIX_STORE_DIR > instead of NIX_STORE. > --- > guix/build/utils.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guix/build/utils.scm b/guix/build/utils.scm > index 76180e67e0..2cbdb31505 100644 > --- a/guix/build/utils.scm > +++ b/guix/build/utils.scm > @@ -144,7 +144,7 @@ > > (define (%store-directory) > "Return the directory name of the store." > - (or (getenv "NIX_STORE") > + (or (getenv "NIX_STORE_DIR") > "/gnu/store")) > > (define (store-file-name? file) I found that both environment variables should be honored and pushed with a revised explanation in 47a6a938c3c4d0bbe7b6a3c64ff75d7bfb2f24fb. Closing, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 27 18:11:03 2021 Received: (at 45958-done) by debbugs.gnu.org; 27 Jan 2021 23:11:04 +0000 Received: from localhost ([127.0.0.1]:46429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4txn-0008QP-Mj for submit@debbugs.gnu.org; Wed, 27 Jan 2021 18:11:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4txl-0008Pf-85; Wed, 27 Jan 2021 18:11:01 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57235) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4txg-0004lJ-3H; Wed, 27 Jan 2021 18:10:56 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55796 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l4txf-0005Jx-Mo; Wed, 27 Jan 2021 18:10:55 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#45958: [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. References: <20210118165122.25813-1-maxim.cournoyer@gmail.com> <87sg6nyqrm.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 9 =?utf-8?Q?Pluvi=C3=B4se?= an 229 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 28 Jan 2021 00:10:53 +0100 In-Reply-To: <87sg6nyqrm.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 26 Jan 2021 22:58:53 -0500") Message-ID: <874kj2t1qa.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45958-done Cc: 45774-done@debbugs.gnu.org, 45958-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: >> (define (%store-directory) >> "Return the directory name of the store." >> - (or (getenv "NIX_STORE") >> + (or (getenv "NIX_STORE_DIR") >> "/gnu/store")) >>=20=20 >> (define (store-file-name? file) > > I found that both environment variables should be honored and pushed > with a revised explanation in 47a6a938c3c4d0bbe7b6a3c64ff75d7bfb2f24fb. Sounds good to me, thanks! Ludo=E2=80=99. From unknown Wed Jun 18 23:15:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 25 Feb 2021 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator