2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2017-01-28 00:11:33 +01:00
|
|
|
|
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
2017-05-02 09:39:23 +02:00
|
|
|
|
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
|
2015-07-22 03:45:54 +02:00
|
|
|
|
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
2016-05-19 18:11:58 +02:00
|
|
|
|
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
2017-05-23 20:51:36 +02:00
|
|
|
|
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-06-28 01:24: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-28 01:24: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-28 01:24: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-28 01:24:34 +02:00
|
|
|
|
|
|
|
|
|
(define-module (guix packages)
|
|
|
|
|
#:use-module (guix utils)
|
2013-05-12 15:46:16 +02:00
|
|
|
|
#:use-module (guix records)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
#:use-module (guix 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
|
|
|
|
#:use-module (guix monads)
|
2015-03-17 22:09:32 +01:00
|
|
|
|
#:use-module (guix gexp)
|
Move base32 code to (guix base32).
* guix/utils.scm (bytevector-quintet-ref, bytevector-quintet-ref-right,
bytevector-quintet-length, bytevector-quintet-fold,
bytevector-quintet-fold-right, make-bytevector->base32-string,
%nix-base32-chars, %rfc4648-base32-chars, bytevector->base32-string,
bytevector->nix-base32-string, bytevector-quintet-set!,
bytevector-quintet-set-right!, base32-string-unfold,
base32-string-unfold-right, make-base32-string->bytevector,
base32-string->bytevector, nix-base32-string->bytevector): Move to...
* guix/base32.scm: ... here. New file.
* tests/utils.scm (%nix-hash, "bytevector->base32-string",
"base32-string->bytevector", "nix-base32-string->bytevector", "sha256
& bytevector->base32-string"): Move to...
* tests/base32.scm: ... here. New file
* guix-download.in, guix/derivations.scm, guix/packages.scm,
guix/snix.scm, tests/builders.scm, tests/derivations.scm: Adjust
accordingly.
* guix.scm (%public-modules): Add `base32'.
2012-11-11 22:33:28 +01:00
|
|
|
|
#:use-module (guix base32)
|
2016-02-22 16:29:44 +01:00
|
|
|
|
#:use-module (guix grafts)
|
2013-02-16 01:37:26 +01:00
|
|
|
|
#:use-module (guix derivations)
|
2017-01-28 17:15:27 +01:00
|
|
|
|
#:use-module (guix memoization)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
#:use-module (guix build-system)
|
Move search path specifications to (guix search-paths).
* guix/packages.scm (<search-path-specification>,
search-path-specification->sexp, sexp->search-path-specification):
Move to...
* guix/search-paths.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
* guix/build-system/cmake.scm, guix/build-system/glib-or-gtk.scm,
guix/build-system/gnu.scm, guix/build-system/haskell.scm,
guix/build-system/perl.scm, guix/build-system/python.scm,
guix/build-system/ruby.scm, guix/build-system/waf.scm,
guix/profiles.scm, guix/scripts/package.scm: Use it.
2015-05-04 22:11:37 +02:00
|
|
|
|
#:use-module (guix search-paths)
|
2016-02-27 23:06:50 +01:00
|
|
|
|
#:use-module (guix sets)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
#:use-module (ice-9 match)
|
2014-11-03 21:26:48 +01:00
|
|
|
|
#:use-module (ice-9 vlist)
|
2012-07-01 17:32:03 +02:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2012-09-01 19:21:06 +02:00
|
|
|
|
#:use-module (srfi srfi-9 gnu)
|
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
|
|
|
|
#:use-module (srfi srfi-11)
|
2013-05-20 23:00:47 +02:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2012-08-23 23:09:13 +02:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2015-09-10 22:39:44 +02:00
|
|
|
|
#:use-module (web uri)
|
2013-05-25 16:14:37 +02:00
|
|
|
|
#:re-export (%current-system
|
Move search path specifications to (guix search-paths).
* guix/packages.scm (<search-path-specification>,
search-path-specification->sexp, sexp->search-path-specification):
Move to...
* guix/search-paths.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
* guix/build-system/cmake.scm, guix/build-system/glib-or-gtk.scm,
guix/build-system/gnu.scm, guix/build-system/haskell.scm,
guix/build-system/perl.scm, guix/build-system/python.scm,
guix/build-system/ruby.scm, guix/build-system/waf.scm,
guix/profiles.scm, guix/scripts/package.scm: Use it.
2015-05-04 22:11:37 +02:00
|
|
|
|
%current-target-system
|
|
|
|
|
search-path-specification) ;for convenience
|
2012-09-01 19:21:06 +02:00
|
|
|
|
#:export (origin
|
2012-07-01 17:32:03 +02:00
|
|
|
|
origin?
|
|
|
|
|
origin-uri
|
|
|
|
|
origin-method
|
|
|
|
|
origin-sha256
|
|
|
|
|
origin-file-name
|
2015-09-10 22:39:44 +02:00
|
|
|
|
origin-actual-file-name
|
2013-10-09 00:04:45 +02:00
|
|
|
|
origin-patches
|
|
|
|
|
origin-patch-flags
|
|
|
|
|
origin-patch-inputs
|
|
|
|
|
origin-patch-guile
|
2013-11-07 22:41:21 +01:00
|
|
|
|
origin-snippet
|
|
|
|
|
origin-modules
|
2012-07-01 17:32:03 +02:00
|
|
|
|
base32
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
|
|
|
|
package
|
|
|
|
|
package?
|
|
|
|
|
package-name
|
2017-01-28 00:11:33 +01:00
|
|
|
|
package-upstream-name
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-version
|
2012-09-05 19:01:47 +02:00
|
|
|
|
package-full-name
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-source
|
|
|
|
|
package-build-system
|
|
|
|
|
package-arguments
|
|
|
|
|
package-inputs
|
|
|
|
|
package-native-inputs
|
2012-07-01 17:32:03 +02:00
|
|
|
|
package-propagated-inputs
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-outputs
|
2013-03-30 22:56:38 +01:00
|
|
|
|
package-native-search-paths
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-search-paths
|
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
|
|
|
|
package-replacement
|
2012-11-04 13:41:34 +01:00
|
|
|
|
package-synopsis
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-description
|
|
|
|
|
package-license
|
2012-11-25 16:55:35 +01:00
|
|
|
|
package-home-page
|
2014-10-06 19:14:47 +02:00
|
|
|
|
package-supported-systems
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-maintainers
|
2012-07-01 17:32:03 +02:00
|
|
|
|
package-properties
|
2012-06-28 23:15:24 +02:00
|
|
|
|
package-location
|
2016-07-28 18:50:43 +02:00
|
|
|
|
hidden-package
|
|
|
|
|
hidden-package?
|
2016-09-06 23:14:07 +02:00
|
|
|
|
package-superseded
|
|
|
|
|
deprecated-package
|
2013-04-22 23:07:13 +02:00
|
|
|
|
package-field-location
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2015-04-24 14:57:51 +02:00
|
|
|
|
package-direct-sources
|
|
|
|
|
package-transitive-sources
|
2014-07-20 18:29:48 +02:00
|
|
|
|
package-direct-inputs
|
2012-07-07 20:14:20 +02:00
|
|
|
|
package-transitive-inputs
|
2013-05-24 22:21:24 +02:00
|
|
|
|
package-transitive-target-inputs
|
|
|
|
|
package-transitive-native-inputs
|
2012-09-01 19:21:06 +02:00
|
|
|
|
package-transitive-propagated-inputs
|
2015-12-20 14:34:36 +01:00
|
|
|
|
package-transitive-native-search-paths
|
2014-10-17 23:20:39 +02:00
|
|
|
|
package-transitive-supported-systems
|
2017-04-05 15:19:15 +02:00
|
|
|
|
package-mapping
|
2016-09-01 22:35:35 +02:00
|
|
|
|
package-input-rewriting
|
2012-06-28 01:24:34 +02:00
|
|
|
|
package-source-derivation
|
|
|
|
|
package-derivation
|
2012-08-23 23:09:13 +02:00
|
|
|
|
package-cross-derivation
|
2013-02-16 01:37:26 +01:00
|
|
|
|
package-output
|
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
|
|
|
|
package-grafts
|
2017-05-02 09:39:23 +02:00
|
|
|
|
package/inherit
|
2012-08-23 23:09:13 +02:00
|
|
|
|
|
2015-07-22 03:45:54 +02:00
|
|
|
|
transitive-input-references
|
|
|
|
|
|
2014-10-06 19:14:47 +02:00
|
|
|
|
%supported-systems
|
2015-09-04 13:40:55 +02:00
|
|
|
|
%hurd-systems
|
2015-05-01 16:05:40 +02:00
|
|
|
|
%hydra-supported-systems
|
2015-04-19 16:49:09 +02:00
|
|
|
|
supported-package?
|
2014-10-06 19:14:47 +02:00
|
|
|
|
|
2012-08-23 23:09:13 +02:00
|
|
|
|
&package-error
|
2012-10-27 14:56:38 +02:00
|
|
|
|
package-error?
|
2012-08-23 23:09:13 +02:00
|
|
|
|
package-error-package
|
|
|
|
|
&package-input-error
|
2012-10-27 14:56:38 +02:00
|
|
|
|
package-input-error?
|
2013-05-27 23:41:35 +02:00
|
|
|
|
package-error-invalid-input
|
|
|
|
|
&package-cross-build-system-error
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
package-cross-build-system-error?
|
|
|
|
|
|
|
|
|
|
package->bag
|
2014-10-05 16:32:25 +02:00
|
|
|
|
bag->derivation
|
2015-04-11 12:29:10 +02:00
|
|
|
|
bag-direct-inputs
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
bag-transitive-inputs
|
|
|
|
|
bag-transitive-host-inputs
|
|
|
|
|
bag-transitive-build-inputs
|
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
|
|
|
|
bag-transitive-target-inputs
|
|
|
|
|
|
|
|
|
|
default-guile
|
2015-03-17 22:09:32 +01:00
|
|
|
|
default-guile-derivation
|
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
|
|
|
|
set-guile-for-build
|
|
|
|
|
package-file
|
|
|
|
|
package->derivation
|
|
|
|
|
package->cross-derivation
|
|
|
|
|
origin->derivation))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module provides a high-level mechanism to define packages in a
|
|
|
|
|
;;; Guix-based distribution.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2012-07-01 17:32:03 +02:00
|
|
|
|
;; The source of a package, such as a tarball URL and fetcher---called
|
|
|
|
|
;; "origin" to avoid name clash with `package-source', `source', etc.
|
|
|
|
|
(define-record-type* <origin>
|
|
|
|
|
origin make-origin
|
|
|
|
|
origin?
|
|
|
|
|
(uri origin-uri) ; string
|
2014-02-21 23:41:11 +01:00
|
|
|
|
(method origin-method) ; procedure
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(sha256 origin-sha256) ; bytevector
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(file-name origin-file-name (default #f)) ; optional file name
|
2015-01-20 09:59:56 +01:00
|
|
|
|
|
|
|
|
|
;; Patches are delayed so that the 'search-patch' calls are made lazily,
|
|
|
|
|
;; which reduces I/O on startup and allows patch-not-found errors to be
|
|
|
|
|
;; gracefully handled at run time.
|
|
|
|
|
(patches origin-patches ; list of file names
|
|
|
|
|
(default '()) (delayed))
|
|
|
|
|
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(snippet origin-snippet (default #f)) ; sexp or #f
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(patch-flags origin-patch-flags ; list of strings
|
|
|
|
|
(default '("-p1")))
|
2013-10-10 23:00:47 +02:00
|
|
|
|
|
|
|
|
|
;; Patching requires Guile, GNU Patch, and a few more. These two fields are
|
|
|
|
|
;; used to specify these dependencies when needed.
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(patch-inputs origin-patch-inputs ; input list or #f
|
|
|
|
|
(default #f))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(modules origin-modules ; list of module names
|
|
|
|
|
(default '()))
|
2016-07-12 22:23:12 +02:00
|
|
|
|
|
2013-10-10 23:00:47 +02:00
|
|
|
|
(patch-guile origin-patch-guile ; package or #f
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(default #f)))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2014-07-11 13:59:54 +02:00
|
|
|
|
(define (print-origin origin port)
|
|
|
|
|
"Write a concise representation of ORIGIN to PORT."
|
|
|
|
|
(match origin
|
|
|
|
|
(($ <origin> uri method sha256 file-name patches)
|
|
|
|
|
(simple-format port "#<origin ~s ~a ~s ~a>"
|
|
|
|
|
uri (bytevector->base32-string sha256)
|
2015-01-20 09:59:56 +01:00
|
|
|
|
(force patches)
|
2014-07-11 13:59:54 +02:00
|
|
|
|
(number->string (object-address origin) 16)))))
|
|
|
|
|
|
|
|
|
|
(set-record-type-printer! <origin> print-origin)
|
|
|
|
|
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(define-syntax base32
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Return the bytevector corresponding to the given Nix-base32
|
|
|
|
|
representation."
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_ str)
|
|
|
|
|
(string? (syntax->datum #'str))
|
2013-01-17 15:45:05 +01:00
|
|
|
|
;; A literal string: do the conversion at expansion time.
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(with-syntax ((bv (nix-base32-string->bytevector
|
|
|
|
|
(syntax->datum #'str))))
|
2013-01-17 15:45:05 +01:00
|
|
|
|
#''bv))
|
|
|
|
|
((_ str)
|
|
|
|
|
#'(nix-base32-string->bytevector str)))))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
|
2015-09-10 22:39:44 +02:00
|
|
|
|
(define (origin-actual-file-name origin)
|
|
|
|
|
"Return the file name of ORIGIN, either its 'file-name' field or the file
|
|
|
|
|
name of its URI."
|
|
|
|
|
(define (uri->file-name uri)
|
|
|
|
|
;; Return the 'base name' of URI or URI itself, where URI is a string.
|
|
|
|
|
(let ((path (and=> (string->uri uri) uri-path)))
|
|
|
|
|
(if path
|
|
|
|
|
(basename path)
|
|
|
|
|
uri)))
|
|
|
|
|
|
|
|
|
|
(or (origin-file-name origin)
|
|
|
|
|
(match (origin-uri origin)
|
|
|
|
|
((head . tail)
|
|
|
|
|
(uri->file-name head))
|
|
|
|
|
((? string? uri)
|
|
|
|
|
(uri->file-name uri))
|
|
|
|
|
(else
|
|
|
|
|
;; git, svn, cvs, etc. reference
|
|
|
|
|
#f))))
|
|
|
|
|
|
2014-10-06 19:14:47 +02:00
|
|
|
|
(define %supported-systems
|
|
|
|
|
;; This is the list of system types that are supported. By default, we
|
|
|
|
|
;; expect all packages to build successfully here.
|
2017-05-23 20:51:36 +02:00
|
|
|
|
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux"))
|
2014-10-06 19:14:47 +02:00
|
|
|
|
|
2015-09-04 13:40:55 +02:00
|
|
|
|
(define %hurd-systems
|
|
|
|
|
;; The GNU/Hurd systems for which support is being developed.
|
|
|
|
|
'("i585-gnu" "i686-gnu"))
|
|
|
|
|
|
2015-05-01 16:05:40 +02:00
|
|
|
|
(define %hydra-supported-systems
|
2017-03-29 22:50:42 +02:00
|
|
|
|
;; This is the list of system types for which build machines are available.
|
|
|
|
|
;;
|
|
|
|
|
;; XXX: MIPS is temporarily unavailable on Hydra:
|
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00790.html>.
|
2017-05-23 20:51:36 +02:00
|
|
|
|
(fold delete %supported-systems '("aarch64-linux" "mips64el-linux")))
|
2015-05-01 16:05:40 +02:00
|
|
|
|
|
|
|
|
|
|
2013-03-30 22:56:38 +01:00
|
|
|
|
;; A package.
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(define-record-type* <package>
|
|
|
|
|
package make-package
|
|
|
|
|
package?
|
|
|
|
|
(name package-name) ; string
|
|
|
|
|
(version package-version) ; string
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(source package-source) ; <origin> instance
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(build-system package-build-system) ; build system
|
2012-06-29 00:28:57 +02:00
|
|
|
|
(arguments package-arguments ; arguments for the build method
|
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
|
|
|
|
(default '()) (thunked))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(inputs package-inputs ; input packages or derivations
|
2013-01-24 23:33:30 +01:00
|
|
|
|
(default '()) (thunked))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(propagated-inputs package-propagated-inputs ; same, but propagated
|
2013-06-06 00:04:11 +02:00
|
|
|
|
(default '()) (thunked))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(native-inputs package-native-inputs ; native input packages/derivations
|
2013-05-25 16:14:57 +02:00
|
|
|
|
(default '()) (thunked))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(self-native-input? package-self-native-input? ; whether to use itself as
|
|
|
|
|
; a native input when cross-
|
|
|
|
|
(default #f)) ; compiling
|
2012-07-01 17:32:03 +02:00
|
|
|
|
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(outputs package-outputs ; list of strings
|
|
|
|
|
(default '("out")))
|
2013-03-30 22:56:38 +01:00
|
|
|
|
|
|
|
|
|
; lists of
|
|
|
|
|
; <search-path-specification>,
|
|
|
|
|
; for native and cross
|
|
|
|
|
; inputs
|
|
|
|
|
(native-search-paths package-native-search-paths (default '()))
|
|
|
|
|
(search-paths package-search-paths (default '()))
|
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
|
|
|
|
(replacement package-replacement ; package | #f
|
|
|
|
|
(default #f) (thunked))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2012-11-04 13:41:34 +01:00
|
|
|
|
(synopsis package-synopsis) ; one-line description
|
|
|
|
|
(description package-description) ; one or two paragraphs
|
2013-03-07 00:42:18 +01:00
|
|
|
|
(license package-license)
|
2012-06-28 23:44:43 +02:00
|
|
|
|
(home-page package-home-page)
|
2014-10-06 19:14:47 +02:00
|
|
|
|
(supported-systems package-supported-systems ; list of strings
|
|
|
|
|
(default %supported-systems))
|
2012-06-28 23:15:24 +02:00
|
|
|
|
(maintainers package-maintainers (default '()))
|
2012-06-28 23:44:43 +02:00
|
|
|
|
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(properties package-properties (default '())) ; alist for anything else
|
|
|
|
|
|
2012-06-28 23:15:24 +02:00
|
|
|
|
(location package-location
|
|
|
|
|
(default (and=> (current-source-location)
|
2015-06-11 23:06:06 +02:00
|
|
|
|
source-properties->location))
|
|
|
|
|
(innate)))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(set-record-type-printer! <package>
|
|
|
|
|
(lambda (package port)
|
|
|
|
|
(let ((loc (package-location package))
|
|
|
|
|
(format simple-format))
|
2016-01-24 17:42:39 +01:00
|
|
|
|
(format port "#<package ~a@~a ~a~a>"
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(package-name package)
|
|
|
|
|
(package-version package)
|
2014-10-08 23:06:19 +02:00
|
|
|
|
(if loc
|
|
|
|
|
(format #f "~a:~a "
|
|
|
|
|
(location-file loc)
|
|
|
|
|
(location-line loc))
|
|
|
|
|
"")
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(number->string (object-address
|
|
|
|
|
package)
|
|
|
|
|
16)))))
|
|
|
|
|
|
2017-01-28 00:11:33 +01:00
|
|
|
|
(define (package-upstream-name package)
|
|
|
|
|
"Return the upstream name of PACKAGE, which could be different from the name
|
|
|
|
|
it has in Guix."
|
|
|
|
|
(or (assq-ref (package-properties package) 'upstream-name)
|
|
|
|
|
(package-name package)))
|
|
|
|
|
|
2016-07-28 18:50:43 +02:00
|
|
|
|
(define (hidden-package p)
|
|
|
|
|
"Return a \"hidden\" version of P--i.e., one that 'fold-packages' and thus,
|
|
|
|
|
user interfaces, ignores."
|
|
|
|
|
(package
|
|
|
|
|
(inherit p)
|
|
|
|
|
(properties `((hidden? . #t)
|
|
|
|
|
,@(package-properties p)))))
|
|
|
|
|
|
|
|
|
|
(define (hidden-package? p)
|
|
|
|
|
"Return true if P is \"hidden\"--i.e., must not be visible to user
|
|
|
|
|
interfaces."
|
|
|
|
|
(assoc-ref (package-properties p) 'hidden?))
|
|
|
|
|
|
2016-09-06 23:14:07 +02:00
|
|
|
|
(define (package-superseded p)
|
|
|
|
|
"Return the package the supersedes P, or #f if P is still current."
|
|
|
|
|
(assoc-ref (package-properties p) 'superseded))
|
|
|
|
|
|
|
|
|
|
(define (deprecated-package old-name p)
|
|
|
|
|
"Return a package called OLD-NAME and marked as superseded by P, a package
|
|
|
|
|
object."
|
|
|
|
|
(package
|
|
|
|
|
(inherit p)
|
|
|
|
|
(name old-name)
|
|
|
|
|
(properties `((superseded . ,p)))))
|
|
|
|
|
|
2013-04-22 23:07:13 +02:00
|
|
|
|
(define (package-field-location package field)
|
2013-04-24 14:43:31 +02:00
|
|
|
|
"Return the source code location of the definition of FIELD for PACKAGE, or
|
|
|
|
|
#f if it could not be determined."
|
|
|
|
|
(define (goto port line column)
|
|
|
|
|
(unless (and (= (port-column port) (- column 1))
|
|
|
|
|
(= (port-line port) (- line 1)))
|
|
|
|
|
(unless (eof-object? (read-char port))
|
|
|
|
|
(goto port line column))))
|
2013-04-22 23:07:13 +02:00
|
|
|
|
|
|
|
|
|
(match (package-location package)
|
|
|
|
|
(($ <location> file line column)
|
|
|
|
|
(catch 'system
|
|
|
|
|
(lambda ()
|
2013-11-18 23:56:07 +01:00
|
|
|
|
;; In general we want to keep relative file names for modules.
|
|
|
|
|
(with-fluids ((%file-port-name-canonicalization 'relative))
|
|
|
|
|
(call-with-input-file (search-path %load-path file)
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(goto port line column)
|
|
|
|
|
(match (read port)
|
|
|
|
|
(('package inits ...)
|
|
|
|
|
(let ((field (assoc field inits)))
|
|
|
|
|
(match field
|
|
|
|
|
((_ value)
|
|
|
|
|
;; Put the `or' here, and not in the first argument of
|
|
|
|
|
;; `and=>', to work around a compiler bug in 2.0.5.
|
|
|
|
|
(or (and=> (source-properties value)
|
|
|
|
|
source-properties->location)
|
|
|
|
|
(and=> (source-properties field)
|
|
|
|
|
source-properties->location)))
|
|
|
|
|
(_
|
|
|
|
|
#f))))
|
|
|
|
|
(_
|
|
|
|
|
#f))))))
|
2013-04-22 23:07:13 +02:00
|
|
|
|
(lambda _
|
2013-04-24 14:43:31 +02:00
|
|
|
|
#f)))
|
2013-04-22 23:07:13 +02:00
|
|
|
|
(_ #f)))
|
|
|
|
|
|
2012-08-23 23:09:13 +02:00
|
|
|
|
|
|
|
|
|
;; Error conditions.
|
|
|
|
|
|
|
|
|
|
(define-condition-type &package-error &error
|
|
|
|
|
package-error?
|
|
|
|
|
(package package-error-package))
|
|
|
|
|
|
|
|
|
|
(define-condition-type &package-input-error &package-error
|
|
|
|
|
package-input-error?
|
|
|
|
|
(input package-error-invalid-input))
|
|
|
|
|
|
2013-05-27 23:41:35 +02:00
|
|
|
|
(define-condition-type &package-cross-build-system-error &package-error
|
|
|
|
|
package-cross-build-system-error?)
|
|
|
|
|
|
2012-08-23 23:09:13 +02:00
|
|
|
|
|
2012-09-05 19:01:47 +02:00
|
|
|
|
(define (package-full-name package)
|
|
|
|
|
"Return the full name of PACKAGE--i.e., `NAME-VERSION'."
|
|
|
|
|
(string-append (package-name package) "-" (package-version package)))
|
|
|
|
|
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(define (%standard-patch-inputs)
|
2015-05-05 18:10:30 +02:00
|
|
|
|
(let* ((canonical (module-ref (resolve-interface '(gnu packages base))
|
|
|
|
|
'canonical-package))
|
|
|
|
|
(ref (lambda (module var)
|
|
|
|
|
(canonical
|
|
|
|
|
(module-ref (resolve-interface module) var)))))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
`(("tar" ,(ref '(gnu packages base) 'tar))
|
|
|
|
|
("xz" ,(ref '(gnu packages compression) 'xz))
|
|
|
|
|
("bzip2" ,(ref '(gnu packages compression) 'bzip2))
|
|
|
|
|
("gzip" ,(ref '(gnu packages compression) 'gzip))
|
|
|
|
|
("lzip" ,(ref '(gnu packages compression) 'lzip))
|
gnu: Move contents of zip module into compression module.
* gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to...
* gnu/packages/compression.scm: ...here.
* gnu/packages/zip.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file.
* po/packages/POTFILES.in: Unregister deleted file.
* gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression,
docbook, documentation, fonts, fpga, game-development, games, gl, gnome,
gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice,
markup, maths, mc, monitoring, music, php, pretty-print, python, scheme,
smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml,
zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm:
Adapt module import.
2017-06-12 20:40:01 +02:00
|
|
|
|
("unzip" ,(ref '(gnu packages compression) 'unzip))
|
2015-02-27 00:03:17 +01:00
|
|
|
|
("patch" ,(ref '(gnu packages base) 'patch))
|
2015-05-05 18:10:30 +02:00
|
|
|
|
("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
|
2013-10-10 23:00:47 +02:00
|
|
|
|
(define (default-guile)
|
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
|
|
|
|
"Return the default Guile package used to run the build code of
|
|
|
|
|
derivations."
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
|
(let ((distro (resolve-interface '(gnu packages commencement))))
|
2013-10-10 23:00:47 +02:00
|
|
|
|
(module-ref distro 'guile-final)))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
|
2015-03-17 22:09:32 +01:00
|
|
|
|
(define* (default-guile-derivation #:optional (system (%current-system)))
|
|
|
|
|
"Return the derivation for SYSTEM of the default Guile package used to run
|
|
|
|
|
the build code of derivation."
|
|
|
|
|
(package->derivation (default-guile) system
|
|
|
|
|
#:graft? #f))
|
|
|
|
|
|
2015-03-18 19:00:12 +01:00
|
|
|
|
(define* (patch-and-repack source patches
|
2013-10-09 00:04:45 +02:00
|
|
|
|
#:key
|
2015-03-21 22:07:11 +01:00
|
|
|
|
inputs
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(snippet #f)
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(flags '("-p1"))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(modules '())
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(guile-for-build (%guile-for-build))
|
|
|
|
|
(system (%current-system)))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
"Unpack SOURCE (a derivation or store path), apply all of PATCHES, and
|
|
|
|
|
repack the tarball using the tools listed in INPUTS. When SNIPPET is true,
|
|
|
|
|
it must be an s-expression that will run from within the directory where
|
2016-07-12 22:23:12 +02:00
|
|
|
|
SOURCE was unpacked, after all of PATCHES have been applied. MODULES
|
|
|
|
|
specifies modules in scope when evaluating SNIPPET."
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(define source-file-name
|
|
|
|
|
;; SOURCE is usually a derivation, but it could be a store file.
|
|
|
|
|
(if (derivation? source)
|
|
|
|
|
(derivation->output-path source)
|
|
|
|
|
source))
|
|
|
|
|
|
2015-03-21 22:07:11 +01:00
|
|
|
|
(define lookup-input
|
|
|
|
|
;; The default value of the 'patch-inputs' field, and thus INPUTS is #f,
|
|
|
|
|
;; so deal with that.
|
|
|
|
|
(let ((inputs (or inputs (%standard-patch-inputs))))
|
|
|
|
|
(lambda (name)
|
|
|
|
|
(match (assoc-ref inputs name)
|
|
|
|
|
((package) package)
|
|
|
|
|
(#f #f)))))
|
2015-03-18 19:00:12 +01:00
|
|
|
|
|
2013-10-09 00:04:45 +02:00
|
|
|
|
(define decompression-type
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(cond ((string-suffix? "gz" source-file-name) "gzip")
|
2016-06-14 21:34:07 +02:00
|
|
|
|
((string-suffix? "Z" source-file-name) "gzip")
|
2013-11-07 22:41:21 +01:00
|
|
|
|
((string-suffix? "bz2" source-file-name) "bzip2")
|
|
|
|
|
((string-suffix? "lz" source-file-name) "lzip")
|
2015-03-24 16:52:05 +01:00
|
|
|
|
((string-suffix? "zip" source-file-name) "unzip")
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(else "xz")))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
|
|
|
|
|
(define original-file-name
|
2013-11-07 22:41:21 +01:00
|
|
|
|
;; Remove the store prefix plus the slash, hash, and hyphen.
|
|
|
|
|
(let* ((sans (string-drop source-file-name
|
|
|
|
|
(+ (string-length (%store-prefix)) 1)))
|
|
|
|
|
(dash (string-index sans #\-)))
|
|
|
|
|
(string-drop sans (+ 1 dash))))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
|
2014-02-28 10:42:09 +01:00
|
|
|
|
(define (numeric-extension? file-name)
|
|
|
|
|
;; Return true if FILE-NAME ends with digits.
|
2014-04-12 14:39:43 +02:00
|
|
|
|
(and=> (file-extension file-name)
|
|
|
|
|
(cut string-every char-set:hex-digit <>)))
|
2014-02-28 10:42:09 +01:00
|
|
|
|
|
|
|
|
|
(define (tarxz-name file-name)
|
|
|
|
|
;; Return a '.tar.xz' file name based on FILE-NAME.
|
|
|
|
|
(let ((base (if (numeric-extension? file-name)
|
|
|
|
|
original-file-name
|
|
|
|
|
(file-sans-extension file-name))))
|
|
|
|
|
(string-append base
|
|
|
|
|
(if (equal? (file-extension base) "tar")
|
|
|
|
|
".xz"
|
|
|
|
|
".tar.xz"))))
|
|
|
|
|
|
2015-03-18 19:00:12 +01:00
|
|
|
|
(define instantiate-patch
|
|
|
|
|
(match-lambda
|
2017-06-15 18:07:10 +02:00
|
|
|
|
((? string? patch) ;deprecated
|
2015-03-18 19:00:12 +01:00
|
|
|
|
(interned-file patch #:recursive? #t))
|
2017-06-15 18:07:10 +02:00
|
|
|
|
((? struct? patch) ;origin, local-file, etc.
|
|
|
|
|
(lower-object patch system))))
|
2015-03-18 19:00:12 +01:00
|
|
|
|
|
|
|
|
|
(mlet %store-monad ((tar -> (lookup-input "tar"))
|
|
|
|
|
(xz -> (lookup-input "xz"))
|
|
|
|
|
(patch -> (lookup-input "patch"))
|
|
|
|
|
(locales -> (lookup-input "locales"))
|
|
|
|
|
(decomp -> (lookup-input decompression-type))
|
|
|
|
|
(patches (sequence %store-monad
|
|
|
|
|
(map instantiate-patch patches))))
|
|
|
|
|
(define build
|
2016-07-12 22:23:12 +02:00
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (ice-9 ftw)
|
|
|
|
|
(srfi srfi-1)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
|
|
|
|
|
;; The --sort option was added to GNU tar in version 1.28, released
|
|
|
|
|
;; 2014-07-28. During bootstrap we must cope with older versions.
|
|
|
|
|
(define tar-supports-sort?
|
|
|
|
|
(zero? (system* (string-append #+tar "/bin/tar")
|
|
|
|
|
"cf" "/dev/null" "--files-from=/dev/null"
|
|
|
|
|
"--sort=name")))
|
|
|
|
|
|
|
|
|
|
(define (apply-patch patch)
|
|
|
|
|
(format (current-error-port) "applying '~a'...~%" patch)
|
|
|
|
|
|
|
|
|
|
;; Use '--force' so that patches that do not apply perfectly are
|
2016-05-19 18:11:58 +02:00
|
|
|
|
;; rejected. Use '--no-backup-if-mismatch' to prevent making
|
|
|
|
|
;; "*.orig" file if a patch is applied with offset.
|
2016-07-12 22:23:12 +02:00
|
|
|
|
(zero? (system* (string-append #+patch "/bin/patch")
|
2016-05-19 18:11:58 +02:00
|
|
|
|
"--force" "--no-backup-if-mismatch"
|
|
|
|
|
#+@flags "--input" patch)))
|
2016-07-12 22:23:12 +02:00
|
|
|
|
|
|
|
|
|
(define (first-file directory)
|
|
|
|
|
;; Return the name of the first file in DIRECTORY.
|
|
|
|
|
(car (scandir directory
|
|
|
|
|
(lambda (name)
|
|
|
|
|
(not (member name '("." "..")))))))
|
|
|
|
|
|
|
|
|
|
;; Encoding/decoding errors shouldn't be silent.
|
|
|
|
|
(fluid-set! %default-port-conversion-strategy 'error)
|
|
|
|
|
|
|
|
|
|
(when #+locales
|
|
|
|
|
;; First of all, install a UTF-8 locale so that UTF-8 file names
|
|
|
|
|
;; are correctly interpreted. During bootstrap, LOCALES is #f.
|
|
|
|
|
(setenv "LOCPATH"
|
|
|
|
|
(string-append #+locales "/lib/locale/"
|
|
|
|
|
#+(and locales
|
|
|
|
|
(package-version locales))))
|
|
|
|
|
(setlocale LC_ALL "en_US.utf8"))
|
|
|
|
|
|
|
|
|
|
(setenv "PATH" (string-append #+xz "/bin" ":"
|
|
|
|
|
#+decomp "/bin"))
|
|
|
|
|
|
|
|
|
|
;; SOURCE may be either a directory or a tarball.
|
|
|
|
|
(and (if (file-is-directory? #+source)
|
|
|
|
|
(let* ((store (%store-directory))
|
|
|
|
|
(len (+ 1 (string-length store)))
|
|
|
|
|
(base (string-drop #+source len))
|
|
|
|
|
(dash (string-index base #\-))
|
|
|
|
|
(directory (string-drop base (+ 1 dash))))
|
|
|
|
|
(mkdir directory)
|
|
|
|
|
(copy-recursively #+source directory)
|
|
|
|
|
#t)
|
|
|
|
|
#+(if (string=? decompression-type "unzip")
|
|
|
|
|
#~(zero? (system* "unzip" #+source))
|
|
|
|
|
#~(zero? (system* (string-append #+tar "/bin/tar")
|
|
|
|
|
"xvf" #+source))))
|
|
|
|
|
(let ((directory (first-file ".")))
|
|
|
|
|
(format (current-error-port)
|
|
|
|
|
"source is under '~a'~%" directory)
|
|
|
|
|
(chdir directory)
|
|
|
|
|
|
|
|
|
|
(and (every apply-patch '#+patches)
|
|
|
|
|
#+@(if snippet
|
|
|
|
|
#~((let ((module (make-fresh-user-module)))
|
|
|
|
|
(module-use-interfaces!
|
|
|
|
|
module
|
|
|
|
|
(map resolve-interface '#+modules))
|
|
|
|
|
((@ (system base compile) compile)
|
|
|
|
|
'#+snippet
|
|
|
|
|
#:to 'value
|
|
|
|
|
#:opts %auto-compilation-options
|
|
|
|
|
#:env module)))
|
|
|
|
|
#~())
|
|
|
|
|
|
|
|
|
|
(begin (chdir "..") #t)
|
|
|
|
|
|
|
|
|
|
(unless tar-supports-sort?
|
|
|
|
|
(call-with-output-file ".file_list"
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(for-each (lambda (name)
|
|
|
|
|
(format port "~a~%" name))
|
|
|
|
|
(find-files directory
|
|
|
|
|
#:directories? #t
|
|
|
|
|
#:fail-on-error? #t)))))
|
|
|
|
|
(zero? (apply system*
|
|
|
|
|
(string-append #+tar "/bin/tar")
|
|
|
|
|
"cvfa" #$output
|
|
|
|
|
;; avoid non-determinism in the archive
|
|
|
|
|
"--mtime=@0"
|
|
|
|
|
"--owner=root:0"
|
|
|
|
|
"--group=root:0"
|
|
|
|
|
(if tar-supports-sort?
|
|
|
|
|
`("--sort=name"
|
|
|
|
|
,directory)
|
|
|
|
|
'("--no-recursion"
|
|
|
|
|
"--files-from=.file_list"))))))))))
|
|
|
|
|
|
|
|
|
|
(let ((name (tarxz-name original-file-name)))
|
2015-03-18 19:00:12 +01:00
|
|
|
|
(gexp->derivation name build
|
|
|
|
|
#:graft? #f
|
|
|
|
|
#:system system
|
|
|
|
|
#:guile-for-build guile-for-build))))
|
2013-10-09 00:04:45 +02:00
|
|
|
|
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(define (transitive-inputs inputs)
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
"Return the closure of INPUTS when considering the 'propagated-inputs'
|
|
|
|
|
edges. Omit duplicate inputs, except for those already present in INPUTS
|
|
|
|
|
itself.
|
|
|
|
|
|
|
|
|
|
This is implemented as a breadth-first traversal such that INPUTS is
|
|
|
|
|
preserved, and only duplicate propagated inputs are removed."
|
|
|
|
|
(define (seen? seen item outputs)
|
|
|
|
|
(match (vhash-assq item seen)
|
|
|
|
|
((_ . o) (equal? o outputs))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
|
|
|
(let loop ((inputs inputs)
|
|
|
|
|
(result '())
|
|
|
|
|
(propagated '())
|
|
|
|
|
(first? #t)
|
|
|
|
|
(seen vlist-null))
|
2012-07-07 20:14:20 +02:00
|
|
|
|
(match inputs
|
|
|
|
|
(()
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
(if (null? propagated)
|
|
|
|
|
(reverse result)
|
|
|
|
|
(loop (reverse (concatenate propagated)) result '() #f seen)))
|
|
|
|
|
(((and input (label (? package? package) outputs ...)) rest ...)
|
|
|
|
|
(if (and (not first?) (seen? seen package outputs))
|
|
|
|
|
(loop rest result propagated first? seen)
|
|
|
|
|
(loop rest
|
|
|
|
|
(cons input result)
|
|
|
|
|
(cons (package-propagated-inputs package) propagated)
|
|
|
|
|
first?
|
|
|
|
|
(vhash-consq package outputs seen))))
|
2012-07-07 20:14:20 +02:00
|
|
|
|
((input rest ...)
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
(loop rest (cons input result) propagated first? seen)))))
|
2012-07-07 20:14:20 +02:00
|
|
|
|
|
2015-04-24 14:57:51 +02:00
|
|
|
|
(define (package-direct-sources package)
|
|
|
|
|
"Return all source origins associated with PACKAGE; including origins in
|
|
|
|
|
PACKAGE's inputs."
|
|
|
|
|
`(,@(or (and=> (package-source package) list) '())
|
|
|
|
|
,@(filter-map (match-lambda
|
|
|
|
|
((_ (? origin? orig) _ ...)
|
|
|
|
|
orig)
|
|
|
|
|
(_ #f))
|
|
|
|
|
(package-direct-inputs package))))
|
|
|
|
|
|
|
|
|
|
(define (package-transitive-sources package)
|
|
|
|
|
"Return PACKAGE's direct sources, and their direct sources, recursively."
|
|
|
|
|
(delete-duplicates
|
|
|
|
|
(concatenate (filter-map (match-lambda
|
|
|
|
|
((_ (? origin? orig) _ ...)
|
|
|
|
|
(list orig))
|
|
|
|
|
((_ (? package? p) _ ...)
|
|
|
|
|
(package-direct-sources p))
|
|
|
|
|
(_ #f))
|
|
|
|
|
(bag-transitive-inputs
|
|
|
|
|
(package->bag package))))))
|
|
|
|
|
|
2014-07-20 18:29:48 +02:00
|
|
|
|
(define (package-direct-inputs package)
|
|
|
|
|
"Return all the direct inputs of PACKAGE---i.e, its direct inputs along
|
|
|
|
|
with their propagated inputs."
|
|
|
|
|
(append (package-native-inputs package)
|
|
|
|
|
(package-inputs package)
|
|
|
|
|
(package-propagated-inputs package)))
|
|
|
|
|
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(define (package-transitive-inputs package)
|
|
|
|
|
"Return the transitive inputs of PACKAGE---i.e., its direct inputs along
|
|
|
|
|
with their propagated inputs, recursively."
|
2014-07-20 18:29:48 +02:00
|
|
|
|
(transitive-inputs (package-direct-inputs package)))
|
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2013-05-24 22:21:24 +02:00
|
|
|
|
(define (package-transitive-target-inputs package)
|
|
|
|
|
"Return the transitive target inputs of PACKAGE---i.e., its direct inputs
|
|
|
|
|
along with their propagated inputs, recursively. This only includes inputs
|
|
|
|
|
for the target system, and not native inputs."
|
|
|
|
|
(transitive-inputs (append (package-inputs package)
|
|
|
|
|
(package-propagated-inputs package))))
|
|
|
|
|
|
|
|
|
|
(define (package-transitive-native-inputs package)
|
|
|
|
|
"Return the transitive native inputs of PACKAGE---i.e., its direct inputs
|
|
|
|
|
along with their propagated inputs, recursively. This only includes inputs
|
|
|
|
|
for the host system (\"native inputs\"), and not target inputs."
|
|
|
|
|
(transitive-inputs (package-native-inputs package)))
|
|
|
|
|
|
2012-09-01 19:21:06 +02:00
|
|
|
|
(define (package-transitive-propagated-inputs package)
|
|
|
|
|
"Return the propagated inputs of PACKAGE, and their propagated inputs,
|
|
|
|
|
recursively."
|
|
|
|
|
(transitive-inputs (package-propagated-inputs package)))
|
|
|
|
|
|
2015-12-20 14:34:36 +01:00
|
|
|
|
(define (package-transitive-native-search-paths package)
|
|
|
|
|
"Return the list of search paths for PACKAGE and its propagated inputs,
|
|
|
|
|
recursively."
|
|
|
|
|
(append (package-native-search-paths package)
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((label (? package? p) _ ...)
|
|
|
|
|
(package-native-search-paths p))
|
|
|
|
|
(_
|
|
|
|
|
'()))
|
|
|
|
|
(package-transitive-propagated-inputs package))))
|
|
|
|
|
|
2015-07-22 03:45:54 +02:00
|
|
|
|
(define (transitive-input-references alist inputs)
|
|
|
|
|
"Return a list of (assoc-ref ALIST <label>) for each (<label> <package> . _)
|
|
|
|
|
in INPUTS and their transitive propagated inputs."
|
|
|
|
|
(define label
|
|
|
|
|
(match-lambda
|
|
|
|
|
((label . _)
|
|
|
|
|
label)))
|
|
|
|
|
|
|
|
|
|
(map (lambda (input)
|
|
|
|
|
`(assoc-ref ,alist ,(label input)))
|
|
|
|
|
(transitive-inputs inputs)))
|
|
|
|
|
|
2017-01-28 17:15:27 +01:00
|
|
|
|
(define package-transitive-supported-systems
|
|
|
|
|
(mlambdaq (package)
|
|
|
|
|
"Return the intersection of the systems supported by PACKAGE and those
|
2014-10-17 23:20:39 +02:00
|
|
|
|
supported by its dependencies."
|
2017-01-28 17:15:27 +01:00
|
|
|
|
(fold (lambda (input systems)
|
|
|
|
|
(match input
|
|
|
|
|
((label (? package? p) . _)
|
|
|
|
|
(lset-intersection
|
|
|
|
|
string=? systems (package-transitive-supported-systems p)))
|
|
|
|
|
(_
|
|
|
|
|
systems)))
|
|
|
|
|
(package-supported-systems package)
|
|
|
|
|
(bag-direct-inputs (package->bag package)))))
|
2014-10-17 23:20:39 +02:00
|
|
|
|
|
2015-04-19 16:49:09 +02:00
|
|
|
|
(define* (supported-package? package #:optional (system (%current-system)))
|
|
|
|
|
"Return true if PACKAGE is supported on SYSTEM--i.e., if PACKAGE and all its
|
|
|
|
|
dependencies are known to build on SYSTEM."
|
|
|
|
|
(member system (package-transitive-supported-systems package)))
|
|
|
|
|
|
2015-04-11 12:29:10 +02:00
|
|
|
|
(define (bag-direct-inputs bag)
|
|
|
|
|
"Same as 'package-direct-inputs', but applied to a bag."
|
|
|
|
|
(append (bag-build-inputs bag)
|
|
|
|
|
(bag-host-inputs bag)
|
|
|
|
|
(bag-target-inputs bag)))
|
|
|
|
|
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(define (bag-transitive-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-inputs', but applied to a bag."
|
2015-04-11 12:29:10 +02:00
|
|
|
|
(transitive-inputs (bag-direct-inputs bag)))
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
|
|
|
|
|
(define (bag-transitive-build-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-native-inputs', but applied to a bag."
|
|
|
|
|
(transitive-inputs (bag-build-inputs bag)))
|
|
|
|
|
|
|
|
|
|
(define (bag-transitive-host-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-target-inputs', but applied to a bag."
|
|
|
|
|
(transitive-inputs (bag-host-inputs bag)))
|
|
|
|
|
|
|
|
|
|
(define (bag-transitive-target-inputs bag)
|
|
|
|
|
"Return the \"target inputs\" of BAG, recursively."
|
|
|
|
|
(transitive-inputs (bag-target-inputs bag)))
|
|
|
|
|
|
2017-04-05 15:19:15 +02:00
|
|
|
|
(define* (package-mapping proc #:optional (cut? (const #f)))
|
|
|
|
|
"Return a procedure that, given a package, applies PROC to all the packages
|
|
|
|
|
depended on and returns the resulting package. The procedure stops recursion
|
|
|
|
|
when CUT? returns true for a given package."
|
2016-09-01 22:35:35 +02:00
|
|
|
|
(define (rewrite input)
|
|
|
|
|
(match input
|
|
|
|
|
((label (? package? package) outputs ...)
|
2017-04-05 15:19:15 +02:00
|
|
|
|
(let ((proc (if (cut? package) proc replace)))
|
|
|
|
|
(cons* label (proc package) outputs)))
|
2016-09-01 22:35:35 +02:00
|
|
|
|
(_
|
|
|
|
|
input)))
|
|
|
|
|
|
2017-01-28 17:15:27 +01:00
|
|
|
|
(define replace
|
|
|
|
|
(mlambdaq (p)
|
2017-04-05 15:19:15 +02:00
|
|
|
|
;; Return a variant of P with PROC applied to P and its explicit
|
|
|
|
|
;; dependencies, recursively. Memoize the transformations. Failing to
|
|
|
|
|
;; do that, we would build a huge object graph with lots of duplicates,
|
|
|
|
|
;; which in turns prevents us from benefiting from memoization in
|
|
|
|
|
;; 'package-derivation'.
|
|
|
|
|
(let ((p (proc p)))
|
|
|
|
|
(package
|
|
|
|
|
(inherit p)
|
|
|
|
|
(location (package-location p))
|
|
|
|
|
(inputs (map rewrite (package-inputs p)))
|
|
|
|
|
(native-inputs (map rewrite (package-native-inputs p)))
|
|
|
|
|
(propagated-inputs (map rewrite (package-propagated-inputs p)))))))
|
2016-09-01 22:35:35 +02:00
|
|
|
|
|
|
|
|
|
replace)
|
|
|
|
|
|
2017-04-05 15:19:15 +02:00
|
|
|
|
(define* (package-input-rewriting replacements
|
|
|
|
|
#:optional (rewrite-name identity))
|
|
|
|
|
"Return a procedure that, when passed a package, replaces its direct and
|
|
|
|
|
indirect dependencies (but not its implicit inputs) according to REPLACEMENTS.
|
|
|
|
|
REPLACEMENTS is a list of package pairs; the first element of each pair is the
|
|
|
|
|
package to replace, and the second one is the replacement.
|
|
|
|
|
|
|
|
|
|
Optionally, REWRITE-NAME is a one-argument procedure that takes the name of a
|
|
|
|
|
package and returns its new name after rewrite."
|
|
|
|
|
(define (rewrite p)
|
|
|
|
|
(match (assq-ref replacements p)
|
|
|
|
|
(#f (package
|
|
|
|
|
(inherit p)
|
|
|
|
|
(name (rewrite-name (package-name p)))))
|
|
|
|
|
(new new)))
|
|
|
|
|
|
|
|
|
|
(package-mapping rewrite (cut assq <> replacements)))
|
|
|
|
|
|
2017-05-02 09:39:23 +02:00
|
|
|
|
(define-syntax-rule (package/inherit p overrides ...)
|
|
|
|
|
"Like (package (inherit P) OVERRIDES ...), except that the same
|
|
|
|
|
transformation is done to the package replacement, if any. P must be a bare
|
|
|
|
|
identifier, and will be bound to either P or its replacement when evaluating
|
|
|
|
|
OVERRIDES."
|
|
|
|
|
(let loop ((p p))
|
|
|
|
|
(package (inherit p)
|
|
|
|
|
overrides ...
|
|
|
|
|
(replacement (and=> (package-replacement p) loop)))))
|
|
|
|
|
|
2012-09-01 19:21:06 +02:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Package derivations.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %derivation-cache
|
|
|
|
|
;; Package to derivation-path mapping.
|
2012-10-08 22:07:19 +02:00
|
|
|
|
(make-weak-key-hash-table 100))
|
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2014-10-18 18:19:08 +02:00
|
|
|
|
(define (cache! cache package system thunk)
|
|
|
|
|
"Memoize in CACHE the return values of THUNK as the derivation of PACKAGE on
|
2013-01-20 22:17:58 +01:00
|
|
|
|
SYSTEM."
|
2014-07-21 22:06:36 +02:00
|
|
|
|
;; FIXME: This memoization should be associated with the open store, because
|
|
|
|
|
;; otherwise it breaks when switching to a different store.
|
2013-01-20 22:17:58 +01:00
|
|
|
|
(let ((vals (call-with-values thunk list)))
|
|
|
|
|
;; Use `hashq-set!' instead of `hash-set!' because `hash' returns the
|
|
|
|
|
;; same value for all structs (as of Guile 2.0.6), and because pointer
|
|
|
|
|
;; equality is sufficient in practice.
|
2014-10-18 18:19:08 +02:00
|
|
|
|
(hashq-set! cache package
|
2014-10-15 09:22:23 +02:00
|
|
|
|
`((,system ,@vals)
|
2014-10-18 18:19:08 +02:00
|
|
|
|
,@(or (hashq-ref cache package) '())))
|
2013-01-20 22:17:58 +01:00
|
|
|
|
(apply values vals)))
|
|
|
|
|
|
2014-10-18 18:19:08 +02:00
|
|
|
|
(define-syntax cached
|
|
|
|
|
(syntax-rules (=>)
|
|
|
|
|
"Memoize the result of BODY for the arguments PACKAGE and SYSTEM.
|
2013-01-20 22:17:58 +01:00
|
|
|
|
Return the cached result when available."
|
2014-10-18 18:19:08 +02:00
|
|
|
|
((_ (=> cache) package system body ...)
|
|
|
|
|
(let ((thunk (lambda () body ...))
|
|
|
|
|
(key system))
|
|
|
|
|
(match (hashq-ref cache package)
|
|
|
|
|
((alist (... ...))
|
|
|
|
|
(match (assoc-ref alist key)
|
|
|
|
|
((vals (... ...))
|
|
|
|
|
(apply values vals))
|
|
|
|
|
(#f
|
|
|
|
|
(cache! cache package key thunk))))
|
2013-01-20 22:17:58 +01:00
|
|
|
|
(#f
|
2014-10-18 18:19:08 +02:00
|
|
|
|
(cache! cache package key thunk)))))
|
|
|
|
|
((_ package system body ...)
|
|
|
|
|
(cached (=> %derivation-cache) package system body ...))))
|
2012-09-01 19:21:06 +02:00
|
|
|
|
|
2013-05-20 23:00:47 +02:00
|
|
|
|
(define* (expand-input store package input system #:optional cross-system)
|
|
|
|
|
"Expand INPUT, an input tuple, such that it contains only references to
|
|
|
|
|
derivation paths or store paths. PACKAGE is only used to provide contextual
|
|
|
|
|
information in exceptions."
|
2012-10-21 16:57:50 +02:00
|
|
|
|
(define (intern file)
|
|
|
|
|
;; Add FILE to the store. Set the `recursive?' bit to #t, so that
|
|
|
|
|
;; file permissions are preserved.
|
2013-01-30 16:30:49 +01:00
|
|
|
|
(add-to-store store (basename file) #t "sha256" file))
|
2012-10-21 16:57:50 +02:00
|
|
|
|
|
2013-05-20 23:00:47 +02:00
|
|
|
|
(define derivation
|
|
|
|
|
(if cross-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
|
|
|
|
(cut package-cross-derivation store <> cross-system system
|
|
|
|
|
#:graft? #f)
|
|
|
|
|
(cut package-derivation store <> system #:graft? #f)))
|
2013-05-20 23:00:47 +02:00
|
|
|
|
|
|
|
|
|
(match input
|
|
|
|
|
(((? string? name) (? package? package))
|
|
|
|
|
(list name (derivation package)))
|
|
|
|
|
(((? string? name) (? package? package)
|
|
|
|
|
(? string? sub-drv))
|
|
|
|
|
(list name (derivation package)
|
|
|
|
|
sub-drv))
|
|
|
|
|
(((? string? name)
|
|
|
|
|
(and (? string?) (? derivation-path?) drv))
|
|
|
|
|
(list name drv))
|
|
|
|
|
(((? string? name)
|
|
|
|
|
(and (? string?) (? file-exists? file)))
|
|
|
|
|
;; Add FILE to the store. When FILE is in the sub-directory of a
|
|
|
|
|
;; store path, it needs to be added anyway, so it can be used as a
|
|
|
|
|
;; source.
|
|
|
|
|
(list name (intern file)))
|
2016-06-15 10:38:46 +02:00
|
|
|
|
(((? string? name) (? struct? source))
|
2017-04-04 00:00:41 +02:00
|
|
|
|
;; 'package-source-derivation' calls 'lower-object', which can throw
|
|
|
|
|
;; '&gexp-input-error'. However '&gexp-input-error' lacks source
|
|
|
|
|
;; location info, so we catch and rethrow here (XXX: not optimal
|
|
|
|
|
;; performance-wise).
|
|
|
|
|
(guard (c ((gexp-input-error? c)
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&package-input-error
|
|
|
|
|
(package package)
|
|
|
|
|
(input (gexp-error-invalid-input c)))))))
|
|
|
|
|
(list name (package-source-derivation store source system))))
|
2013-05-20 23:00:47 +02:00
|
|
|
|
(x
|
|
|
|
|
(raise (condition (&package-input-error
|
|
|
|
|
(package package)
|
|
|
|
|
(input x)))))))
|
2012-10-21 16:57:50 +02:00
|
|
|
|
|
2016-03-07 23:52:35 +01:00
|
|
|
|
(define %bag-cache
|
|
|
|
|
;; 'eq?' cache mapping packages to system+target+graft?-dependent bags.
|
|
|
|
|
;; It significantly speeds things up when doing repeated calls to
|
|
|
|
|
;; 'package->bag' as is the case when building a profile.
|
|
|
|
|
(make-weak-key-hash-table 200))
|
|
|
|
|
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(define* (package->bag package #:optional
|
|
|
|
|
(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
|
|
|
|
(target (%current-target-system))
|
|
|
|
|
#:key (graft? (%graft?)))
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
"Compile PACKAGE into a bag for SYSTEM, possibly cross-compiled to TARGET,
|
|
|
|
|
and return it."
|
2016-03-07 23:52:35 +01:00
|
|
|
|
(cached (=> %bag-cache)
|
|
|
|
|
package (list system target graft?)
|
|
|
|
|
;; Bind %CURRENT-SYSTEM and %CURRENT-TARGET-SYSTEM so that thunked
|
|
|
|
|
;; field values can refer to it.
|
|
|
|
|
(parameterize ((%current-system system)
|
|
|
|
|
(%current-target-system target))
|
|
|
|
|
(match (if graft?
|
|
|
|
|
(or (package-replacement package) package)
|
|
|
|
|
package)
|
|
|
|
|
(($ <package> name version source build-system
|
|
|
|
|
args inputs propagated-inputs native-inputs
|
|
|
|
|
self-native-input? outputs)
|
|
|
|
|
(or (make-bag build-system (string-append name "-" version)
|
|
|
|
|
#:system system
|
|
|
|
|
#:target target
|
|
|
|
|
#:source source
|
|
|
|
|
#:inputs (append (inputs)
|
|
|
|
|
(propagated-inputs))
|
|
|
|
|
#:outputs outputs
|
|
|
|
|
#:native-inputs `(,@(if (and target
|
|
|
|
|
self-native-input?)
|
|
|
|
|
`(("self" ,package))
|
|
|
|
|
'())
|
|
|
|
|
,@(native-inputs))
|
|
|
|
|
#:arguments (args))
|
|
|
|
|
(raise (if target
|
|
|
|
|
(condition
|
|
|
|
|
(&package-cross-build-system-error
|
|
|
|
|
(package package)))
|
|
|
|
|
(condition
|
|
|
|
|
(&package-error
|
|
|
|
|
(package package)))))))))))
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
|
2016-03-07 23:57:33 +01:00
|
|
|
|
(define %graft-cache
|
|
|
|
|
;; 'eq?' cache mapping package objects to a graft corresponding to their
|
|
|
|
|
;; replacement package.
|
|
|
|
|
(make-weak-key-hash-table 200))
|
|
|
|
|
|
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 (input-graft store system)
|
2016-02-27 23:06:50 +01:00
|
|
|
|
"Return a procedure that, given a package with a graft, returns a graft, and
|
|
|
|
|
#f otherwise."
|
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
|
|
|
|
(match-lambda
|
2016-02-27 23:06:50 +01:00
|
|
|
|
((? package? package)
|
|
|
|
|
(let ((replacement (package-replacement package)))
|
|
|
|
|
(and replacement
|
2016-03-07 23:57:33 +01:00
|
|
|
|
(cached (=> %graft-cache) package system
|
|
|
|
|
(let ((orig (package-derivation store package system
|
|
|
|
|
#:graft? #f))
|
2016-10-14 10:36:37 +02:00
|
|
|
|
(new (package-derivation store replacement system
|
|
|
|
|
#:graft? #t)))
|
2016-03-07 23:57:33 +01:00
|
|
|
|
(graft
|
|
|
|
|
(origin orig)
|
|
|
|
|
(replacement new)))))))
|
2016-02-27 23:06:50 +01:00
|
|
|
|
(x
|
|
|
|
|
#f)))
|
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 (input-cross-graft store target system)
|
|
|
|
|
"Same as 'input-graft', but for cross-compilation inputs."
|
|
|
|
|
(match-lambda
|
2016-02-27 23:06:50 +01:00
|
|
|
|
((? package? 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
|
|
|
|
(let ((replacement (package-replacement package)))
|
|
|
|
|
(and replacement
|
|
|
|
|
(let ((orig (package-cross-derivation store package target system
|
|
|
|
|
#:graft? #f))
|
|
|
|
|
(new (package-cross-derivation store replacement
|
2016-10-14 10:36:37 +02:00
|
|
|
|
target system
|
|
|
|
|
#:graft? #t)))
|
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
|
|
|
|
|
(origin orig)
|
2016-02-27 23:06:50 +01:00
|
|
|
|
(replacement new))))))
|
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
|
|
|
|
(_
|
|
|
|
|
#f)))
|
|
|
|
|
|
2016-02-27 23:06:50 +01:00
|
|
|
|
(define* (fold-bag-dependencies proc seed bag
|
|
|
|
|
#:key (native? #t))
|
|
|
|
|
"Fold PROC over the packages BAG depends on. Each package is visited only
|
|
|
|
|
once, in depth-first order. If NATIVE? is true, restrict to native
|
|
|
|
|
dependencies; otherwise, restrict to target dependencies."
|
|
|
|
|
(define nodes
|
|
|
|
|
(match (if native?
|
|
|
|
|
(append (bag-build-inputs bag)
|
|
|
|
|
(bag-target-inputs bag)
|
|
|
|
|
(if (bag-target bag)
|
|
|
|
|
'()
|
|
|
|
|
(bag-host-inputs bag)))
|
|
|
|
|
(bag-host-inputs bag))
|
|
|
|
|
(((labels things _ ...) ...)
|
|
|
|
|
things)))
|
|
|
|
|
|
|
|
|
|
(let loop ((nodes nodes)
|
|
|
|
|
(result seed)
|
|
|
|
|
(visited (setq)))
|
|
|
|
|
(match nodes
|
|
|
|
|
(()
|
|
|
|
|
result)
|
|
|
|
|
(((? package? head) . tail)
|
|
|
|
|
(if (set-contains? visited head)
|
|
|
|
|
(loop tail result visited)
|
|
|
|
|
(let ((inputs (bag-direct-inputs (package->bag head))))
|
|
|
|
|
(loop (match inputs
|
|
|
|
|
(((labels things _ ...) ...)
|
|
|
|
|
(append things tail)))
|
|
|
|
|
(proc head result)
|
|
|
|
|
(set-insert head visited)))))
|
|
|
|
|
((head . tail)
|
|
|
|
|
(loop tail result visited)))))
|
|
|
|
|
|
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* (bag-grafts store bag)
|
2016-02-27 23:06:50 +01:00
|
|
|
|
"Return the list of grafts potentially applicable to BAG. Potentially
|
|
|
|
|
applicable grafts are collected by looking at direct or indirect dependencies
|
|
|
|
|
of BAG that have a 'replacement'. Whether a graft is actually applicable
|
|
|
|
|
depends on whether the outputs of BAG depend on the items the grafts refer
|
|
|
|
|
to (see 'graft-derivation'.)"
|
|
|
|
|
(define system (bag-system bag))
|
|
|
|
|
(define target (bag-target bag))
|
|
|
|
|
|
|
|
|
|
(define native-grafts
|
|
|
|
|
(let ((->graft (input-graft store system)))
|
|
|
|
|
(fold-bag-dependencies (lambda (package grafts)
|
|
|
|
|
(match (->graft package)
|
|
|
|
|
(#f grafts)
|
|
|
|
|
(graft (cons graft grafts))))
|
|
|
|
|
'()
|
|
|
|
|
bag)))
|
|
|
|
|
|
|
|
|
|
(define target-grafts
|
|
|
|
|
(if target
|
|
|
|
|
(let ((->graft (input-cross-graft store target system)))
|
|
|
|
|
(fold-bag-dependencies (lambda (package grafts)
|
|
|
|
|
(match (->graft package)
|
|
|
|
|
(#f grafts)
|
|
|
|
|
(graft (cons graft grafts))))
|
|
|
|
|
'()
|
|
|
|
|
bag
|
|
|
|
|
#:native? #f))
|
|
|
|
|
'()))
|
|
|
|
|
|
2016-03-04 23:01:47 +01:00
|
|
|
|
;; We can end up with several identical grafts if we stumble upon packages
|
|
|
|
|
;; that are not 'eq?' but map to the same derivation (this can happen when
|
|
|
|
|
;; using things like 'package-with-explicit-inputs'.) Hence the
|
|
|
|
|
;; 'delete-duplicates' call.
|
|
|
|
|
(delete-duplicates
|
|
|
|
|
(append native-grafts target-grafts)))
|
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* (package-grafts store package
|
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key target)
|
|
|
|
|
"Return the list of grafts applicable to PACKAGE as built for SYSTEM and
|
|
|
|
|
TARGET."
|
|
|
|
|
(let* ((package (or (package-replacement package) package))
|
|
|
|
|
(bag (package->bag package system target)))
|
|
|
|
|
(bag-grafts store bag)))
|
|
|
|
|
|
2014-10-05 16:32:25 +02:00
|
|
|
|
(define* (bag->derivation store bag
|
|
|
|
|
#:optional context)
|
|
|
|
|
"Return the derivation to build BAG for SYSTEM. Optionally, CONTEXT can be
|
|
|
|
|
a package object describing the context in which the call occurs, for improved
|
|
|
|
|
error reporting."
|
|
|
|
|
(if (bag-target bag)
|
|
|
|
|
(bag->cross-derivation store bag)
|
|
|
|
|
(let* ((system (bag-system bag))
|
|
|
|
|
(inputs (bag-transitive-inputs bag))
|
|
|
|
|
(input-drvs (map (cut expand-input store context <> system)
|
|
|
|
|
inputs))
|
|
|
|
|
(paths (delete-duplicates
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((_ (? package? p) _ ...)
|
|
|
|
|
(package-native-search-paths
|
|
|
|
|
p))
|
|
|
|
|
(_ '()))
|
|
|
|
|
inputs))))
|
|
|
|
|
|
|
|
|
|
(apply (bag-build bag)
|
|
|
|
|
store (bag-name bag) input-drvs
|
|
|
|
|
#:search-paths paths
|
|
|
|
|
#:outputs (bag-outputs bag) #:system system
|
|
|
|
|
(bag-arguments bag)))))
|
|
|
|
|
|
|
|
|
|
(define* (bag->cross-derivation store bag
|
|
|
|
|
#:optional context)
|
|
|
|
|
"Return the derivation to build BAG, which is actually a cross build.
|
|
|
|
|
Optionally, CONTEXT can be a package object denoting the context of the call.
|
|
|
|
|
This is an internal procedure."
|
|
|
|
|
(let* ((system (bag-system bag))
|
|
|
|
|
(target (bag-target bag))
|
|
|
|
|
(host (bag-transitive-host-inputs bag))
|
|
|
|
|
(host-drvs (map (cut expand-input store context <> system target)
|
|
|
|
|
host))
|
|
|
|
|
(target* (bag-transitive-target-inputs bag))
|
|
|
|
|
(target-drvs (map (cut expand-input store context <> system)
|
|
|
|
|
target*))
|
|
|
|
|
(build (bag-transitive-build-inputs bag))
|
|
|
|
|
(build-drvs (map (cut expand-input store context <> system)
|
|
|
|
|
build))
|
|
|
|
|
(all (append build target* host))
|
|
|
|
|
(paths (delete-duplicates
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((_ (? package? p) _ ...)
|
|
|
|
|
(package-search-paths p))
|
|
|
|
|
(_ '()))
|
|
|
|
|
all)))
|
|
|
|
|
(npaths (delete-duplicates
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((_ (? package? p) _ ...)
|
|
|
|
|
(package-native-search-paths
|
|
|
|
|
p))
|
|
|
|
|
(_ '()))
|
|
|
|
|
all))))
|
|
|
|
|
|
|
|
|
|
(apply (bag-build bag)
|
|
|
|
|
store (bag-name bag)
|
|
|
|
|
#:native-drvs build-drvs
|
|
|
|
|
#:target-drvs (append host-drvs target-drvs)
|
|
|
|
|
#:search-paths paths
|
|
|
|
|
#:native-search-paths npaths
|
|
|
|
|
#:outputs (bag-outputs bag)
|
|
|
|
|
#:system system #:target target
|
|
|
|
|
(bag-arguments bag))))
|
|
|
|
|
|
2013-05-20 23:00:47 +02:00
|
|
|
|
(define* (package-derivation store 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
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key (graft? (%graft?)))
|
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
|
|
|
|
"Return the <derivation> object of PACKAGE for SYSTEM."
|
|
|
|
|
|
2013-01-20 22:17:58 +01:00
|
|
|
|
;; Compute the derivation and cache the result. Caching is important
|
|
|
|
|
;; because some derivations, such as the implicit inputs of the GNU build
|
|
|
|
|
;; system, will be queried many, many times in a row.
|
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
|
|
|
|
(cached package (cons system graft?)
|
|
|
|
|
(let* ((bag (package->bag package system #f #:graft? graft?))
|
|
|
|
|
(drv (bag->derivation store bag package)))
|
|
|
|
|
(if graft?
|
|
|
|
|
(match (bag-grafts store bag)
|
|
|
|
|
(()
|
|
|
|
|
drv)
|
|
|
|
|
(grafts
|
|
|
|
|
(let ((guile (package-derivation store (default-guile)
|
|
|
|
|
system #:graft? #f)))
|
2016-02-27 23:06:50 +01:00
|
|
|
|
;; TODO: As an optimization, we can simply graft the tip
|
|
|
|
|
;; of the derivation graph since 'graft-derivation'
|
|
|
|
|
;; recurses anyway.
|
2016-02-22 19:02:16 +01:00
|
|
|
|
(graft-derivation store drv grafts
|
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
|
|
|
|
#:system system
|
|
|
|
|
#:guile guile))))
|
|
|
|
|
drv))))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2013-05-24 22:21:24 +02:00
|
|
|
|
(define* (package-cross-derivation store package target
|
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
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key (graft? (%graft?)))
|
2013-05-24 22:21:24 +02:00
|
|
|
|
"Cross-build PACKAGE for TARGET (a GNU triplet) from host SYSTEM (a Guix
|
|
|
|
|
system identifying string)."
|
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
|
|
|
|
(cached package (list system target graft?)
|
|
|
|
|
(let* ((bag (package->bag package system target #:graft? graft?))
|
|
|
|
|
(drv (bag->derivation store bag package)))
|
|
|
|
|
(if graft?
|
|
|
|
|
(match (bag-grafts store bag)
|
|
|
|
|
(()
|
|
|
|
|
drv)
|
|
|
|
|
(grafts
|
2016-02-22 19:02:16 +01:00
|
|
|
|
(graft-derivation store drv grafts
|
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
|
|
|
|
#:system system
|
|
|
|
|
#:guile
|
|
|
|
|
(package-derivation store (default-guile)
|
|
|
|
|
system #:graft? #f))))
|
|
|
|
|
drv))))
|
2013-02-16 01:37:26 +01:00
|
|
|
|
|
2013-09-25 23:26:42 +02:00
|
|
|
|
(define* (package-output store package
|
|
|
|
|
#:optional (output "out") (system (%current-system)))
|
2013-02-16 01:37:26 +01:00
|
|
|
|
"Return the output path of PACKAGE's OUTPUT for SYSTEM---where OUTPUT is the
|
|
|
|
|
symbolic output name, such as \"out\". Note that this procedure calls
|
|
|
|
|
`package-derivation', which is costly."
|
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
|
|
|
|
(let ((drv (package-derivation store package system)))
|
|
|
|
|
(derivation->output-path drv output)))
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Monadic interface.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (set-guile-for-build guile)
|
|
|
|
|
"This monadic procedure changes the Guile currently used to run the build
|
|
|
|
|
code of derivations to GUILE, a package object."
|
|
|
|
|
(lambda (store)
|
|
|
|
|
(let ((guile (package-derivation store guile)))
|
2015-01-17 23:19:13 +01:00
|
|
|
|
(values (%guile-for-build guile) 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
|
|
|
|
|
|
|
|
|
(define* (package-file package
|
|
|
|
|
#:optional file
|
|
|
|
|
#:key
|
|
|
|
|
system (output "out") target)
|
|
|
|
|
"Return as a monadic value the absolute file name of FILE within the
|
|
|
|
|
OUTPUT directory of PACKAGE. When FILE is omitted, return the name of the
|
|
|
|
|
OUTPUT directory of PACKAGE. When TARGET is true, use it as a
|
|
|
|
|
cross-compilation target triplet."
|
|
|
|
|
(lambda (store)
|
|
|
|
|
(define compute-derivation
|
|
|
|
|
(if target
|
|
|
|
|
(cut package-cross-derivation <> <> target <>)
|
|
|
|
|
package-derivation))
|
|
|
|
|
|
|
|
|
|
(let* ((system (or system (%current-system)))
|
|
|
|
|
(drv (compute-derivation store package system))
|
|
|
|
|
(out (derivation->output-path drv output)))
|
2015-01-17 23:19:13 +01:00
|
|
|
|
(values (if file
|
|
|
|
|
(string-append out "/" file)
|
|
|
|
|
out)
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
(define package->derivation
|
|
|
|
|
(store-lift package-derivation))
|
|
|
|
|
|
|
|
|
|
(define package->cross-derivation
|
|
|
|
|
(store-lift package-cross-derivation))
|
|
|
|
|
|
2016-09-10 11:57:37 +02:00
|
|
|
|
(define-gexp-compiler (package-compiler (package <package>) system target)
|
2015-03-17 22:09:32 +01:00
|
|
|
|
;; Compile PACKAGE to a derivation for SYSTEM, optionally cross-compiled for
|
|
|
|
|
;; TARGET. This is used when referring to a package from within a gexp.
|
|
|
|
|
(if target
|
|
|
|
|
(package->cross-derivation package target system)
|
|
|
|
|
(package->derivation package system)))
|
|
|
|
|
|
2016-06-15 10:16:56 +02:00
|
|
|
|
(define* (origin->derivation origin
|
2015-01-14 14:42:10 +01:00
|
|
|
|
#:optional (system (%current-system)))
|
2016-06-15 10:16:56 +02:00
|
|
|
|
"Return the derivation corresponding to ORIGIN."
|
|
|
|
|
(match origin
|
2015-01-20 09:59:56 +01:00
|
|
|
|
(($ <origin> uri method sha256 name (= force ()) #f)
|
2015-01-14 14:42:10 +01:00
|
|
|
|
;; No patches, no snippet: this is a fixed-output derivation.
|
|
|
|
|
(method uri 'sha256 sha256 name #:system system))
|
2015-01-20 09:59:56 +01:00
|
|
|
|
(($ <origin> uri method sha256 name (= force (patches ...)) snippet
|
2016-07-12 22:23:12 +02:00
|
|
|
|
(flags ...) inputs (modules ...) guile-for-build)
|
2015-01-14 14:42:10 +01:00
|
|
|
|
;; Patches and/or a snippet.
|
|
|
|
|
(mlet %store-monad ((source (method uri 'sha256 sha256 name
|
|
|
|
|
#:system system))
|
|
|
|
|
(guile (package->derivation (or guile-for-build
|
|
|
|
|
(default-guile))
|
|
|
|
|
system
|
|
|
|
|
#:graft? #f)))
|
2015-03-18 19:00:12 +01:00
|
|
|
|
(patch-and-repack source patches
|
|
|
|
|
#:inputs inputs
|
|
|
|
|
#:snippet snippet
|
|
|
|
|
#:flags flags
|
|
|
|
|
#:system system
|
|
|
|
|
#:modules modules
|
2016-06-15 10:16:56 +02:00
|
|
|
|
#:guile-for-build guile)))))
|
2015-01-14 14:42:10 +01:00
|
|
|
|
|
2016-09-10 11:57:37 +02:00
|
|
|
|
(define-gexp-compiler (origin-compiler (origin <origin>) system target)
|
2015-03-17 22:09:32 +01:00
|
|
|
|
;; Compile ORIGIN to a derivation for SYSTEM. This is used when referring
|
|
|
|
|
;; to an origin from within a gexp.
|
|
|
|
|
(origin->derivation origin system))
|
|
|
|
|
|
2016-06-15 10:16:56 +02:00
|
|
|
|
(define package-source-derivation ;somewhat deprecated
|
2016-06-15 10:38:46 +02:00
|
|
|
|
(let ((lower (store-lower lower-object)))
|
2016-06-15 10:16:56 +02:00
|
|
|
|
(lambda* (store source #:optional (system (%current-system)))
|
|
|
|
|
"Return the derivation or file corresponding to SOURCE, which can be an
|
2016-06-15 10:38:46 +02:00
|
|
|
|
a file name or any object handled by 'lower-object', such as an <origin>.
|
|
|
|
|
When SOURCE is a file name, return either the interned file name (if SOURCE is
|
|
|
|
|
outside of the store) or SOURCE itself (if SOURCE is already a store item.)"
|
2016-06-15 10:16:56 +02:00
|
|
|
|
(match source
|
|
|
|
|
((and (? string?) (? direct-store-path?) file)
|
|
|
|
|
file)
|
|
|
|
|
((? string? file)
|
|
|
|
|
(add-to-store store (basename file) #t "sha256" file))
|
|
|
|
|
(_
|
|
|
|
|
(lower store source system))))))
|