diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-14 13:34:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-14 13:34:52 +0100 |
| commit | e87f0591f3117ed61285f33c7cc3548f72e551ad (patch) | |
| tree | fcfbd9ee742721b4d30ddc2b863436f5bd0c17c2 /build-aux/hydra | |
| parent | 1ed194646b22600e002ab8050905fd428d3036fc (diff) | |
| download | guix-e87f0591f3117ed61285f33c7cc3548f72e551ad.tar.gz guix-e87f0591f3117ed61285f33c7cc3548f72e551ad.zip | |
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index f62c9cb11d..cfef7dc425 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,14 +147,18 @@ system.") (if (member system '("x86_64-linux" "i686-linux")) (list (->job 'qemu-image (run-with-store store - (system-qemu-image (demo-os) - #:disk-image-size - (* 1400 MiB)))) ; 1.4 GiB + (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 (run-with-store store - (system-disk-image installation-os - #:disk-image-size - (* 800 MiB))))) + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (system-disk-image installation-os + #:disk-image-size + (* 800 MiB)))))) '())) (define job-name |