daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables.
authorLudovic Courtès <ludo@gnu.org>
Sun, 3 Feb 2019 21:10:06 +0000 (22:10 +0100)
committerLudovic Courtès <ludo@gnu.org>
Sun, 3 Feb 2019 23:03:30 +0000 (00:03 +0100)
commita87d66f371da2a84d7bba1cae58b71c9c9af73aa
treeb76d7573152a73dad1c51ac6d41538fe3a40ff66
parentf73ab814a54033e12f2fe71bff672198210bb8c2
daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables.

Fixes <https://bugs.gnu.org/22459>.
Reported by Jeff Mickey <j@codemac.net>.

* guix/config.scm.in (%state-directory): Change NIX_STATE_DIR to
GUIX_STATE_DIRECTORY.
(%store-database-directory): Change NIX_DB_DIR to
GUIX_DATABASE_DIRECTORY.
* nix/libstore/globals.cc (Settings::processEnvironment): Likewise.
* guix/self.scm (make-config.scm): Likewise.
* build-aux/build-self.scm (make-config.scm): Likewise.
* build-aux/test-env.in: Likewise.
* tests/derivations.scm ("derivation #:leaked-env-vars"): Likewise.
* tests/guix-build.sh (GUIX_DAEMON_SOCKET): Likewise.
* tests/guix-daemon.sh (socket): Likewise.
build-aux/build-self.scm
build-aux/test-env.in
guix/config.scm.in
guix/self.scm
nix/libstore/globals.cc
tests/derivations.scm
tests/guix-build.sh
tests/guix-daemon.sh