diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-14 21:35:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-14 21:57:39 +0200 |
| commit | 1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d (patch) | |
| tree | bb1a81684fe9f5c777b826ad10b104501b0e6189 /tests | |
| parent | 03d76577b96ba81c9921eb3a297d42db8644280b (diff) | |
| download | patches-1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d.tar patches-1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d.tar.gz | |
packages: Remove 'search-bootstrap-binary'.
* gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary):
Remove.
* gnu/packages/bootstrap.scm (bootstrap-executable): Export.
* guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary):
Export.
* tests/derivations.scm: Remove (gnu packages) import.
* tests/grafts.scm: Likewise.
* tests/guix-daemon.sh: Likewise.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/derivations.scm | 1 | ||||
| -rw-r--r-- | tests/grafts.scm | 3 | ||||
| -rw-r--r-- | tests/guix-daemon.sh | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index c421d094a4..25ba4c9fa0 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -29,7 +29,6 @@ #:use-module (guix tests http) #:use-module ((guix packages) #:select (package-derivation base32)) #:use-module ((guix build utils) #:select (executable-file?)) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module ((gnu packages guile) #:select (guile-1.8)) #:use-module (srfi srfi-1) diff --git a/tests/grafts.scm b/tests/grafts.scm index f85f3c6913..e5356decc5 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +24,6 @@ #:use-module (guix utils) #:use-module (guix grafts) #:use-module (guix tests) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index ce82cfd1e6..ca46e34ce9 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -141,7 +141,7 @@ daemon_pid=$! GUIX_DAEMON_SOCKET="$socket" \ guile -c ' - (use-modules (guix) (gnu packages) (guix tests)) + (use-modules (guix) (guix tests)) (with-store store (let* ((build (add-text-to-store store "build.sh" @@ -165,7 +165,7 @@ kill "$daemon_pid" # honored. client_code=' - (use-modules (guix) (gnu packages) (guix tests) (srfi srfi-34)) + (use-modules (guix) (guix tests) (srfi srfi-34)) (with-store store (let* ((build (add-text-to-store store "build.sh" |