diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
| commit | cc0725914e74c4c4dec369f3e7cdb6f201b3fecd (patch) | |
| tree | e68b452ed625a2db8ed10914fb0968fdc36c655d /build-aux/hydra/gnu-system.scm | |
| parent | a25b6880f1398ad36aea1d0e4e4105936a8b7e70 (diff) | |
| parent | ce195ba12277ec4286ad0d8ddf7294655987ea9d (diff) | |
Merge branch 'master' into python-tests
Diffstat (limited to 'build-aux/hydra/gnu-system.scm')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index cddda85eac..e406ed94c5 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -125,12 +125,6 @@ SYSTEM." "arm-linux-gnueabihf" "i686-w64-mingw32")) -(define (demo-os) - "Return the \"demo\" 'operating-system' structure." - (let* ((dir (dirname (assoc-ref (current-source-location) 'filename))) - (file (string-append dir "/demo-os.scm"))) - (read-operating-system file))) - (define %guixsd-supported-systems '("x86_64-linux" "i686-linux")) @@ -156,14 +150,7 @@ system.") (expt 2 20)) (if (member system %guixsd-supported-systems) - (list (->job 'qemu-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (system-qemu-image (demo-os) - #:disk-image-size - (* 1400 MiB))))) ; 1.4 GiB - (->job 'usb-image + (list (->job 'usb-image (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) |