;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
(variables rest ...))))))
(variables %localstatedir %storedir %sysconfdir %system)))
-(define* (make-config.scm #:key zlib gzip xz bzip2
+(define* (make-config.scm #:key gzip xz bzip2
(package-name "GNU Guix")
(package-version "0")
(bug-report-address "bug-guix@gnu.org")
(define %bzip2
#+(and bzip2 (file-append bzip2 "/bin/bzip2")))
(define %xz
- #+(and xz (file-append xz "/bin/xz")))
-
- (define %libz
- #+(and zlib
- (file-append zlib "/lib/libz")))))))
+ #+(and xz (file-append xz "/bin/xz")))))))
\f
;;;
(define* (build-program source version
#:optional (guile-version (effective-version))
- #:key (pull-version 0))
+ #:key (pull-version 0) (channel-metadata #f))
"Return a program that computes the derivation to build Guix from SOURCE."
(define select?
;; Select every module but (guix config) and non-Guix modules.
+ ;; Also exclude (guix channels): it is autoloaded by (guix describe), but
+ ;; only for peripheral functionality.
(match-lambda
(('guix 'config) #f)
+ (('guix 'channels) #f)
+ (('guix 'build 'download) #f) ;autoloaded by (guix download)
(('guix _ ...) #t)
(('gnu _ ...) #t)
(_ #f)))
#:select? select?))
(gexp->script "compute-guix-derivation"
#~(begin
- (use-modules (ice-9 match)
- (ice-9 threads))
+ (use-modules (ice-9 match))
(eval-when (expand load eval)
;; (gnu packages …) modules are going to be looked up
(guix derivations)
(srfi srfi-1))
- (define (spin system)
- (define spin
- (circular-list "-" "\\" "|" "/" "-" "\\" "|" "/"))
-
- (format (current-error-port)
- "Computing Guix derivation for '~a'... "
- system)
- (when (isatty? (current-error-port))
- (let loop ((spin spin))
- (display (string-append "\b" (car spin))
- (current-error-port))
- (force-output (current-error-port))
- (sleep 1)
- (loop (cdr spin)))))
-
(match (command-line)
- ((_ source system version protocol-version)
+ ((_ source system version protocol-version
+ build-output)
;; The current input port normally wraps a file
;; descriptor connected to the daemon, or it is
;; connected to /dev/null. In the former case, reuse
(current-input-port)
"w+0")
#:version proto)
- (open-connection))))
- (call-with-new-thread
- (lambda ()
- (spin system)))
+ (open-connection)))
+ (sock (socket AF_UNIX SOCK_STREAM 0)))
+ ;; Connect to BUILD-OUTPUT and send it the raw
+ ;; build output.
+ (connect sock AF_UNIX build-output)
(display
(and=>
- (run-with-store store
- (guix-derivation source version
- #$guile-version
- #:pull-version
- #$pull-version)
- #:system system)
+ ;; Silence autoload warnings and the likes.
+ (parameterize ((current-warning-port
+ (%make-void-port "w"))
+ (current-build-output-port sock))
+ (run-with-store store
+ (guix-derivation source version
+ #$guile-version
+ #:channel-metadata
+ '#$channel-metadata
+ #:pull-version
+ #$pull-version)
+ #:system system))
derivation-file-name))))))
#:module-path (list source))))
+(define (proxy input output)
+ "Dump the contents of INPUT to OUTPUT until EOF is reached on INPUT.
+Display a spinner when nothing happens."
+ (define spin
+ (circular-list "-" "\\" "|" "/" "-" "\\" "|" "/"))
+
+ (setvbuf input 'block 16384)
+ (let loop ((spin spin))
+ (match (select (list input) '() '() 1)
+ ((() () ())
+ (when (isatty? (current-error-port))
+ (display (string-append "\b" (car spin))
+ (current-error-port))
+ (force-output (current-error-port)))
+ (loop (cdr spin)))
+ (((_) () ())
+ ;; Read from INPUT as much as can be read without blocking.
+ (let ((bv (get-bytevector-some input)))
+ (unless (eof-object? bv)
+ (put-bytevector output bv)
+ (loop spin)))))))
+
(define (call-with-clean-environment thunk)
(let ((env (environ)))
(dynamic-wind
;; The procedure below is our return value.
(define* (build source
- #:key verbose? (version (date-version-string)) system
+ #:key verbose?
+ (version (date-version-string)) channel-metadata
+ system
(pull-version 0)
;; For the standalone Guix, default to Guile 3.0. For old
;; Build the build program and then use it as a trampoline to build from
;; SOURCE.
(mlet %store-monad ((build (build-program source version guile-version
+ #:channel-metadata channel-metadata
#:pull-version pull-version))
(system (if system (return system) (current-system)))
(home -> (getenv "HOME"))
;; way, we know 'open-pipe*' will not close it on 'exec'. If PORT is
;; not a file port (e.g., it's an SSH channel), then the subprocess's
;; stdin will actually be /dev/null.
- (let* ((pipe (with-input-from-port port
+ (let* ((sock (socket AF_UNIX SOCK_STREAM 0))
+ (node (let ((file (string-append (or (getenv "TMPDIR") "/tmp")
+ "/guix-build-output-"
+ (number->string (getpid)))))
+ (bind sock AF_UNIX file)
+ (listen sock 1)
+ file))
+ (pipe (with-input-from-port port
(lambda ()
;; Make sure BUILD is not influenced by
;; $GUILE_LOAD_PATH & co.
(if (file-port? port)
(number->string
(logior major minor))
- "none"))))))
- (str (get-string-all pipe))
- (status (close-pipe pipe)))
- (match str
- ((? eof-object?)
- (error "build program failed" (list build status)))
- ((? derivation-path? drv)
- (mbegin %store-monad
- (return (newline (current-error-port)))
- ((store-lift add-temp-root) drv)
- (return (read-derivation-from-file drv))))
- ("#f"
- ;; Unsupported PULL-VERSION.
- (return #f))
- ((? string? str)
- (raise (condition
- (&message
- (message (format #f "You found a bug: the program '~a'
+ "none")
+ node))))))
+ (format (current-error-port) "Computing Guix derivation for '~a'... "
+ system)
+
+ ;; Wait for a connection on SOCK and proxy build output so it can be
+ ;; processed according to the settings currently in effect (build
+ ;; traces, verbosity level, and so on).
+ (match (accept sock)
+ ((port . _)
+ (close-port sock)
+ (delete-file node)
+ (proxy port (current-build-output-port))))
+
+ ;; Now that the build output connection was closed, read the result, a
+ ;; derivation file name, from PIPE.
+ (let ((str (get-string-all pipe))
+ (status (close-pipe pipe)))
+ (match str
+ ((? eof-object?)
+ (error "build program failed" (list build status)))
+ ((? derivation-path? drv)
+ (mbegin %store-monad
+ (return (newline (current-error-port)))
+ ((store-lift add-temp-root) drv)
+ (return (read-derivation-from-file drv))))
+ ("#f"
+ ;; Unsupported PULL-VERSION.
+ (return #f))
+ ((? string? str)
+ (raise (condition
+ (&message
+ (message (format #f "You found a bug: the program '~a'
failed to compute the derivation for Guix (version: ~s; system: ~s;
host version: ~s; pull-version: ~s).
Please report it by email to <~a>.~%"
- (derivation->output-path build)
- version system %guix-version pull-version
- %guix-bug-report-address)))))))))))
+ (derivation->output-path build)
+ version system %guix-version pull-version
+ %guix-bug-report-address))))))))))))
;; This file is loaded by 'guix pull'; return it the build procedure.
build
HCoop / jackhill / guix / guix.git / blobdiff