2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
|
2012-07-01 00:56:24 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-07-01 00:56:24 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-07-01 00:56:24 +02:00
|
|
|
|
;;; 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.
|
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-07-01 00:56:24 +02:00
|
|
|
|
;;; 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
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
Replace individual scripts with master 'guix' script.
* scripts/guix.in: New script.
* Makefile.am (bin_SCRIPTS): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
(MODULES): Add 'guix/scripts/build.scm', 'guix/scripts/download.scm',
'guix/scripts/import.scm', 'guix/scripts/package.scm', and
'guix/scripts/gc.scm'.
* configure.ac (AC_CONFIG_FILES): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
* guix-build.in, guix-download.in, guix-gc.in, guix-import.in,
guix-package.in: Remove shell script boilerplate. Move to guix-COMMAND.in
to guix/scripts/COMMAND.scm. Rename module from (guix-COMMAND) to
(guix scripts COMMAND). Change "guix-COMMAND" to "guix COMMAND" in
usage help string.
* pre-inst-env.in: Add "@abs_top_builddir@/scripts" to the front of $PATH.
Export $GUIX_UNINSTALLED.
* tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-gc.sh, tests/guix-package.sh: Use "guix COMMAND" instead of
"guix-COMMAND".
* doc/guix.texi: Replace all occurrences of "guix-COMMAND" with
"guix COMMAND".
* po/POTFILES.in: Update.
2013-02-14 10:15:25 +01:00
|
|
|
|
(define-module (guix scripts build)
|
2012-11-01 00:50:01 +01:00
|
|
|
|
#:use-module (guix ui)
|
2012-07-01 00:56:24 +02:00
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix derivations)
|
|
|
|
|
#:use-module (guix packages)
|
2012-10-27 14:56:38 +02:00
|
|
|
|
#:use-module (guix utils)
|
2013-11-18 23:08:20 +01:00
|
|
|
|
#:use-module (guix monads)
|
2014-06-14 22:37:24 +02:00
|
|
|
|
#:use-module (guix gexp)
|
2012-07-01 00:56:24 +02:00
|
|
|
|
#:use-module (ice-9 format)
|
|
|
|
|
#:use-module (ice-9 match)
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
#:use-module (ice-9 vlist)
|
2012-07-01 00:56:24 +02:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2013-01-22 22:13:10 +01:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2012-07-01 00:56:24 +02:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2012-10-27 14:56:38 +02:00
|
|
|
|
#:use-module (srfi srfi-34)
|
2012-07-01 00:56:24 +02:00
|
|
|
|
#:use-module (srfi srfi-37)
|
2014-09-24 11:26:30 +02:00
|
|
|
|
#:autoload (gnu packages) (specification->package %package-module-path)
|
2014-03-11 22:08:40 +01:00
|
|
|
|
#:autoload (guix download) (download-to-store)
|
2014-03-13 19:21:49 +01:00
|
|
|
|
#:export (%standard-build-options
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
set-build-options-from-command-line
|
|
|
|
|
show-build-options-help
|
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
guix-build))
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
2013-12-21 22:53:58 +01:00
|
|
|
|
(define (register-root store paths root)
|
|
|
|
|
"Register ROOT as an indirect GC root for all of PATHS."
|
|
|
|
|
(let* ((root (string-append (canonicalize-path (dirname root))
|
|
|
|
|
"/" root)))
|
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(match paths
|
|
|
|
|
((path)
|
|
|
|
|
(symlink path root)
|
|
|
|
|
(add-indirect-root store root))
|
|
|
|
|
((paths ...)
|
|
|
|
|
(fold (lambda (path count)
|
|
|
|
|
(let ((root (string-append root
|
|
|
|
|
"-"
|
|
|
|
|
(number->string count))))
|
|
|
|
|
(symlink path root)
|
|
|
|
|
(add-indirect-root store root))
|
|
|
|
|
(+ 1 count))
|
|
|
|
|
0
|
|
|
|
|
paths))))
|
|
|
|
|
(lambda args
|
|
|
|
|
(leave (_ "failed to create GC root `~a': ~a~%")
|
|
|
|
|
root (strerror (system-error-errno args)))))))
|
|
|
|
|
|
2014-03-11 22:08:40 +01:00
|
|
|
|
(define (package-with-source store p uri)
|
|
|
|
|
"Return a package based on P but with its source taken from URI. Extract
|
|
|
|
|
the new package's version number from URI."
|
|
|
|
|
(define (numeric-extension? file-name)
|
|
|
|
|
;; Return true if FILE-NAME ends with digits.
|
|
|
|
|
(string-every char-set:hex-digit (file-extension file-name)))
|
|
|
|
|
|
|
|
|
|
(define (tarball-base-name file-name)
|
|
|
|
|
;; Return the "base" of FILE-NAME, removing '.tar.gz' or similar
|
|
|
|
|
;; extensions.
|
|
|
|
|
;; TODO: Factorize.
|
|
|
|
|
(cond ((numeric-extension? file-name)
|
|
|
|
|
file-name)
|
|
|
|
|
((string=? (file-extension file-name) "tar")
|
|
|
|
|
(file-sans-extension file-name))
|
|
|
|
|
(else
|
|
|
|
|
(tarball-base-name (file-sans-extension file-name)))))
|
|
|
|
|
|
|
|
|
|
(let ((base (tarball-base-name (basename uri))))
|
|
|
|
|
(let-values (((name version)
|
|
|
|
|
(package-name->name+version base)))
|
|
|
|
|
(package (inherit p)
|
|
|
|
|
(version (or version (package-version p)))
|
|
|
|
|
(source (download-to-store store uri))))))
|
|
|
|
|
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
;;; Standard command-line build options.
|
2012-07-01 00:56:24 +02:00
|
|
|
|
;;;
|
|
|
|
|
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(define (show-build-options-help)
|
|
|
|
|
"Display on the current output port help about the standard command-line
|
|
|
|
|
options handled by 'set-build-options-from-command-line', and listed in
|
|
|
|
|
'%standard-build-options'."
|
2014-09-24 11:26:30 +02:00
|
|
|
|
(display (_ "
|
|
|
|
|
-L, --load-path=DIR prepend DIR to the package module search path"))
|
2012-09-04 23:43:24 +02:00
|
|
|
|
(display (_ "
|
2012-07-01 00:56:24 +02:00
|
|
|
|
-K, --keep-failed keep build tree of failed builds"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-n, --dry-run do not build the derivations"))
|
2013-05-29 23:08:06 +02:00
|
|
|
|
(display (_ "
|
|
|
|
|
--fallback fall back to building when the substituter fails"))
|
2012-10-18 22:24:49 +02:00
|
|
|
|
(display (_ "
|
2012-10-24 15:01:16 +02:00
|
|
|
|
--no-substitutes build instead of resorting to pre-built substitutes"))
|
2014-01-05 22:58:32 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--no-build-hook do not attempt to offload builds via the build hook"))
|
2013-05-20 18:14:55 +02:00
|
|
|
|
(display (_ "
|
|
|
|
|
--max-silent-time=SECONDS
|
|
|
|
|
mark the build as failed after SECONDS of silence"))
|
2014-03-09 23:09:18 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--timeout=SECONDS mark the build as failed after SECONDS of activity"))
|
2012-12-15 15:21:38 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--verbosity=LEVEL use the given verbosity LEVEL"))
|
2013-11-12 01:06:25 +01:00
|
|
|
|
(display (_ "
|
2014-11-25 22:32:26 +01:00
|
|
|
|
-c, --cores=N allow the use of up to N CPU cores for the build"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-M, --max-jobs=N allow at most N build jobs")))
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(define (set-build-options-from-command-line store opts)
|
|
|
|
|
"Given OPTS, an alist as returned by 'args-fold' given
|
|
|
|
|
'%standard-build-options', set the corresponding build options on STORE."
|
|
|
|
|
;; TODO: Add more options.
|
|
|
|
|
(set-build-options store
|
|
|
|
|
#:keep-failed? (assoc-ref opts 'keep-failed?)
|
|
|
|
|
#:build-cores (or (assoc-ref opts 'cores) 0)
|
2014-11-25 22:32:26 +01:00
|
|
|
|
#:max-build-jobs (or (assoc-ref opts 'max-jobs) 1)
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
#:fallback? (assoc-ref opts 'fallback?)
|
|
|
|
|
#:use-substitutes? (assoc-ref opts 'substitutes?)
|
|
|
|
|
#:use-build-hook? (assoc-ref opts 'build-hook?)
|
|
|
|
|
#:max-silent-time (assoc-ref opts 'max-silent-time)
|
2014-03-09 23:09:18 +01:00
|
|
|
|
#:timeout (assoc-ref opts 'timeout)
|
2014-06-09 18:54:52 +02:00
|
|
|
|
#:print-build-trace (assoc-ref opts 'print-build-trace?)
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
#:verbosity (assoc-ref opts 'verbosity)))
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(define %standard-build-options
|
|
|
|
|
;; List of standard command-line options for tools that build something.
|
2014-09-24 11:26:30 +02:00
|
|
|
|
(list (option '(#\L "load-path") #t #f
|
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
;; XXX: Imperatively modify the search paths.
|
|
|
|
|
(%package-module-path (cons arg (%package-module-path)))
|
|
|
|
|
(set! %load-path (cons arg %load-path))
|
|
|
|
|
(set! %load-compiled-path (cons arg %load-compiled-path))
|
|
|
|
|
|
|
|
|
|
(apply values (cons result rest))))
|
|
|
|
|
(option '(#\K "keep-failed") #f #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'keep-failed? #t result)
|
|
|
|
|
rest)))
|
2013-05-29 23:08:06 +02:00
|
|
|
|
(option '("fallback") #f #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'fallback? #t
|
|
|
|
|
(alist-delete 'fallback? result))
|
|
|
|
|
rest)))
|
2012-10-24 15:01:16 +02:00
|
|
|
|
(option '("no-substitutes") #f #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'substitutes? #f
|
|
|
|
|
(alist-delete 'substitutes? result))
|
|
|
|
|
rest)))
|
2014-01-05 22:58:32 +01:00
|
|
|
|
(option '("no-build-hook") #f #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'build-hook? #f
|
|
|
|
|
(alist-delete 'build-hook? result))
|
|
|
|
|
rest)))
|
2013-05-20 18:14:55 +02:00
|
|
|
|
(option '("max-silent-time") #t #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'max-silent-time (string->number* arg)
|
|
|
|
|
result)
|
|
|
|
|
rest)))
|
2014-03-09 23:09:18 +01:00
|
|
|
|
(option '("timeout") #t #f
|
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'timeout (string->number* arg) result)
|
|
|
|
|
rest)))
|
2012-12-15 15:21:38 +01:00
|
|
|
|
(option '("verbosity") #t #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
2012-12-15 15:21:38 +01:00
|
|
|
|
(let ((level (string->number arg)))
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(apply values
|
|
|
|
|
(alist-cons 'verbosity level
|
|
|
|
|
(alist-delete 'verbosity result))
|
|
|
|
|
rest))))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(option '(#\c "cores") #t #f
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(lambda (opt name arg result . rest)
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(let ((c (false-if-exception (string->number arg))))
|
|
|
|
|
(if c
|
2014-03-01 18:29:29 +01:00
|
|
|
|
(apply values (alist-cons 'cores c result) rest)
|
2014-11-25 22:32:26 +01:00
|
|
|
|
(leave (_ "not a number: '~a' option argument: ~a~%")
|
|
|
|
|
name arg)))))
|
|
|
|
|
(option '(#\M "max-jobs") #t #f
|
|
|
|
|
(lambda (opt name arg result . rest)
|
|
|
|
|
(let ((c (false-if-exception (string->number arg))))
|
|
|
|
|
(if c
|
|
|
|
|
(apply values (alist-cons 'max-jobs c result) rest)
|
|
|
|
|
(leave (_ "not a number: '~a' option argument: ~a~%")
|
|
|
|
|
name arg)))))))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Command-line options.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %default-options
|
|
|
|
|
;; Alist of default option values.
|
|
|
|
|
`((system . ,(%current-system))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(graft? . #t)
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(substitutes? . #t)
|
|
|
|
|
(build-hook? . #t)
|
2014-06-09 18:54:52 +02:00
|
|
|
|
(print-build-trace? . #t)
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(max-silent-time . 3600)
|
|
|
|
|
(verbosity . 0)))
|
|
|
|
|
|
|
|
|
|
(define (show-help)
|
|
|
|
|
(display (_ "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...
|
|
|
|
|
Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-e, --expression=EXPR build the package or derivation EXPR evaluates to"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-S, --source build the packages' source derivations"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
|
|
|
|
|
(display (_ "
|
|
|
|
|
--target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
|
2014-03-11 22:08:40 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--with-source=SOURCE
|
|
|
|
|
use SOURCE when building the corresponding package"))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--no-grafts do not graft packages"))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
-d, --derivations return the derivation paths of the given packages"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-r, --root=FILE make FILE a symlink to the result, and register it
|
|
|
|
|
as a garbage collector root"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
--log-file return the log file names for the given derivations"))
|
|
|
|
|
(newline)
|
|
|
|
|
(show-build-options-help)
|
|
|
|
|
(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.
|
|
|
|
|
(cons* (option '(#\h "help") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-help)
|
|
|
|
|
(exit 0)))
|
|
|
|
|
(option '(#\V "version") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-version-and-exit "guix build")))
|
|
|
|
|
|
|
|
|
|
(option '(#\S "source") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'source? #t result)))
|
|
|
|
|
(option '(#\s "system") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'system arg
|
|
|
|
|
(alist-delete 'system result eq?))))
|
|
|
|
|
(option '("target") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'target arg
|
|
|
|
|
(alist-delete 'target result eq?))))
|
|
|
|
|
(option '(#\d "derivations") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'derivations-only? #t result)))
|
|
|
|
|
(option '(#\e "expression") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'expression arg result)))
|
|
|
|
|
(option '(#\n "dry-run") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'dry-run? #t result)))
|
|
|
|
|
(option '(#\r "root") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'gc-root arg result)))
|
|
|
|
|
(option '("log-file") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'log-file? #t result)))
|
2014-03-11 22:08:40 +01:00
|
|
|
|
(option '("with-source") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'with-source arg result)))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(option '("no-grafts") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'graft? #f
|
|
|
|
|
(alist-delete 'graft? result eq?))))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
|
|
|
|
|
%standard-build-options))
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
2013-12-21 22:53:58 +01:00
|
|
|
|
(define (options->derivations store opts)
|
|
|
|
|
"Given OPTS, the result of 'args-fold', return a list of derivations to
|
|
|
|
|
build."
|
|
|
|
|
(define package->derivation
|
|
|
|
|
(match (assoc-ref opts 'target)
|
|
|
|
|
(#f package-derivation)
|
|
|
|
|
(triplet
|
|
|
|
|
(cut package-cross-derivation <> <> triplet <>))))
|
|
|
|
|
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(define src? (assoc-ref opts 'source?))
|
|
|
|
|
(define sys (assoc-ref opts 'system))
|
|
|
|
|
(define graft? (assoc-ref opts 'graft?))
|
2013-12-21 22:53:58 +01:00
|
|
|
|
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(parameterize ((%graft? graft?))
|
|
|
|
|
(let ((opts (options/with-source store
|
|
|
|
|
(options/resolve-packages store opts))))
|
|
|
|
|
(filter-map (match-lambda
|
|
|
|
|
(('argument . (? package? p))
|
|
|
|
|
(if src?
|
|
|
|
|
(let ((s (package-source p)))
|
|
|
|
|
(package-source-derivation store s))
|
|
|
|
|
(package->derivation store p sys)))
|
|
|
|
|
(('argument . (? derivation? drv))
|
|
|
|
|
drv)
|
|
|
|
|
(('argument . (? derivation-path? drv))
|
|
|
|
|
(call-with-input-file drv read-derivation))
|
|
|
|
|
(('argument . (? store-path?))
|
|
|
|
|
;; Nothing to do; maybe for --log-file.
|
|
|
|
|
#f)
|
|
|
|
|
(_ #f))
|
|
|
|
|
opts))))
|
2014-03-11 22:08:40 +01:00
|
|
|
|
|
2014-03-13 19:21:49 +01:00
|
|
|
|
(define (options/resolve-packages store opts)
|
2014-03-11 22:08:40 +01:00
|
|
|
|
"Return OPTS with package specification strings replaced by actual
|
|
|
|
|
packages."
|
2014-03-13 19:21:49 +01:00
|
|
|
|
(define system
|
|
|
|
|
(or (assoc-ref opts 'system) (%current-system)))
|
|
|
|
|
|
2014-03-11 22:08:40 +01:00
|
|
|
|
(map (match-lambda
|
|
|
|
|
(('argument . (? string? spec))
|
|
|
|
|
(if (store-path? spec)
|
|
|
|
|
`(argument . ,spec)
|
|
|
|
|
`(argument . ,(specification->package spec))))
|
2014-03-13 19:21:49 +01:00
|
|
|
|
(('expression . str)
|
|
|
|
|
(match (read/eval str)
|
|
|
|
|
((? package? p)
|
|
|
|
|
`(argument . ,p))
|
|
|
|
|
((? procedure? proc)
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
(let ((drv (run-with-store store
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(set-guile-for-build (default-guile))
|
|
|
|
|
(proc))
|
|
|
|
|
#:system system)))
|
2014-06-14 22:37:24 +02:00
|
|
|
|
`(argument . ,drv)))
|
|
|
|
|
((? gexp? gexp)
|
|
|
|
|
(let ((drv (run-with-store store
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(set-guile-for-build (default-guile))
|
|
|
|
|
(gexp->derivation "gexp" gexp
|
|
|
|
|
#:system system)))))
|
2014-03-13 19:21:49 +01:00
|
|
|
|
`(argument . ,drv)))))
|
2014-03-11 22:08:40 +01:00
|
|
|
|
(opt opt))
|
|
|
|
|
opts))
|
|
|
|
|
|
|
|
|
|
(define (options/with-source store opts)
|
|
|
|
|
"Process with 'with-source' options in OPTS, replacing the relevant package
|
|
|
|
|
arguments with packages that use the specified source."
|
|
|
|
|
(define new-sources
|
|
|
|
|
(filter-map (match-lambda
|
|
|
|
|
(('with-source . uri)
|
|
|
|
|
(cons (package-name->name+version (basename uri))
|
|
|
|
|
uri))
|
|
|
|
|
(_ #f))
|
|
|
|
|
opts))
|
|
|
|
|
|
|
|
|
|
(let loop ((opts opts)
|
|
|
|
|
(sources new-sources)
|
|
|
|
|
(result '()))
|
|
|
|
|
(match opts
|
|
|
|
|
(()
|
|
|
|
|
(unless (null? sources)
|
|
|
|
|
(warning (_ "sources do not match any package:~{ ~a~}~%")
|
|
|
|
|
(match sources
|
|
|
|
|
(((name . uri) ...)
|
|
|
|
|
uri))))
|
|
|
|
|
(reverse result))
|
|
|
|
|
((('argument . (? package? p)) tail ...)
|
|
|
|
|
(let ((source (assoc-ref sources (package-name p))))
|
|
|
|
|
(loop tail
|
|
|
|
|
(alist-delete (package-name p) sources)
|
|
|
|
|
(alist-cons 'argument
|
|
|
|
|
(if source
|
|
|
|
|
(package-with-source store p source)
|
|
|
|
|
p)
|
|
|
|
|
result))))
|
|
|
|
|
((('with-source . _) tail ...)
|
|
|
|
|
(loop tail sources result))
|
|
|
|
|
((head tail ...)
|
|
|
|
|
(loop tail sources (cons head result))))))
|
2013-12-21 22:53:58 +01:00
|
|
|
|
|
2012-07-01 00:56:24 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Entry point.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (guix-build . args)
|
2012-07-07 16:50:40 +02:00
|
|
|
|
(define (parse-options)
|
|
|
|
|
;; Return the alist of option values.
|
2014-12-05 01:28:12 +01:00
|
|
|
|
(append (parse-options-from args)
|
|
|
|
|
(parse-options-from (environment-build-options))))
|
|
|
|
|
|
|
|
|
|
(define (parse-options-from args)
|
|
|
|
|
;; Actual parsing takes place here.
|
|
|
|
|
(args-fold* args %options
|
2013-04-27 16:46:39 +02:00
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(leave (_ "~A: unrecognized option~%") name))
|
|
|
|
|
(lambda (arg result)
|
|
|
|
|
(alist-cons 'argument arg result))
|
|
|
|
|
%default-options))
|
2012-07-07 16:50:40 +02:00
|
|
|
|
|
2012-11-01 00:50:01 +01:00
|
|
|
|
(with-error-handling
|
2013-11-12 01:06:25 +01:00
|
|
|
|
;; Ask for absolute file names so that .drv file names passed from the
|
|
|
|
|
;; user to 'read-derivation' are absolute when it returns.
|
|
|
|
|
(with-fluids ((%file-port-name-canonicalization 'absolute))
|
2013-12-21 22:53:58 +01:00
|
|
|
|
(let* ((opts (parse-options))
|
|
|
|
|
(store (open-connection))
|
|
|
|
|
(drv (options->derivations store opts))
|
|
|
|
|
(roots (filter-map (match-lambda
|
|
|
|
|
(('gc-root . root) root)
|
|
|
|
|
(_ #f))
|
|
|
|
|
opts)))
|
2013-02-20 23:41:24 +01:00
|
|
|
|
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(set-build-options-from-command-line store opts)
|
2014-02-11 23:18:41 +01:00
|
|
|
|
(unless (assoc-ref opts 'log-file?)
|
|
|
|
|
(show-what-to-build store drv
|
|
|
|
|
#:use-substitutes? (assoc-ref opts 'substitutes?)
|
|
|
|
|
#:dry-run? (assoc-ref opts 'dry-run?)))
|
|
|
|
|
|
2013-12-21 22:53:58 +01:00
|
|
|
|
(cond ((assoc-ref opts 'log-file?)
|
|
|
|
|
(for-each (lambda (file)
|
|
|
|
|
(let ((log (log-file store file)))
|
|
|
|
|
(if log
|
|
|
|
|
(format #t "~a~%" log)
|
|
|
|
|
(leave (_ "no build log for '~a'~%")
|
|
|
|
|
file))))
|
|
|
|
|
(delete-duplicates
|
|
|
|
|
(append (map derivation-file-name drv)
|
|
|
|
|
(filter-map (match-lambda
|
|
|
|
|
(('argument
|
|
|
|
|
. (? store-path? file))
|
|
|
|
|
file)
|
|
|
|
|
(_ #f))
|
|
|
|
|
opts)))))
|
|
|
|
|
((assoc-ref opts 'derivations-only?)
|
|
|
|
|
(format #t "~{~a~%~}" (map derivation-file-name drv))
|
|
|
|
|
(for-each (cut register-root store <> <>)
|
|
|
|
|
(map (compose list derivation-file-name) drv)
|
|
|
|
|
roots))
|
|
|
|
|
((not (assoc-ref opts 'dry-run?))
|
|
|
|
|
(and (build-derivations store drv)
|
|
|
|
|
(for-each (lambda (d)
|
|
|
|
|
(format #t "~{~a~%~}"
|
|
|
|
|
(map (match-lambda
|
|
|
|
|
((out-name . out)
|
|
|
|
|
(derivation->output-path
|
|
|
|
|
d out-name)))
|
|
|
|
|
(derivation-outputs d))))
|
|
|
|
|
drv)
|
|
|
|
|
(for-each (cut register-root store <> <>)
|
|
|
|
|
(map (lambda (drv)
|
|
|
|
|
(map cdr
|
|
|
|
|
(derivation->output-paths drv)))
|
|
|
|
|
drv)
|
|
|
|
|
roots))))))))
|