Browse Source

Fix remaining references to "substitute-binary".

* nix/nix-daemon/guix-daemon.cc (main): Change substitute-binary to
  substitute.
* po/guix/POTFILES.in: Likewise.
* tests/guix-daemon.sh: Likewise.
* tests/guix-system.sh: Likewise.
gn-latest-20200428
Taylan Ulrich Bayırlı/Kammer 6 years ago
parent
commit
122c87ead0
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      nix/nix-daemon/guix-daemon.cc
  2. +1
    -1
      po/guix/POTFILES.in
  3. +2
    -2
      tests/guix-daemon.sh
  4. +1
    -1
      tests/guix-system.sh

+ 1
- 1
nix/nix-daemon/guix-daemon.cc View File

@ -310,7 +310,7 @@ main (int argc, char *argv[])
if (subs == "default")
{
string subst =
settings.nixLibexecDir + "/guix/substitute-binary";
settings.nixLibexecDir + "/guix/substitute";
setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1);
}
}


+ 1
- 1
po/guix/POTFILES.in View File

@ -9,7 +9,7 @@ guix/scripts/package.scm
guix/scripts/gc.scm
guix/scripts/hash.scm
guix/scripts/pull.scm
guix/scripts/substitute-binary.scm
guix/scripts/substitute.scm
guix/scripts/authenticate.scm
guix/scripts/system.scm
guix/scripts/lint.scm


+ 2
- 2
tests/guix-daemon.sh View File

@ -17,7 +17,7 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
#
# Test the daemon and its interaction with 'guix substitute-binary'.
# Test the daemon and its interaction with 'guix substitute'.
#
set -e
@ -51,7 +51,7 @@ Deriver: $drv
EOF
# Remove the cached narinfo.
rm -f "$XDG_CACHE_HOME/guix/substitute-binary/$hash_part"
rm -f "$XDG_CACHE_HOME/guix/substitute/$hash_part"
# Make sure we see the substitute.
guile -c '


+ 1
- 1
tests/guix-system.sh View File

@ -17,7 +17,7 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
#
# Test the daemon and its interaction with 'guix substitute-binary'.
# Test the daemon and its interaction with 'guix substitute'.
#
set -e


Loading…
Cancel
Save