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.
Showing
- build-aux/hydra/gnu-system.scm 11 additions, 7 deletionsbuild-aux/hydra/gnu-system.scm
- doc/guix.texi 7 additions, 4 deletionsdoc/guix.texi
- gnu/services/avahi.scm 2 additions, 1 deletiongnu/services/avahi.scm
- gnu/services/base.scm 1 addition, 2 deletionsgnu/services/base.scm
- gnu/services/dbus.scm 2 additions, 1 deletiongnu/services/dbus.scm
- gnu/services/dmd.scm 3 additions, 1 deletiongnu/services/dmd.scm
- gnu/services/networking.scm 2 additions, 1 deletiongnu/services/networking.scm
- gnu/services/ssh.scm 3 additions, 2 deletionsgnu/services/ssh.scm
- gnu/services/xorg.scm 2 additions, 1 deletiongnu/services/xorg.scm
- gnu/system/install.scm 2 additions, 1 deletiongnu/system/install.scm
- gnu/system/linux-initrd.scm 2 additions, 1 deletiongnu/system/linux-initrd.scm
- gnu/system/shadow.scm 2 additions, 1 deletiongnu/system/shadow.scm
- guix/derivations.scm 41 additions, 26 deletionsguix/derivations.scm
- guix/download.scm 2 additions, 2 deletionsguix/download.scm
- guix/gexp.scm 2 additions, 5 deletionsguix/gexp.scm
- guix/git-download.scm 2 additions, 1 deletionguix/git-download.scm
- guix/monad-repl.scm 19 additions, 7 deletionsguix/monad-repl.scm
- guix/monads.scm 1 addition, 136 deletionsguix/monads.scm
- guix/packages.scm 55 additions, 3 deletionsguix/packages.scm
- guix/profiles.scm 2 additions, 1 deletionguix/profiles.scm
Loading
Please register or sign in to comment