2013-02-20 23:46:38 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2018-05-30 17:50:21 +02:00
|
|
|
|
;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
2017-03-01 22:11:02 +01:00
|
|
|
|
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
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)
|
2015-10-26 22:17:25 +01:00
|
|
|
|
#:use-module (guix utils)
|
2015-09-10 11:37:36 +02:00
|
|
|
|
#:use-module (guix scripts)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix config)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix derivations)
|
2018-05-30 17:50:21 +02:00
|
|
|
|
#:use-module (guix profiles)
|
2014-09-18 18:42:39 +02:00
|
|
|
|
#:use-module (guix gexp)
|
2017-08-01 23:38:07 +02:00
|
|
|
|
#:use-module (guix grafts)
|
2014-09-18 18:42:39 +02:00
|
|
|
|
#:use-module (guix monads)
|
2017-05-09 15:45:04 +02:00
|
|
|
|
#:use-module (guix scripts build)
|
2018-05-30 17:50:21 +02:00
|
|
|
|
#:autoload (guix self) (whole-package)
|
|
|
|
|
#:autoload (gnu packages ssh) (guile-ssh)
|
|
|
|
|
#:autoload (gnu packages tls) (gnutls)
|
|
|
|
|
#:use-module ((guix scripts package) #:select (build-and-use-profile))
|
2014-11-09 22:32:21 +01:00
|
|
|
|
#:use-module ((guix build utils)
|
|
|
|
|
#:select (with-directory-excursion delete-file-recursively))
|
2017-03-01 22:11:02 +01:00
|
|
|
|
#:use-module ((guix build download)
|
|
|
|
|
#:select (%x509-certificate-directory))
|
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))
|
2017-03-01 22:11:02 +01:00
|
|
|
|
#:use-module ((gnu packages certs) #:select (le-certs))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2017-07-28 17:38:19 +02:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:use-module (srfi srfi-37)
|
2014-11-09 22:32:21 +01:00
|
|
|
|
#:use-module (ice-9 match)
|
2013-02-20 23:46:38 +01:00
|
|
|
|
#:export (guix-pull))
|
|
|
|
|
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(module-autoload! (resolve-module '(guix scripts pull))
|
|
|
|
|
'(git) '(git-error? set-tls-certificate-locations!)
|
|
|
|
|
'(guix git) '(latest-repository-commit))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(define (ensure-guile-git!)
|
|
|
|
|
;; Previously Guile-Git was not a prerequisite. Thus, someone running 'guix
|
|
|
|
|
;; pull' on an old installation may be lacking Guile-Git. To address this,
|
|
|
|
|
;; we autoload things that depend on Guile-Git and check in the entry point
|
|
|
|
|
;; whether Guile-Git is available.
|
|
|
|
|
;;
|
|
|
|
|
;; TODO: Remove this hack when Guile-Git is widespread or enforced.
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(unless (false-if-exception (resolve-interface '(git)))
|
|
|
|
|
(leave (G_ "Guile-Git is missing but it is now required by 'guix pull'.
|
|
|
|
|
Install it by running:
|
|
|
|
|
|
|
|
|
|
guix package -i ~a
|
|
|
|
|
export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH
|
|
|
|
|
export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH
|
|
|
|
|
\n")
|
|
|
|
|
(match (effective-version)
|
|
|
|
|
("2.0" "guile2.0-git")
|
|
|
|
|
(_ "guile-git"))
|
|
|
|
|
(effective-version)
|
|
|
|
|
(effective-version)))
|
|
|
|
|
|
|
|
|
|
;; XXX: For unclear reasons this is needed for
|
|
|
|
|
;; 'set-tls-certificate-locations!'.
|
|
|
|
|
(module-use! (resolve-module '(guix scripts pull))
|
|
|
|
|
(resolve-interface '(git))))
|
|
|
|
|
|
|
|
|
|
(define %repository-url
|
2017-10-04 11:01:41 +02:00
|
|
|
|
(or (getenv "GUIX_PULL_URL") "https://git.savannah.gnu.org/git/guix.git"))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Command-line options.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %default-options
|
|
|
|
|
;; Alist of default option values.
|
2017-07-28 17:38:19 +02:00
|
|
|
|
`((repository-url . ,%repository-url)
|
|
|
|
|
(ref . (branch . "origin/master"))
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(system . ,(%current-system))
|
|
|
|
|
(substitutes? . #t)
|
2017-12-07 22:49:08 +01:00
|
|
|
|
(build-hook? . #t)
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(graft? . #t)
|
|
|
|
|
(verbosity . 0)))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
|
|
|
|
(define (show-help)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "Usage: guix pull [OPTION]...
|
2013-02-20 23:46:38 +01:00
|
|
|
|
Download and deploy the latest version of Guix.\n"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2013-02-20 23:46:38 +01:00
|
|
|
|
--verbose produce verbose output"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2017-07-28 17:38:19 +02:00
|
|
|
|
--url=URL download from the Git repository at URL"))
|
|
|
|
|
(display (G_ "
|
|
|
|
|
--commit=COMMIT download the specified COMMIT"))
|
|
|
|
|
(display (G_ "
|
|
|
|
|
--branch=BRANCH download the tip of the specified BRANCH"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2013-02-20 23:46:38 +01:00
|
|
|
|
--bootstrap use the bootstrap Guile to build the new Guix"))
|
|
|
|
|
(newline)
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(show-build-options-help)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2013-02-20 23:46:38 +01:00
|
|
|
|
-h, --help display this help and exit"))
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(display (G_ "
|
2013-02-20 23:46:38 +01:00
|
|
|
|
-V, --version display version information and exit"))
|
|
|
|
|
(newline)
|
|
|
|
|
(show-bug-report-information))
|
|
|
|
|
|
|
|
|
|
(define %options
|
|
|
|
|
;; Specifications of the command-line options.
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(cons* (option '("verbose") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'verbose? #t result)))
|
|
|
|
|
(option '("url") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(alist-cons 'repository-url arg
|
|
|
|
|
(alist-delete 'repository-url result))))
|
|
|
|
|
(option '("commit") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'ref `(commit . ,arg) result)))
|
|
|
|
|
(option '("branch") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'ref `(branch . ,(string-append "origin/" arg))
|
|
|
|
|
result)))
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(option '(#\n "dry-run") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
|
|
|
|
(option '("bootstrap") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'bootstrap? #t result)))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2017-05-09 15:45:04 +02:00
|
|
|
|
(option '(#\h "help") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-help)
|
|
|
|
|
(exit 0)))
|
|
|
|
|
(option '(#\V "version") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-version-and-exit "guix pull")))
|
|
|
|
|
|
|
|
|
|
%standard-build-options))
|
2013-02-20 23:46:38 +01:00
|
|
|
|
|
2014-09-18 18:42:39 +02:00
|
|
|
|
(define what-to-build
|
|
|
|
|
(store-lift show-what-to-build))
|
2017-11-21 23:51:59 +01:00
|
|
|
|
(define indirect-root-added
|
|
|
|
|
(store-lift add-indirect-root))
|
2014-09-18 18:42:39 +02:00
|
|
|
|
|
2014-11-09 22:32:21 +01:00
|
|
|
|
(define %self-build-file
|
|
|
|
|
;; The file containing code to build Guix. This serves the same purpose as
|
|
|
|
|
;; a makefile, and, similarly, is intended to always keep this name.
|
|
|
|
|
"build-aux/build-self.scm")
|
|
|
|
|
|
2018-05-30 17:50:21 +02:00
|
|
|
|
(define %pull-version
|
|
|
|
|
;; This is the version of the 'guix pull' protocol. It specifies what's
|
|
|
|
|
;; expected from %SELF-BUILD-FILE. The initial version ("0") was when we'd
|
|
|
|
|
;; place a set of compiled Guile modules in ~/.config/guix/latest.
|
|
|
|
|
1)
|
|
|
|
|
|
2017-07-28 17:58:18 +02:00
|
|
|
|
(define* (build-from-source source
|
|
|
|
|
#:key verbose? commit)
|
2017-07-28 17:38:19 +02:00
|
|
|
|
"Return a derivation to build Guix from SOURCE, using the self-build script
|
2017-07-28 17:58:18 +02:00
|
|
|
|
contained therein. Use COMMIT as the version string."
|
2014-11-09 22:32:21 +01:00
|
|
|
|
;; Running the self-build script makes it easier to update the build
|
|
|
|
|
;; procedure: the self-build script of the Guix-to-be-installed contains the
|
|
|
|
|
;; right dependencies, build procedure, etc., which the Guix-in-use may not
|
|
|
|
|
;; be know.
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(let* ((script (string-append source "/" %self-build-file))
|
|
|
|
|
(build (primitive-load script)))
|
2014-11-09 22:32:21 +01:00
|
|
|
|
;; BUILD must be a monadic procedure of at least one argument: the source
|
|
|
|
|
;; tree.
|
2018-05-30 17:50:21 +02:00
|
|
|
|
;;
|
|
|
|
|
;; Note: BUILD can return #f if it does not support %PULL-VERSION. In the
|
|
|
|
|
;; future we'll fall back to a previous version of the protocol when that
|
|
|
|
|
;; happens.
|
|
|
|
|
(build source #:verbose? verbose? #:version commit
|
|
|
|
|
#:pull-version %pull-version)))
|
|
|
|
|
|
|
|
|
|
(define (whole-package-for-legacy name modules)
|
|
|
|
|
"Return a full-blown Guix package for MODULES, a derivation that builds Guix
|
|
|
|
|
modules in the old ~/.config/guix/latest style."
|
|
|
|
|
(whole-package name modules
|
|
|
|
|
|
|
|
|
|
;; In the "old style", %SELF-BUILD-FILE would simply return a
|
|
|
|
|
;; derivation that builds modules. We have to infer what the
|
|
|
|
|
;; dependencies of these modules were.
|
|
|
|
|
(list guile-json guile-git guile-bytestructures
|
|
|
|
|
guile-ssh gnutls)))
|
|
|
|
|
|
2018-06-09 11:31:18 +02:00
|
|
|
|
(define* (derivation->manifest-entry drv
|
|
|
|
|
#:key url branch commit)
|
|
|
|
|
"Return a manifest entry for DRV, which represents Guix at COMMIT. Record
|
|
|
|
|
URL, BRANCH, and COMMIT as a property in the manifest entry."
|
2018-05-30 17:50:21 +02:00
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(what-to-build (list drv))
|
|
|
|
|
(built-derivations (list drv))
|
|
|
|
|
(let ((out (derivation->output-path drv)))
|
|
|
|
|
(return (manifest-entry
|
|
|
|
|
(name "guix")
|
|
|
|
|
(version (string-take commit 7))
|
|
|
|
|
(item (if (file-exists? (string-append out "/bin/guix"))
|
|
|
|
|
drv
|
|
|
|
|
(whole-package-for-legacy (string-append name "-"
|
|
|
|
|
version)
|
2018-06-09 11:31:18 +02:00
|
|
|
|
drv)))
|
|
|
|
|
(properties
|
|
|
|
|
`((source (repository
|
|
|
|
|
(version 0)
|
|
|
|
|
(url ,url)
|
|
|
|
|
(branch ,branch)
|
|
|
|
|
(commit ,commit))))))))))
|
2014-11-09 22:32:21 +01:00
|
|
|
|
|
2017-11-21 23:51:59 +01:00
|
|
|
|
(define* (build-and-install source config-dir
|
2018-06-09 11:31:18 +02:00
|
|
|
|
#:key verbose? url branch commit)
|
2017-11-21 23:51:59 +01:00
|
|
|
|
"Build the tool from SOURCE, and install it in CONFIG-DIR."
|
2018-05-30 17:50:21 +02:00
|
|
|
|
(define update-profile
|
|
|
|
|
(store-lift build-and-use-profile))
|
|
|
|
|
|
|
|
|
|
(mlet* %store-monad ((drv (build-from-source source
|
|
|
|
|
#:commit commit
|
|
|
|
|
#:verbose? verbose?))
|
2018-06-09 11:31:18 +02:00
|
|
|
|
(entry (derivation->manifest-entry drv
|
|
|
|
|
#:url url
|
|
|
|
|
#:branch branch
|
|
|
|
|
#:commit commit)))
|
2018-05-30 17:50:21 +02:00
|
|
|
|
(update-profile (string-append config-dir "/current")
|
|
|
|
|
(manifest (list entry)))))
|
2014-09-18 18:42:39 +02:00
|
|
|
|
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(define (honor-lets-encrypt-certificates! store)
|
|
|
|
|
"Tell Guile-Git to use the Let's Encrypt certificates."
|
|
|
|
|
(let* ((drv (package-derivation store le-certs))
|
|
|
|
|
(certs (string-append (derivation->output-path drv)
|
|
|
|
|
"/etc/ssl/certs")))
|
|
|
|
|
(build-derivations store (list drv))
|
|
|
|
|
|
|
|
|
|
;; In the past Guile-Git would not provide this procedure.
|
|
|
|
|
(if (module-defined? (resolve-interface '(git))
|
|
|
|
|
'set-tls-certificate-locations!)
|
|
|
|
|
(set-tls-certificate-locations! certs)
|
|
|
|
|
(begin
|
|
|
|
|
;; In this case we end up using whichever certificates OpenSSL
|
|
|
|
|
;; chooses to use: $SSL_CERT_FILE, $SSL_CERT_DIR, or /etc/ssl/certs.
|
|
|
|
|
(warning (G_ "cannot enforce use of the Let's Encrypt \
|
|
|
|
|
certificates~%"))
|
|
|
|
|
(warning (G_ "please upgrade Guile-Git~%"))))))
|
|
|
|
|
|
|
|
|
|
(define (report-git-error error)
|
|
|
|
|
"Report the given Guile-Git error."
|
|
|
|
|
;; Prior to Guile-Git commit b6b2760c2fd6dfaa5c0fedb43eeaff06166b3134,
|
|
|
|
|
;; errors would be represented by integers.
|
|
|
|
|
(match error
|
|
|
|
|
((? integer? error) ;old Guile-Git
|
|
|
|
|
(leave (G_ "Git error ~a~%") error))
|
|
|
|
|
((? git-error? error) ;new Guile-Git
|
|
|
|
|
(leave (G_ "Git error: ~a~%") (git-error-message error)))))
|
|
|
|
|
|
|
|
|
|
(define-syntax-rule (with-git-error-handling body ...)
|
|
|
|
|
(catch 'git-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
body ...)
|
|
|
|
|
(lambda (key err)
|
|
|
|
|
(report-git-error err))))
|
|
|
|
|
|
2017-05-09 15:45:04 +02:00
|
|
|
|
|
2013-02-20 23:46:38 +01:00
|
|
|
|
(define (guix-pull . args)
|
2017-03-01 22:11:02 +01:00
|
|
|
|
(define (use-le-certs? url)
|
|
|
|
|
(string-prefix? "https://git.savannah.gnu.org/" url))
|
|
|
|
|
|
2013-03-07 19:29:12 +01:00
|
|
|
|
(with-error-handling
|
2017-07-28 17:38:19 +02:00
|
|
|
|
(with-git-error-handling
|
|
|
|
|
(let* ((opts (parse-command-line args %options
|
|
|
|
|
(list %default-options)))
|
|
|
|
|
(url (assoc-ref opts 'repository-url))
|
|
|
|
|
(ref (assoc-ref opts 'ref))
|
|
|
|
|
(cache (string-append (cache-directory) "/pull")))
|
|
|
|
|
(ensure-guile-git!)
|
|
|
|
|
|
|
|
|
|
(unless (assoc-ref opts 'dry-run?) ;XXX: not very useful
|
|
|
|
|
(with-store store
|
2017-08-01 23:38:07 +02:00
|
|
|
|
(parameterize ((%graft? (assoc-ref opts 'graft?)))
|
|
|
|
|
(set-build-options-from-command-line store opts)
|
2017-07-28 17:38:19 +02:00
|
|
|
|
|
2017-08-01 23:38:07 +02:00
|
|
|
|
;; For reproducibility, always refer to the LE certificates when we
|
|
|
|
|
;; know we're talking to Savannah.
|
|
|
|
|
(when (use-le-certs? url)
|
|
|
|
|
(honor-lets-encrypt-certificates! store))
|
2017-07-28 17:38:19 +02:00
|
|
|
|
|
2017-08-01 23:38:07 +02:00
|
|
|
|
(format (current-error-port)
|
|
|
|
|
(G_ "Updating from Git repository at '~a'...~%")
|
|
|
|
|
url)
|
2017-07-28 17:38:19 +02:00
|
|
|
|
|
2017-08-01 23:38:07 +02:00
|
|
|
|
(let-values (((checkout commit)
|
|
|
|
|
(latest-repository-commit store url
|
|
|
|
|
#:ref ref
|
|
|
|
|
#:cache-directory cache)))
|
2014-11-09 22:32:21 +01:00
|
|
|
|
|
2017-08-01 23:38:07 +02:00
|
|
|
|
(format (current-error-port)
|
|
|
|
|
(G_ "Building from Git commit ~a...~%")
|
|
|
|
|
commit)
|
|
|
|
|
(parameterize ((%guile-for-build
|
|
|
|
|
(package-derivation
|
|
|
|
|
store
|
|
|
|
|
(if (assoc-ref opts 'bootstrap?)
|
|
|
|
|
%bootstrap-guile
|
2017-12-03 22:13:33 +01:00
|
|
|
|
(canonical-package guile-2.2)))))
|
2017-11-21 23:51:59 +01:00
|
|
|
|
(run-with-store store
|
|
|
|
|
(build-and-install checkout (config-directory)
|
2018-06-09 11:31:18 +02:00
|
|
|
|
#:url url
|
|
|
|
|
#:branch (match ref
|
|
|
|
|
(('branch . branch)
|
|
|
|
|
branch)
|
|
|
|
|
(_ #f))
|
2017-11-21 23:51:59 +01:00
|
|
|
|
#:commit commit
|
|
|
|
|
#:verbose?
|
|
|
|
|
(assoc-ref opts 'verbose?))))))))))))
|
2014-11-09 22:32:21 +01:00
|
|
|
|
|
|
|
|
|
;;; pull.scm ends here
|