2013-02-20 23:46:38 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
|
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
2013-02-20 23:46:38 +01:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (guix scripts pull)
|
|
|
|
|
#:use-module (guix ui)
|
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix config)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix derivations)
|
2013-04-27 11:40:18 +02:00
|
|
|
|
#:use-module (guix download)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:use-module (gnu packages base)
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
|
#:use-module (gnu packages guile)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:use-module ((gnu packages bootstrap)
|
|
|
|
|
#:select (%bootstrap-guile))
|
|
|
|
|
#:use-module (gnu packages compression)
|
|
|
|
|
#:use-module (gnu packages gnupg)
|
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
|
#:use-module (srfi srfi-37)
|
|
|
|
|
#:export (guix-pull))
|
|
|
|
|
|
|
|
|
|
(define %snapshot-url
|
2013-03-31 12:46:28 +02:00
|
|
|
|
;; "http://hydra.gnu.org/job/guix/master/tarball/latest/download"
|
|
|
|
|
"http://git.savannah.gnu.org/cgit/guix.git/snapshot/guix-master.tar.gz"
|
2013-02-20 23:46:38 +01:00
|
|
|
|
)
|
|
|
|
|
|
2014-09-05 23:11:04 +02:00
|
|
|
|
(define* (unpack store tarball #:key verbose?)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
"Return a derivation that unpacks TARBALL into STORE and compiles Scheme
|
|
|
|
|
files."
|
|
|
|
|
(define builder
|
2014-09-05 23:11:04 +02:00
|
|
|
|
`(begin
|
2013-12-16 23:07:17 +01:00
|
|
|
|
(use-modules (guix build pull))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2013-12-16 23:07:17 +01:00
|
|
|
|
(build-guix (assoc-ref %outputs "out")
|
|
|
|
|
(assoc-ref %build-inputs "tarball")
|
2014-09-05 23:11:04 +02:00
|
|
|
|
|
|
|
|
|
;; XXX: This is not perfect, enabling VERBOSE? means
|
|
|
|
|
;; building a different derivation.
|
|
|
|
|
#:debug-port (if ',verbose?
|
|
|
|
|
(current-error-port)
|
|
|
|
|
(%make-void-port "w"))
|
2013-12-16 23:07:17 +01:00
|
|
|
|
#:tar (assoc-ref %build-inputs "tar")
|
|
|
|
|
#:gzip (assoc-ref %build-inputs "gzip")
|
|
|
|
|
#:gcrypt (assoc-ref %build-inputs "gcrypt"))))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
derivations: Use more keyword parameters for 'build-expression->derivation'.
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
2013-12-04 16:07:36 +01:00
|
|
|
|
(build-expression->derivation store "guix-latest" builder
|
|
|
|
|
#:inputs
|
2013-02-20 23:46:38 +01:00
|
|
|
|
`(("tar" ,(package-derivation store tar))
|
|
|
|
|
("gzip" ,(package-derivation store gzip))
|
|
|
|
|
("gcrypt" ,(package-derivation store
|
|
|
|
|
libgcrypt))
|
|
|
|
|
("tarball" ,tarball))
|
2013-12-16 23:07:17 +01:00
|
|
|
|
#:modules '((guix build pull)
|
|
|
|
|
(guix build utils))))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Command-line options.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %default-options
|
|
|
|
|
;; Alist of default option values.
|
2013-10-12 17:14:41 +02:00
|
|
|
|
`((tarball-url . ,%snapshot-url)))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
|
|
|
|
(define (show-help)
|
|
|
|
|
(display (_ "Usage: guix pull [OPTION]...
|
|
|
|
|
Download and deploy the latest version of Guix.\n"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
--verbose produce verbose output"))
|
2013-10-12 17:14:41 +02:00
|
|
|
|
(display (_ "
|
|
|
|
|
--url=URL download the Guix tarball from URL"))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--bootstrap use the bootstrap Guile to build the new Guix"))
|
|
|
|
|
(newline)
|
|
|
|
|
(display (_ "
|
|
|
|
|
-h, --help display this help and exit"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-V, --version display version information and exit"))
|
|
|
|
|
(newline)
|
|
|
|
|
(show-bug-report-information))
|
|
|
|
|
|
|
|
|
|
(define %options
|
|
|
|
|
;; Specifications of the command-line options.
|
|
|
|
|
(list (option '("verbose") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'verbose? #t result)))
|
2013-10-12 17:14:41 +02:00
|
|
|
|
(option '("url") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'tarball-url arg
|
|
|
|
|
(alist-delete 'tarball-url result))))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
(option '("bootstrap") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'bootstrap? #t result)))
|
|
|
|
|
|
|
|
|
|
(option '(#\h "help") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-help)
|
|
|
|
|
(exit 0)))
|
|
|
|
|
(option '(#\V "version") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-version-and-exit "guix pull")))))
|
|
|
|
|
|
|
|
|
|
(define (guix-pull . args)
|
|
|
|
|
(define (parse-options)
|
|
|
|
|
;; Return the alist of option values.
|
2013-04-27 16:46:39 +02:00
|
|
|
|
(args-fold* args %options
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(leave (_ "~A: unrecognized option~%") name))
|
|
|
|
|
(lambda (arg result)
|
|
|
|
|
(leave (_ "~A: unexpected argument~%") arg))
|
|
|
|
|
%default-options))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2013-03-07 19:29:12 +01:00
|
|
|
|
(with-error-handling
|
2013-10-12 17:14:41 +02:00
|
|
|
|
(let* ((opts (parse-options))
|
|
|
|
|
(store (open-connection))
|
|
|
|
|
(url (assoc-ref opts 'tarball-url)))
|
|
|
|
|
(let ((tarball (download-to-store store url "guix-latest.tar.gz")))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
(unless tarball
|
|
|
|
|
(leave (_ "failed to download up-to-date source, exiting\n")))
|
|
|
|
|
(parameterize ((%guile-for-build
|
|
|
|
|
(package-derivation store
|
|
|
|
|
(if (assoc-ref opts 'bootstrap?)
|
|
|
|
|
%bootstrap-guile
|
2014-09-05 23:11:04 +02:00
|
|
|
|
(canonical-package guile-2.0)))))
|
2013-09-21 22:12:20 +02:00
|
|
|
|
(let* ((config-dir (config-directory))
|
2014-09-05 23:11:04 +02:00
|
|
|
|
(source (unpack store tarball
|
|
|
|
|
#:verbose? (assoc-ref opts 'verbose?)))
|
2013-09-21 22:12:20 +02:00
|
|
|
|
(source-dir (derivation->output-path source)))
|
2013-02-22 21:08:06 +01:00
|
|
|
|
(if (show-what-to-build store (list source))
|
|
|
|
|
(if (build-derivations store (list source))
|
|
|
|
|
(let ((latest (string-append config-dir "/latest")))
|
|
|
|
|
(add-indirect-root store latest)
|
|
|
|
|
(switch-symlinks latest source-dir)
|
|
|
|
|
(format #t
|
|
|
|
|
(_ "updated ~a successfully deployed under `~a'~%")
|
|
|
|
|
%guix-package-name latest)
|
|
|
|
|
#t)
|
|
|
|
|
(leave (_ "failed to update Guix, check the build log~%")))
|
|
|
|
|
(begin
|
|
|
|
|
(display (_ "Guix already up to date\n"))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#t))))))))
|