rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix remaining references to "substitute-binary".

Browse Source 
* 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.
This commit is contained in:
Taylan Ulrich Bayırlı/Kammer 2015-03-26 23:34:21 +01:00
parent 24066017a9
commit 122c87ead0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/nix-daemon/guix-daemon.cc
View File

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

2
po/guix/POTFILES.in
View File

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

4
tests/guix-daemon.sh
View File

@ -17,7 +17,7 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. # 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 set -e
@ -51,7 +51,7 @@ Deriver: $drv
EOF EOF
# Remove the cached narinfo. # 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. # Make sure we see the substitute.
guile -c ' guile -c '

2
tests/guix-system.sh
View File

@ -17,7 +17,7 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. # 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 set -e