2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
packages: Mark the `arguments' field of <package> as thunked.
* guix/packages.scm (<package>): Mark `arguments' as thunked.
(package-derivation): Adjust accordingly. Parameterize
%CURRENT-SYSTEM to SYSTEM, so that arguments can refer to it.
* guix/build-system/gnu.scm (package-with-explicit-inputs): Expect
`package-arguments' to always return a list, and return a list.
(package-with-extra-configure-variable): Likewise.
(static-package): Likewise.
* gnu/packages/base.scm (patch, findutils, gcc-4.7, binutils-boot0,
gcc-boot0, glibc-final-with-bootstrap-bash, cross-gcc-wrapper,
static-bash-for-glibc, binutils-final, gcc-final): Change `arguments'
from a lambda to a list, and use (%current-system) as needed.
(nix-system->gnu-triplet, boot-triplet): Have the first argument
default to (%current-system).
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Have `system'
default to (%current-system).
(%bootstrap-gcc): Change `arguments' to a list.
* gnu/packages/gawk.scm (gawk): Likewise.
* gnu/packages/m4.scm (m4): Likewise.
* gnu/packages/make-bootstrap.scm (%glibc-for-bootstrap): Likewise, and
expect `package-arguments' to return a list.
(%static-inputs, %gcc-static, tarball-package): Likewise.
* gnu/packages/ncurses.scm (ncurses): Likewise.
2013-01-23 23:21:59 +01:00
|
|
|
|
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
|
2012-06-13 17:03:34 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-06-13 17:03:34 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-06-13 17:03:34 +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-06-13 17:03:34 +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-06-13 17:03:34 +02:00
|
|
|
|
|
2012-06-27 23:58:07 +02:00
|
|
|
|
(define-module (guix build-system gnu)
|
2012-06-13 17:03:34 +02:00
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module (guix derivations)
|
2012-06-27 23:58:07 +02:00
|
|
|
|
#:use-module (guix build-system)
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
#:use-module (guix packages)
|
2012-06-13 17:03:34 +02:00
|
|
|
|
#:use-module (srfi srfi-1)
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
#:use-module (srfi srfi-39)
|
|
|
|
|
#:use-module (ice-9 match)
|
2012-06-27 23:58:07 +02:00
|
|
|
|
#:export (gnu-build
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
gnu-build-system
|
2013-04-16 14:05:00 +02:00
|
|
|
|
standard-search-paths
|
2013-03-04 00:41:46 +01:00
|
|
|
|
standard-inputs
|
2012-11-05 23:50:05 +01:00
|
|
|
|
package-with-explicit-inputs
|
|
|
|
|
package-with-extra-configure-variable
|
2013-01-01 16:55:34 +01:00
|
|
|
|
static-libgcc-package
|
2013-08-24 17:17:06 +02:00
|
|
|
|
static-package
|
|
|
|
|
dist-package))
|
2012-06-13 17:03:34 +02:00
|
|
|
|
|
|
|
|
|
;; Commentary:
|
|
|
|
|
;;
|
|
|
|
|
;; Standard build procedure for packages using the GNU Build System or
|
|
|
|
|
;; something compatible ("./configure && make && make install").
|
|
|
|
|
;;
|
|
|
|
|
;; Code:
|
|
|
|
|
|
2013-08-24 17:17:06 +02:00
|
|
|
|
(define %default-modules
|
|
|
|
|
;; Build-side modules imported and used by default.
|
|
|
|
|
'((guix build gnu-build-system)
|
|
|
|
|
(guix build utils)))
|
|
|
|
|
|
2013-06-25 20:54:56 +02:00
|
|
|
|
(define* (package-with-explicit-inputs p inputs
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
#:optional
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(loc (current-source-location))
|
2013-06-25 20:54:56 +02:00
|
|
|
|
#:key (native-inputs '())
|
|
|
|
|
guile)
|
|
|
|
|
"Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take INPUTS and
|
|
|
|
|
NATIVE-INPUTS as explicit inputs instead of the implicit default, and return
|
|
|
|
|
it. INPUTS and NATIVE-INPUTS can be either input lists or thunks; in the
|
|
|
|
|
latter case, they will be called in a context where the `%current-system' and
|
|
|
|
|
`%current-target-system' are suitably parametrized. Use GUILE to run the
|
|
|
|
|
builder, or the distro's final Guile when GUILE is #f."
|
|
|
|
|
(define inputs* inputs)
|
|
|
|
|
(define native-inputs* native-inputs)
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2013-06-25 20:54:56 +02:00
|
|
|
|
(define (call inputs)
|
|
|
|
|
(if (procedure? inputs)
|
|
|
|
|
(inputs)
|
|
|
|
|
inputs))
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2013-06-25 20:54:56 +02:00
|
|
|
|
(define (duplicate-filter inputs)
|
|
|
|
|
(let ((names (match (call inputs)
|
|
|
|
|
(((name _ ...) ...)
|
|
|
|
|
name))))
|
|
|
|
|
(lambda (inputs)
|
|
|
|
|
(fold alist-delete inputs names))))
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2013-06-25 20:54:56 +02:00
|
|
|
|
(let loop ((p p))
|
|
|
|
|
(define rewritten-input
|
|
|
|
|
(memoize
|
|
|
|
|
(match-lambda
|
|
|
|
|
((name (? package? p) sub-drv ...)
|
2013-06-25 23:04:32 +02:00
|
|
|
|
;; XXX: Check whether P's build system knows #:implicit-inputs, for
|
|
|
|
|
;; things like `cross-pkg-config'.
|
|
|
|
|
(if (eq? (package-build-system p) gnu-build-system)
|
|
|
|
|
(cons* name (loop p) sub-drv)
|
|
|
|
|
(cons* name p sub-drv)))
|
2013-06-25 20:54:56 +02:00
|
|
|
|
(x x))))
|
|
|
|
|
|
|
|
|
|
(package (inherit p)
|
|
|
|
|
(location (if (pair? loc) (source-properties->location loc) loc))
|
|
|
|
|
(arguments
|
|
|
|
|
(let ((args (package-arguments p)))
|
|
|
|
|
`(#:guile ,guile
|
|
|
|
|
#:implicit-inputs? #f
|
|
|
|
|
,@args)))
|
|
|
|
|
(native-inputs
|
|
|
|
|
(let ((filtered (duplicate-filter native-inputs*)))
|
|
|
|
|
`(,@(call native-inputs*)
|
|
|
|
|
,@(map rewritten-input
|
|
|
|
|
(filtered (package-native-inputs p))))))
|
|
|
|
|
(propagated-inputs
|
|
|
|
|
(map rewritten-input
|
|
|
|
|
(package-propagated-inputs p)))
|
|
|
|
|
(inputs
|
|
|
|
|
(let ((filtered (duplicate-filter inputs*)))
|
|
|
|
|
`(,@(call inputs*)
|
|
|
|
|
,@(map rewritten-input
|
|
|
|
|
(filtered (package-inputs p)))))))))
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2012-11-05 23:50:05 +01:00
|
|
|
|
(define (package-with-extra-configure-variable p variable value)
|
2013-02-08 18:03:36 +01:00
|
|
|
|
"Return a version of P with VARIABLE=VALUE specified as an extra `configure'
|
|
|
|
|
flag, recursively. An example is LDFLAGS=-static. If P already has configure
|
|
|
|
|
flags for VARIABLE, the associated value is augmented."
|
2012-11-05 23:50:05 +01:00
|
|
|
|
(let loop ((p p))
|
|
|
|
|
(define (rewritten-inputs inputs)
|
|
|
|
|
(map (match-lambda
|
|
|
|
|
((name (? package? p) sub ...)
|
|
|
|
|
`(,name ,(loop p) ,@sub))
|
|
|
|
|
(input input))
|
|
|
|
|
inputs))
|
|
|
|
|
|
|
|
|
|
(package (inherit p)
|
|
|
|
|
(arguments
|
packages: Mark the `arguments' field of <package> as thunked.
* guix/packages.scm (<package>): Mark `arguments' as thunked.
(package-derivation): Adjust accordingly. Parameterize
%CURRENT-SYSTEM to SYSTEM, so that arguments can refer to it.
* guix/build-system/gnu.scm (package-with-explicit-inputs): Expect
`package-arguments' to always return a list, and return a list.
(package-with-extra-configure-variable): Likewise.
(static-package): Likewise.
* gnu/packages/base.scm (patch, findutils, gcc-4.7, binutils-boot0,
gcc-boot0, glibc-final-with-bootstrap-bash, cross-gcc-wrapper,
static-bash-for-glibc, binutils-final, gcc-final): Change `arguments'
from a lambda to a list, and use (%current-system) as needed.
(nix-system->gnu-triplet, boot-triplet): Have the first argument
default to (%current-system).
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Have `system'
default to (%current-system).
(%bootstrap-gcc): Change `arguments' to a list.
* gnu/packages/gawk.scm (gawk): Likewise.
* gnu/packages/m4.scm (m4): Likewise.
* gnu/packages/make-bootstrap.scm (%glibc-for-bootstrap): Likewise, and
expect `package-arguments' to return a list.
(%static-inputs, %gcc-static, tarball-package): Likewise.
* gnu/packages/ncurses.scm (ncurses): Likewise.
2013-01-23 23:21:59 +01:00
|
|
|
|
(let ((args (package-arguments p)))
|
|
|
|
|
(substitute-keyword-arguments args
|
|
|
|
|
((#:configure-flags flags)
|
|
|
|
|
(let* ((var= (string-append variable "="))
|
|
|
|
|
(len (string-length var=)))
|
|
|
|
|
`(cons ,(string-append var= value)
|
|
|
|
|
(map (lambda (flag)
|
|
|
|
|
(if (string-prefix? ,var= flag)
|
|
|
|
|
(string-append
|
|
|
|
|
,(string-append var= value " ")
|
|
|
|
|
(substring flag ,len))
|
|
|
|
|
flag))
|
|
|
|
|
,flags)))))))
|
2012-11-05 23:50:05 +01:00
|
|
|
|
(inputs (rewritten-inputs (package-inputs p)))
|
|
|
|
|
(propagated-inputs (rewritten-inputs (package-propagated-inputs p))))))
|
|
|
|
|
|
|
|
|
|
(define (static-libgcc-package p)
|
|
|
|
|
"A version of P linked with `-static-gcc'."
|
|
|
|
|
(package-with-extra-configure-variable p "LDFLAGS" "-static-libgcc"))
|
|
|
|
|
|
2013-02-14 00:14:29 +01:00
|
|
|
|
(define* (static-package p #:optional (loc (current-source-location))
|
|
|
|
|
#:key (strip-all? #t))
|
|
|
|
|
"Return a statically-linked version of package P. If STRIP-ALL? is true,
|
|
|
|
|
use `--strip-all' as the arguments to `strip'."
|
2013-06-05 16:39:58 +02:00
|
|
|
|
(package (inherit p)
|
|
|
|
|
(location (source-properties->location loc))
|
|
|
|
|
(arguments
|
|
|
|
|
(let ((a (default-keyword-arguments (package-arguments p)
|
|
|
|
|
'(#:configure-flags '()
|
|
|
|
|
#:strip-flags '("--strip-debug")))))
|
|
|
|
|
(substitute-keyword-arguments a
|
|
|
|
|
((#:configure-flags flags)
|
|
|
|
|
`(cons* "--disable-shared" "LDFLAGS=-static" ,flags))
|
|
|
|
|
((#:strip-flags flags)
|
|
|
|
|
(if strip-all?
|
|
|
|
|
''("--strip-all")
|
|
|
|
|
flags)))))))
|
2013-01-01 16:55:34 +01:00
|
|
|
|
|
2013-08-24 17:17:06 +02:00
|
|
|
|
(define* (dist-package p source)
|
|
|
|
|
"Return a package that runs takes source files from the SOURCE directory,
|
|
|
|
|
runs `make distcheck' and whose result is one or more source tarballs."
|
|
|
|
|
(let ((s source))
|
|
|
|
|
(package (inherit p)
|
|
|
|
|
(name (string-append (package-name p) "-dist"))
|
|
|
|
|
(source s)
|
|
|
|
|
(arguments
|
|
|
|
|
;; Use the right phases and modules.
|
|
|
|
|
(let* ((args (default-keyword-arguments (package-arguments p)
|
|
|
|
|
`(#:phases #f
|
|
|
|
|
#:modules ,%default-modules
|
|
|
|
|
#:imported-modules ,%default-modules))))
|
|
|
|
|
(substitute-keyword-arguments args
|
|
|
|
|
((#:modules modules)
|
|
|
|
|
`((guix build gnu-dist)
|
|
|
|
|
,@modules))
|
|
|
|
|
((#:imported-modules modules)
|
|
|
|
|
`((guix build gnu-dist)
|
|
|
|
|
,@modules))
|
|
|
|
|
((#:phases _)
|
|
|
|
|
'%dist-phases))))
|
|
|
|
|
(native-inputs
|
|
|
|
|
;; Add autotools & co. as inputs.
|
|
|
|
|
(let ((ref (lambda (module var)
|
|
|
|
|
(module-ref (resolve-interface module) var))))
|
|
|
|
|
`(("autoconf" ,(ref '(gnu packages autotools) 'autoconf))
|
|
|
|
|
("automake" ,(ref '(gnu packages autotools) 'automake))
|
|
|
|
|
("libtool" ,(ref '(gnu packages autotools) 'libtool) "bin")
|
|
|
|
|
("gettext" ,(ref '(gnu packages gettext) 'gettext))
|
|
|
|
|
("texinfo" ,(ref '(gnu packages texinfo) 'texinfo))))))))
|
|
|
|
|
|
2012-11-05 23:50:05 +01:00
|
|
|
|
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
(define %store
|
|
|
|
|
;; Store passed to STANDARD-INPUTS.
|
|
|
|
|
(make-parameter #f))
|
|
|
|
|
|
2013-04-09 19:01:21 +02:00
|
|
|
|
(define (standard-packages)
|
|
|
|
|
"Return the list of (NAME PACKAGE OUTPUT) or (NAME PACKAGE) tuples of
|
|
|
|
|
standard packages used as implicit inputs of the GNU build system."
|
|
|
|
|
|
|
|
|
|
;; Resolve (gnu packages base) lazily to hide circular dependency.
|
|
|
|
|
(let ((distro (resolve-module '(gnu packages base))))
|
|
|
|
|
(module-ref distro '%final-inputs)))
|
|
|
|
|
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(define* (inputs-search-paths inputs
|
|
|
|
|
#:optional (package->search-paths
|
|
|
|
|
package-native-search-paths))
|
|
|
|
|
"Return the <search-path-specification> objects for INPUTS, using
|
|
|
|
|
PACKAGE->SEARCH-PATHS to extract the search path specifications of a package."
|
2013-04-16 14:05:00 +02:00
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((_ (? package? p) _ ...)
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(package->search-paths p))
|
2013-04-16 14:05:00 +02:00
|
|
|
|
(_
|
|
|
|
|
'()))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
inputs))
|
|
|
|
|
|
|
|
|
|
(define (standard-search-paths)
|
|
|
|
|
"Return the list of <search-path-specification> for the standard (implicit)
|
|
|
|
|
inputs when doing a native build."
|
|
|
|
|
(inputs-search-paths (standard-packages)))
|
|
|
|
|
|
|
|
|
|
(define (expand-inputs inputs system)
|
|
|
|
|
"Expand INPUTS, which contains <package> objects, so that it contains only
|
|
|
|
|
derivations for SYSTEM. Include propagated inputs in the result."
|
|
|
|
|
(define input-package->derivation
|
|
|
|
|
(match-lambda
|
|
|
|
|
((name pkg sub-drv ...)
|
|
|
|
|
(cons* name (package-derivation (%store) pkg system) sub-drv))
|
|
|
|
|
((name (? derivation-path? path) sub-drv ...)
|
|
|
|
|
(cons* name path sub-drv))
|
|
|
|
|
(z
|
|
|
|
|
(error "invalid standard input" z))))
|
|
|
|
|
|
|
|
|
|
(map input-package->derivation
|
|
|
|
|
(append inputs
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((name package _ ...)
|
|
|
|
|
(package-transitive-propagated-inputs package)))
|
|
|
|
|
inputs))))
|
2013-04-16 14:05:00 +02:00
|
|
|
|
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
(define standard-inputs
|
|
|
|
|
(memoize
|
|
|
|
|
(lambda (system)
|
|
|
|
|
"Return the list of implicit standard inputs used with the GNU Build
|
|
|
|
|
System: GCC, GNU Make, Bash, Coreutils, etc."
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(expand-inputs (standard-packages) system))))
|
2012-06-13 17:03:34 +02:00
|
|
|
|
|
|
|
|
|
(define* (gnu-build store name source inputs
|
2012-10-06 01:24:46 +02:00
|
|
|
|
#:key (guile #f)
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(outputs '("out"))
|
|
|
|
|
(search-paths '())
|
|
|
|
|
(configure-flags ''())
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(make-flags ''())
|
2012-08-23 23:13:41 +02:00
|
|
|
|
(out-of-source? #f)
|
2012-07-07 18:12:20 +02:00
|
|
|
|
(tests? #t)
|
2012-12-29 21:03:23 +01:00
|
|
|
|
(test-target "check")
|
2012-07-07 16:49:23 +02:00
|
|
|
|
(parallel-build? #t) (parallel-tests? #t)
|
2012-08-19 17:54:54 +02:00
|
|
|
|
(patch-shebangs? #t)
|
2012-08-31 17:04:53 +02:00
|
|
|
|
(strip-binaries? #t)
|
|
|
|
|
(strip-flags ''("--strip-debug"))
|
|
|
|
|
(strip-directories ''("lib" "lib64" "libexec"
|
|
|
|
|
"bin" "sbin"))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(phases '%standard-phases)
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(system (%current-system))
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(implicit-inputs? #t) ; useful when bootstrapping
|
2013-08-24 17:17:06 +02:00
|
|
|
|
(imported-modules %default-modules)
|
|
|
|
|
(modules %default-modules))
|
2012-06-13 17:03:34 +02:00
|
|
|
|
"Return a derivation called NAME that builds from tarball SOURCE, with
|
2012-10-06 01:24:46 +02:00
|
|
|
|
input derivation INPUTS, using the usual procedure of the GNU Build
|
|
|
|
|
System. The builder is run with GUILE, or with the distro's final Guile
|
2012-10-31 17:53:59 +01:00
|
|
|
|
package if GUILE is #f or omitted.
|
|
|
|
|
|
|
|
|
|
The builder is run in a context where MODULES are used; IMPORTED-MODULES
|
|
|
|
|
specifies modules not provided by Guile itself that must be imported in
|
|
|
|
|
the builder's environment, from the host. Note that we distinguish
|
|
|
|
|
between both, because for Guile's own modules like (ice-9 foo), we want
|
|
|
|
|
to use GUILE's own version of it, rather than import the user's one,
|
|
|
|
|
which could lead to gratuitous input divergence."
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(define implicit-inputs
|
|
|
|
|
(and implicit-inputs?
|
|
|
|
|
(parameterize ((%store store))
|
|
|
|
|
(standard-inputs system))))
|
|
|
|
|
|
|
|
|
|
(define implicit-search-paths
|
|
|
|
|
(if implicit-inputs?
|
2013-04-16 14:05:00 +02:00
|
|
|
|
(standard-search-paths)
|
2013-03-30 22:56:38 +01:00
|
|
|
|
'()))
|
|
|
|
|
|
2012-06-13 17:03:34 +02:00
|
|
|
|
(define builder
|
|
|
|
|
`(begin
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(use-modules ,@modules)
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(gnu-build #:source ,(if (derivation? source)
|
|
|
|
|
(derivation->output-path source)
|
2012-06-16 16:56:47 +02:00
|
|
|
|
source)
|
2012-10-17 22:40:05 +02:00
|
|
|
|
#:system ,system
|
2012-06-16 16:56:47 +02:00
|
|
|
|
#:outputs %outputs
|
|
|
|
|
#:inputs %build-inputs
|
2013-03-30 22:56:38 +01:00
|
|
|
|
#:search-paths ',(map search-path-specification->sexp
|
|
|
|
|
(append implicit-search-paths
|
|
|
|
|
search-paths))
|
2012-06-16 16:56:47 +02:00
|
|
|
|
#:phases ,phases
|
2012-06-28 01:18:15 +02:00
|
|
|
|
#:configure-flags ,configure-flags
|
2012-07-07 16:49:23 +02:00
|
|
|
|
#:make-flags ,make-flags
|
2012-08-23 23:13:41 +02:00
|
|
|
|
#:out-of-source? ,out-of-source?
|
2012-07-07 18:12:20 +02:00
|
|
|
|
#:tests? ,tests?
|
2012-12-29 21:03:23 +01:00
|
|
|
|
#:test-target ,test-target
|
2012-07-07 16:49:23 +02:00
|
|
|
|
#:parallel-build? ,parallel-build?
|
2012-08-19 17:54:54 +02:00
|
|
|
|
#:parallel-tests? ,parallel-tests?
|
2012-08-31 17:04:53 +02:00
|
|
|
|
#:patch-shebangs? ,patch-shebangs?
|
|
|
|
|
#:strip-binaries? ,strip-binaries?
|
|
|
|
|
#:strip-flags ,strip-flags
|
|
|
|
|
#:strip-directories ,strip-directories)))
|
2012-06-13 17:03:34 +02:00
|
|
|
|
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(define guile-for-build
|
|
|
|
|
(match guile
|
2012-10-06 01:24:46 +02:00
|
|
|
|
((? package?)
|
|
|
|
|
(package-derivation store guile system))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
;; ((and (? string?) (? derivation-path?))
|
|
|
|
|
;; guile)
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(#f ; the default
|
2013-01-18 01:06:24 +01:00
|
|
|
|
(let* ((distro (resolve-interface '(gnu packages base)))
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(guile (module-ref distro 'guile-final)))
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(package-derivation store guile system)))))
|
2012-10-06 01:24:46 +02:00
|
|
|
|
|
2012-06-13 17:03:34 +02:00
|
|
|
|
(build-expression->derivation store name system
|
|
|
|
|
builder
|
2013-01-15 01:05:39 +01:00
|
|
|
|
`(,@(if source
|
|
|
|
|
`(("source" ,source))
|
|
|
|
|
'())
|
2012-06-13 17:21:27 +02:00
|
|
|
|
,@inputs
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
,@(if implicit-inputs?
|
2013-03-30 22:56:38 +01:00
|
|
|
|
implicit-inputs
|
distro: Bootstrap standard inputs from Nixpkgs.
This is a first step towards bootstrapping from a set of pre-built,
statically-linked binaries.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
standard-inputs): New procedure.
(%store): New variable.
(%standard-inputs): Remove.
(gnu-build): New `implicit-inputs?' keyword parameter. Use it to
choose whether to use `(standard-inputs SYSTEM)' or the empty list.
* distro/base.scm (guile-2.0): Remove dependency on XZ, which is now
implicit.
(%bootstrap-inputs, gcc-boot0, binutils-boot0, linux-headers-boot0,
%boot1-inputs, glibc-final, %boot2-inputs, m4-boot2, gmp-boot2,
mpfr-boot2, mpc-boot2, %boot3-inputs, gcc-final, %boot4-inputs,
%final-inputs): New variables.
2012-09-01 19:21:06 +02:00
|
|
|
|
'()))
|
2013-07-04 13:26:35 +02:00
|
|
|
|
#:outputs (if strip-binaries?
|
|
|
|
|
outputs
|
|
|
|
|
(delete "debug" outputs))
|
2012-10-31 17:53:59 +01:00
|
|
|
|
#:modules imported-modules
|
2012-10-06 01:24:46 +02:00
|
|
|
|
#:guile-for-build guile-for-build))
|
2012-06-27 23:58:07 +02:00
|
|
|
|
|
2013-05-24 22:44:15 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Cross-compilation.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define standard-cross-packages
|
|
|
|
|
(memoize
|
|
|
|
|
(lambda (target kind)
|
|
|
|
|
"Return the list of name/package tuples to cross-build for TARGET. KIND
|
|
|
|
|
is one of `host' or `target'."
|
|
|
|
|
(let* ((cross (resolve-interface '(gnu packages cross-base)))
|
|
|
|
|
(gcc (module-ref cross 'cross-gcc))
|
|
|
|
|
(binutils (module-ref cross 'cross-binutils))
|
|
|
|
|
(libc (module-ref cross 'cross-libc)))
|
|
|
|
|
(case kind
|
|
|
|
|
((host)
|
|
|
|
|
`(("cross-gcc" ,(gcc target
|
|
|
|
|
(binutils target)
|
|
|
|
|
(libc target)))
|
|
|
|
|
("cross-binutils" ,(binutils target))
|
|
|
|
|
,@(standard-packages)))
|
|
|
|
|
((target)
|
|
|
|
|
`(("cross-libc" ,(libc target)))))))))
|
|
|
|
|
|
|
|
|
|
(define standard-cross-inputs
|
|
|
|
|
(memoize
|
|
|
|
|
(lambda (system target kind)
|
|
|
|
|
"Return the list of implicit standard inputs used with the GNU Build
|
|
|
|
|
System when cross-compiling for TARGET: GCC, GNU Make, Bash, Coreutils, etc."
|
|
|
|
|
(expand-inputs (standard-cross-packages target kind) system))))
|
|
|
|
|
|
|
|
|
|
(define (standard-cross-search-paths target kind)
|
|
|
|
|
"Return the list of <search-path-specification> for the standard (implicit)
|
|
|
|
|
inputs."
|
|
|
|
|
(inputs-search-paths (append (standard-cross-packages target 'target)
|
|
|
|
|
(standard-cross-packages target 'host))
|
|
|
|
|
(case kind
|
|
|
|
|
((host) package-native-search-paths)
|
|
|
|
|
((target) package-search-paths))))
|
|
|
|
|
|
|
|
|
|
(define* (gnu-cross-build store name target source inputs native-inputs
|
|
|
|
|
#:key
|
|
|
|
|
(guile #f)
|
|
|
|
|
(outputs '("out"))
|
|
|
|
|
(search-paths '())
|
|
|
|
|
(native-search-paths '())
|
|
|
|
|
|
|
|
|
|
(configure-flags ''())
|
|
|
|
|
(make-flags ''())
|
|
|
|
|
(out-of-source? #f)
|
2013-06-24 23:26:50 +02:00
|
|
|
|
(tests? #f) ; nothing can be done
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(test-target "check")
|
|
|
|
|
(parallel-build? #t) (parallel-tests? #t)
|
|
|
|
|
(patch-shebangs? #t)
|
|
|
|
|
(strip-binaries? #t)
|
|
|
|
|
(strip-flags ''("--strip-debug"))
|
|
|
|
|
(strip-directories ''("lib" "lib64" "libexec"
|
|
|
|
|
"bin" "sbin"))
|
build-system/gnu: Unify with (guix build-system gnu-cross-build).
* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and
`native-search-paths' keyword parameters. Honor them.
(configure): Add `target' and `native-inputs' keyword parameters.
Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET
is true.
(strip): Add `strip-command' keyword parameter. Use it.
* guix/build/gnu-cross-build.scm: Remove.
* Makefile.am (MODULES): Adjust accordingly.
* gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm,
gnu/packages/bash.scm, gnu/packages/gawk.scm,
gnu/packages/gettext.scm, gnu/packages/guile.scm,
gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm,
gnu/packages/linux.scm, gnu/packages/ncurses.scm,
gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace
`%standard-cross-phases' by `%standard-phases'. Remove references
to (guix build gnu-cross-build).
2013-06-21 00:25:54 +02:00
|
|
|
|
(phases '%standard-phases)
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(system (%current-system))
|
build-system/gnu: Unify with (guix build-system gnu-cross-build).
* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and
`native-search-paths' keyword parameters. Honor them.
(configure): Add `target' and `native-inputs' keyword parameters.
Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET
is true.
(strip): Add `strip-command' keyword parameter. Use it.
* guix/build/gnu-cross-build.scm: Remove.
* Makefile.am (MODULES): Adjust accordingly.
* gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm,
gnu/packages/bash.scm, gnu/packages/gawk.scm,
gnu/packages/gettext.scm, gnu/packages/guile.scm,
gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm,
gnu/packages/linux.scm, gnu/packages/ncurses.scm,
gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace
`%standard-cross-phases' by `%standard-phases'. Remove references
to (guix build gnu-cross-build).
2013-06-21 00:25:54 +02:00
|
|
|
|
(implicit-inputs? #t)
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(imported-modules '((guix build gnu-build-system)
|
|
|
|
|
(guix build utils)))
|
|
|
|
|
(modules '((guix build gnu-build-system)
|
|
|
|
|
(guix build utils))))
|
|
|
|
|
"Cross-build NAME for TARGET, where TARGET is a GNU triplet. INPUTS are
|
|
|
|
|
cross-built inputs, and NATIVE-INPUTS are inputs that run on the build
|
|
|
|
|
platform."
|
|
|
|
|
|
|
|
|
|
(define implicit-host-inputs
|
|
|
|
|
(and implicit-inputs?
|
|
|
|
|
(parameterize ((%store store))
|
|
|
|
|
(standard-cross-inputs system target 'host))))
|
|
|
|
|
|
|
|
|
|
(define implicit-target-inputs
|
|
|
|
|
(and implicit-inputs?
|
|
|
|
|
(parameterize ((%store store))
|
|
|
|
|
(standard-cross-inputs system target 'target))))
|
|
|
|
|
|
|
|
|
|
(define implicit-host-search-paths
|
|
|
|
|
(if implicit-inputs?
|
|
|
|
|
(standard-cross-search-paths target 'host)
|
|
|
|
|
'()))
|
|
|
|
|
|
|
|
|
|
(define implicit-target-search-paths
|
|
|
|
|
(if implicit-inputs?
|
|
|
|
|
(standard-cross-search-paths target 'target)
|
|
|
|
|
'()))
|
|
|
|
|
|
|
|
|
|
(define builder
|
|
|
|
|
`(begin
|
|
|
|
|
(use-modules ,@modules)
|
|
|
|
|
|
|
|
|
|
(let ()
|
|
|
|
|
(define %build-host-inputs
|
|
|
|
|
',(map (match-lambda
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
((name (? derivation? drv) sub ...)
|
|
|
|
|
`(,name . ,(apply derivation->output-path drv sub)))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
((name (? derivation-path? drv-path) sub ...)
|
|
|
|
|
`(,name . ,(apply derivation-path->output-path
|
|
|
|
|
drv-path sub)))
|
2013-05-25 15:35:36 +02:00
|
|
|
|
((name path)
|
|
|
|
|
`(,name . ,path)))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(append (or implicit-host-inputs '()) native-inputs)))
|
|
|
|
|
|
|
|
|
|
(define %build-target-inputs
|
|
|
|
|
',(map (match-lambda
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
((name (? derivation? drv) sub ...)
|
|
|
|
|
`(,name . ,(apply derivation->output-path drv sub)))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
((name (? derivation-path? drv-path) sub ...)
|
|
|
|
|
`(,name . ,(apply derivation-path->output-path
|
|
|
|
|
drv-path sub)))
|
2013-05-25 15:35:36 +02:00
|
|
|
|
((name path)
|
|
|
|
|
`(,name . ,path)))
|
2013-05-27 23:20:02 +02:00
|
|
|
|
(append (or implicit-target-inputs '()) inputs)))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(gnu-build #:source ,(if (derivation? source)
|
|
|
|
|
(derivation->output-path source)
|
2013-05-24 22:44:15 +02:00
|
|
|
|
source)
|
|
|
|
|
#:system ,system
|
|
|
|
|
#:target ,target
|
|
|
|
|
#:outputs %outputs
|
|
|
|
|
#:inputs %build-target-inputs
|
|
|
|
|
#:native-inputs %build-host-inputs
|
|
|
|
|
#:search-paths ',(map search-path-specification->sexp
|
|
|
|
|
(append implicit-target-search-paths
|
|
|
|
|
search-paths))
|
|
|
|
|
#:native-search-paths ',(map
|
|
|
|
|
search-path-specification->sexp
|
|
|
|
|
(append implicit-host-search-paths
|
|
|
|
|
native-search-paths))
|
|
|
|
|
#:phases ,phases
|
|
|
|
|
#:configure-flags ,configure-flags
|
|
|
|
|
#:make-flags ,make-flags
|
|
|
|
|
#:out-of-source? ,out-of-source?
|
|
|
|
|
#:tests? ,tests?
|
|
|
|
|
#:test-target ,test-target
|
|
|
|
|
#:parallel-build? ,parallel-build?
|
|
|
|
|
#:parallel-tests? ,parallel-tests?
|
|
|
|
|
#:patch-shebangs? ,patch-shebangs?
|
|
|
|
|
#:strip-binaries? ,strip-binaries?
|
|
|
|
|
#:strip-flags ,strip-flags
|
|
|
|
|
#:strip-directories ,strip-directories))))
|
|
|
|
|
|
|
|
|
|
(define guile-for-build
|
|
|
|
|
(match guile
|
|
|
|
|
((? package?)
|
|
|
|
|
(package-derivation store guile system))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
;; ((and (? string?) (? derivation-path?))
|
|
|
|
|
;; guile)
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(#f ; the default
|
|
|
|
|
(let* ((distro (resolve-interface '(gnu packages base)))
|
|
|
|
|
(guile (module-ref distro 'guile-final)))
|
|
|
|
|
(package-derivation store guile system)))))
|
|
|
|
|
|
|
|
|
|
(build-expression->derivation store name system
|
|
|
|
|
builder
|
|
|
|
|
`(,@(if source
|
|
|
|
|
`(("source" ,source))
|
|
|
|
|
'())
|
|
|
|
|
,@inputs
|
|
|
|
|
,@(if implicit-inputs?
|
|
|
|
|
implicit-target-inputs
|
|
|
|
|
'())
|
|
|
|
|
,@native-inputs
|
|
|
|
|
,@(if implicit-inputs?
|
|
|
|
|
implicit-host-inputs
|
|
|
|
|
'()))
|
2013-07-04 13:26:35 +02:00
|
|
|
|
#:outputs (if strip-binaries?
|
|
|
|
|
outputs
|
|
|
|
|
(delete "debug" outputs))
|
2013-05-24 22:44:15 +02:00
|
|
|
|
#:modules imported-modules
|
|
|
|
|
#:guile-for-build guile-for-build))
|
|
|
|
|
|
2012-06-27 23:58:07 +02:00
|
|
|
|
(define gnu-build-system
|
|
|
|
|
(build-system (name 'gnu)
|
|
|
|
|
(description
|
|
|
|
|
"The GNU Build System—i.e., ./configure && make && make install")
|
2013-05-24 22:44:15 +02:00
|
|
|
|
(build gnu-build)
|
|
|
|
|
(cross-build gnu-cross-build)))
|