diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-14 23:25:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-14 23:25:59 +0200 |
| commit | 7470df5ddfa092872836b7e746ba8af50998b6aa (patch) | |
| tree | a80014bd2ab00b0def1cca092f083feeb49d87ff /guix/build | |
| parent | d2e2f142268e32ea2d42990cddfc7df2136741f3 (diff) | |
| parent | 07254feb24d755a01c63b64c1df1bfb68ac469bf (diff) | |
| download | gnu-guix-7470df5ddfa092872836b7e746ba8af50998b6aa.tar gnu-guix-7470df5ddfa092872836b7e746ba8af50998b6aa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/pull.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/pull.scm b/guix/build/pull.scm index 4bad88fe42..e5b8797503 100644 --- a/guix/build/pull.scm +++ b/guix/build/pull.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> ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,10 +94,11 @@ exit with non-zero." (format #t "copying and compiling Guix to `~a'...~%" out) - ;; Copy everything under guix/ and gnu/ plus guix.scm. + ;; Copy everything under guix/ and gnu/ plus {guix,gnu}.scm. (copy-recursively "guix" (string-append out "/guix")) (copy-recursively "gnu" (string-append out "/gnu")) (copy-file "guix.scm" (string-append out "/guix.scm")) + (copy-file "gnu.scm" (string-append out "/gnu.scm")) ;; Add a fake (guix config) module to allow the other modules to be ;; compiled. The user's (guix config) is the one that will be used. |