From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: Re: Patch to rename NIX_CONF_DIR to GUIX_CONF_DIR Date: Fri, 24 Jun 2016 21:21:27 +0200 Message-ID: References: <87oa6q6aln.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGWfY-00050b-28 for guix-devel@gnu.org; Fri, 24 Jun 2016 15:21:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGWfT-0001Ix-DW for guix-devel@gnu.org; Fri, 24 Jun 2016 15:21:35 -0400 Received: from mail-yw0-x233.google.com ([2607:f8b0:4002:c05::233]:32806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGWfS-0001Ig-54 for guix-devel@gnu.org; Fri, 24 Jun 2016 15:21:31 -0400 Received: by mail-yw0-x233.google.com with SMTP id v77so108374720ywg.0 for ; Fri, 24 Jun 2016 12:21:28 -0700 (PDT) In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Cc: guix-devel@gnu.org >From 234f4c35a2477f7da38156ca48388fdb2b48741d Mon Sep 17 00:00:00 2001 From: David Craven Date: Thu, 23 Jun 2016 19:44:38 +0200 Subject: [PATCH] guix: Rename NIX_CONF_DIR to GUIX_CONFIGURATION_DIRECTORY. Search and replace NIX_CONF_DIR for compatibility with nix. * build-aux/test-env.in * gnu/packages/patches/hydra-automake-1.15.patch * guix/config.scm.in * nix/libstore/globals.cc * nix/local.mk --- build-aux/test-env.in | 12 ++++++------ gnu/packages/patches/hydra-automake-1.15.patch | 4 ++-- guix/config.scm.in | 4 ++-- nix/libstore/globals.cc | 2 +- nix/local.mk | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-aux/test-env.in b/build-aux/test-env.in index c153763..1657556 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -69,16 +69,16 @@ then fi # The configuration directory, for import/export signing keys. - NIX_CONF_DIR=3D"@GUIX_TEST_ROOT@/etc" - if [ ! -d "$NIX_CONF_DIR" ] + GUIX_CONFIGURATION_DIRECTORY=3D"@GUIX_TEST_ROOT@/etc" + if [ ! -d "$GUIX_CONFIGURATION_DIRECTORY" ] then # Copy the keys so that the secret key has the right permissions (the # daemon errors out when this is not the case.) - mkdir -p "$NIX_CONF_DIR" + mkdir -p "$GUIX_CONFIGURATION_DIRECTORY" cp "@abs_top_srcdir@/tests/signing-key.sec" \ "@abs_top_srcdir@/tests/signing-key.pub" \ - "$NIX_CONF_DIR" - chmod 400 "$NIX_CONF_DIR/signing-key.sec" + "$GUIX_CONFIGURATION_DIRECTORY" + chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec" fi # A place to store data of the substituter. @@ -100,7 +100,7 @@ then NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ - NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS + GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS # Launch the daemon without chroot support because is may be # unavailable, for instance if we're not running as root. diff --git a/gnu/packages/patches/hydra-automake-1.15.patch b/gnu/packages/patches/hydra-automake-1.15.patch index 0d8fa98..91c7b92 100644 --- a/gnu/packages/patches/hydra-automake-1.15.patch +++ b/gnu/packages/patches/hydra-automake-1.15.patch @@ -23,7 +23,7 @@ Automake's parallel test harness. - HYDRA_HOME=3D"$(top_srcdir)/src" \ - HYDRA_CONFIG=3D \ - NIX_REMOTE=3D \ -- NIX_CONF_DIR=3D"$(abs_builddir)/nix/etc/nix" \ +- GUIX_CONFIGURATION_DIRECTORY=3D"$(abs_builddir)/nix/etc/nix" \ - NIX_STATE_DIR=3D"$(abs_builddir)/nix/var/nix" \ - NIX_MANIFESTS_DIR=3D"$(abs_builddir)/nix/var/nix/manifests" \ - NIX_STORE_DIR=3D"$(abs_builddir)/nix/store" \ @@ -39,7 +39,7 @@ Automake's parallel test harness. + HYDRA_HOME=3D"$(top_srcdir)/src"; export HYDRA_HOME; \ + HYDRA_CONFIG=3D; export HYDRA_CONFIG; \ + NIX_REMOTE=3D; export NIX_REMOTE; \ -+ NIX_CONF_DIR=3D"$(abs_builddir)/nix/etc/nix"; export NIX_CONF_DIR; \ ++ GUIX_CONFIGURATION_DIRECTORY=3D"$(abs_builddir)/nix/etc/nix"; export GUIX_CONFIGURATION_DIRECTORY; \ + NIX_STATE_DIR=3D"$(abs_builddir)/nix/var/nix"; export NIX_STATE_DIR; \ + NIX_MANIFESTS_DIR=3D"$(abs_builddir)/nix/var/nix/manifests"; export NIX_MANIFESTS_DIR; \ + NIX_STORE_DIR=3D"$(abs_builddir)/nix/store"; export NIX_STORE_DIR; \ diff --git a/guix/config.scm.in b/guix/config.scm.in index d7df9f7..adffa0c 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -59,8 +59,8 @@ (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")) (define %config-directory - ;; This must match `NIX_CONF_DIR' as defined in `nix/local.mk'. - (or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix")) + ;; This must match `GUIX_CONFIGURATION_DIRECTORY' as defined in `nix/local.mk'. + (or (getenv "GUIX_CONFIGURATION_DIRECTORY") "@guix_sysconfdir@/guix")) (define %guix-register-program ;; The 'guix-register' program. diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 84fc885..65dad24 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -67,7 +67,7 @@ void Settings::processEnvironment() nixLogDir =3D canonPath(getEnv("NIX_LOG_DIR", NIX_LOG_DIR)); nixStateDir =3D canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR)); nixDBPath =3D getEnv("NIX_DB_DIR", nixStateDir + "/db"); - nixConfDir =3D canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR)); + nixConfDir =3D canonPath(getEnv("GUIX_CONFIGURATION_DIRECTORY", GUIX_CONFIGURATION_DIRECTORY)); nixLibexecDir =3D canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)= ); nixBinDir =3D canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); nixDaemonSocketFile =3D canonPath(nixStateDir + DEFAULT_SOCKET_PATH); diff --git a/nix/local.mk b/nix/local.mk index 07a92f7..b0e9bc1 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -106,7 +106,7 @@ libstore_a_CPPFLAGS =3D \ -DNIX_DATA_DIR=3D\"$(datadir)\" \ -DNIX_STATE_DIR=3D\"$(localstatedir)/guix\" \ -DNIX_LOG_DIR=3D\"$(localstatedir)/log/guix\" \ - -DNIX_CONF_DIR=3D\"$(sysconfdir)/guix\" \ + -DGUIX_CONFIGURATION_DIRECTORY=3D\"$(sysconfdir)/guix\" \ -DNIX_LIBEXEC_DIR=3D\"$(libexecdir)\" \ -DNIX_BIN_DIR=3D\"$(bindir)\" \ -DOPENSSL_PATH=3D"\"guix-authenticate\"" \ --=20 2.8.3 On Fri, Jun 24, 2016 at 5:02 PM, David Craven wrote: > Did you have a test failure? I get one on `tests/substitute.scm`. > > After `sudo guix archive --generate-key` I still get a test failure, > but `sudo make check TESTS=3D"tests/substitute.scm"` remedied it. > > Who's supposed to own the keys? A private key in /etc shouldn't be > owned by anyone other than root should it? > > But I don't think this has anything to do with my patch so I don't know > why you'd get this failure. > > > I don't think I missed any references, quoting ng0: > >> nix/libstore/globals.cc | 2 +- >> nix/local.mk | 2 +- > > Are there any other references? That would be a serious bug in my text > editor ;-) > > On Fri, Jun 24, 2016 at 2:21 PM, Ludovic Court=C3=A8s wrot= e: >> Hello! >> >> David Craven skribis: >> >>> First I have to say `guix build guix --with-source=3D.` is totally awes= ome!! >> >> Thanks! Don=E2=80=99t miss --with-input too! ;-) >> >> https://www.gnu.org/software/guix/manual/html_node/Package-Transformat= ion-Options.html >> >>> I couldn't find any documentation on the git commit message >>> convention, hope I did it right. >> >> ng0 already replied on that point; you=E2=80=99re almost there. :-) >> >> The patch omits to change references to =E2=80=98NIX_CONF_DIR=E2=80=99 i= n the *.cc and >> *.h files under nix/. Could you update it accordingly? >> >> While at it, can you make it =E2=80=98GUIX_CONFIGURATION_DIRECTORY=E2=80= =99 instead of >> =E2=80=98GUIX_CONF_DIR=E2=80=99 (following the Scheme tradition of avoid= ing >> abbreviations ;-))? >> >> Last, please run the test suite to make sure nothing goes wrong: >> >> https://www.gnu.org/software/guix/manual/html_node/Running-the-Test-Su= ite.html >> >> Thank you for looking into it! >> >> Ludo=E2=80=99.