diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-29 22:51:23 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-29 22:51:23 +0200 |
| commit | f1728d43460e63b106dd446e70001d8e100eaf6d (patch) | |
| tree | 9d211fabf9e200743be49e25d108d58ed88d2f60 /build-aux/hydra | |
| parent | cda7f4bc8ecf331d623c7d37b01931a46830c648 (diff) | |
| parent | 373cc3b74a6ad33fddf75c2d773a97b1775bda8e (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 3 | ||||
| -rw-r--r-- | build-aux/hydra/guix-modular.scm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 654f3ecf3e..b1554ced4c 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -43,7 +43,8 @@ (and=> (assoc-ref (current-source-location) 'filename) (lambda (file) - (let ((dir (string-append (dirname file) "/../.."))) + (let ((dir (canonicalize-path + (string-append (dirname file) "/../..")))) (format (current-error-port) "prepending ~s to the load path~%" dir) (set! %load-path (cons dir %load-path)))))) diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index 58e09e1831..9ff9e090fc 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -46,6 +46,7 @@ for SYSTEM. Use VERSION as the version identifier." `((derivation . ,(derivation-file-name (run-with-store store (build source #:version version #:system system + #:pull-version 1 #:guile-version "2.2")))) ;the latest 2.2.x (description . "Modular Guix") (long-description |