2013-01-05 18:47:50 -05:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2023-03-07 09:48:01 -05:00
|
|
|
|
;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
|
2021-09-16 07:47:33 -04:00
|
|
|
|
;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
|
2015-07-21 21:45:54 -04:00
|
|
|
|
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
2016-05-19 12:11:58 -04:00
|
|
|
|
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
2022-02-22 06:11:41 -05:00
|
|
|
|
;;; Copyright © 2017, 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
|
2019-06-16 04:50:15 -04:00
|
|
|
|
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
2021-02-20 20:29:58 -05:00
|
|
|
|
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
2022-03-19 18:39:33 -04:00
|
|
|
|
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
|
2022-12-07 00:57:09 -05:00
|
|
|
|
;;; Copyright © 2022 jgart <jgart@dismail.de>
|
2023-03-11 11:51:10 -05:00
|
|
|
|
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
|
2012-06-27 19:24:34 -04:00
|
|
|
|
;;;
|
2013-01-05 18:47:50 -05:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-06-27 19:24:34 -04:00
|
|
|
|
;;;
|
2013-01-05 18:47:50 -05:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-06-27 19:24:34 -04: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-05 18:47:50 -05:00
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-06-27 19:24:34 -04: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-05 18:47:50 -05:00
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
|
|
|
|
(define-module (guix packages)
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
#:use-module ((guix build utils) #:select (compressor tarball?
|
|
|
|
|
strip-store-file-name))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
#:use-module (guix utils)
|
2013-05-12 09:46:16 -04:00
|
|
|
|
#:use-module (guix records)
|
2012-06-27 19:24:34 -04: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 07:34:52 -05:00
|
|
|
|
#:use-module (guix monads)
|
2015-03-17 17:09:32 -04: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 16:33:28 -05:00
|
|
|
|
#:use-module (guix base32)
|
2020-05-18 17:21:36 -04:00
|
|
|
|
#:autoload (guix base64) (base64-decode)
|
2016-02-22 10:29:44 -05:00
|
|
|
|
#:use-module (guix grafts)
|
2013-02-15 19:37:26 -05:00
|
|
|
|
#:use-module (guix derivations)
|
2017-01-28 11:15:27 -05:00
|
|
|
|
#:use-module (guix memoization)
|
2012-06-27 19:24:34 -04: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 16:11:37 -04:00
|
|
|
|
#:use-module (guix search-paths)
|
2016-02-27 17:06:50 -05:00
|
|
|
|
#:use-module (guix sets)
|
2020-05-19 09:55:08 -04:00
|
|
|
|
#:use-module (guix deprecation)
|
2022-10-01 10:56:19 -04:00
|
|
|
|
#:use-module ((guix diagnostics)
|
|
|
|
|
#:select (formatted-message define-with-syntax-properties))
|
|
|
|
|
#:autoload (guix licenses) (license?)
|
2020-05-19 09:55:08 -04:00
|
|
|
|
#:use-module (guix i18n)
|
2012-06-27 19:24:34 -04:00
|
|
|
|
#:use-module (ice-9 match)
|
2014-11-03 15:26:48 -05:00
|
|
|
|
#:use-module (ice-9 vlist)
|
2018-05-13 12:46:13 -04:00
|
|
|
|
#:use-module (ice-9 regex)
|
2012-07-01 11:32:03 -04:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2012-09-01 13:21:06 -04:00
|
|
|
|
#:use-module (srfi srfi-9 gnu)
|
2013-05-20 17:00:47 -04:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2012-08-23 17:09:13 -04:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2023-03-07 09:48:01 -05:00
|
|
|
|
#:use-module (srfi srfi-71)
|
2020-05-19 09:55:08 -04:00
|
|
|
|
#:use-module (rnrs bytevectors)
|
2015-09-10 16:39:44 -04:00
|
|
|
|
#:use-module (web uri)
|
2021-10-18 11:49:55 -04:00
|
|
|
|
#:autoload (texinfo) (texi-fragment->stexi)
|
2013-05-25 10:14:37 -04: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 16:11:37 -04:00
|
|
|
|
%current-target-system
|
|
|
|
|
search-path-specification) ;for convenience
|
2021-09-07 15:19:11 -04:00
|
|
|
|
#:replace ((define-public* . define-public))
|
2020-05-19 09:55:08 -04:00
|
|
|
|
#:export (content-hash
|
|
|
|
|
content-hash?
|
|
|
|
|
content-hash-algorithm
|
|
|
|
|
content-hash-value
|
|
|
|
|
|
|
|
|
|
origin
|
2012-07-01 11:32:03 -04:00
|
|
|
|
origin?
|
2019-03-29 17:49:00 -04:00
|
|
|
|
this-origin
|
2012-07-01 11:32:03 -04:00
|
|
|
|
origin-uri
|
|
|
|
|
origin-method
|
2020-05-19 09:55:08 -04:00
|
|
|
|
origin-hash
|
2012-07-01 11:32:03 -04:00
|
|
|
|
origin-file-name
|
2015-09-10 16:39:44 -04:00
|
|
|
|
origin-actual-file-name
|
2013-10-08 18:04:45 -04:00
|
|
|
|
origin-patches
|
|
|
|
|
origin-patch-flags
|
|
|
|
|
origin-patch-inputs
|
|
|
|
|
origin-patch-guile
|
2013-11-07 16:41:21 -05:00
|
|
|
|
origin-snippet
|
|
|
|
|
origin-modules
|
2012-07-01 11:32:03 -04:00
|
|
|
|
base32
|
2020-05-18 17:21:36 -04:00
|
|
|
|
base64
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
|
|
|
|
package
|
|
|
|
|
package?
|
2019-03-29 17:49:00 -04:00
|
|
|
|
this-package
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-name
|
2017-01-27 18:11:33 -05:00
|
|
|
|
package-upstream-name
|
2022-12-09 05:46:37 -05:00
|
|
|
|
package-upstream-name*
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-version
|
2012-09-05 13:01:47 -04:00
|
|
|
|
package-full-name
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-source
|
|
|
|
|
package-build-system
|
|
|
|
|
package-arguments
|
|
|
|
|
package-inputs
|
|
|
|
|
package-native-inputs
|
2012-07-01 11:32:03 -04:00
|
|
|
|
package-propagated-inputs
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-outputs
|
2013-03-30 17:56:38 -04:00
|
|
|
|
package-native-search-paths
|
2012-06-27 19:24:34 -04: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 13:09:00 -04:00
|
|
|
|
package-replacement
|
2012-11-04 07:41:34 -05:00
|
|
|
|
package-synopsis
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-description
|
|
|
|
|
package-license
|
2012-11-25 10:55:35 -05:00
|
|
|
|
package-home-page
|
2014-10-06 13:14:47 -04:00
|
|
|
|
package-supported-systems
|
2012-07-01 11:32:03 -04:00
|
|
|
|
package-properties
|
2012-06-28 17:15:24 -04:00
|
|
|
|
package-location
|
2021-09-07 15:19:11 -04:00
|
|
|
|
package-definition-location
|
2016-07-28 12:50:43 -04:00
|
|
|
|
hidden-package
|
|
|
|
|
hidden-package?
|
2016-09-06 17:14:07 -04:00
|
|
|
|
package-superseded
|
|
|
|
|
deprecated-package
|
2013-04-22 17:07:13 -04:00
|
|
|
|
package-field-location
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
2021-07-14 07:12:50 -04:00
|
|
|
|
this-package-input
|
|
|
|
|
this-package-native-input
|
|
|
|
|
|
2021-06-16 17:19:16 -04:00
|
|
|
|
lookup-package-input
|
|
|
|
|
lookup-package-native-input
|
|
|
|
|
lookup-package-propagated-input
|
|
|
|
|
lookup-package-direct-input
|
|
|
|
|
|
2021-06-16 17:52:42 -04:00
|
|
|
|
prepend ;syntactic keyword
|
|
|
|
|
replace ;syntactic keyword
|
|
|
|
|
modify-inputs
|
|
|
|
|
|
2015-04-24 08:57:51 -04:00
|
|
|
|
package-direct-sources
|
|
|
|
|
package-transitive-sources
|
2014-07-20 12:29:48 -04:00
|
|
|
|
package-direct-inputs
|
2012-07-07 14:14:20 -04:00
|
|
|
|
package-transitive-inputs
|
2013-05-24 16:21:24 -04:00
|
|
|
|
package-transitive-target-inputs
|
|
|
|
|
package-transitive-native-inputs
|
2012-09-01 13:21:06 -04:00
|
|
|
|
package-transitive-propagated-inputs
|
2015-12-20 08:34:36 -05:00
|
|
|
|
package-transitive-native-search-paths
|
2014-10-17 17:20:39 -04:00
|
|
|
|
package-transitive-supported-systems
|
2017-04-05 09:19:15 -04:00
|
|
|
|
package-mapping
|
2016-09-01 16:35:35 -04:00
|
|
|
|
package-input-rewriting
|
2019-03-12 16:39:48 -04:00
|
|
|
|
package-input-rewriting/spec
|
2012-06-27 19:24:34 -04:00
|
|
|
|
package-source-derivation
|
|
|
|
|
package-derivation
|
2012-08-23 17:09:13 -04:00
|
|
|
|
package-cross-derivation
|
2013-02-15 19:37:26 -05: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 13:09:00 -04:00
|
|
|
|
package-grafts
|
2018-05-13 12:46:13 -04:00
|
|
|
|
package-patched-vulnerabilities
|
2020-04-06 14:02:42 -04:00
|
|
|
|
package-with-patches
|
|
|
|
|
package-with-extra-patches
|
2020-09-28 11:36:42 -04:00
|
|
|
|
package-with-c-toolchain
|
2017-05-02 03:39:23 -04:00
|
|
|
|
package/inherit
|
2012-08-23 17:09:13 -04:00
|
|
|
|
|
2015-07-21 21:45:54 -04:00
|
|
|
|
transitive-input-references
|
|
|
|
|
|
2022-02-22 06:11:41 -05:00
|
|
|
|
%32bit-supported-systems
|
|
|
|
|
%64bit-supported-systems
|
2014-10-06 13:14:47 -04:00
|
|
|
|
%supported-systems
|
2015-09-04 07:40:55 -04:00
|
|
|
|
%hurd-systems
|
2021-03-10 02:48:19 -05:00
|
|
|
|
%cuirass-supported-systems
|
2015-04-19 10:49:09 -04:00
|
|
|
|
supported-package?
|
2014-10-06 13:14:47 -04:00
|
|
|
|
|
2012-08-23 17:09:13 -04:00
|
|
|
|
&package-error
|
2012-10-27 08:56:38 -04:00
|
|
|
|
package-error?
|
2012-08-23 17:09:13 -04:00
|
|
|
|
package-error-package
|
2022-10-01 10:56:19 -04:00
|
|
|
|
package-license-error?
|
|
|
|
|
package-error-invalid-license
|
2012-08-23 17:09:13 -04:00
|
|
|
|
&package-input-error
|
2012-10-27 08:56:38 -04:00
|
|
|
|
package-input-error?
|
2013-05-27 17:41:35 -04: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 12:06:16 -04:00
|
|
|
|
package-cross-build-system-error?
|
|
|
|
|
|
|
|
|
|
package->bag
|
2014-10-05 10:32:25 -04:00
|
|
|
|
bag->derivation
|
2015-04-11 06:29:10 -04: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 12:06:16 -04: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 07:34:52 -05:00
|
|
|
|
bag-transitive-target-inputs
|
2021-10-01 04:49:22 -04:00
|
|
|
|
package-development-inputs
|
2019-01-25 04:05:31 -05:00
|
|
|
|
package-closure
|
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 07:34:52 -05:00
|
|
|
|
|
|
|
|
|
default-guile
|
2015-03-17 17:09:32 -04: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 07:34:52 -05:00
|
|
|
|
set-guile-for-build
|
|
|
|
|
package-file
|
|
|
|
|
package->derivation
|
|
|
|
|
package->cross-derivation
|
|
|
|
|
origin->derivation))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
2021-12-22 16:01:25 -05:00
|
|
|
|
;; The 'source-module-closure' procedure ca. 1.2.0 did not recognize
|
|
|
|
|
;; #:re-export-and-replace: <https://issues.guix.gnu.org/52694>.
|
2022-03-19 18:39:33 -04:00
|
|
|
|
;; Work around it. The #:replace? argument is only supported by
|
|
|
|
|
;; Guile 2.2.7 and later, work-around it if necessary to allow
|
|
|
|
|
;; time-travel from 1.1.0, see <https://issues.guix.gnu.org/53765>.
|
|
|
|
|
(let ((major (string->number (major-version))))
|
|
|
|
|
(if (or (>= major 3)
|
|
|
|
|
(and (= major 2)
|
|
|
|
|
(= (string->number (minor-version)) 2) ; there is no Guile 2.3.X
|
|
|
|
|
(>= (string->number (micro-version)) 7)))
|
|
|
|
|
(module-re-export! (current-module) '(delete) #:replace? #t)
|
|
|
|
|
(module-re-export! (current-module) '(delete))))
|
2021-12-22 16:01:25 -05:00
|
|
|
|
|
2012-06-27 19:24:34 -04:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module provides a high-level mechanism to define packages in a
|
|
|
|
|
;;; Guix-based distribution.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2021-01-10 08:42:42 -05:00
|
|
|
|
(define-syntax-rule (define-compile-time-decoder name string->bytevector)
|
|
|
|
|
"Define NAME as a macro that runs STRING->BYTEVECTOR at macro expansion time
|
|
|
|
|
if possible."
|
|
|
|
|
(define-syntax name
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Return the bytevector corresponding to the given textual
|
|
|
|
|
representation."
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_ str)
|
|
|
|
|
(string? (syntax->datum #'str))
|
|
|
|
|
;; A literal string: do the conversion at expansion time.
|
|
|
|
|
(with-syntax ((bv (string->bytevector (syntax->datum #'str))))
|
|
|
|
|
#''bv))
|
|
|
|
|
((_ str)
|
|
|
|
|
#'(string->bytevector str))))))
|
|
|
|
|
|
|
|
|
|
(define-compile-time-decoder base32 nix-base32-string->bytevector)
|
|
|
|
|
(define-compile-time-decoder base64 base64-decode)
|
|
|
|
|
|
2020-05-19 09:55:08 -04:00
|
|
|
|
;; Crytographic content hash.
|
|
|
|
|
(define-immutable-record-type <content-hash>
|
|
|
|
|
(%content-hash algorithm value)
|
|
|
|
|
content-hash?
|
|
|
|
|
(algorithm content-hash-algorithm) ;symbol
|
|
|
|
|
(value content-hash-value)) ;bytevector
|
|
|
|
|
|
|
|
|
|
(define-syntax-rule (define-content-hash-constructor name
|
|
|
|
|
(algorithm size) ...)
|
|
|
|
|
"Define NAME as a <content-hash> constructor that ensures that (1) its
|
|
|
|
|
second argument is among the listed ALGORITHM, and (2), when possible, that
|
|
|
|
|
its first argument has the right size for the chosen algorithm."
|
|
|
|
|
(define-syntax name
|
|
|
|
|
(lambda (s)
|
|
|
|
|
(syntax-case s (algorithm ...)
|
|
|
|
|
((_ bv algorithm)
|
|
|
|
|
(let ((bv* (syntax->datum #'bv)))
|
|
|
|
|
(when (and (bytevector? bv*)
|
|
|
|
|
(not (= size (bytevector-length bv*))))
|
|
|
|
|
(syntax-violation 'content-hash "invalid content hash length" s))
|
|
|
|
|
#'(%content-hash 'algorithm bv)))
|
|
|
|
|
...))))
|
|
|
|
|
|
|
|
|
|
(define-content-hash-constructor build-content-hash
|
|
|
|
|
(sha256 32)
|
2020-06-23 10:35:58 -04:00
|
|
|
|
(sha512 64)
|
|
|
|
|
(sha3-256 32)
|
|
|
|
|
(sha3-512 64)
|
|
|
|
|
(blake2s-256 64))
|
2020-05-19 09:55:08 -04:00
|
|
|
|
|
|
|
|
|
(define-syntax content-hash
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Return a content hash with the given parameters. The default hash
|
|
|
|
|
algorithm is sha256. If the first argument is a literal string, it is decoded
|
|
|
|
|
as base32. Otherwise, it must be a bytevector."
|
|
|
|
|
;; What we'd really want here is something like C++ 'constexpr'.
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_ str)
|
|
|
|
|
(string? (syntax->datum #'str))
|
|
|
|
|
#'(content-hash str sha256))
|
|
|
|
|
((_ str algorithm)
|
|
|
|
|
(string? (syntax->datum #'str))
|
|
|
|
|
(with-syntax ((bv (base32 (syntax->datum #'str))))
|
|
|
|
|
#'(content-hash bv algorithm)))
|
|
|
|
|
((_ (id str) algorithm)
|
|
|
|
|
(and (string? (syntax->datum #'str))
|
|
|
|
|
(free-identifier=? #'id #'base32))
|
|
|
|
|
(with-syntax ((bv (nix-base32-string->bytevector (syntax->datum #'str))))
|
|
|
|
|
#'(content-hash bv algorithm)))
|
|
|
|
|
((_ (id str) algorithm)
|
|
|
|
|
(and (string? (syntax->datum #'str))
|
|
|
|
|
(free-identifier=? #'id #'base64))
|
|
|
|
|
(with-syntax ((bv (base64-decode (syntax->datum #'str))))
|
|
|
|
|
#'(content-hash bv algorithm)))
|
|
|
|
|
((_ bv)
|
|
|
|
|
#'(content-hash bv sha256))
|
|
|
|
|
((_ bv hash)
|
|
|
|
|
#'(build-content-hash bv hash)))))
|
|
|
|
|
|
|
|
|
|
(define (print-content-hash hash port)
|
|
|
|
|
(format port "#<content-hash ~a:~a>"
|
|
|
|
|
(content-hash-algorithm hash)
|
2020-08-31 06:24:21 -04:00
|
|
|
|
(and=> (content-hash-value hash)
|
|
|
|
|
bytevector->nix-base32-string)))
|
2020-05-19 09:55:08 -04:00
|
|
|
|
|
|
|
|
|
(set-record-type-printer! <content-hash> print-content-hash)
|
|
|
|
|
|
|
|
|
|
|
2012-07-01 11:32:03 -04: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>
|
2020-05-19 09:55:08 -04:00
|
|
|
|
%origin make-origin
|
2012-07-01 11:32:03 -04:00
|
|
|
|
origin?
|
2019-03-29 17:49:00 -04:00
|
|
|
|
this-origin
|
2012-07-01 11:32:03 -04:00
|
|
|
|
(uri origin-uri) ; string
|
2014-02-21 17:41:11 -05:00
|
|
|
|
(method origin-method) ; procedure
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(hash origin-hash) ; <content-hash>
|
2013-10-08 18:04:45 -04:00
|
|
|
|
(file-name origin-file-name (default #f)) ; optional file name
|
2015-01-20 03:59:56 -05: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 16:41:21 -05:00
|
|
|
|
(snippet origin-snippet (default #f)) ; sexp or #f
|
2021-02-28 14:53:00 -05:00
|
|
|
|
(patch-flags origin-patch-flags ; string-list gexp
|
|
|
|
|
(default %default-patch-flags))
|
2013-10-10 17:00:47 -04:00
|
|
|
|
|
|
|
|
|
;; Patching requires Guile, GNU Patch, and a few more. These two fields are
|
|
|
|
|
;; used to specify these dependencies when needed.
|
2013-10-08 18:04:45 -04:00
|
|
|
|
(patch-inputs origin-patch-inputs ; input list or #f
|
|
|
|
|
(default #f))
|
2013-11-07 16:41:21 -05:00
|
|
|
|
(modules origin-modules ; list of module names
|
|
|
|
|
(default '()))
|
2016-07-12 16:23:12 -04:00
|
|
|
|
|
2013-10-10 17:00:47 -04:00
|
|
|
|
(patch-guile origin-patch-guile ; package or #f
|
2013-10-08 18:04:45 -04:00
|
|
|
|
(default #f)))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(define-syntax origin-compatibility-helper
|
|
|
|
|
(syntax-rules (sha256)
|
|
|
|
|
((_ () (fields ...))
|
|
|
|
|
(%origin fields ...))
|
|
|
|
|
((_ ((sha256 exp) rest ...) (others ...))
|
|
|
|
|
(%origin others ...
|
|
|
|
|
(hash (content-hash exp sha256))
|
|
|
|
|
rest ...))
|
|
|
|
|
((_ (field rest ...) (others ...))
|
|
|
|
|
(origin-compatibility-helper (rest ...)
|
|
|
|
|
(others ... field)))))
|
|
|
|
|
|
|
|
|
|
(define-syntax-rule (origin fields ...)
|
|
|
|
|
"Build an <origin> record, automatically converting 'sha256' field
|
|
|
|
|
specifications to 'hash'."
|
|
|
|
|
(origin-compatibility-helper (fields ...) ()))
|
|
|
|
|
|
2014-07-11 07:59:54 -04:00
|
|
|
|
(define (print-origin origin port)
|
|
|
|
|
"Write a concise representation of ORIGIN to PORT."
|
|
|
|
|
(match origin
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(($ <origin> uri method hash file-name patches)
|
2014-07-11 07:59:54 -04:00
|
|
|
|
(simple-format port "#<origin ~s ~a ~s ~a>"
|
2020-05-19 09:55:08 -04:00
|
|
|
|
uri hash
|
2015-01-20 03:59:56 -05:00
|
|
|
|
(force patches)
|
2014-07-11 07:59:54 -04:00
|
|
|
|
(number->string (object-address origin) 16)))))
|
|
|
|
|
|
|
|
|
|
(set-record-type-printer! <origin> print-origin)
|
|
|
|
|
|
2021-02-28 14:53:00 -05:00
|
|
|
|
(define %default-patch-flags
|
|
|
|
|
#~("-p1"))
|
|
|
|
|
|
2015-09-10 16:39:44 -04: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))))
|
|
|
|
|
|
2021-09-16 07:47:33 -04:00
|
|
|
|
;; Work around limitations in the 'snippet' mechanism. It is not possible for
|
|
|
|
|
;; a 'snippet' to produce a tarball with a different base name than the
|
|
|
|
|
;; original downloaded source. Moreover, cherry picking dozens of upsteam
|
|
|
|
|
;; patches and applying them suddenly is often impractical; especially when a
|
|
|
|
|
;; comprehensive code reformatting is done upstream. Mainly designed for
|
|
|
|
|
;; Linux and IceCat packages.
|
|
|
|
|
;; XXXX: do not make part of public API (export) such radical capability
|
|
|
|
|
;; before a detailed review process.
|
|
|
|
|
(define* (computed-origin-method gexp-promise hash-algo hash
|
|
|
|
|
#:optional (name "source")
|
|
|
|
|
#:key (system (%current-system))
|
|
|
|
|
(guile (default-guile)))
|
|
|
|
|
"Return a derivation that executes the G-expression that results
|
|
|
|
|
from forcing GEXP-PROMISE."
|
|
|
|
|
(mlet %store-monad ((guile (package->derivation guile system)))
|
|
|
|
|
(gexp->derivation (or name "computed-origin")
|
|
|
|
|
(force gexp-promise)
|
|
|
|
|
#:graft? #f ;nothing to graft
|
|
|
|
|
#:system system
|
|
|
|
|
#:guile-for-build guile)))
|
|
|
|
|
|
2020-05-19 09:55:08 -04:00
|
|
|
|
|
2022-02-22 06:11:41 -05:00
|
|
|
|
(define %32bit-supported-systems
|
|
|
|
|
;; This is the list of 32-bit system types that are supported.
|
|
|
|
|
'("i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux"))
|
|
|
|
|
|
|
|
|
|
(define %64bit-supported-systems
|
|
|
|
|
;; This is the list of 64-bit system types that are supported.
|
|
|
|
|
'("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux"
|
|
|
|
|
"riscv64-linux"))
|
|
|
|
|
|
2014-10-06 13:14:47 -04:00
|
|
|
|
(define %supported-systems
|
|
|
|
|
;; This is the list of system types that are supported. By default, we
|
|
|
|
|
;; expect all packages to build successfully here.
|
2022-06-16 17:55:31 -04:00
|
|
|
|
(append %64bit-supported-systems %32bit-supported-systems))
|
2014-10-06 13:14:47 -04:00
|
|
|
|
|
2015-09-04 07:40:55 -04:00
|
|
|
|
(define %hurd-systems
|
|
|
|
|
;; The GNU/Hurd systems for which support is being developed.
|
2022-11-25 05:21:57 -05:00
|
|
|
|
'("i586-gnu"))
|
2015-09-04 07:40:55 -04:00
|
|
|
|
|
2021-03-10 02:48:19 -05:00
|
|
|
|
(define %cuirass-supported-systems
|
2017-03-29 16:50:42 -04:00
|
|
|
|
;; This is the list of system types for which build machines are available.
|
|
|
|
|
;;
|
2019-10-20 09:43:18 -04:00
|
|
|
|
;; XXX: MIPS is unavailable in CI:
|
2017-03-29 16:50:42 -04:00
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00790.html>.
|
2021-06-12 16:23:43 -04:00
|
|
|
|
(fold delete %supported-systems '("mips64el-linux" "powerpc-linux" "riscv64-linux")))
|
2015-05-01 10:05:40 -04:00
|
|
|
|
|
packages: Allow inputs to be plain package lists.
* guix/packages.scm (add-input-label, sanitize-inputs): New procedures.
(<package>)[inputs, propagated-inputs, native-inputs]: Add 'sanitize' property.
* doc/guix.texi (Defining Packages, package Reference):
(Defining Package Variants): Adjust examples accordingly.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades, propagated inputs")
("transaction-upgrade-entry, grafts")
("package-transitive-inputs")
("package-transitive-supported-systems")
("package-closure")
("supported-package?")
("package-derivation, inputs deduplicated")
("package-transitive-native-search-paths")
("package-grafts, indirect grafts")
("package-grafts, indirect grafts, propagated inputs")
("package-grafts, same replacement twice")
("package-grafts, dependency on several outputs")
("replacement also grafted")
("package->bag, sensitivity to %current-target-system")
("package->bag, propagated inputs")
("package->bag, sensitivity to %current-system")
("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): Use the label-less input style.
2021-05-20 09:46:08 -04:00
|
|
|
|
(define-inlinable (sanitize-inputs inputs)
|
|
|
|
|
"Sanitize INPUTS by turning it into a list of name/package tuples if it's
|
|
|
|
|
not already the case."
|
|
|
|
|
(cond ((null? inputs) inputs)
|
|
|
|
|
((and (pair? (car inputs))
|
|
|
|
|
(string? (caar inputs)))
|
|
|
|
|
inputs)
|
|
|
|
|
(else (map add-input-label inputs))))
|
2015-05-01 10:05:40 -04:00
|
|
|
|
|
2021-09-07 12:04:21 -04:00
|
|
|
|
(define-syntax current-location-vector
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Like 'current-source-location' but expand to a literal vector with
|
|
|
|
|
one-indexed line numbers."
|
|
|
|
|
;; Storing a literal vector in .go files is more efficient than storing an
|
|
|
|
|
;; alist: less initialization code, fewer relocations, etc.
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_)
|
|
|
|
|
(match (syntax-source s)
|
|
|
|
|
(#f #f)
|
|
|
|
|
(properties
|
|
|
|
|
(let ((file (assq-ref properties 'filename))
|
|
|
|
|
(line (assq-ref properties 'line))
|
|
|
|
|
(column (assq-ref properties 'column)))
|
|
|
|
|
(and file line column
|
|
|
|
|
#`#(#,file #,(+ 1 line) #,column)))))))))
|
|
|
|
|
|
|
|
|
|
(define-inlinable (sanitize-location loc)
|
|
|
|
|
;; Convert LOC to a vector or to #f.
|
|
|
|
|
(cond ((vector? loc) loc)
|
|
|
|
|
((not loc) loc)
|
|
|
|
|
(else (vector (location-file loc)
|
|
|
|
|
(location-line loc)
|
|
|
|
|
(location-column loc)))))
|
2015-05-01 10:05:40 -04:00
|
|
|
|
|
2021-09-07 15:19:11 -04:00
|
|
|
|
(define-syntax-parameter current-definition-location
|
|
|
|
|
;; Location of the encompassing 'define-public'.
|
|
|
|
|
(const #f))
|
|
|
|
|
|
|
|
|
|
(define-syntax define-public*
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Like 'define-public' but set 'current-definition-location' for the
|
|
|
|
|
lexical scope of its body."
|
|
|
|
|
(define location
|
|
|
|
|
(match (syntax-source s)
|
|
|
|
|
(#f #f)
|
|
|
|
|
(properties
|
|
|
|
|
(let ((line (assq-ref properties 'line))
|
|
|
|
|
(column (assq-ref properties 'column)))
|
|
|
|
|
;; Don't repeat the file name since it's redundant with 'location'.
|
|
|
|
|
;; Encode the whole thing so that it fits in a fixnum on 32-bit
|
|
|
|
|
;; platforms, which leaves us 29 bits: 7 bits for COLUMN (which is
|
|
|
|
|
;; almost always zero), and 22 bits for LINE.
|
|
|
|
|
(and line column
|
|
|
|
|
(logior (ash (logand #x7f column) 22)
|
|
|
|
|
(logand (- (expt 2 22) 1) (+ 1 line))))))))
|
|
|
|
|
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_ prototype body ...)
|
|
|
|
|
#`(define-public prototype
|
|
|
|
|
(syntax-parameterize ((current-definition-location
|
|
|
|
|
(lambda (s) #,location)))
|
|
|
|
|
body ...))))))
|
|
|
|
|
|
2021-10-18 11:49:55 -04:00
|
|
|
|
(define-syntax validate-texinfo
|
|
|
|
|
(let ((validate? (getenv "GUIX_UNINSTALLED")))
|
|
|
|
|
(define ensure-thread-safe-texinfo-parser!
|
|
|
|
|
;; Work around <https://issues.guix.gnu.org/51264> for Guile <= 3.0.7.
|
|
|
|
|
(let ((patched? (or (> (string->number (major-version)) 3)
|
|
|
|
|
(> (string->number (minor-version)) 0)
|
|
|
|
|
(> (string->number (micro-version)) 7)))
|
|
|
|
|
(next-token-of/thread-safe
|
|
|
|
|
(lambda (pred port)
|
|
|
|
|
(let loop ((chars '()))
|
|
|
|
|
(match (read-char port)
|
|
|
|
|
((? eof-object?)
|
|
|
|
|
(list->string (reverse! chars)))
|
|
|
|
|
(chr
|
|
|
|
|
(let ((chr* (pred chr)))
|
|
|
|
|
(if chr*
|
|
|
|
|
(loop (cons chr* chars))
|
|
|
|
|
(begin
|
|
|
|
|
(unread-char chr port)
|
|
|
|
|
(list->string (reverse! chars)))))))))))
|
|
|
|
|
(lambda ()
|
|
|
|
|
(unless patched?
|
|
|
|
|
(set! (@@ (texinfo) next-token-of) next-token-of/thread-safe)
|
|
|
|
|
(set! patched? #t)))))
|
|
|
|
|
|
|
|
|
|
(lambda (s)
|
|
|
|
|
"Raise a syntax error when passed a literal string that is not valid
|
|
|
|
|
Texinfo. Otherwise, return the string."
|
|
|
|
|
(syntax-case s ()
|
|
|
|
|
((_ str)
|
|
|
|
|
(string? (syntax->datum #'str))
|
|
|
|
|
(if validate?
|
|
|
|
|
(catch 'parser-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(ensure-thread-safe-texinfo-parser!)
|
|
|
|
|
(texi-fragment->stexi (syntax->datum #'str))
|
|
|
|
|
#'str)
|
|
|
|
|
(lambda _
|
|
|
|
|
(syntax-violation 'package "invalid Texinfo markup" #'str)))
|
|
|
|
|
#'str))
|
|
|
|
|
((_ obj)
|
|
|
|
|
#'obj)))))
|
|
|
|
|
|
2022-10-01 10:56:19 -04:00
|
|
|
|
(define-syntax valid-license-value?
|
|
|
|
|
(syntax-rules (list package-license)
|
|
|
|
|
"Return #t if the given value is a valid license field, #f otherwise."
|
|
|
|
|
;; Arrange so that the answer can be given at macro-expansion time in the
|
|
|
|
|
;; most common cases.
|
|
|
|
|
((_ (list x ...))
|
|
|
|
|
(and (license? x) ...))
|
|
|
|
|
((_ (package-license _))
|
|
|
|
|
#t)
|
|
|
|
|
((_ obj)
|
|
|
|
|
(or (license? obj)
|
|
|
|
|
;; Note: Avoid 'not' below due to <https://bugs.gnu.org/58217>.
|
|
|
|
|
(eq? #f obj) ;#f is considered valid
|
|
|
|
|
(let ((x obj))
|
|
|
|
|
(and (pair? x) (every license? x)))))))
|
|
|
|
|
|
|
|
|
|
(define-with-syntax-properties (validate-license (value properties))
|
|
|
|
|
(unless (valid-license-value? value)
|
|
|
|
|
(raise
|
|
|
|
|
(make-compound-condition
|
|
|
|
|
(condition
|
|
|
|
|
(&error-location
|
|
|
|
|
(location (source-properties->location properties))))
|
|
|
|
|
(condition
|
|
|
|
|
(&package-license-error (package #f) (license value)))
|
|
|
|
|
(formatted-message (G_ "~s: invalid package license~%") value))))
|
|
|
|
|
value)
|
|
|
|
|
|
2013-03-30 17:56:38 -04:00
|
|
|
|
;; A package.
|
2012-06-27 19:24:34 -04:00
|
|
|
|
(define-record-type* <package>
|
|
|
|
|
package make-package
|
|
|
|
|
package?
|
2019-03-29 17:49:00 -04:00
|
|
|
|
this-package
|
2012-06-27 19:24:34 -04:00
|
|
|
|
(name package-name) ; string
|
|
|
|
|
(version package-version) ; string
|
2012-07-01 11:32:03 -04:00
|
|
|
|
(source package-source) ; <origin> instance
|
2022-03-15 18:00:56 -04:00
|
|
|
|
(build-system package-build-system) ; <build-system> instance
|
2012-06-28 18:28:57 -04: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 17:21:59 -05:00
|
|
|
|
(default '()) (thunked))
|
2012-07-01 11:32:03 -04:00
|
|
|
|
|
2012-06-27 19:24:34 -04:00
|
|
|
|
(inputs package-inputs ; input packages or derivations
|
packages: Allow inputs to be plain package lists.
* guix/packages.scm (add-input-label, sanitize-inputs): New procedures.
(<package>)[inputs, propagated-inputs, native-inputs]: Add 'sanitize' property.
* doc/guix.texi (Defining Packages, package Reference):
(Defining Package Variants): Adjust examples accordingly.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades, propagated inputs")
("transaction-upgrade-entry, grafts")
("package-transitive-inputs")
("package-transitive-supported-systems")
("package-closure")
("supported-package?")
("package-derivation, inputs deduplicated")
("package-transitive-native-search-paths")
("package-grafts, indirect grafts")
("package-grafts, indirect grafts, propagated inputs")
("package-grafts, same replacement twice")
("package-grafts, dependency on several outputs")
("replacement also grafted")
("package->bag, sensitivity to %current-target-system")
("package->bag, propagated inputs")
("package->bag, sensitivity to %current-system")
("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): Use the label-less input style.
2021-05-20 09:46:08 -04:00
|
|
|
|
(default '()) (thunked)
|
|
|
|
|
(sanitize sanitize-inputs))
|
2012-07-01 11:32:03 -04:00
|
|
|
|
(propagated-inputs package-propagated-inputs ; same, but propagated
|
packages: Allow inputs to be plain package lists.
* guix/packages.scm (add-input-label, sanitize-inputs): New procedures.
(<package>)[inputs, propagated-inputs, native-inputs]: Add 'sanitize' property.
* doc/guix.texi (Defining Packages, package Reference):
(Defining Package Variants): Adjust examples accordingly.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades, propagated inputs")
("transaction-upgrade-entry, grafts")
("package-transitive-inputs")
("package-transitive-supported-systems")
("package-closure")
("supported-package?")
("package-derivation, inputs deduplicated")
("package-transitive-native-search-paths")
("package-grafts, indirect grafts")
("package-grafts, indirect grafts, propagated inputs")
("package-grafts, same replacement twice")
("package-grafts, dependency on several outputs")
("replacement also grafted")
("package->bag, sensitivity to %current-target-system")
("package->bag, propagated inputs")
("package->bag, sensitivity to %current-system")
("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): Use the label-less input style.
2021-05-20 09:46:08 -04:00
|
|
|
|
(default '()) (thunked)
|
|
|
|
|
(sanitize sanitize-inputs))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
(native-inputs package-native-inputs ; native input packages/derivations
|
packages: Allow inputs to be plain package lists.
* guix/packages.scm (add-input-label, sanitize-inputs): New procedures.
(<package>)[inputs, propagated-inputs, native-inputs]: Add 'sanitize' property.
* doc/guix.texi (Defining Packages, package Reference):
(Defining Package Variants): Adjust examples accordingly.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades, propagated inputs")
("transaction-upgrade-entry, grafts")
("package-transitive-inputs")
("package-transitive-supported-systems")
("package-closure")
("supported-package?")
("package-derivation, inputs deduplicated")
("package-transitive-native-search-paths")
("package-grafts, indirect grafts")
("package-grafts, indirect grafts, propagated inputs")
("package-grafts, same replacement twice")
("package-grafts, dependency on several outputs")
("replacement also grafted")
("package->bag, sensitivity to %current-target-system")
("package->bag, propagated inputs")
("package->bag, sensitivity to %current-system")
("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): Use the label-less input style.
2021-05-20 09:46:08 -04:00
|
|
|
|
(default '()) (thunked)
|
|
|
|
|
(sanitize sanitize-inputs))
|
2012-07-01 11:32:03 -04:00
|
|
|
|
|
2012-06-27 19:24:34 -04:00
|
|
|
|
(outputs package-outputs ; list of strings
|
|
|
|
|
(default '("out")))
|
2013-03-30 17:56:38 -04: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 '()))
|
2017-07-03 06:07:23 -04:00
|
|
|
|
|
|
|
|
|
;; The 'replacement' field is marked as "innate" because it never makes
|
|
|
|
|
;; sense to inherit a replacement as is. See the 'package/inherit' macro.
|
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 13:09:00 -04:00
|
|
|
|
(replacement package-replacement ; package | #f
|
2017-07-03 06:07:23 -04:00
|
|
|
|
(default #f) (thunked) (innate))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
2021-10-18 11:49:55 -04:00
|
|
|
|
(synopsis package-synopsis
|
|
|
|
|
(sanitize validate-texinfo)) ; one-line description
|
|
|
|
|
(description package-description
|
|
|
|
|
(sanitize validate-texinfo)) ; one or two paragraphs
|
2022-10-01 10:56:19 -04:00
|
|
|
|
(license package-license ; (list of) <license>
|
|
|
|
|
(sanitize validate-license))
|
2022-12-07 00:57:09 -05:00
|
|
|
|
(home-page package-home-page) ; string
|
2014-10-06 13:14:47 -04:00
|
|
|
|
(supported-systems package-supported-systems ; list of strings
|
|
|
|
|
(default %supported-systems))
|
2012-06-28 17:44:43 -04:00
|
|
|
|
|
2012-07-01 11:32:03 -04:00
|
|
|
|
(properties package-properties (default '())) ; alist for anything else
|
|
|
|
|
|
2021-09-07 12:04:21 -04:00
|
|
|
|
(location package-location-vector
|
|
|
|
|
(default (current-location-vector))
|
2021-09-07 15:19:11 -04:00
|
|
|
|
(innate) (sanitize sanitize-location))
|
|
|
|
|
(definition-location package-definition-location-code
|
|
|
|
|
(default (current-definition-location))
|
|
|
|
|
(innate)))
|
2012-06-27 19:24:34 -04:00
|
|
|
|
|
packages: Allow inputs to be plain package lists.
* guix/packages.scm (add-input-label, sanitize-inputs): New procedures.
(<package>)[inputs, propagated-inputs, native-inputs]: Add 'sanitize' property.
* doc/guix.texi (Defining Packages, package Reference):
(Defining Package Variants): Adjust examples accordingly.
* tests/packages.scm ("transaction-upgrade-entry, zero upgrades, propagated inputs")
("transaction-upgrade-entry, grafts")
("package-transitive-inputs")
("package-transitive-supported-systems")
("package-closure")
("supported-package?")
("package-derivation, inputs deduplicated")
("package-transitive-native-search-paths")
("package-grafts, indirect grafts")
("package-grafts, indirect grafts, propagated inputs")
("package-grafts, same replacement twice")
("package-grafts, dependency on several outputs")
("replacement also grafted")
("package->bag, sensitivity to %current-target-system")
("package->bag, propagated inputs")
("package->bag, sensitivity to %current-system")
("package-input-rewriting/spec, identity")
("package-input-rewriting, identity"): Use the label-less input style.
2021-05-20 09:46:08 -04:00
|
|
|
|
(define (add-input-label input)
|
|
|
|
|
"Add an input label to INPUT."
|
|
|
|
|
(match input
|
|
|
|
|
((? package? package)
|
|
|
|
|
(list (package-name package) package))
|
|
|
|
|
(((? package? package) output) ;XXX: ugly?
|
|
|
|
|
(list (package-name package) package output))
|
|
|
|
|
((? gexp-input?) ;XXX: misplaced because 'native?' field is ignored?
|
|
|
|
|
(let ((obj (gexp-input-thing input))
|
|
|
|
|
(output (gexp-input-output input)))
|
|
|
|
|
`(,(if (package? obj)
|
|
|
|
|
(package-name obj)
|
|
|
|
|
"_")
|
|
|
|
|
,obj
|
|
|
|
|
,@(if (string=? output "out") '() (list output)))))
|
|
|
|
|
(x
|
|
|
|
|
`("_" ,x))))
|
|
|
|
|
|
2012-09-01 13:21:06 -04:00
|
|
|
|
(set-record-type-printer! <package>
|
|
|
|
|
(lambda (package port)
|
|
|
|
|
(let ((loc (package-location package))
|
|
|
|
|
(format simple-format))
|
2016-01-24 11:42:39 -05:00
|
|
|
|
(format port "#<package ~a@~a ~a~a>"
|
2012-09-01 13:21:06 -04:00
|
|
|
|
(package-name package)
|
|
|
|
|
(package-version package)
|
2014-10-08 17:06:19 -04:00
|
|
|
|
(if loc
|
|
|
|
|
(format #f "~a:~a "
|
|
|
|
|
(location-file loc)
|
|
|
|
|
(location-line loc))
|
|
|
|
|
"")
|
2012-09-01 13:21:06 -04:00
|
|
|
|
(number->string (object-address
|
|
|
|
|
package)
|
|
|
|
|
16)))))
|
|
|
|
|
|
2021-09-07 12:04:21 -04:00
|
|
|
|
(define (package-location package)
|
|
|
|
|
"Return the source code location of PACKAGE as a <location> record, or #f if
|
|
|
|
|
it is not known."
|
|
|
|
|
(match (package-location-vector package)
|
|
|
|
|
(#f #f)
|
|
|
|
|
(#(file line column) (location file line column))))
|
|
|
|
|
|
2021-09-07 15:19:11 -04:00
|
|
|
|
(define (package-definition-location package)
|
|
|
|
|
"Like 'package-location', but return the location of the definition
|
|
|
|
|
itself--i.e., that of the enclosing 'define-public' form, if any, or #f."
|
|
|
|
|
(match (package-definition-location-code package)
|
|
|
|
|
(#f #f)
|
|
|
|
|
(code
|
|
|
|
|
(let ((column (bit-extract code 22 29))
|
|
|
|
|
(line (bit-extract code 0 21)))
|
|
|
|
|
(match (package-location-vector package)
|
|
|
|
|
(#f #f)
|
|
|
|
|
(#(file _ _) (location file line column)))))))
|
|
|
|
|
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
(define-syntax-rule (package/inherit p overrides ...)
|
|
|
|
|
"Like (package (inherit P) OVERRIDES ...), except that the same
|
2021-02-23 13:41:52 -05:00
|
|
|
|
transformation is done to the package P's replacement, if any. P must be a bare
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
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)))))
|
|
|
|
|
|
2017-01-27 18:11:33 -05: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)))
|
|
|
|
|
|
2022-12-09 05:46:37 -05:00
|
|
|
|
(define (package-upstream-name* package)
|
|
|
|
|
"Return the upstream name of PACKAGE, accounting for commonly-used
|
|
|
|
|
package name prefixes in addition to the @code{upstream-name} property."
|
|
|
|
|
(let ((namespaces (list "cl-"
|
|
|
|
|
"ecl-"
|
|
|
|
|
"emacs-"
|
|
|
|
|
"ghc-"
|
|
|
|
|
"go-"
|
|
|
|
|
"guile-"
|
|
|
|
|
"java-"
|
|
|
|
|
"julia-"
|
|
|
|
|
"lua-"
|
|
|
|
|
"minetest-"
|
|
|
|
|
"node-"
|
|
|
|
|
"ocaml-"
|
|
|
|
|
"perl-"
|
|
|
|
|
"python-"
|
|
|
|
|
"r-"
|
|
|
|
|
"ruby-"
|
|
|
|
|
"rust-"
|
|
|
|
|
"sbcl-"
|
|
|
|
|
"texlive-"))
|
|
|
|
|
(name (package-name package)))
|
|
|
|
|
(or (assq-ref (package-properties package) 'upstream-name)
|
|
|
|
|
(let loop ((prefixes namespaces))
|
|
|
|
|
(match prefixes
|
|
|
|
|
(() name)
|
|
|
|
|
((prefix rest ...)
|
|
|
|
|
(if (string-prefix? prefix name)
|
|
|
|
|
(substring name (string-length prefix))
|
|
|
|
|
(loop rest))))))))
|
|
|
|
|
|
2016-07-28 12:50:43 -04: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)
|
2021-06-27 10:14:21 -04:00
|
|
|
|
(location (package-location p))
|
2016-07-28 12:50:43 -04:00
|
|
|
|
(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 17:14:07 -04:00
|
|
|
|
(define (package-superseded p)
|
2022-04-28 23:58:36 -04:00
|
|
|
|
"Return the package that supersedes P, or #f if P is still current."
|
2016-09-06 17:14:07 -04:00
|
|
|
|
(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 17:07:13 -04:00
|
|
|
|
(define (package-field-location package field)
|
2013-04-24 08:43:31 -04:00
|
|
|
|
"Return the source code location of the definition of FIELD for PACKAGE, or
|
|
|
|
|
#f if it could not be determined."
|
2013-04-22 17:07:13 -04:00
|
|
|
|
(match (package-location package)
|
|
|
|
|
(($ <location> file line column)
|
2021-02-22 04:52:21 -05:00
|
|
|
|
(match (search-path %load-path file)
|
2021-02-22 11:58:11 -05:00
|
|
|
|
((? string? file-found)
|
2021-02-22 04:52:21 -05:00
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
;; In general we want to keep relative file names for modules.
|
2021-02-22 11:58:11 -05:00
|
|
|
|
(call-with-input-file file-found
|
2021-02-22 04:52:21 -05:00
|
|
|
|
(lambda (port)
|
2021-06-21 06:21:19 -04:00
|
|
|
|
(go-to-location port line column)
|
2021-02-22 04:52:21 -05:00
|
|
|
|
(match (read port)
|
|
|
|
|
(('package inits ...)
|
|
|
|
|
(let ((field (assoc field inits)))
|
|
|
|
|
(match field
|
|
|
|
|
((_ value)
|
|
|
|
|
(let ((loc (and=> (source-properties value)
|
|
|
|
|
source-properties->location)))
|
|
|
|
|
(and loc
|
|
|
|
|
;; Preserve the original file name, which may be a
|
|
|
|
|
;; relative file name.
|
|
|
|
|
(set-field loc (location-file) file))))
|
|
|
|
|
(_
|
|
|
|
|
#f))))
|
|
|
|
|
(_
|
|
|
|
|
#f)))))
|
|
|
|
|
(lambda _
|
|
|
|
|
#f)))
|
|
|
|
|
(#f
|
|
|
|
|
;; FILE could not be found in %LOAD-PATH.
|
|
|
|
|
#f)))
|
2013-04-22 17:07:13 -04:00
|
|
|
|
(_ #f)))
|
|
|
|
|
|
2021-07-14 07:12:50 -04:00
|
|
|
|
(define-syntax-rule (this-package-input name)
|
|
|
|
|
"Return the input NAME of the package being defined--i.e., an input
|
|
|
|
|
from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not
|
|
|
|
|
considered. If this input does not exist, return #f instead."
|
2021-07-19 05:08:40 -04:00
|
|
|
|
(or (lookup-package-input this-package name)
|
|
|
|
|
(lookup-package-propagated-input this-package name)))
|
2021-07-14 07:12:50 -04:00
|
|
|
|
|
|
|
|
|
(define-syntax-rule (this-package-native-input name)
|
|
|
|
|
"Return the native package input NAME of the package being defined--i.e.,
|
|
|
|
|
an input from the ‘native-inputs’ field. If this native input does not
|
|
|
|
|
exist, return #f instead."
|
2021-07-19 05:08:40 -04:00
|
|
|
|
(lookup-package-native-input this-package name))
|
2012-08-23 17:09:13 -04:00
|
|
|
|
|
|
|
|
|
;; Error conditions.
|
|
|
|
|
|
|
|
|
|
(define-condition-type &package-error &error
|
|
|
|
|
package-error?
|
|
|
|
|
(package package-error-package))
|
|
|
|
|
|
2022-10-01 10:56:19 -04:00
|
|
|
|
(define-condition-type &package-license-error &package-error
|
|
|
|
|
package-license-error?
|
|
|
|
|
(license package-error-invalid-license))
|
|
|
|
|
|
2012-08-23 17:09:13 -04:00
|
|
|
|
(define-condition-type &package-input-error &package-error
|
|
|
|
|
package-input-error?
|
|
|
|
|
(input package-error-invalid-input))
|
|
|
|
|
|
2013-05-27 17:41:35 -04:00
|
|
|
|
(define-condition-type &package-cross-build-system-error &package-error
|
|
|
|
|
package-cross-build-system-error?)
|
|
|
|
|
|
2018-04-08 19:51:42 -04:00
|
|
|
|
(define* (package-full-name package #:optional (delimiter "@"))
|
|
|
|
|
"Return the full name of PACKAGE--i.e., `NAME@VERSION'. By specifying
|
|
|
|
|
DELIMITER (a string), you can customize what will appear between the name and
|
|
|
|
|
the version. By default, DELIMITER is \"@\"."
|
|
|
|
|
(string-append (package-name package) delimiter (package-version package)))
|
2012-09-05 13:01:47 -04:00
|
|
|
|
|
2018-05-13 12:46:13 -04:00
|
|
|
|
(define (patch-file-name patch)
|
|
|
|
|
"Return the basename of PATCH's file name, or #f if the file name could not
|
|
|
|
|
be determined."
|
|
|
|
|
(match patch
|
|
|
|
|
((? string?)
|
|
|
|
|
(basename patch))
|
|
|
|
|
((? origin?)
|
|
|
|
|
(and=> (origin-actual-file-name patch) basename))))
|
|
|
|
|
|
|
|
|
|
(define %vulnerability-regexp
|
|
|
|
|
;; Regexp matching a CVE identifier in patch file names.
|
|
|
|
|
(make-regexp "CVE-[0-9]{4}-[0-9]+"))
|
|
|
|
|
|
|
|
|
|
(define (package-patched-vulnerabilities package)
|
|
|
|
|
"Return the list of patched vulnerabilities of PACKAGE as a list of CVE
|
|
|
|
|
identifiers. The result is inferred from the file names of patches."
|
|
|
|
|
(define (patch-vulnerabilities patch)
|
|
|
|
|
(map (cut match:substring <> 0)
|
|
|
|
|
(list-matches %vulnerability-regexp patch)))
|
|
|
|
|
|
|
|
|
|
(let ((patches (filter-map patch-file-name
|
|
|
|
|
(or (and=> (package-source package)
|
|
|
|
|
origin-patches)
|
|
|
|
|
'()))))
|
|
|
|
|
(append-map patch-vulnerabilities patches)))
|
|
|
|
|
|
2013-10-08 18:04:45 -04:00
|
|
|
|
(define (%standard-patch-inputs)
|
2015-05-05 12:10:30 -04:00
|
|
|
|
(let* ((canonical (module-ref (resolve-interface '(gnu packages base))
|
|
|
|
|
'canonical-package))
|
|
|
|
|
(ref (lambda (module var)
|
2021-03-05 03:30:55 -05:00
|
|
|
|
;; Make sure 'canonical-package' is not influenced by
|
|
|
|
|
;; '%current-target-system' since we're going to use the
|
|
|
|
|
;; native package anyway.
|
|
|
|
|
(parameterize ((%current-target-system #f))
|
|
|
|
|
(canonical
|
|
|
|
|
(module-ref (resolve-interface module) var))))))
|
2013-10-08 18:04:45 -04: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 14:40:01 -04:00
|
|
|
|
("unzip" ,(ref '(gnu packages compression) 'unzip))
|
2015-02-26 18:03:17 -05:00
|
|
|
|
("patch" ,(ref '(gnu packages base) 'patch))
|
2015-05-05 12:10:30 -04:00
|
|
|
|
("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
|
2013-10-08 18:04:45 -04:00
|
|
|
|
|
2013-10-10 17:00:47 -04: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 07:34:52 -05: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-26 18:25:17 -04:00
|
|
|
|
(let ((distro (resolve-interface '(gnu packages commencement))))
|
2013-10-10 17:00:47 -04:00
|
|
|
|
(module-ref distro 'guile-final)))
|
2013-10-08 18:04:45 -04:00
|
|
|
|
|
2020-03-27 13:36:20 -04:00
|
|
|
|
(define (guile-for-grafts)
|
|
|
|
|
"Return the Guile package used to build grafting derivations."
|
|
|
|
|
;; Guile 2.2 would not work due to <https://bugs.gnu.org/28211> when
|
2017-08-23 18:41:44 -04:00
|
|
|
|
;; grafting packages.
|
|
|
|
|
(let ((distro (resolve-interface '(gnu packages guile))))
|
|
|
|
|
(module-ref distro 'guile-2.0)))
|
|
|
|
|
|
2015-03-17 17:09:32 -04: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 14:00:12 -04:00
|
|
|
|
(define* (patch-and-repack source patches
|
2013-10-08 18:04:45 -04:00
|
|
|
|
#:key
|
2015-03-21 17:07:11 -04:00
|
|
|
|
inputs
|
2013-11-07 16:41:21 -05:00
|
|
|
|
(snippet #f)
|
2021-02-28 14:53:00 -05:00
|
|
|
|
(flags %default-patch-flags)
|
2013-11-07 16:41:21 -05:00
|
|
|
|
(modules '())
|
2013-10-08 18:04:45 -04:00
|
|
|
|
(guile-for-build (%guile-for-build))
|
|
|
|
|
(system (%current-system)))
|
2013-11-07 16:41:21 -05: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 16:23:12 -04:00
|
|
|
|
SOURCE was unpacked, after all of PATCHES have been applied. MODULES
|
|
|
|
|
specifies modules in scope when evaluating SNIPPET."
|
2013-11-07 16:41:21 -05: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 17:07:11 -04: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 14:00:12 -04:00
|
|
|
|
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(define original-file-name (strip-store-file-name source-file-name))
|
2013-10-08 18:04:45 -04:00
|
|
|
|
|
2014-02-28 04:42:09 -05:00
|
|
|
|
(define (numeric-extension? file-name)
|
|
|
|
|
;; Return true if FILE-NAME ends with digits.
|
2014-04-12 08:39:43 -04:00
|
|
|
|
(and=> (file-extension file-name)
|
|
|
|
|
(cut string-every char-set:hex-digit <>)))
|
2014-02-28 04:42:09 -05:00
|
|
|
|
|
2019-06-16 04:50:15 -04:00
|
|
|
|
(define (checkout? directory)
|
|
|
|
|
;; Return true if DIRECTORY is a checkout (git, svn, etc).
|
|
|
|
|
(string-suffix? "-checkout" directory))
|
|
|
|
|
|
2014-02-28 04:42:09 -05:00
|
|
|
|
(define (tarxz-name file-name)
|
|
|
|
|
;; Return a '.tar.xz' file name based on FILE-NAME.
|
2021-01-15 08:07:21 -05:00
|
|
|
|
(let ((base (if (numeric-extension? file-name)
|
|
|
|
|
original-file-name
|
|
|
|
|
(file-sans-extension file-name))))
|
2014-02-28 04:42:09 -05:00
|
|
|
|
(string-append base
|
|
|
|
|
(if (equal? (file-extension base) "tar")
|
|
|
|
|
".xz"
|
|
|
|
|
".tar.xz"))))
|
|
|
|
|
|
2015-03-18 14:00:12 -04:00
|
|
|
|
(define instantiate-patch
|
|
|
|
|
(match-lambda
|
2017-06-15 12:07:10 -04:00
|
|
|
|
((? string? patch) ;deprecated
|
2017-06-25 09:31:37 -04:00
|
|
|
|
(local-file patch #:recursive? #t))
|
2017-06-15 12:07:10 -04:00
|
|
|
|
((? struct? patch) ;origin, local-file, etc.
|
2017-06-25 09:31:37 -04:00
|
|
|
|
patch)))
|
|
|
|
|
|
|
|
|
|
(let ((tar (lookup-input "tar"))
|
|
|
|
|
(gzip (lookup-input "gzip"))
|
|
|
|
|
(bzip2 (lookup-input "bzip2"))
|
|
|
|
|
(lzip (lookup-input "lzip"))
|
|
|
|
|
(xz (lookup-input "xz"))
|
|
|
|
|
(patch (lookup-input "patch"))
|
|
|
|
|
(locales (lookup-input "locales"))
|
|
|
|
|
(comp (and=> (compressor source-file-name) lookup-input))
|
|
|
|
|
(patches (map instantiate-patch patches)))
|
2015-03-18 14:00:12 -04:00
|
|
|
|
(define build
|
2016-07-12 16:23:12 -04:00
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (ice-9 ftw)
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(ice-9 match)
|
|
|
|
|
(ice-9 regex)
|
2016-07-12 16:23:12 -04:00
|
|
|
|
(srfi srfi-1)
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(srfi srfi-26)
|
2016-07-12 16:23:12 -04:00
|
|
|
|
(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 12:11:58 -04:00
|
|
|
|
;; rejected. Use '--no-backup-if-mismatch' to prevent making
|
|
|
|
|
;; "*.orig" file if a patch is applied with offset.
|
2018-03-16 03:38:27 -04:00
|
|
|
|
(invoke (string-append #+patch "/bin/patch")
|
|
|
|
|
"--force" "--no-backup-if-mismatch"
|
|
|
|
|
#+@flags "--input" patch))
|
2016-07-12 16:23:12 -04:00
|
|
|
|
|
|
|
|
|
(define (first-file directory)
|
|
|
|
|
;; Return the name of the first file in DIRECTORY.
|
|
|
|
|
(car (scandir directory
|
|
|
|
|
(lambda (name)
|
|
|
|
|
(not (member name '("." "..")))))))
|
|
|
|
|
|
2021-01-15 08:07:21 -05:00
|
|
|
|
(define (repack directory output)
|
|
|
|
|
;; Write to OUTPUT a compressed tarball containing DIRECTORY.
|
|
|
|
|
(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)))))
|
|
|
|
|
|
|
|
|
|
(apply invoke #+(file-append tar "/bin/tar")
|
|
|
|
|
"cvfa" output
|
|
|
|
|
;; Avoid non-determinism in the archive. Set the mtime
|
|
|
|
|
;; to 1 as is the case in the store (software like gzip
|
|
|
|
|
;; behaves differently when it stumbles upon mtime = 0).
|
|
|
|
|
"--mtime=@1"
|
|
|
|
|
"--owner=root:0" "--group=root:0"
|
|
|
|
|
(if tar-supports-sort?
|
|
|
|
|
`("--sort=name" ,directory)
|
|
|
|
|
'("--no-recursion"
|
|
|
|
|
"--files-from=.file_list"))))
|
|
|
|
|
|
2016-07-12 16:23:12 -04:00
|
|
|
|
;; 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
|
2017-12-02 20:32:16 -05:00
|
|
|
|
(version-major+minor
|
|
|
|
|
(package-version locales)))))
|
2016-07-12 16:23:12 -04:00
|
|
|
|
(setlocale LC_ALL "en_US.utf8"))
|
|
|
|
|
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(setenv "PATH"
|
|
|
|
|
(string-append #+xz "/bin"
|
|
|
|
|
(if #+comp
|
|
|
|
|
(string-append ":" #+comp "/bin")
|
|
|
|
|
"")))
|
2016-07-12 16:23:12 -04:00
|
|
|
|
|
2020-09-19 00:20:47 -04:00
|
|
|
|
(setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
|
|
|
|
|
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
;; SOURCE may be either a directory, a tarball or a simple file.
|
|
|
|
|
(let ((name (strip-store-file-name #+source))
|
|
|
|
|
(command (and=> #+comp (cut string-append <> "/bin/"
|
|
|
|
|
(compressor #+source)))))
|
|
|
|
|
(if (file-is-directory? #+source)
|
|
|
|
|
(copy-recursively #+source name)
|
|
|
|
|
(cond
|
|
|
|
|
((tarball? #+source)
|
|
|
|
|
(invoke (string-append #+tar "/bin/tar") "xvf" #+source))
|
|
|
|
|
((and=> (compressor #+source) (cut string= "unzip" <>))
|
|
|
|
|
;; Note: Referring to the store unzip here (#+unzip)
|
|
|
|
|
;; would introduce a cycle.
|
2021-03-16 20:56:38 -04:00
|
|
|
|
(invoke "unzip" #+source))
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(else
|
|
|
|
|
(copy-file #+source name)
|
|
|
|
|
(when command
|
|
|
|
|
(invoke command "--decompress" name))))))
|
|
|
|
|
|
|
|
|
|
(let* ((file (first-file "."))
|
|
|
|
|
(directory (if (file-is-directory? file)
|
|
|
|
|
file
|
|
|
|
|
".")))
|
|
|
|
|
(format (current-error-port) "source is at '~a'~%" file)
|
|
|
|
|
|
|
|
|
|
(with-directory-excursion directory
|
|
|
|
|
|
|
|
|
|
(for-each apply-patch '#+patches)
|
|
|
|
|
|
|
|
|
|
#+(if snippet
|
|
|
|
|
#~(let ((module (make-fresh-user-module)))
|
|
|
|
|
(module-use-interfaces!
|
|
|
|
|
module
|
|
|
|
|
(map resolve-interface '#+modules))
|
|
|
|
|
((@ (system base compile) compile)
|
2021-02-28 15:30:50 -05:00
|
|
|
|
'#+(if (pair? snippet)
|
|
|
|
|
(sexp->gexp snippet)
|
|
|
|
|
snippet)
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
#:to 'value
|
|
|
|
|
#:opts %auto-compilation-options
|
|
|
|
|
#:env module))
|
|
|
|
|
#~#t))
|
2018-03-16 03:38:27 -04:00
|
|
|
|
|
2021-01-15 08:07:21 -05:00
|
|
|
|
;; If SOURCE is a directory (such as a checkout), return a
|
|
|
|
|
;; directory. Otherwise create a tarball.
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
(cond
|
|
|
|
|
((file-is-directory? #+source)
|
|
|
|
|
(copy-recursively directory #$output
|
|
|
|
|
#:log (%make-void-port "w")))
|
2021-08-30 17:32:21 -04:00
|
|
|
|
((or #+comp (tarball? #+source))
|
|
|
|
|
(repack directory #$output))
|
|
|
|
|
(else ;single uncompressed file
|
|
|
|
|
(copy-file file #$output)))))))
|
build-systems/gnu: Allow unpacking/repacking more kind of files.
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail. Origins relying on snippets would suffer from the
same problem.
This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs. Files of unknown
extensions are treated as uncompressed files and supported as well.
* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed. Bind more inputs in the mlet, and use them
for decompressing single files. Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures. Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests. Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
2021-01-18 11:51:21 -05:00
|
|
|
|
|
|
|
|
|
(let ((name (if (or (checkout? original-file-name)
|
|
|
|
|
(not (compressor original-file-name)))
|
2021-01-15 08:07:21 -05:00
|
|
|
|
original-file-name
|
|
|
|
|
(tarxz-name original-file-name))))
|
2015-03-18 14:00:12 -04:00
|
|
|
|
(gexp->derivation name build
|
|
|
|
|
#:graft? #f
|
|
|
|
|
#:system system
|
2019-03-10 17:21:14 -04:00
|
|
|
|
#:guile-for-build guile-for-build
|
|
|
|
|
#:properties `((type . origin)
|
|
|
|
|
(patches . ,(length patches)))))))
|
2013-10-08 18:04:45 -04:00
|
|
|
|
|
2020-04-06 14:02:42 -04:00
|
|
|
|
(define (package-with-patches original patches)
|
|
|
|
|
"Return package ORIGINAL with PATCHES applied."
|
|
|
|
|
(package (inherit original)
|
|
|
|
|
(source (origin (inherit (package-source original))
|
2021-04-28 09:26:58 -04:00
|
|
|
|
(patches patches)))
|
|
|
|
|
(location (package-location original))))
|
2020-04-06 14:02:42 -04:00
|
|
|
|
|
|
|
|
|
(define (package-with-extra-patches original patches)
|
|
|
|
|
"Return package ORIGINAL with all PATCHES appended to its list of patches."
|
|
|
|
|
(package-with-patches original
|
|
|
|
|
(append (origin-patches (package-source original))
|
|
|
|
|
patches)))
|
|
|
|
|
|
2020-09-28 11:36:42 -04:00
|
|
|
|
(define (package-with-c-toolchain package toolchain)
|
|
|
|
|
"Return a variant of PACKAGE that uses TOOLCHAIN instead of the default GNU
|
|
|
|
|
C/C++ toolchain. TOOLCHAIN must be a list of inputs (label/package tuples)
|
|
|
|
|
providing equivalent functionality, such as the 'gcc-toolchain' package."
|
|
|
|
|
(let ((bs (package-build-system package)))
|
|
|
|
|
(package/inherit package
|
|
|
|
|
(build-system (build-system-with-c-toolchain bs toolchain)))))
|
|
|
|
|
|
2012-09-01 13:21:06 -04: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 17:13:24 -04: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)
|
2018-01-18 10:14:06 -05:00
|
|
|
|
;; FIXME: We're using pointer identity here, which is extremely sensitive
|
|
|
|
|
;; to memoization in package-producing procedures; see
|
|
|
|
|
;; <https://bugs.gnu.org/30155>.
|
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 17:13:24 -04:00
|
|
|
|
(match (vhash-assq item seen)
|
|
|
|
|
((_ . o) (equal? o outputs))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
|
|
|
(let loop ((inputs inputs)
|
|
|
|
|
(result '())
|
|
|
|
|
(propagated '())
|
|
|
|
|
(first? #t)
|
|
|
|
|
(seen vlist-null))
|
2012-07-07 14:14:20 -04: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 17:13:24 -04: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 14:14:20 -04: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 17:13:24 -04:00
|
|
|
|
(loop rest (cons input result) propagated first? seen)))))
|
2012-07-07 14:14:20 -04:00
|
|
|
|
|
2021-06-16 17:19:16 -04:00
|
|
|
|
(define (lookup-input inputs name)
|
|
|
|
|
"Lookup NAME among INPUTS, an input list."
|
|
|
|
|
;; Note: Currently INPUTS is assumed to be an input list that contains input
|
|
|
|
|
;; labels. In the future, input labels will be gone and this procedure will
|
|
|
|
|
;; check package names.
|
|
|
|
|
(match (assoc-ref inputs name)
|
|
|
|
|
((obj) obj)
|
|
|
|
|
((obj _) obj)
|
|
|
|
|
(#f #f)))
|
|
|
|
|
|
|
|
|
|
(define (lookup-package-input package name)
|
|
|
|
|
"Look up NAME among PACKAGE's inputs. Return it if found, #f otherwise."
|
|
|
|
|
(lookup-input (package-inputs package) name))
|
|
|
|
|
|
|
|
|
|
(define (lookup-package-native-input package name)
|
|
|
|
|
"Look up NAME among PACKAGE's native inputs. Return it if found, #f
|
|
|
|
|
otherwise."
|
|
|
|
|
(lookup-input (package-native-inputs package) name))
|
|
|
|
|
|
|
|
|
|
(define (lookup-package-propagated-input package name)
|
|
|
|
|
"Look up NAME among PACKAGE's propagated inputs. Return it if found, #f
|
|
|
|
|
otherwise."
|
|
|
|
|
(lookup-input (package-propagated-inputs package) name))
|
|
|
|
|
|
|
|
|
|
(define (lookup-package-direct-input package name)
|
|
|
|
|
"Look up NAME among PACKAGE's direct inputs. Return it if found, #f
|
|
|
|
|
otherwise."
|
|
|
|
|
(lookup-input (package-direct-inputs package) name))
|
|
|
|
|
|
2021-06-16 17:52:42 -04:00
|
|
|
|
(define (replace-input name replacement inputs)
|
|
|
|
|
"Replace input NAME by REPLACEMENT within INPUTS."
|
|
|
|
|
(map (lambda (input)
|
|
|
|
|
(match input
|
2022-03-15 10:17:49 -04:00
|
|
|
|
(((? string? label) _ . outputs)
|
2021-06-16 17:52:42 -04:00
|
|
|
|
(if (string=? label name)
|
|
|
|
|
(match replacement ;does REPLACEMENT specify an output?
|
|
|
|
|
((_ _) (cons label replacement))
|
2022-03-15 10:17:49 -04:00
|
|
|
|
(_ (cons* label replacement outputs)))
|
2021-06-16 17:52:42 -04:00
|
|
|
|
input))))
|
|
|
|
|
inputs))
|
|
|
|
|
|
|
|
|
|
(define-syntax prepend
|
|
|
|
|
(lambda (s)
|
|
|
|
|
(syntax-violation 'prepend
|
|
|
|
|
"'prepend' may only be used within 'modify-inputs'"
|
|
|
|
|
s)))
|
|
|
|
|
|
|
|
|
|
(define-syntax replace
|
|
|
|
|
(lambda (s)
|
|
|
|
|
(syntax-violation 'replace
|
|
|
|
|
"'replace' may only be used within 'modify-inputs'"
|
|
|
|
|
s)))
|
|
|
|
|
|
|
|
|
|
(define-syntax modify-inputs
|
|
|
|
|
(syntax-rules (delete prepend append replace)
|
|
|
|
|
"Modify the given package inputs, as returned by 'package-inputs' & co.,
|
|
|
|
|
according to the given clauses. The example below removes the GMP and ACL
|
|
|
|
|
inputs of Coreutils and adds libcap:
|
|
|
|
|
|
|
|
|
|
(modify-inputs (package-inputs coreutils)
|
|
|
|
|
(delete \"gmp\" \"acl\")
|
2022-11-05 07:59:01 -04:00
|
|
|
|
(prepend libcap))
|
2021-06-16 17:52:42 -04:00
|
|
|
|
|
2022-11-05 07:59:01 -04:00
|
|
|
|
Other types of clauses include 'append' and 'replace'.
|
2021-12-13 11:43:02 -05:00
|
|
|
|
|
|
|
|
|
The first argument must be a labeled input list; the result is also a labeled
|
|
|
|
|
input list."
|
2021-06-16 17:52:42 -04:00
|
|
|
|
;; Note: This macro hides the fact that INPUTS, as returned by
|
|
|
|
|
;; 'package-inputs' & co., is actually an alist with labels. Eventually,
|
|
|
|
|
;; it will operate on list of inputs without labels.
|
|
|
|
|
((_ inputs (delete name) clauses ...)
|
|
|
|
|
(modify-inputs (alist-delete name inputs)
|
|
|
|
|
clauses ...))
|
|
|
|
|
((_ inputs (delete names ...) clauses ...)
|
|
|
|
|
(modify-inputs (fold alist-delete inputs (list names ...))
|
|
|
|
|
clauses ...))
|
|
|
|
|
((_ inputs (prepend lst ...) clauses ...)
|
2021-12-13 11:43:02 -05:00
|
|
|
|
(modify-inputs (append (map add-input-label (list lst ...)) inputs)
|
2021-06-16 17:52:42 -04:00
|
|
|
|
clauses ...))
|
|
|
|
|
((_ inputs (append lst ...) clauses ...)
|
2021-12-13 11:43:02 -05:00
|
|
|
|
(modify-inputs (append inputs (map add-input-label (list lst ...)))
|
2021-06-16 17:52:42 -04:00
|
|
|
|
clauses ...))
|
|
|
|
|
((_ inputs (replace name replacement) clauses ...)
|
|
|
|
|
(modify-inputs (replace-input name replacement inputs)
|
|
|
|
|
clauses ...))
|
|
|
|
|
((_ inputs)
|
|
|
|
|
inputs)))
|
|
|
|
|
|
2015-04-24 08:57:51 -04:00
|
|
|
|
(define (package-direct-sources package)
|
|
|
|
|
"Return all source origins associated with PACKAGE; including origins in
|
2023-03-11 11:51:10 -05:00
|
|
|
|
PACKAGE's inputs and patches."
|
|
|
|
|
(define (expand source)
|
|
|
|
|
(cons
|
|
|
|
|
source
|
|
|
|
|
(filter origin? (origin-patches source))))
|
|
|
|
|
|
|
|
|
|
`(,@(or (and=> (package-source package) expand) '())
|
2015-04-24 08:57:51 -04:00
|
|
|
|
,@(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 12:29:48 -04: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 13:21:06 -04: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 12:29:48 -04:00
|
|
|
|
(transitive-inputs (package-direct-inputs package)))
|
2012-09-01 13:21:06 -04:00
|
|
|
|
|
2013-05-24 16:21:24 -04: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 13:21:06 -04: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 08:34:36 -05: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-21 21:45:54 -04: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 11:15:27 -05:00
|
|
|
|
(define package-transitive-supported-systems
|
2019-09-06 08:41:58 -04:00
|
|
|
|
(let ()
|
2021-10-26 04:46:12 -04:00
|
|
|
|
(define (supported-systems-procedure system)
|
|
|
|
|
(define supported-systems
|
|
|
|
|
(mlambdaq (package)
|
|
|
|
|
(parameterize ((%current-system system))
|
|
|
|
|
(fold (lambda (input systems)
|
|
|
|
|
(match input
|
|
|
|
|
((label (? package? package) . _)
|
|
|
|
|
(lset-intersection string=? systems
|
|
|
|
|
(supported-systems package)))
|
|
|
|
|
(_
|
|
|
|
|
systems)))
|
|
|
|
|
(package-supported-systems package)
|
2022-02-17 10:04:15 -05:00
|
|
|
|
(bag-direct-inputs (package->bag package system #f))))))
|
2021-10-26 04:46:12 -04:00
|
|
|
|
|
|
|
|
|
supported-systems)
|
|
|
|
|
|
|
|
|
|
(define procs
|
|
|
|
|
;; Map system strings to one-argument procedures. This allows these
|
|
|
|
|
;; procedures to have fast 'eq?' memoization on their argument.
|
|
|
|
|
(make-hash-table))
|
2019-09-06 08:41:58 -04:00
|
|
|
|
|
|
|
|
|
(lambda* (package #:optional (system (%current-system)))
|
|
|
|
|
"Return the intersection of the systems supported by PACKAGE and those
|
2014-10-17 17:20:39 -04:00
|
|
|
|
supported by its dependencies."
|
2021-10-26 04:46:12 -04:00
|
|
|
|
(match (hash-ref procs system)
|
|
|
|
|
(#f
|
|
|
|
|
(hash-set! procs system (supported-systems-procedure system))
|
|
|
|
|
(package-transitive-supported-systems package system))
|
|
|
|
|
(proc
|
|
|
|
|
(proc package))))))
|
2014-10-17 17:20:39 -04:00
|
|
|
|
|
2015-04-19 10:49:09 -04: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."
|
2019-09-06 08:41:58 -04:00
|
|
|
|
(member system (package-transitive-supported-systems package system)))
|
2015-04-19 10:49:09 -04:00
|
|
|
|
|
2015-04-11 06:29:10 -04: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 12:06:16 -04:00
|
|
|
|
(define (bag-transitive-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-inputs', but applied to a bag."
|
2020-07-13 10:43:58 -04:00
|
|
|
|
(parameterize ((%current-target-system #f)
|
|
|
|
|
(%current-system (bag-system bag)))
|
2020-05-14 10:03:56 -04: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 12:06:16 -04:00
|
|
|
|
|
|
|
|
|
(define (bag-transitive-build-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-native-inputs', but applied to a bag."
|
2020-07-13 10:43:58 -04:00
|
|
|
|
(parameterize ((%current-target-system #f)
|
|
|
|
|
(%current-system (bag-system bag)))
|
2020-05-14 10:03:56 -04:00
|
|
|
|
(transitive-inputs (bag-build-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 12:06:16 -04:00
|
|
|
|
|
|
|
|
|
(define (bag-transitive-host-inputs bag)
|
|
|
|
|
"Same as 'package-transitive-target-inputs', but applied to a bag."
|
2020-07-13 10:43:58 -04:00
|
|
|
|
(parameterize ((%current-target-system (bag-target bag))
|
|
|
|
|
(%current-system (bag-system bag)))
|
2019-08-01 08:46:13 -04:00
|
|
|
|
(transitive-inputs (bag-host-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 12:06:16 -04:00
|
|
|
|
|
|
|
|
|
(define (bag-transitive-target-inputs bag)
|
|
|
|
|
"Return the \"target inputs\" of BAG, recursively."
|
2020-07-13 10:43:58 -04:00
|
|
|
|
(parameterize ((%current-target-system (bag-target bag))
|
|
|
|
|
(%current-system (bag-system bag)))
|
2020-05-14 10:03:56 -04:00
|
|
|
|
(transitive-inputs (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 12:06:16 -04:00
|
|
|
|
|
2021-10-01 04:49:22 -04:00
|
|
|
|
(define* (package-development-inputs package
|
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key target)
|
|
|
|
|
"Return the list of inputs required by PACKAGE for development purposes on
|
|
|
|
|
SYSTEM. When TARGET is true, return the inputs needed to cross-compile
|
|
|
|
|
PACKAGE from SYSTEM to TRIPLET, where TRIPLET is a triplet such as
|
|
|
|
|
\"aarch64-linux-gnu\"."
|
|
|
|
|
(bag-transitive-inputs (package->bag package system target)))
|
|
|
|
|
|
2019-01-25 04:05:31 -05:00
|
|
|
|
(define* (package-closure packages #:key (system (%current-system)))
|
|
|
|
|
"Return the closure of PACKAGES on SYSTEM--i.e., PACKAGES and the list of
|
|
|
|
|
packages they depend on, recursively."
|
|
|
|
|
(let loop ((packages packages)
|
|
|
|
|
(visited vlist-null)
|
|
|
|
|
(closure (list->setq packages)))
|
|
|
|
|
(match packages
|
|
|
|
|
(()
|
|
|
|
|
(set->list closure))
|
|
|
|
|
((package . rest)
|
|
|
|
|
(if (vhash-assq package visited)
|
|
|
|
|
(loop rest visited closure)
|
|
|
|
|
(let* ((bag (package->bag package system))
|
|
|
|
|
(dependencies (filter-map (match-lambda
|
|
|
|
|
((label (? package? package) . _)
|
|
|
|
|
package)
|
|
|
|
|
(_ #f))
|
|
|
|
|
(bag-direct-inputs bag))))
|
|
|
|
|
(loop (append dependencies rest)
|
|
|
|
|
(vhash-consq package #t visited)
|
|
|
|
|
(fold set-insert closure dependencies))))))))
|
|
|
|
|
|
2020-09-21 11:44:29 -04:00
|
|
|
|
(define (build-system-with-package-mapping bs rewrite)
|
|
|
|
|
"Return a variant of BS, a build system, that rewrites a bag's inputs by
|
|
|
|
|
passing them through REWRITE, a procedure that takes an input tuplet and
|
|
|
|
|
returns a \"rewritten\" input tuplet."
|
|
|
|
|
(define lower
|
|
|
|
|
(build-system-lower bs))
|
|
|
|
|
|
|
|
|
|
(define (lower* . args)
|
|
|
|
|
(let ((lowered (apply lower args)))
|
|
|
|
|
(bag
|
|
|
|
|
(inherit lowered)
|
|
|
|
|
(build-inputs (map rewrite (bag-build-inputs lowered)))
|
|
|
|
|
(host-inputs (map rewrite (bag-host-inputs lowered)))
|
|
|
|
|
(target-inputs (map rewrite (bag-target-inputs lowered))))))
|
|
|
|
|
|
|
|
|
|
(build-system
|
|
|
|
|
(inherit bs)
|
|
|
|
|
(lower lower*)))
|
|
|
|
|
|
|
|
|
|
(define* (package-mapping proc #:optional (cut? (const #f))
|
|
|
|
|
#:key deep?)
|
2017-04-05 09:19:15 -04:00
|
|
|
|
"Return a procedure that, given a package, applies PROC to all the packages
|
|
|
|
|
depended on and returns the resulting package. The procedure stops recursion
|
2020-09-21 11:44:29 -04:00
|
|
|
|
when CUT? returns true for a given package. When DEEP? is true, PROC is
|
|
|
|
|
applied to implicit inputs as well."
|
2016-09-01 16:35:35 -04:00
|
|
|
|
(define (rewrite input)
|
|
|
|
|
(match input
|
|
|
|
|
((label (? package? package) outputs ...)
|
2020-10-20 03:18:07 -04:00
|
|
|
|
(cons* label (replace package) outputs))
|
2016-09-01 16:35:35 -04:00
|
|
|
|
(_
|
|
|
|
|
input)))
|
|
|
|
|
|
2020-09-21 11:44:29 -04:00
|
|
|
|
(define mapping-property
|
|
|
|
|
;; Property indicating whether the package has already been processed.
|
|
|
|
|
(gensym " package-mapping-done"))
|
|
|
|
|
|
2017-01-28 11:15:27 -05:00
|
|
|
|
(define replace
|
|
|
|
|
(mlambdaq (p)
|
2020-09-21 11:44:29 -04:00
|
|
|
|
;; If P is the result of a previous call, return it.
|
2020-10-20 03:18:07 -04:00
|
|
|
|
(cond ((assq-ref (package-properties p) mapping-property)
|
|
|
|
|
p)
|
|
|
|
|
|
|
|
|
|
((cut? p)
|
|
|
|
|
;; Since P's propagated inputs are really inputs of its dependents,
|
|
|
|
|
;; rewrite them as well, unless we're doing a "shallow" rewrite.
|
|
|
|
|
(let ((p (proc p)))
|
|
|
|
|
(if (or (not deep?)
|
|
|
|
|
(null? (package-propagated-inputs p)))
|
|
|
|
|
p
|
|
|
|
|
(package
|
|
|
|
|
(inherit p)
|
|
|
|
|
(location (package-location p))
|
|
|
|
|
(replacement (package-replacement p))
|
|
|
|
|
(propagated-inputs (map rewrite (package-propagated-inputs p)))
|
|
|
|
|
(properties `((,mapping-property . #t)
|
|
|
|
|
,@(package-properties p)))))))
|
|
|
|
|
|
|
|
|
|
(else
|
|
|
|
|
;; 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))
|
|
|
|
|
(build-system (if deep?
|
|
|
|
|
(build-system-with-package-mapping
|
|
|
|
|
(package-build-system p) rewrite)
|
|
|
|
|
(package-build-system p)))
|
|
|
|
|
(inputs (map rewrite (package-inputs p)))
|
|
|
|
|
(native-inputs (map rewrite (package-native-inputs p)))
|
|
|
|
|
(propagated-inputs (map rewrite (package-propagated-inputs p)))
|
|
|
|
|
(replacement (and=> (package-replacement p) replace))
|
|
|
|
|
(properties `((,mapping-property . #t)
|
|
|
|
|
,@(package-properties p)))))))))
|
2016-09-01 16:35:35 -04:00
|
|
|
|
|
|
|
|
|
replace)
|
|
|
|
|
|
2017-04-05 09:19:15 -04:00
|
|
|
|
(define* (package-input-rewriting replacements
|
2020-09-23 08:56:38 -04:00
|
|
|
|
#:optional (rewrite-name identity)
|
|
|
|
|
#:key (deep? #t))
|
2017-04-05 09:19:15 -04:00
|
|
|
|
"Return a procedure that, when passed a package, replaces its direct and
|
2020-09-23 08:56:38 -04:00
|
|
|
|
indirect dependencies, including implicit inputs when DEEP? is true, 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.
|
2017-04-05 09:19:15 -04:00
|
|
|
|
|
|
|
|
|
Optionally, REWRITE-NAME is a one-argument procedure that takes the name of a
|
|
|
|
|
package and returns its new name after rewrite."
|
2020-09-23 08:56:38 -04:00
|
|
|
|
(define replacement-property
|
|
|
|
|
;; Property to tag right-hand sides in REPLACEMENTS.
|
|
|
|
|
(gensym " package-replacement"))
|
2017-04-05 09:19:15 -04:00
|
|
|
|
|
2020-09-23 08:56:38 -04:00
|
|
|
|
(define (rewrite p)
|
|
|
|
|
(if (assq-ref (package-properties p) replacement-property)
|
|
|
|
|
p
|
|
|
|
|
(match (assq-ref replacements p)
|
|
|
|
|
(#f (package/inherit p
|
|
|
|
|
(name (rewrite-name (package-name p)))))
|
|
|
|
|
(new (if deep?
|
|
|
|
|
(package/inherit new
|
|
|
|
|
(properties `((,replacement-property . #t)
|
|
|
|
|
,@(package-properties new))))
|
|
|
|
|
new)))))
|
|
|
|
|
|
|
|
|
|
(define (cut? p)
|
|
|
|
|
(or (assq-ref (package-properties p) replacement-property)
|
|
|
|
|
(assq-ref replacements p)))
|
|
|
|
|
|
|
|
|
|
(package-mapping rewrite cut?
|
|
|
|
|
#:deep? deep?))
|
2017-04-05 09:19:15 -04:00
|
|
|
|
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
(define* (package-input-rewriting/spec replacements #:key (deep? #t))
|
2019-03-12 16:39:48 -04:00
|
|
|
|
"Return a procedure that, given a package, applies the given REPLACEMENTS to
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
all the package graph, including implicit inputs unless DEEP? is false.
|
2023-03-08 06:53:20 -05:00
|
|
|
|
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
REPLACEMENTS is a list of spec/procedures pair; each spec is a package
|
|
|
|
|
specification such as \"gcc\" or \"guile@2\", and each procedure takes a
|
2023-03-08 06:53:20 -05:00
|
|
|
|
matching package and returns a replacement for that package. Matching
|
|
|
|
|
packages that have the 'hidden?' property set are not replaced."
|
2019-03-12 16:39:48 -04:00
|
|
|
|
(define table
|
|
|
|
|
(fold (lambda (replacement table)
|
|
|
|
|
(match replacement
|
|
|
|
|
((spec . proc)
|
2023-03-07 09:48:01 -05:00
|
|
|
|
(let ((name version (package-name->name+version spec)))
|
2019-03-12 16:39:48 -04:00
|
|
|
|
(vhash-cons name (list version proc) table)))))
|
|
|
|
|
vlist-null
|
|
|
|
|
replacements))
|
|
|
|
|
|
|
|
|
|
(define (find-replacement package)
|
|
|
|
|
(vhash-fold* (lambda (item proc)
|
|
|
|
|
(or proc
|
|
|
|
|
(match item
|
|
|
|
|
((#f proc)
|
|
|
|
|
proc)
|
|
|
|
|
((version proc)
|
|
|
|
|
(and (version-prefix? version
|
|
|
|
|
(package-version package))
|
|
|
|
|
proc)))))
|
|
|
|
|
#f
|
|
|
|
|
(package-name package)
|
|
|
|
|
table))
|
|
|
|
|
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
(define replacement-property
|
|
|
|
|
(gensym " package-replacement"))
|
2019-03-12 16:39:48 -04:00
|
|
|
|
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
(define (rewrite p)
|
2023-03-08 06:53:20 -05:00
|
|
|
|
(if (or (assq-ref (package-properties p) replacement-property)
|
|
|
|
|
(hidden-package? p))
|
packages: 'package-input-rewriting/spec' can rewrite implicit dependencies.
With this change, '--with-input', '--with-graft', etc. also apply to
implicit dependencies. Thus, it's now possible to do:
guix build python-itsdangerous --with-input=python-wrapper=python@2
or:
guix build hello --with-graft=glibc=glibc@2.29
Additionally, before, implicit inputs were not rewritten, which could
lead to duplicates in the output of 'bag-transitive-inputs' (packages
that are not 'eq?' but lead to the same derivation). This in turn would
lead to unnecessary rebuilds when using '--with-input' & co. This
change fixes it by ensuring even implicit inputs are rewritten.
Fixes <https://bugs.gnu.org/42156>.
* guix/packages.scm (package-input-rewriting/spec): Add #:deep?
defaulting to #true, and pass it to 'package-mapping'.
[replacement-property]: New variable.
[rewrite]: Check that property and set it on the result of PROC.
[cut?]: New procedure.
* tests/packages.scm ("package-input-rewriting/spec"): Ensure implicit
inputs were unchanged.
("package-input-rewriting/spec, partial match"): Pass #:deep? #f.
("package-input-rewriting/spec, deep")
("package-input-rewriting/spec, no duplicates"): New tests.
(package/inherit): Move before use.
* tests/guix-build.sh: Add tests.
* tests/scripts-build.scm ("options->transformation, with-graft"):
Compare dependencies by package name or derivation file name.
* doc/guix.texi (Defining Packages): Adjust accordingly.
2020-09-23 04:29:09 -04:00
|
|
|
|
p
|
|
|
|
|
(match (find-replacement p)
|
|
|
|
|
(#f p)
|
|
|
|
|
(proc
|
|
|
|
|
(let ((new (proc p)))
|
|
|
|
|
;; Mark NEW as already processed.
|
|
|
|
|
(package/inherit new
|
|
|
|
|
(properties `((,replacement-property . #t)
|
|
|
|
|
,@(package-properties new)))))))))
|
|
|
|
|
|
|
|
|
|
(define (cut? p)
|
|
|
|
|
(or (assq-ref (package-properties p) replacement-property)
|
|
|
|
|
(find-replacement p)))
|
|
|
|
|
|
|
|
|
|
(package-mapping rewrite cut?
|
|
|
|
|
#:deep? deep?))
|
2017-05-02 03:39:23 -04:00
|
|
|
|
|
2012-09-01 13:21:06 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Package derivations.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-10-18 12:19:08 -04:00
|
|
|
|
(define (cache! cache package system thunk)
|
|
|
|
|
"Memoize in CACHE the return values of THUNK as the derivation of PACKAGE on
|
2013-01-20 16:17:58 -05:00
|
|
|
|
SYSTEM."
|
2014-07-21 16:06:36 -04:00
|
|
|
|
;; FIXME: This memoization should be associated with the open store, because
|
|
|
|
|
;; otherwise it breaks when switching to a different store.
|
2017-06-25 10:31:33 -04:00
|
|
|
|
(let ((result (thunk)))
|
2013-01-20 16:17:58 -05:00
|
|
|
|
;; 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 12:19:08 -04:00
|
|
|
|
(hashq-set! cache package
|
2017-06-25 10:31:33 -04:00
|
|
|
|
`((,system . ,result)
|
2014-10-18 12:19:08 -04:00
|
|
|
|
,@(or (hashq-ref cache package) '())))
|
2017-06-25 10:31:33 -04:00
|
|
|
|
result))
|
2013-01-20 16:17:58 -05:00
|
|
|
|
|
2014-10-18 12:19:08 -04:00
|
|
|
|
(define-syntax cached
|
|
|
|
|
(syntax-rules (=>)
|
|
|
|
|
"Memoize the result of BODY for the arguments PACKAGE and SYSTEM.
|
2013-01-20 16:17:58 -05:00
|
|
|
|
Return the cached result when available."
|
2014-10-18 12:19:08 -04:00
|
|
|
|
((_ (=> cache) package system body ...)
|
|
|
|
|
(let ((thunk (lambda () body ...))
|
|
|
|
|
(key system))
|
|
|
|
|
(match (hashq-ref cache package)
|
|
|
|
|
((alist (... ...))
|
|
|
|
|
(match (assoc-ref alist key)
|
2017-06-25 10:31:33 -04:00
|
|
|
|
(#f (cache! cache package key thunk))
|
|
|
|
|
(value value)))
|
2013-01-20 16:17:58 -05:00
|
|
|
|
(#f
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(cache! cache package key thunk)))))))
|
2012-09-01 13:21:06 -04:00
|
|
|
|
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(define* (expand-input package input system #:key target)
|
build-system: Rewrite using gexps.
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2015-03-28 14:26:39 -04:00
|
|
|
|
"Expand INPUT, an input tuple, to a name/<gexp-input> tuple. PACKAGE is
|
|
|
|
|
only used to provide contextual information in exceptions."
|
2021-03-07 09:22:29 -05:00
|
|
|
|
(with-monad %store-monad
|
|
|
|
|
(match input
|
|
|
|
|
;; INPUT doesn't need to be lowered here because it'll be lowered down
|
|
|
|
|
;; the road in the gexp that refers to it. However, packages need to be
|
|
|
|
|
;; special-cased to pass #:graft? #f (only the "tip" of the package
|
|
|
|
|
;; graph needs to have #:graft? #t). Lowering them here also allows
|
|
|
|
|
;; 'bag->derivation' to delete non-eq? packages that lead to the same
|
|
|
|
|
;; derivation.
|
|
|
|
|
(((? string? name) (? package? package))
|
|
|
|
|
(mlet %store-monad ((drv (if target
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(package->cross-derivation package
|
|
|
|
|
target system
|
2021-03-07 09:22:29 -05:00
|
|
|
|
#:graft? #f)
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(package->derivation package system
|
|
|
|
|
#:graft? #f))))
|
2021-03-07 09:22:29 -05:00
|
|
|
|
(return (list name (gexp-input drv #:native? (not target))))))
|
|
|
|
|
(((? string? name) (? package? package) (? string? output))
|
|
|
|
|
(mlet %store-monad ((drv (if target
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(package->cross-derivation package
|
|
|
|
|
target system
|
2021-03-07 09:22:29 -05:00
|
|
|
|
#:graft? #f)
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(package->derivation package system
|
|
|
|
|
#:graft? #f))))
|
2021-03-07 09:22:29 -05:00
|
|
|
|
(return (list name (gexp-input drv output #:native? (not target))))))
|
|
|
|
|
|
|
|
|
|
(((? string? name) (? file-like? thing))
|
|
|
|
|
(return (list name (gexp-input thing #:native? (not target)))))
|
|
|
|
|
(((? string? name) (? file-like? thing) (? string? output))
|
|
|
|
|
(return (list name (gexp-input thing output #:native? (not target)))))
|
|
|
|
|
(((? 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.
|
|
|
|
|
(return (list name (gexp-input (local-file file #:recursive? #t)
|
|
|
|
|
#:native? (not target)))))
|
|
|
|
|
(x
|
|
|
|
|
(raise (condition (&package-input-error
|
|
|
|
|
(package package)
|
|
|
|
|
(input x))))))))
|
2012-10-21 10:57:50 -04:00
|
|
|
|
|
2016-03-07 17:52:35 -05: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 12:06:16 -04: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 13:09:00 -04: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 12:06:16 -04:00
|
|
|
|
"Compile PACKAGE into a bag for SYSTEM, possibly cross-compiled to TARGET,
|
|
|
|
|
and return it."
|
2020-03-29 10:14:14 -04:00
|
|
|
|
(let ((package (or (and graft? (package-replacement package))
|
|
|
|
|
package)))
|
|
|
|
|
(cached (=> %bag-cache)
|
|
|
|
|
package (list system target)
|
|
|
|
|
;; 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 package
|
|
|
|
|
((and self
|
|
|
|
|
($ <package> name version source build-system
|
|
|
|
|
args inputs propagated-inputs native-inputs
|
|
|
|
|
outputs))
|
|
|
|
|
;; Even though we prefer to use "@" to separate the package
|
|
|
|
|
;; name from the package version in various user-facing parts
|
|
|
|
|
;; of Guix, checkStoreName (in nix/libstore/store-api.cc)
|
|
|
|
|
;; prohibits the use of "@", so use "-" instead.
|
|
|
|
|
(or (make-bag build-system (string-append name "-" version)
|
|
|
|
|
#:system system
|
|
|
|
|
#:target target
|
|
|
|
|
#:source source
|
|
|
|
|
#:inputs (append (inputs self)
|
|
|
|
|
(propagated-inputs self))
|
|
|
|
|
#:outputs outputs
|
|
|
|
|
#:native-inputs (native-inputs self)
|
|
|
|
|
#:arguments (args self))
|
|
|
|
|
(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 12:06:16 -04:00
|
|
|
|
|
2022-05-13 03:01:16 -04:00
|
|
|
|
(define %package-graft-cache
|
|
|
|
|
;; Cache mapping <package> records to <graft> records, for packages that
|
|
|
|
|
;; have a replacement.
|
|
|
|
|
(allocate-store-connection-cache 'package-graft-cache))
|
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define (input-graft system)
|
|
|
|
|
"Return a monadic procedure that, given a package with a graft, returns a
|
|
|
|
|
graft, and #f otherwise."
|
|
|
|
|
(with-monad %store-monad
|
|
|
|
|
(match-lambda*
|
|
|
|
|
(((? package? package) output)
|
|
|
|
|
(let ((replacement (package-replacement package)))
|
|
|
|
|
(if replacement
|
2022-05-13 03:01:16 -04:00
|
|
|
|
(mcached eq? (=> %package-graft-cache)
|
|
|
|
|
(mlet %store-monad ((orig (package->derivation package system
|
2017-06-28 15:57:16 -04:00
|
|
|
|
#:graft? #f))
|
|
|
|
|
(new (package->derivation replacement system
|
|
|
|
|
#:graft? #t)))
|
|
|
|
|
(return (graft
|
|
|
|
|
(origin orig)
|
|
|
|
|
(origin-output output)
|
|
|
|
|
(replacement new)
|
|
|
|
|
(replacement-output output))))
|
2022-05-13 03:01:16 -04:00
|
|
|
|
package output system)
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(return #f))))
|
|
|
|
|
(_
|
|
|
|
|
(return #f)))))
|
2016-03-07 17:57:33 -05:00
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define (input-cross-graft target 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 13:09:00 -04:00
|
|
|
|
"Same as 'input-graft', but for cross-compilation inputs."
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(with-monad %store-monad
|
|
|
|
|
(match-lambda*
|
|
|
|
|
(((? package? package) output)
|
|
|
|
|
(let ((replacement (package-replacement package)))
|
|
|
|
|
(if replacement
|
|
|
|
|
(mlet %store-monad ((orig (package->cross-derivation package
|
|
|
|
|
target system
|
|
|
|
|
#:graft? #f))
|
|
|
|
|
(new (package->cross-derivation replacement
|
|
|
|
|
target system
|
|
|
|
|
#:graft? #t)))
|
|
|
|
|
(return (graft
|
|
|
|
|
(origin orig)
|
|
|
|
|
(origin-output output)
|
|
|
|
|
(replacement new)
|
|
|
|
|
(replacement-output output))))
|
|
|
|
|
(return #f))))
|
|
|
|
|
(_
|
|
|
|
|
(return #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 13:09:00 -04:00
|
|
|
|
|
2016-02-27 17:06:50 -05: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."
|
2017-12-05 09:13:38 -05:00
|
|
|
|
(define bag-direct-inputs*
|
|
|
|
|
(if native?
|
|
|
|
|
(lambda (bag)
|
|
|
|
|
(append (bag-build-inputs bag)
|
|
|
|
|
(bag-target-inputs bag)
|
|
|
|
|
(if (bag-target bag)
|
|
|
|
|
'()
|
|
|
|
|
(bag-host-inputs bag))))
|
2017-12-06 03:07:28 -05:00
|
|
|
|
bag-host-inputs))
|
2017-12-05 09:13:38 -05:00
|
|
|
|
|
2020-06-11 12:24:59 -04:00
|
|
|
|
(let loop ((inputs (bag-direct-inputs* bag))
|
2016-02-27 17:06:50 -05:00
|
|
|
|
(result seed)
|
2020-06-11 12:24:59 -04:00
|
|
|
|
(visited vlist-null))
|
|
|
|
|
(match inputs
|
2016-02-27 17:06:50 -05:00
|
|
|
|
(()
|
|
|
|
|
result)
|
2020-06-11 12:24:59 -04:00
|
|
|
|
(((label (? package? head) . rest) . tail)
|
|
|
|
|
(let ((output (match rest (() "out") ((output) output)))
|
|
|
|
|
(outputs (vhash-foldq* cons '() head visited)))
|
|
|
|
|
(if (member output outputs)
|
|
|
|
|
(loop tail result visited)
|
|
|
|
|
(let ((inputs (bag-direct-inputs* (package->bag head))))
|
|
|
|
|
(loop (append inputs tail)
|
|
|
|
|
(proc head output result)
|
|
|
|
|
(vhash-consq head output visited))))))
|
2016-02-27 17:06:50 -05:00
|
|
|
|
((head . tail)
|
|
|
|
|
(loop tail result visited)))))
|
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define* (bag-grafts bag)
|
2016-02-27 17:06:50 -05: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))
|
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(mlet %store-monad
|
|
|
|
|
((native-grafts
|
|
|
|
|
(let ((->graft (input-graft system)))
|
2020-06-06 15:37:47 -04:00
|
|
|
|
(parameterize ((%current-system system)
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(%current-target-system #f))
|
2020-06-11 12:24:59 -04:00
|
|
|
|
(fold-bag-dependencies (lambda (package output grafts)
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(mlet %store-monad ((grafts grafts))
|
|
|
|
|
(>>= (->graft package output)
|
|
|
|
|
(match-lambda
|
|
|
|
|
(#f (return grafts))
|
|
|
|
|
(graft (return (cons graft grafts)))))))
|
|
|
|
|
(return '())
|
|
|
|
|
bag))))
|
|
|
|
|
|
|
|
|
|
(target-grafts
|
|
|
|
|
(if target
|
|
|
|
|
(let ((->graft (input-cross-graft target system)))
|
|
|
|
|
(parameterize ((%current-system system)
|
|
|
|
|
(%current-target-system target))
|
|
|
|
|
(fold-bag-dependencies
|
|
|
|
|
(lambda (package output grafts)
|
|
|
|
|
(mlet %store-monad ((grafts grafts))
|
|
|
|
|
(>>= (->graft package output)
|
|
|
|
|
(match-lambda
|
|
|
|
|
(#f (return grafts))
|
|
|
|
|
(graft (return (cons graft grafts)))))))
|
|
|
|
|
(return '())
|
|
|
|
|
bag
|
|
|
|
|
#:native? #f)))
|
|
|
|
|
(return '()))))
|
|
|
|
|
|
|
|
|
|
;; 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.
|
|
|
|
|
(return (delete-duplicates
|
|
|
|
|
(append native-grafts target-grafts)))))
|
|
|
|
|
|
|
|
|
|
(define* (package-grafts* package
|
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key 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 13:09:00 -04:00
|
|
|
|
"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)))
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(bag-grafts bag)))
|
|
|
|
|
|
|
|
|
|
(define package-grafts
|
|
|
|
|
(store-lower package-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 13:09:00 -04:00
|
|
|
|
|
2020-10-15 17:01:57 -04:00
|
|
|
|
(define-inlinable (derivation=? drv1 drv2)
|
|
|
|
|
"Return true if DRV1 and DRV2 are equal."
|
|
|
|
|
(or (eq? drv1 drv2)
|
|
|
|
|
(string=? (derivation-file-name drv1)
|
|
|
|
|
(derivation-file-name drv2))))
|
|
|
|
|
|
|
|
|
|
(define (input=? input1 input2)
|
|
|
|
|
"Return true if INPUT1 and INPUT2 are equivalent."
|
|
|
|
|
(match input1
|
build-system: Rewrite using gexps.
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2015-03-28 14:26:39 -04:00
|
|
|
|
((label1 obj1 . outputs1)
|
2020-10-15 17:01:57 -04:00
|
|
|
|
(match input2
|
build-system: Rewrite using gexps.
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2015-03-28 14:26:39 -04:00
|
|
|
|
((label2 obj2 . outputs2)
|
2020-10-15 17:01:57 -04:00
|
|
|
|
(and (string=? label1 label2)
|
|
|
|
|
(equal? outputs1 outputs2)
|
build-system: Rewrite using gexps.
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2015-03-28 14:26:39 -04:00
|
|
|
|
(or (and (derivation? obj1) (derivation? obj2)
|
|
|
|
|
(derivation=? obj1 obj2))
|
|
|
|
|
(equal? obj1 obj2))))))))
|
2020-10-15 17:01:57 -04:00
|
|
|
|
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(define* (bag->derivation bag #:optional context)
|
2014-10-05 10:32:25 -04:00
|
|
|
|
"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)
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(bag->cross-derivation bag)
|
2021-03-07 09:22:29 -05:00
|
|
|
|
(mlet* %store-monad ((system -> (bag-system bag))
|
|
|
|
|
(inputs -> (bag-transitive-inputs bag))
|
|
|
|
|
(input-drvs (mapm %store-monad
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(cut expand-input context <> system)
|
2021-03-07 09:22:29 -05:00
|
|
|
|
inputs))
|
|
|
|
|
(paths -> (delete-duplicates
|
|
|
|
|
(append-map (match-lambda
|
|
|
|
|
((_ (? package? p) _ ...)
|
|
|
|
|
(package-native-search-paths
|
|
|
|
|
p))
|
|
|
|
|
(_ '()))
|
|
|
|
|
inputs))))
|
2020-10-15 17:01:57 -04:00
|
|
|
|
;; It's possible that INPUTS contains packages that are not 'eq?' but
|
|
|
|
|
;; that lead to the same derivation. Delete those duplicates to avoid
|
|
|
|
|
;; issues down the road, such as duplicate entries in '%build-inputs'.
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(apply (bag-build bag) (bag-name bag)
|
2020-10-15 17:01:57 -04:00
|
|
|
|
(delete-duplicates input-drvs input=?)
|
2014-10-05 10:32:25 -04:00
|
|
|
|
#:search-paths paths
|
|
|
|
|
#:outputs (bag-outputs bag) #:system system
|
|
|
|
|
(bag-arguments bag)))))
|
|
|
|
|
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(define* (bag->cross-derivation bag #:optional context)
|
2014-10-05 10:32:25 -04:00
|
|
|
|
"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."
|
2021-03-07 09:22:29 -05:00
|
|
|
|
(mlet* %store-monad ((system -> (bag-system bag))
|
|
|
|
|
(target -> (bag-target bag))
|
|
|
|
|
(host -> (bag-transitive-host-inputs bag))
|
|
|
|
|
(host-drvs (mapm %store-monad
|
|
|
|
|
(cut expand-input context <>
|
2021-07-01 15:30:46 -04:00
|
|
|
|
system #:target target)
|
2021-03-07 09:22:29 -05:00
|
|
|
|
host))
|
|
|
|
|
(target* -> (bag-transitive-target-inputs bag))
|
|
|
|
|
(target-drvs (mapm %store-monad
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(cut expand-input context <> system)
|
2021-03-07 09:22:29 -05:00
|
|
|
|
target*))
|
|
|
|
|
(build -> (bag-transitive-build-inputs bag))
|
|
|
|
|
(build-drvs (mapm %store-monad
|
2021-07-01 15:30:46 -04:00
|
|
|
|
(cut expand-input context <> system)
|
2021-03-07 09:22:29 -05:00
|
|
|
|
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))))
|
2014-10-05 10:32:25 -04:00
|
|
|
|
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(apply (bag-build bag) (bag-name bag)
|
build-system: Rewrite using gexps.
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2015-03-28 14:26:39 -04:00
|
|
|
|
#:build-inputs (delete-duplicates build-drvs input=?)
|
|
|
|
|
#:host-inputs (delete-duplicates host-drvs input=?)
|
|
|
|
|
#:target-inputs (delete-duplicates target-drvs input=?)
|
2014-10-05 10:32:25 -04:00
|
|
|
|
#:search-paths paths
|
|
|
|
|
#:native-search-paths npaths
|
|
|
|
|
#:outputs (bag-outputs bag)
|
|
|
|
|
#:system system #:target target
|
|
|
|
|
(bag-arguments bag))))
|
|
|
|
|
|
2015-04-04 16:05:15 -04:00
|
|
|
|
(define bag->derivation*
|
|
|
|
|
(store-lower bag->derivation))
|
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define graft-derivation*
|
|
|
|
|
(store-lift graft-derivation))
|
|
|
|
|
|
|
|
|
|
(define* (package->derivation package
|
|
|
|
|
#: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 11:01:40 -04:00
|
|
|
|
"Return the <derivation> object of PACKAGE for SYSTEM."
|
|
|
|
|
|
2013-01-20 16:17:58 -05: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.
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(mcached (mlet* %store-monad ((bag -> (package->bag package system #f
|
|
|
|
|
#:graft? graft?))
|
|
|
|
|
(drv (bag->derivation bag package)))
|
|
|
|
|
(if graft?
|
|
|
|
|
(>>= (bag-grafts bag)
|
|
|
|
|
(match-lambda
|
|
|
|
|
(()
|
|
|
|
|
(return drv))
|
|
|
|
|
(grafts
|
|
|
|
|
(mlet %store-monad ((guile (package->derivation
|
2021-09-27 05:22:52 -04:00
|
|
|
|
(guile-for-grafts)
|
2017-06-28 15:57:16 -04:00
|
|
|
|
system #:graft? #f)))
|
|
|
|
|
(graft-derivation* drv grafts
|
|
|
|
|
#:system system
|
|
|
|
|
#:guile guile)))))
|
|
|
|
|
(return drv)))
|
|
|
|
|
package system #f graft?))
|
|
|
|
|
|
|
|
|
|
(define* (package->cross-derivation package target
|
|
|
|
|
#:optional (system (%current-system))
|
|
|
|
|
#:key (graft? (%graft?)))
|
2013-05-24 16:21:24 -04:00
|
|
|
|
"Cross-build PACKAGE for TARGET (a GNU triplet) from host SYSTEM (a Guix
|
|
|
|
|
system identifying string)."
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(mcached (mlet* %store-monad ((bag -> (package->bag package system target
|
|
|
|
|
#:graft? graft?))
|
|
|
|
|
(drv (bag->derivation bag package)))
|
|
|
|
|
(if graft?
|
|
|
|
|
(>>= (bag-grafts bag)
|
|
|
|
|
(match-lambda
|
|
|
|
|
(()
|
|
|
|
|
(return drv))
|
|
|
|
|
(grafts
|
|
|
|
|
(mlet %store-monad ((guile (package->derivation
|
2021-09-27 05:22:52 -04:00
|
|
|
|
(guile-for-grafts)
|
2017-06-28 15:57:16 -04:00
|
|
|
|
system #:graft? #f)))
|
|
|
|
|
(graft-derivation* drv grafts
|
|
|
|
|
#:system system
|
|
|
|
|
#:guile guile)))))
|
|
|
|
|
(return drv)))
|
|
|
|
|
package system target graft?))
|
2013-02-15 19:37:26 -05:00
|
|
|
|
|
2013-09-25 17:26:42 -04:00
|
|
|
|
(define* (package-output store package
|
|
|
|
|
#:optional (output "out") (system (%current-system)))
|
2013-02-15 19:37:26 -05: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 11:01:40 -04: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 07:34:52 -05: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 17:19:13 -05: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 07:34:52 -05: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
|
2020-04-20 17:37:05 -04:00
|
|
|
|
cross-compilation target triplet.
|
|
|
|
|
|
|
|
|
|
Note that this procedure does _not_ build PACKAGE. Thus, the result might or
|
|
|
|
|
might not designate an existing file. We recommend not using this procedure
|
|
|
|
|
unless you know what you are doing."
|
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 07:34:52 -05:00
|
|
|
|
(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 17:19:13 -05: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 07:34:52 -05:00
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define package-derivation
|
|
|
|
|
(store-lower package->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 07:34:52 -05:00
|
|
|
|
|
2017-06-28 15:57:16 -04:00
|
|
|
|
(define package-cross-derivation
|
|
|
|
|
(store-lower package->cross-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 07:34:52 -05:00
|
|
|
|
|
2016-09-10 05:57:37 -04:00
|
|
|
|
(define-gexp-compiler (package-compiler (package <package>) system target)
|
2015-03-17 17:09:32 -04: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 04:16:56 -04:00
|
|
|
|
(define* (origin->derivation origin
|
2015-01-14 08:42:10 -05:00
|
|
|
|
#:optional (system (%current-system)))
|
2016-06-15 04:16:56 -04:00
|
|
|
|
"Return the derivation corresponding to ORIGIN."
|
|
|
|
|
(match origin
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(($ <origin> uri method hash name (= force ()) #f)
|
2015-01-14 08:42:10 -05:00
|
|
|
|
;; No patches, no snippet: this is a fixed-output derivation.
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(method uri
|
|
|
|
|
(content-hash-algorithm hash)
|
|
|
|
|
(content-hash-value hash)
|
|
|
|
|
name #:system system))
|
|
|
|
|
(($ <origin> uri method hash name (= force (patches ...)) snippet
|
2021-02-28 14:53:00 -05:00
|
|
|
|
flags inputs (modules ...) guile-for-build)
|
2015-01-14 08:42:10 -05:00
|
|
|
|
;; Patches and/or a snippet.
|
2020-05-19 09:55:08 -04:00
|
|
|
|
(mlet %store-monad ((source (method uri
|
|
|
|
|
(content-hash-algorithm hash)
|
|
|
|
|
(content-hash-value hash)
|
|
|
|
|
name #:system system))
|
2015-01-14 08:42:10 -05:00
|
|
|
|
(guile (package->derivation (or guile-for-build
|
|
|
|
|
(default-guile))
|
|
|
|
|
system
|
|
|
|
|
#:graft? #f)))
|
2015-03-18 14:00:12 -04:00
|
|
|
|
(patch-and-repack source patches
|
|
|
|
|
#:inputs inputs
|
|
|
|
|
#:snippet snippet
|
|
|
|
|
#:flags flags
|
|
|
|
|
#:system system
|
|
|
|
|
#:modules modules
|
2016-06-15 04:16:56 -04:00
|
|
|
|
#:guile-for-build guile)))))
|
2015-01-14 08:42:10 -05:00
|
|
|
|
|
2016-09-10 05:57:37 -04:00
|
|
|
|
(define-gexp-compiler (origin-compiler (origin <origin>) system target)
|
2015-03-17 17:09:32 -04: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 04:16:56 -04:00
|
|
|
|
(define package-source-derivation ;somewhat deprecated
|
2016-06-15 04:38:46 -04:00
|
|
|
|
(let ((lower (store-lower lower-object)))
|
2016-06-15 04:16:56 -04:00
|
|
|
|
(lambda* (store source #:optional (system (%current-system)))
|
|
|
|
|
"Return the derivation or file corresponding to SOURCE, which can be an
|
2016-06-15 04:38:46 -04: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 04:16:56 -04: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))))))
|