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/build-system/python.scm | |
| parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
| parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'guix/build-system/python.scm')
| -rw-r--r-- | guix/build-system/python.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index 7e26864653..dfb8b4a137 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; @@ -141,7 +141,7 @@ provides a 'setup.py' file as its build system." ((and (? string?) (? derivation-path?)) guile) (#f ; the default - (let* ((distro (resolve-interface '(gnu packages base))) + (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) (package-derivation store guile system))))) |