ea68b3f652
Fixes a regression introduced in
5f7dd092ca where, upon completion, 'guix
pull' would fail (instead of printing the new/upgraded packages) with
ugly errors like:
successfully built /gnu/store/…-profile.drv
1 package in profile
Backtrace:
[…]
In guix/store.scm:
1605:24 1 (run-with-store _ _ #:guile-for-build _ #:system _ # _)
In unknown file:
0 (_ #<build-daemon 256.97 2476b40>)
ERROR: Wrong type to apply: #t
Reported by thorwil on #guix.
* guix/scripts/pull.scm (build-and-install): Add missing 'return' when
DRY-RUN? is wrong.
543 lines
22 KiB
Scheme
543 lines
22 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
||
;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||
;;;
|
||
;;; 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 utils)
|
||
#:use-module (guix status)
|
||
#:use-module (guix scripts)
|
||
#:use-module (guix store)
|
||
#:use-module (guix config)
|
||
#:use-module (guix packages)
|
||
#:use-module (guix derivations)
|
||
#:use-module (guix profiles)
|
||
#:use-module (guix gexp)
|
||
#:use-module (guix grafts)
|
||
#:use-module (guix memoization)
|
||
#:use-module (guix monads)
|
||
#:use-module (guix channels)
|
||
#:autoload (guix inferior) (open-inferior)
|
||
#:use-module (guix scripts build)
|
||
#:use-module (guix git)
|
||
#:use-module (git)
|
||
#:use-module (gnu packages)
|
||
#:use-module ((guix scripts package) #:select (build-and-use-profile))
|
||
#:use-module (gnu packages base)
|
||
#:use-module (gnu packages guile)
|
||
#:use-module ((gnu packages bootstrap)
|
||
#:select (%bootstrap-guile))
|
||
#:use-module ((gnu packages certs) #:select (le-certs))
|
||
#:use-module (srfi srfi-1)
|
||
#:use-module (srfi srfi-26)
|
||
#:use-module (srfi srfi-35)
|
||
#:use-module (srfi srfi-37)
|
||
#:use-module (ice-9 match)
|
||
#:use-module (ice-9 vlist)
|
||
#:export (display-profile-content
|
||
guix-pull))
|
||
|
||
|
||
;;;
|
||
;;; Command-line options.
|
||
;;;
|
||
|
||
(define %default-options
|
||
;; Alist of default option values.
|
||
`((system . ,(%current-system))
|
||
(substitutes? . #t)
|
||
(build-hook? . #t)
|
||
(print-build-trace? . #t)
|
||
(print-extended-build-trace? . #t)
|
||
(multiplexed-build-output? . #t)
|
||
(graft? . #t)
|
||
(verbosity . 0)))
|
||
|
||
(define (show-help)
|
||
(display (G_ "Usage: guix pull [OPTION]...
|
||
Download and deploy the latest version of Guix.\n"))
|
||
(display (G_ "
|
||
--verbose produce verbose output"))
|
||
(display (G_ "
|
||
-C, --channels=FILE deploy the channels defined in FILE"))
|
||
(display (G_ "
|
||
--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"))
|
||
(display (G_ "
|
||
-l, --list-generations[=PATTERN]
|
||
list generations matching PATTERN"))
|
||
(display (G_ "
|
||
-p, --profile=PROFILE use PROFILE instead of ~/.config/guix/current"))
|
||
(display (G_ "
|
||
-n, --dry-run show what would be pulled and built"))
|
||
(display (G_ "
|
||
--bootstrap use the bootstrap Guile to build the new Guix"))
|
||
(newline)
|
||
(show-build-options-help)
|
||
(display (G_ "
|
||
-h, --help display this help and exit"))
|
||
(display (G_ "
|
||
-V, --version display version information and exit"))
|
||
(newline)
|
||
(show-bug-report-information))
|
||
|
||
(define %options
|
||
;; Specifications of the command-line options.
|
||
(cons* (option '("verbose") #f #f
|
||
(lambda (opt name arg result)
|
||
(alist-cons 'verbose? #t result)))
|
||
(option '(#\C "channels") #t #f
|
||
(lambda (opt name arg result)
|
||
(alist-cons 'channel-file arg result)))
|
||
(option '(#\l "list-generations") #f #t
|
||
(lambda (opt name arg result)
|
||
(cons `(query list-generations ,(or arg ""))
|
||
result)))
|
||
(option '("url") #t #f
|
||
(lambda (opt name arg result)
|
||
(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)))
|
||
(option '(#\p "profile") #t #f
|
||
(lambda (opt name arg result)
|
||
(alist-cons 'profile (canonicalize-profile arg)
|
||
result)))
|
||
(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)))
|
||
|
||
(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))
|
||
|
||
(define what-to-build
|
||
(store-lift show-what-to-build))
|
||
(define indirect-root-added
|
||
(store-lift add-indirect-root))
|
||
|
||
(define (display-profile-news profile)
|
||
"Display what's up in PROFILE--new packages, and all that."
|
||
(match (memv (generation-number profile)
|
||
(reverse (profile-generations profile)))
|
||
((current previous _ ...)
|
||
(newline)
|
||
(let ((old (fold-packages (lambda (package result)
|
||
(alist-cons (package-name package)
|
||
(package-version package)
|
||
result))
|
||
'()))
|
||
(new (profile-package-alist
|
||
(generation-file-name profile current))))
|
||
(display-new/upgraded-packages old new
|
||
#:heading (G_ "New in this revision:\n"))))
|
||
(_ #t)))
|
||
|
||
(define* (build-and-install instances profile
|
||
#:key verbose? dry-run?)
|
||
"Build the tool from SOURCE, and install it in PROFILE. When DRY-RUN? is
|
||
true, display what would be built without actually building it."
|
||
(define update-profile
|
||
(store-lift build-and-use-profile))
|
||
|
||
(mlet %store-monad ((manifest (channel-instances->manifest instances)))
|
||
(mbegin %store-monad
|
||
(update-profile profile manifest
|
||
#:dry-run? dry-run?)
|
||
(munless dry-run?
|
||
(return (display-profile-news profile))))))
|
||
|
||
(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))
|
||
(set-tls-certificate-locations! certs)))
|
||
|
||
(define (honor-x509-certificates store)
|
||
"Use the right X.509 certificates for Git checkouts over HTTPS."
|
||
;; On distros such as CentOS 7, /etc/ssl/certs contains only a couple of
|
||
;; files (instead of all the certificates) among which "ca-bundle.crt". On
|
||
;; other distros /etc/ssl/certs usually contains the whole set of
|
||
;; certificates along with "ca-certificates.crt". Try to choose the right
|
||
;; one.
|
||
(let ((file (letrec-syntax ((choose
|
||
(syntax-rules ()
|
||
((_ file rest ...)
|
||
(let ((f file))
|
||
(if (and f (file-exists? f))
|
||
f
|
||
(choose rest ...))))
|
||
((_)
|
||
#f))))
|
||
(choose (getenv "SSL_CERT_FILE")
|
||
"/etc/ssl/certs/ca-certificates.crt"
|
||
"/etc/ssl/certs/ca-bundle.crt")))
|
||
(directory (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs")))
|
||
(if (or file
|
||
(and=> (stat directory #f)
|
||
(lambda (st)
|
||
(> (stat:nlink st) 2))))
|
||
(set-tls-certificate-locations! directory file)
|
||
(honor-lets-encrypt-certificates! store))))
|
||
|
||
(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))))
|
||
|
||
|
||
;;;
|
||
;;; Profile.
|
||
;;;
|
||
|
||
(define %current-profile
|
||
;; The "real" profile under /var/guix.
|
||
(string-append %profile-directory "/current-guix"))
|
||
|
||
(define %user-profile-directory
|
||
;; The user-friendly name of %CURRENT-PROFILE.
|
||
(string-append (config-directory #:ensure? #f) "/current"))
|
||
|
||
(define (migrate-generations profile directory)
|
||
"Migrate the generations of PROFILE to DIRECTORY."
|
||
(format (current-error-port)
|
||
(G_ "Migrating profile generations to '~a'...~%")
|
||
%profile-directory)
|
||
(let ((current (generation-number profile)))
|
||
(for-each (lambda (generation)
|
||
(let ((source (generation-file-name profile generation))
|
||
(target (string-append directory "/current-guix-"
|
||
(number->string generation)
|
||
"-link")))
|
||
;; Note: Don't use 'rename-file' as SOURCE and TARGET might
|
||
;; live on different file systems.
|
||
(symlink (readlink source) target)
|
||
(delete-file source)))
|
||
(profile-generations profile))
|
||
(symlink (string-append "current-guix-"
|
||
(number->string current) "-link")
|
||
(string-append directory "/current-guix"))))
|
||
|
||
(define (ensure-default-profile)
|
||
(ensure-profile-directory)
|
||
|
||
;; In 0.15.0+ we'd create ~/.config/guix/current-[0-9]*-link symlinks. Move
|
||
;; them to %PROFILE-DIRECTORY.
|
||
(unless (string=? %profile-directory
|
||
(dirname (canonicalize-profile %user-profile-directory)))
|
||
(migrate-generations %user-profile-directory %profile-directory))
|
||
|
||
;; Make sure ~/.config/guix/current points to /var/guix/profiles/….
|
||
(let ((link %user-profile-directory))
|
||
(unless (equal? (false-if-exception (readlink link))
|
||
%current-profile)
|
||
(catch 'system-error
|
||
(lambda ()
|
||
(false-if-exception (delete-file link))
|
||
(symlink %current-profile link))
|
||
(lambda args
|
||
(leave (G_ "while creating symlink '~a': ~a~%")
|
||
link (strerror (system-error-errno args))))))))
|
||
|
||
|
||
;;;
|
||
;;; Queries.
|
||
;;;
|
||
|
||
(define (display-profile-content profile number)
|
||
"Display the packages in PROFILE, generation NUMBER, in a human-readable
|
||
way and displaying details about the channel's source code."
|
||
(display-generation profile number)
|
||
(for-each (lambda (entry)
|
||
(format #t " ~a ~a~%"
|
||
(manifest-entry-name entry)
|
||
(manifest-entry-version entry))
|
||
(match (assq 'source (manifest-entry-properties entry))
|
||
(('source ('repository ('version 0)
|
||
('url url)
|
||
('branch branch)
|
||
('commit commit)
|
||
_ ...))
|
||
(format #t (G_ " repository URL: ~a~%") url)
|
||
(when branch
|
||
(format #t (G_ " branch: ~a~%") branch))
|
||
(format #t (G_ " commit: ~a~%") commit))
|
||
(_ #f)))
|
||
|
||
;; Show most recently installed packages last.
|
||
(reverse
|
||
(manifest-entries
|
||
(profile-manifest (if (zero? number)
|
||
profile
|
||
(generation-file-name profile number)))))))
|
||
|
||
(define (indented-string str indent)
|
||
"Return STR with each newline preceded by IDENT spaces."
|
||
(define indent-string
|
||
(make-list indent #\space))
|
||
|
||
(list->string
|
||
(string-fold-right (lambda (chr result)
|
||
(if (eqv? chr #\newline)
|
||
(cons chr (append indent-string result))
|
||
(cons chr result)))
|
||
'()
|
||
str)))
|
||
|
||
(define profile-package-alist
|
||
(mlambda (profile)
|
||
"Return a name/version alist representing the packages in PROFILE."
|
||
(fold (lambda (package lst)
|
||
(alist-cons (inferior-package-name package)
|
||
(inferior-package-version package)
|
||
lst))
|
||
'()
|
||
(let* ((inferior (open-inferior profile))
|
||
(packages (inferior-packages inferior)))
|
||
(close-inferior inferior)
|
||
packages))))
|
||
|
||
(define* (display-new/upgraded-packages alist1 alist2
|
||
#:key (heading ""))
|
||
"Given the two package name/version alists ALIST1 and ALIST2, display the
|
||
list of new and upgraded packages going from ALIST1 to ALIST2. When ALIST1
|
||
and ALIST2 differ, display HEADING upfront."
|
||
(let* ((old (fold (match-lambda*
|
||
(((name . version) table)
|
||
(vhash-cons name version table)))
|
||
vlist-null
|
||
alist1))
|
||
(new (remove (match-lambda
|
||
((name . _)
|
||
(vhash-assoc name old)))
|
||
alist2))
|
||
(upgraded (filter-map (match-lambda
|
||
((name . new-version)
|
||
(match (vhash-fold* cons '() name old)
|
||
(() #f)
|
||
((= (cut sort <> version>?) old-versions)
|
||
(and (version>? new-version
|
||
(first old-versions))
|
||
(string-append name "@"
|
||
new-version))))))
|
||
alist2)))
|
||
(unless (and (null? new) (null? upgraded))
|
||
(display heading))
|
||
|
||
(match (length new)
|
||
(0 #t)
|
||
(count
|
||
(format #t (N_ " ~h new package: ~a~%"
|
||
" ~h new packages: ~a~%" count)
|
||
count
|
||
(indented-string
|
||
(fill-paragraph (string-join (sort (map first new) string<?)
|
||
", ")
|
||
(- (%text-width) 4) 30)
|
||
4))))
|
||
(match (length upgraded)
|
||
(0 #t)
|
||
(count
|
||
(format #t (N_ " ~h package upgraded: ~a~%"
|
||
" ~h packages upgraded: ~a~%" count)
|
||
count
|
||
(indented-string
|
||
(fill-paragraph (string-join (sort upgraded string<?) ", ")
|
||
(- (%text-width) 4) 35)
|
||
4))))))
|
||
|
||
(define (display-profile-content-diff profile gen1 gen2)
|
||
"Display the changes in PROFILE GEN2 compared to generation GEN1."
|
||
(define (package-alist generation)
|
||
(profile-package-alist (generation-file-name profile generation)))
|
||
|
||
(display-profile-content profile gen2)
|
||
(display-new/upgraded-packages (package-alist gen1)
|
||
(package-alist gen2)))
|
||
|
||
(define (process-query opts profile)
|
||
"Process any query on PROFILE specified by OPTS."
|
||
(match (assoc-ref opts 'query)
|
||
(('list-generations pattern)
|
||
(define (list-generations profile numbers)
|
||
(match numbers
|
||
((first rest ...)
|
||
(display-profile-content profile first)
|
||
(let loop ((numbers numbers))
|
||
(match numbers
|
||
((first second rest ...)
|
||
(display-profile-content-diff profile
|
||
first second)
|
||
(loop (cons second rest)))
|
||
((_) #t)
|
||
(() #t))))))
|
||
|
||
(leave-on-EPIPE
|
||
(cond ((not (file-exists? profile)) ; XXX: race condition
|
||
(raise (condition (&profile-not-found-error
|
||
(profile profile)))))
|
||
((string-null? pattern)
|
||
(list-generations profile (profile-generations profile)))
|
||
((matching-generations pattern profile)
|
||
=>
|
||
(match-lambda
|
||
(()
|
||
(exit 1))
|
||
((numbers ...)
|
||
(list-generations profile numbers)))))))))
|
||
|
||
(define (channel-list opts)
|
||
"Return the list of channels to use. If OPTS specify a channel file,
|
||
channels are read from there; otherwise, if ~/.config/guix/channels.scm
|
||
exists, read it; otherwise %DEFAULT-CHANNELS is used. Apply channel
|
||
transformations specified in OPTS (resulting from '--url', '--commit', or
|
||
'--branch'), if any."
|
||
(define file
|
||
(assoc-ref opts 'channel-file))
|
||
|
||
(define default-file
|
||
(string-append (config-directory) "/channels.scm"))
|
||
|
||
(define (load-channels file)
|
||
(let ((result (load* file (make-user-module '((guix channels))))))
|
||
(if (and (list? result) (every channel? result))
|
||
result
|
||
(leave (G_ "'~a' did not return a list of channels~%") file))))
|
||
|
||
(define channels
|
||
(cond (file
|
||
(load-channels file))
|
||
((file-exists? default-file)
|
||
(load-channels default-file))
|
||
(else
|
||
%default-channels)))
|
||
|
||
(define (environment-variable)
|
||
(match (getenv "GUIX_PULL_URL")
|
||
(#f #f)
|
||
(url
|
||
(warning (G_ "The 'GUIX_PULL_URL' environment variable is deprecated.
|
||
Use '~/.config/guix/channels.scm' instead."))
|
||
url)))
|
||
|
||
(let ((ref (assoc-ref opts 'ref))
|
||
(url (or (assoc-ref opts 'repository-url)
|
||
(environment-variable))))
|
||
(if (or ref url)
|
||
(match channels
|
||
((one)
|
||
;; When there's only one channel, apply '--url', '--commit', and
|
||
;; '--branch' to this specific channel.
|
||
(let ((url (or url (channel-url one))))
|
||
(list (match ref
|
||
(('commit . commit)
|
||
(channel (inherit one)
|
||
(url url) (commit commit) (branch #f)))
|
||
(('branch . branch)
|
||
(channel (inherit one)
|
||
(url url) (commit #f) (branch branch)))
|
||
(#f
|
||
(channel (inherit one) (url url)))))))
|
||
(_
|
||
;; Otherwise bail out.
|
||
(leave
|
||
(G_ "'--url', '--commit', and '--branch' are not applicable~%"))))
|
||
channels)))
|
||
|
||
|
||
(define (guix-pull . args)
|
||
(with-error-handling
|
||
(with-git-error-handling
|
||
(let* ((opts (parse-command-line args %options
|
||
(list %default-options)))
|
||
(cache (string-append (cache-directory) "/pull"))
|
||
(channels (channel-list opts))
|
||
(profile (or (assoc-ref opts 'profile) %current-profile)))
|
||
(ensure-default-profile)
|
||
(cond ((assoc-ref opts 'query)
|
||
(process-query opts profile))
|
||
(else
|
||
(with-store store
|
||
(with-status-report print-build-event
|
||
(parameterize ((%graft? (assoc-ref opts 'graft?))
|
||
(%repository-cache-directory cache))
|
||
(set-build-options-from-command-line store opts)
|
||
(honor-x509-certificates store)
|
||
|
||
(let ((instances (latest-channel-instances store channels)))
|
||
(format (current-error-port)
|
||
(N_ "Building from this channel:~%"
|
||
"Building from these channels:~%"
|
||
(length instances)))
|
||
(for-each (lambda (instance)
|
||
(let ((channel
|
||
(channel-instance-channel instance)))
|
||
(format (current-error-port)
|
||
" ~10a~a\t~a~%"
|
||
(channel-name channel)
|
||
(channel-url channel)
|
||
(string-take
|
||
(channel-instance-commit instance)
|
||
7))))
|
||
instances)
|
||
(parameterize ((%guile-for-build
|
||
(package-derivation
|
||
store
|
||
(if (assoc-ref opts 'bootstrap?)
|
||
%bootstrap-guile
|
||
(canonical-package guile-2.2)))))
|
||
(run-with-store store
|
||
(build-and-install instances profile
|
||
#:dry-run?
|
||
(assoc-ref opts 'dry-run?)
|
||
#:verbose?
|
||
(assoc-ref opts 'verbose?))))))))))))))
|
||
|
||
;;; pull.scm ends here
|