[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Fix remaining references to "substitute-binary".
From: |
Taylan Ulrich B. |
Subject: |
01/01: Fix remaining references to "substitute-binary". |
Date: |
Fri, 27 Mar 2015 18:41:22 +0000 |
taylanub pushed a commit to branch master
in repository guix.
commit 122c87ead0452a3042f1d42db9986a41218732cf
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date: Thu Mar 26 23:34:21 2015 +0100
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.
---
nix/nix-daemon/guix-daemon.cc | 2 +-
po/guix/POTFILES.in | 2 +-
tests/guix-daemon.sh | 4 ++--
tests/guix-system.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index ca39c2f..f096ed5 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -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);
}
}
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index 619f6f9..39115f9 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -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
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh
index a73c9e2..87f17de 100644
--- a/tests/guix-daemon.sh
+++ b/tests/guix-daemon.sh
@@ -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 '
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 76e722f..1b77d1a 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -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