diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-03-15 10:25:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-03-15 10:25:10 +0100 |
| commit | f8ec8d96d657f95e71e0798124cdeb2c9217c7fa (patch) | |
| tree | e106eb309dc8cb86ac579da40fcb4fcbb7e4578a /tests/packages.scm | |
| parent | dba52a2bcbbc11887df47162b4dd16b46346e362 (diff) | |
| download | guix-f8ec8d96d657f95e71e0798124cdeb2c9217c7fa.tar guix-f8ec8d96d657f95e71e0798124cdeb2c9217c7fa.tar.gz | |
tests: Do not assume the bootstrap guile tarball is available locally.
Fixes <https://bugs.gnu.org/30824>.
Reported by Chris Marusich <cmmarusich@gmail.com>.
* tests/packages.scm ("package-source-derivation, snippet"): Use
'bootstrap-guile-origin' instead of assuming the bootstrap guile tarball
is available locally.
Diffstat (limited to 'tests/packages.scm')
| -rw-r--r-- | tests/packages.scm | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index b2fa21a874..9e19c3992e 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -377,24 +377,9 @@ (unless (network-reachable?) (test-skip 1)) (test-equal "package-source-derivation, snippet" "OK" - (let* ((file (search-bootstrap-binary (match (%current-system) - ("armhf-linux" - "guile-2.0.11.tar.xz") - ("aarch64-linux" - "guile-2.0.14.tar.xz") - (_ - "guile-2.0.9.tar.xz")) - (%current-system))) - (sha256 (call-with-input-file file port-sha256)) - (fetch (lambda* (url hash-algo hash - #:optional name #:key system) - (pk 'fetch url hash-algo hash name system) - (interned-file url))) - (source (bootstrap-origin + (let* ((source (bootstrap-origin (origin - (method fetch) - (uri file) - (sha256 sha256) + (inherit (bootstrap-guile-origin (%current-system))) (patch-inputs `(("tar" ,%bootstrap-coreutils&co) ("xz" ,%bootstrap-coreutils&co) |