diff options
author | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
commit | c00a9fbfef75d2fc08485f8158ec331bfa99d5ec (patch) | |
tree | 4737817ee787c4ec8222ea13d3cfecb2ac98b673 /guix/gexp.scm | |
parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
download | patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'guix/gexp.scm')
-rw-r--r-- | guix/gexp.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 6d1f328aef..e31324e101 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -429,7 +429,7 @@ package/derivation references." (define (default-guile) ;; Lazily resolve 'guile-final'. This module must not refer to (gnu …) ;; modules directly, to avoid circular dependencies, hence this hack. - (module-ref (resolve-interface '(gnu packages base)) + (module-ref (resolve-interface '(gnu packages commencement)) 'guile-final)) (define* (gexp->script name exp |