2016-01-31 19:18:52 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2021-01-07 09:00:50 +00:00
|
|
|
|
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
2016-01-31 19:18:52 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; 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.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; 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
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
guix build: Move transformation options to (guix transformations).
* guix/transformations.scm: New file.
* tests/scripts-build.scm: Rename to...
* tests/transformations.scm: ... this.
* Makefile.am (MODULES): Add 'guix/transformations.scm'.
(SCM_TESTS): Adjust to rename.
* guix/scripts/build.scm (numeric-extension?)
(tarball-base-name, <downloaded-file>, download-to-store*)
(compile-downloaded-file, package-with-source)
(transform-package-source, evaluate-replacement-specs)
(transform-package-inputs, transform-package-inputs/graft)
(%not-equal, package-git-url, evaluate-git-replacement-specs)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, package-dependents/spec)
(package-toolchain-rewriting, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests)
(%transformations, transformation-procedure, %transformation-options)
(show-transformation-options-help, options->transformation)
(package-transformations): Move to (guix transformations).
* guix/scripts/environment.scm: Adjust accordingly.
* guix/scripts/graph.scm: Likewise.
* guix/scripts/install.scm: Likewise.
* guix/scripts/pack.scm: Likewise.
* guix/scripts/package.scm: Likewise.
* guix/scripts/upgrade.scm: Likewise.
* po/guix/POTFILES.in: Add 'guix/transformations.scm'.
2020-10-29 17:30:07 +00:00
|
|
|
|
(define-module (test-transformations)
|
2016-01-31 19:18:52 +00:00
|
|
|
|
#:use-module (guix tests)
|
|
|
|
|
#:use-module (guix store)
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
#:use-module ((guix gexp) #:select (lower-object))
|
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 08:29:09 +00:00
|
|
|
|
#:use-module (guix derivations)
|
2016-01-31 19:18:52 +00:00
|
|
|
|
#:use-module (guix packages)
|
2019-03-13 09:26:31 +00:00
|
|
|
|
#:use-module (guix git-download)
|
2020-09-28 16:56:00 +00:00
|
|
|
|
#:use-module (guix build-system)
|
|
|
|
|
#:use-module (guix build-system gnu)
|
guix build: Move transformation options to (guix transformations).
* guix/transformations.scm: New file.
* tests/scripts-build.scm: Rename to...
* tests/transformations.scm: ... this.
* Makefile.am (MODULES): Add 'guix/transformations.scm'.
(SCM_TESTS): Adjust to rename.
* guix/scripts/build.scm (numeric-extension?)
(tarball-base-name, <downloaded-file>, download-to-store*)
(compile-downloaded-file, package-with-source)
(transform-package-source, evaluate-replacement-specs)
(transform-package-inputs, transform-package-inputs/graft)
(%not-equal, package-git-url, evaluate-git-replacement-specs)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, package-dependents/spec)
(package-toolchain-rewriting, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests)
(%transformations, transformation-procedure, %transformation-options)
(show-transformation-options-help, options->transformation)
(package-transformations): Move to (guix transformations).
* guix/scripts/environment.scm: Adjust accordingly.
* guix/scripts/graph.scm: Likewise.
* guix/scripts/install.scm: Likewise.
* guix/scripts/pack.scm: Likewise.
* guix/scripts/package.scm: Likewise.
* guix/scripts/upgrade.scm: Likewise.
* po/guix/POTFILES.in: Add 'guix/transformations.scm'.
2020-10-29 17:30:07 +00:00
|
|
|
|
#:use-module (guix transformations)
|
2020-12-21 13:52:38 +00:00
|
|
|
|
#:use-module ((guix gexp) #:select (local-file? local-file-file))
|
2016-01-31 19:18:52 +00:00
|
|
|
|
#:use-module (guix ui)
|
2016-03-23 21:32:44 +00:00
|
|
|
|
#:use-module (guix utils)
|
2019-03-12 14:50:13 +00:00
|
|
|
|
#:use-module (guix git)
|
2021-01-07 09:00:50 +00:00
|
|
|
|
#:use-module (guix upstream)
|
2017-04-21 20:53:59 +00:00
|
|
|
|
#:use-module (gnu packages)
|
2016-01-31 22:22:18 +00:00
|
|
|
|
#:use-module (gnu packages base)
|
|
|
|
|
#:use-module (gnu packages busybox)
|
|
|
|
|
#:use-module (ice-9 match)
|
2020-09-28 16:56:00 +00:00
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
|
#:use-module (srfi srfi-26)
|
2016-01-31 19:18:52 +00:00
|
|
|
|
#:use-module (srfi srfi-64))
|
|
|
|
|
|
|
|
|
|
|
guix build: Move transformation options to (guix transformations).
* guix/transformations.scm: New file.
* tests/scripts-build.scm: Rename to...
* tests/transformations.scm: ... this.
* Makefile.am (MODULES): Add 'guix/transformations.scm'.
(SCM_TESTS): Adjust to rename.
* guix/scripts/build.scm (numeric-extension?)
(tarball-base-name, <downloaded-file>, download-to-store*)
(compile-downloaded-file, package-with-source)
(transform-package-source, evaluate-replacement-specs)
(transform-package-inputs, transform-package-inputs/graft)
(%not-equal, package-git-url, evaluate-git-replacement-specs)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, package-dependents/spec)
(package-toolchain-rewriting, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests)
(%transformations, transformation-procedure, %transformation-options)
(show-transformation-options-help, options->transformation)
(package-transformations): Move to (guix transformations).
* guix/scripts/environment.scm: Adjust accordingly.
* guix/scripts/graph.scm: Likewise.
* guix/scripts/install.scm: Likewise.
* guix/scripts/pack.scm: Likewise.
* guix/scripts/package.scm: Likewise.
* guix/scripts/upgrade.scm: Likewise.
* po/guix/POTFILES.in: Add 'guix/transformations.scm'.
2020-10-29 17:30:07 +00:00
|
|
|
|
(test-begin "transformations")
|
2016-01-31 19:18:52 +00:00
|
|
|
|
|
|
|
|
|
(test-assert "options->transformation, no transformations"
|
|
|
|
|
(let ((p (dummy-package "foo"))
|
|
|
|
|
(t (options->transformation '())))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(eq? (t p) p)))
|
2016-01-31 19:18:52 +00:00
|
|
|
|
|
|
|
|
|
(test-assert "options->transformation, with-source"
|
|
|
|
|
;; Our pseudo-package is called 'guix.scm' so the 'guix.scm' source should
|
|
|
|
|
;; be applicable.
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"))
|
|
|
|
|
(s (search-path %load-path "guix.scm"))
|
|
|
|
|
(t (options->transformation `((with-source . ,s)))))
|
|
|
|
|
(with-store store
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let* ((new (t p))
|
|
|
|
|
(source (run-with-store store
|
|
|
|
|
(lower-object (package-source new)))))
|
2016-01-31 19:18:52 +00:00
|
|
|
|
(and (not (eq? new p))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(string=? source
|
2016-01-31 19:18:52 +00:00
|
|
|
|
(add-to-store store "guix.scm" #t
|
|
|
|
|
"sha256" s)))))))
|
|
|
|
|
|
2016-12-21 22:46:44 +00:00
|
|
|
|
(test-assert "options->transformation, with-source, replacement"
|
|
|
|
|
;; Same, but this time the original package has a 'replacement' field. We
|
|
|
|
|
;; expect that replacement to be set to #f in the new package.
|
|
|
|
|
(let* ((p (dummy-package "guix.scm" (replacement coreutils)))
|
|
|
|
|
(s (search-path %load-path "guix.scm"))
|
|
|
|
|
(t (options->transformation `((with-source . ,s)))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(not (package-replacement new))))))
|
2016-12-21 22:46:44 +00:00
|
|
|
|
|
2016-03-23 21:32:44 +00:00
|
|
|
|
(test-assert "options->transformation, with-source, with version"
|
|
|
|
|
;; Our pseudo-package is called 'guix.scm' so the 'guix.scm-2.0' source
|
|
|
|
|
;; should be applicable, and its version should be extracted.
|
|
|
|
|
(let ((p (dummy-package "foo"))
|
|
|
|
|
(s (search-path %load-path "guix.scm")))
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(let* ((f (string-append directory "/foo-42.0.tar.gz"))
|
|
|
|
|
(t (options->transformation `((with-source . ,f)))))
|
|
|
|
|
(copy-file s f)
|
|
|
|
|
(with-store store
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let* ((new (t p))
|
|
|
|
|
(source (run-with-store store
|
|
|
|
|
(lower-object (package-source new)))))
|
2016-03-23 21:32:44 +00:00
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(string=? (package-name new) (package-name p))
|
|
|
|
|
(string=? (package-version new) "42.0")
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(string=? source
|
2016-03-23 21:32:44 +00:00
|
|
|
|
(add-to-store store (basename f) #t
|
|
|
|
|
"sha256" f))))))))))
|
|
|
|
|
|
2016-01-31 19:18:52 +00:00
|
|
|
|
(test-assert "options->transformation, with-source, no matches"
|
|
|
|
|
;; When a transformation in not applicable, a warning must be raised.
|
|
|
|
|
(let* ((p (dummy-package "foobar"))
|
|
|
|
|
(s (search-path %load-path "guix.scm"))
|
|
|
|
|
(t (options->transformation `((with-source . ,s)))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let* ((port (open-output-string))
|
|
|
|
|
(new (parameterize ((guix-warning-port port))
|
|
|
|
|
(t p))))
|
|
|
|
|
(and (eq? new p)
|
|
|
|
|
(string-contains (get-output-string port)
|
|
|
|
|
"had no effect")))))
|
2016-01-31 19:18:52 +00:00
|
|
|
|
|
2017-12-22 22:40:57 +00:00
|
|
|
|
(test-assert "options->transformation, with-source, PKG=URI"
|
|
|
|
|
(let* ((p (dummy-package "foo"))
|
|
|
|
|
(s (search-path %load-path "guix.scm"))
|
|
|
|
|
(f (string-append "foo=" s))
|
|
|
|
|
(t (options->transformation `((with-source . ,f)))))
|
|
|
|
|
(with-store store
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let* ((new (t p))
|
|
|
|
|
(source (run-with-store store
|
|
|
|
|
(lower-object (package-source new)))))
|
2017-12-22 22:40:57 +00:00
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(string=? (package-name new) (package-name p))
|
|
|
|
|
(string=? (package-version new)
|
|
|
|
|
(package-version p))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(string=? source
|
2017-12-22 22:40:57 +00:00
|
|
|
|
(add-to-store store (basename s) #t
|
|
|
|
|
"sha256" s)))))))
|
|
|
|
|
|
|
|
|
|
(test-assert "options->transformation, with-source, PKG@VER=URI"
|
|
|
|
|
(let* ((p (dummy-package "foo"))
|
|
|
|
|
(s (search-path %load-path "guix.scm"))
|
|
|
|
|
(f (string-append "foo@42.0=" s))
|
|
|
|
|
(t (options->transformation `((with-source . ,f)))))
|
|
|
|
|
(with-store store
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let* ((new (t p))
|
|
|
|
|
(source (run-with-store store
|
|
|
|
|
(lower-object (package-source new)))))
|
2017-12-22 22:40:57 +00:00
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(string=? (package-name new) (package-name p))
|
|
|
|
|
(string=? (package-version new) "42.0")
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(string=? source
|
2017-12-22 22:40:57 +00:00
|
|
|
|
(add-to-store store (basename s) #t
|
|
|
|
|
"sha256" s)))))))
|
|
|
|
|
|
2016-01-31 22:22:18 +00:00
|
|
|
|
(test-assert "options->transformation, with-input"
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
2017-04-21 20:53:59 +00:00
|
|
|
|
(inputs `(("foo" ,(specification->package "coreutils"))
|
|
|
|
|
("bar" ,(specification->package "grep"))
|
2016-01-31 22:22:18 +00:00
|
|
|
|
("baz" ,(dummy-package "chbouib"
|
|
|
|
|
(native-inputs `(("x" ,grep)))))))))
|
|
|
|
|
(t (options->transformation '((with-input . "coreutils=busybox")
|
|
|
|
|
(with-input . "grep=findutils")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2) ("baz" dep3))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name busybox))
|
|
|
|
|
(string=? (package-full-name dep2)
|
|
|
|
|
(package-full-name findutils))
|
|
|
|
|
(string=? (package-name dep3) "chbouib")
|
|
|
|
|
(match (package-native-inputs dep3)
|
|
|
|
|
((("x" dep))
|
|
|
|
|
(string=? (package-full-name dep)
|
|
|
|
|
(package-full-name findutils)))))))))))
|
2016-01-31 22:22:18 +00:00
|
|
|
|
|
2016-10-17 21:40:03 +00:00
|
|
|
|
(test-assert "options->transformation, with-graft"
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,(dummy-package "chbouib"
|
|
|
|
|
(native-inputs `(("x" ,grep)))))))))
|
2016-10-19 13:17:06 +00:00
|
|
|
|
(t (options->transformation '((with-graft . "grep=findutils")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(string=? (package-full-name (package-replacement dep1))
|
|
|
|
|
(package-full-name findutils))
|
|
|
|
|
(string=? (package-name dep2) "chbouib")
|
|
|
|
|
(match (package-native-inputs dep2)
|
|
|
|
|
((("x" dep))
|
|
|
|
|
(with-store store
|
|
|
|
|
(string=? (derivation-file-name
|
|
|
|
|
(package-derivation store findutils))
|
|
|
|
|
(derivation-file-name
|
|
|
|
|
(package-derivation store dep)))))))))))))
|
2016-10-17 21:40:03 +00:00
|
|
|
|
|
2019-03-13 09:26:31 +00:00
|
|
|
|
(test-equal "options->transformation, with-branch"
|
|
|
|
|
(git-checkout (url "https://example.org")
|
|
|
|
|
(branch "devel")
|
|
|
|
|
(recursive? #t))
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,(dummy-package "chbouib"
|
|
|
|
|
(source (origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://example.org")
|
|
|
|
|
(commit "cabba9e")))
|
|
|
|
|
(sha256 #f)))))))))
|
|
|
|
|
(t (options->transformation '((with-branch . "chbouib=devel")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(string=? (package-name dep2) "chbouib")
|
|
|
|
|
(package-source dep2))))))))
|
2019-03-13 09:26:31 +00:00
|
|
|
|
|
|
|
|
|
(test-equal "options->transformation, with-commit"
|
|
|
|
|
(git-checkout (url "https://example.org")
|
|
|
|
|
(commit "abcdef")
|
|
|
|
|
(recursive? #t))
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,(dummy-package "chbouib"
|
|
|
|
|
(source (origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://example.org")
|
|
|
|
|
(commit "cabba9e")))
|
|
|
|
|
(sha256 #f)))))))))
|
|
|
|
|
(t (options->transformation '((with-commit . "chbouib=abcdef")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(string=? (package-name dep2) "chbouib")
|
|
|
|
|
(package-source dep2))))))))
|
2019-03-13 09:26:31 +00:00
|
|
|
|
|
2019-03-12 14:50:13 +00:00
|
|
|
|
(test-equal "options->transformation, with-git-url"
|
|
|
|
|
(let ((source (git-checkout (url "https://example.org")
|
|
|
|
|
(recursive? #t))))
|
|
|
|
|
(list source source))
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,(dummy-package "chbouib"
|
|
|
|
|
(native-inputs `(("x" ,grep)))))))))
|
|
|
|
|
(t (options->transformation '((with-git-url . "grep=https://example.org")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(string=? (package-name dep2) "chbouib")
|
|
|
|
|
(match (package-native-inputs dep2)
|
|
|
|
|
((("x" dep3))
|
|
|
|
|
(map package-source (list dep1 dep3)))))))))))
|
2019-03-12 14:50:13 +00:00
|
|
|
|
|
2019-03-13 09:11:54 +00:00
|
|
|
|
(test-equal "options->transformation, with-git-url + with-branch"
|
|
|
|
|
;; Combine the two options and make sure the 'with-branch' transformation
|
|
|
|
|
;; comes after the 'with-git-url' transformation.
|
|
|
|
|
(let ((source (git-checkout (url "https://example.org")
|
|
|
|
|
(branch "BRANCH")
|
|
|
|
|
(recursive? #t))))
|
|
|
|
|
(list source source))
|
|
|
|
|
(let* ((p (dummy-package "guix.scm"
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,(dummy-package "chbouib"
|
|
|
|
|
(native-inputs `(("x" ,grep)))))))))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
(reverse '((with-git-url
|
|
|
|
|
. "grep=https://example.org")
|
|
|
|
|
(with-branch . "grep=BRANCH"))))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (not (eq? new p))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep1) ("bar" dep2))
|
|
|
|
|
(and (string=? (package-name dep1) "grep")
|
|
|
|
|
(string=? (package-name dep2) "chbouib")
|
|
|
|
|
(match (package-native-inputs dep2)
|
|
|
|
|
((("x" dep3))
|
|
|
|
|
(map package-source (list dep1 dep3)))))))))))
|
2019-03-13 09:11:54 +00:00
|
|
|
|
|
2020-09-28 16:56:00 +00:00
|
|
|
|
(define* (depends-on-toolchain? p #:optional (toolchain "gcc-toolchain"))
|
|
|
|
|
"Return true if P depends on TOOLCHAIN instead of the default tool chain."
|
|
|
|
|
(define toolchain-packages
|
|
|
|
|
'("gcc" "binutils" "glibc" "ld-wrapper"))
|
|
|
|
|
|
|
|
|
|
(define (package-name* obj)
|
|
|
|
|
(and (package? obj) (package-name obj)))
|
|
|
|
|
|
|
|
|
|
(match (bag-build-inputs (package->bag p))
|
|
|
|
|
(((_ (= package-name* packages) . _) ...)
|
|
|
|
|
(and (not (any (cut member <> packages) toolchain-packages))
|
|
|
|
|
(member toolchain packages)))))
|
|
|
|
|
|
|
|
|
|
(test-assert "options->transformation, with-c-toolchain"
|
|
|
|
|
(let* ((dep0 (dummy-package "chbouib"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(native-inputs `(("y" ,grep)))))
|
|
|
|
|
(dep1 (dummy-package "stuff"
|
|
|
|
|
(native-inputs `(("x" ,dep0)))))
|
|
|
|
|
(p (dummy-package "thingie"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(inputs `(("foo" ,grep)
|
|
|
|
|
("bar" ,dep1)))))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
'((with-c-toolchain . "chbouib=gcc-toolchain")))))
|
|
|
|
|
;; Here we check that the transformation applies to DEP0 and all its
|
|
|
|
|
;; dependents: DEP0 must use GCC-TOOLCHAIN, DEP1 must use GCC-TOOLCHAIN
|
|
|
|
|
;; and the DEP0 that uses GCC-TOOLCHAIN, and so on.
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (depends-on-toolchain? new "gcc-toolchain")
|
|
|
|
|
(match (bag-build-inputs (package->bag new))
|
|
|
|
|
((("foo" dep0) ("bar" dep1) _ ...)
|
|
|
|
|
(and (depends-on-toolchain? dep1 "gcc-toolchain")
|
|
|
|
|
(not (depends-on-toolchain? dep0 "gcc-toolchain"))
|
|
|
|
|
(string=? (package-full-name dep0)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(match (bag-build-inputs (package->bag dep1))
|
|
|
|
|
((("x" dep) _ ...)
|
|
|
|
|
(and (depends-on-toolchain? dep "gcc-toolchain")
|
|
|
|
|
(match (bag-build-inputs (package->bag dep))
|
|
|
|
|
((("y" dep) _ ...) ;this one is unchanged
|
|
|
|
|
(eq? dep grep)))))))))))))
|
2020-09-28 16:56:00 +00:00
|
|
|
|
|
|
|
|
|
(test-equal "options->transformation, with-c-toolchain twice"
|
|
|
|
|
(package-full-name grep)
|
|
|
|
|
(let* ((dep0 (dummy-package "chbouib"))
|
|
|
|
|
(dep1 (dummy-package "stuff"))
|
|
|
|
|
(p (dummy-package "thingie"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(inputs `(("foo" ,dep0)
|
|
|
|
|
("bar" ,dep1)
|
|
|
|
|
("baz" ,grep)))))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
'((with-c-toolchain . "chbouib=clang-toolchain")
|
|
|
|
|
(with-c-toolchain . "stuff=clang-toolchain")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(and (depends-on-toolchain? new "clang-toolchain")
|
|
|
|
|
(match (bag-build-inputs (package->bag new))
|
|
|
|
|
((("foo" dep0) ("bar" dep1) ("baz" dep2) _ ...)
|
|
|
|
|
(and (depends-on-toolchain? dep0 "clang-toolchain")
|
|
|
|
|
(depends-on-toolchain? dep1 "clang-toolchain")
|
|
|
|
|
(not (depends-on-toolchain? dep2 "clang-toolchain"))
|
|
|
|
|
(package-full-name dep2))))))))
|
2020-09-28 16:56:00 +00:00
|
|
|
|
|
|
|
|
|
(test-assert "options->transformation, with-c-toolchain, no effect"
|
|
|
|
|
(let ((p (dummy-package "thingie"))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
'((with-c-toolchain . "does-not-exist=gcc-toolchain")))))
|
|
|
|
|
;; When it has no effect, '--with-c-toolchain' returns P.
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(eq? (t p) p)))
|
2020-09-28 16:56:00 +00:00
|
|
|
|
|
2020-10-09 16:17:41 +00:00
|
|
|
|
(test-equal "options->transformation, with-debug-info"
|
|
|
|
|
'(#:strip-binaries? #f)
|
|
|
|
|
(let* ((dep (dummy-package "chbouib"))
|
|
|
|
|
(p (dummy-package "thingie"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(inputs `(("foo" ,dep)
|
|
|
|
|
("bar" ,grep)))))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
'((with-debug-info . "chbouib")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(match (package-inputs new)
|
|
|
|
|
((("foo" dep0) ("bar" dep1))
|
|
|
|
|
(and (string=? (package-full-name dep1)
|
|
|
|
|
(package-full-name grep))
|
|
|
|
|
(package-arguments (package-replacement dep0))))))))
|
2020-10-09 16:17:41 +00:00
|
|
|
|
|
2020-09-23 20:29:17 +00:00
|
|
|
|
(test-assert "options->transformation, without-tests"
|
|
|
|
|
(let* ((dep (dummy-package "dep"))
|
|
|
|
|
(p (dummy-package "foo"
|
|
|
|
|
(inputs `(("dep" ,dep)))))
|
|
|
|
|
(t (options->transformation '((without-tests . "dep")
|
|
|
|
|
(without-tests . "tar")))))
|
guix build: 'options->transformation' no longer takes a 'store' parameter.
* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.
2020-10-28 22:35:49 +00:00
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(match (bag-direct-inputs (package->bag new))
|
|
|
|
|
((("dep" dep) ("tar" tar) _ ...)
|
2020-12-21 11:06:11 +00:00
|
|
|
|
(and (equal? (package-arguments dep) '(#:tests? #f))
|
|
|
|
|
(match (memq #:tests? (package-arguments tar))
|
|
|
|
|
((#:tests? #f _ ...) #t))))))))
|
2019-03-13 09:11:54 +00:00
|
|
|
|
|
2020-12-21 13:52:38 +00:00
|
|
|
|
(test-equal "options->transformation, with-patch"
|
|
|
|
|
(search-patches "glibc-locales.patch" "guile-relocatable.patch")
|
|
|
|
|
(let* ((dep (dummy-package "dep"
|
|
|
|
|
(source (dummy-origin))))
|
|
|
|
|
(p (dummy-package "foo"
|
|
|
|
|
(inputs `(("dep" ,dep)))))
|
|
|
|
|
(patch1 (search-patch "glibc-locales.patch"))
|
|
|
|
|
(patch2 (search-patch "guile-relocatable.patch"))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
`((with-patch . ,(string-append "dep=" patch1))
|
|
|
|
|
(with-patch . ,(string-append "dep=" patch2))
|
|
|
|
|
(with-patch . ,(string-append "tar=" patch1))))))
|
|
|
|
|
(let ((new (t p)))
|
|
|
|
|
(match (bag-direct-inputs (package->bag new))
|
|
|
|
|
((("dep" dep) ("tar" tar) _ ...)
|
|
|
|
|
(and (member patch1
|
|
|
|
|
(filter-map (lambda (patch)
|
|
|
|
|
(and (local-file? patch)
|
|
|
|
|
(local-file-file patch)))
|
|
|
|
|
(origin-patches (package-source tar))))
|
|
|
|
|
(map local-file-file
|
|
|
|
|
(origin-patches (package-source dep)))))))))
|
|
|
|
|
|
2021-01-07 09:00:50 +00:00
|
|
|
|
(test-equal "options->transformation, with-latest"
|
|
|
|
|
"42.0"
|
|
|
|
|
(mock ((guix upstream) %updaters
|
|
|
|
|
(delay (list (upstream-updater
|
|
|
|
|
(name 'dummy)
|
|
|
|
|
(pred (const #t))
|
|
|
|
|
(description "")
|
|
|
|
|
(latest (const (upstream-source
|
|
|
|
|
(package "foo")
|
|
|
|
|
(version "42.0")
|
|
|
|
|
(urls '("http://example.org")))))))))
|
|
|
|
|
(let* ((p (dummy-package "foo" (version "1.0")))
|
|
|
|
|
(t (options->transformation
|
|
|
|
|
`((with-latest . "foo")))))
|
|
|
|
|
(package-version (t p)))))
|
|
|
|
|
|
2016-01-31 19:18:52 +00:00
|
|
|
|
(test-end)
|
2020-09-28 16:56:00 +00:00
|
|
|
|
|
|
|
|
|
;;; Local Variables:
|
|
|
|
|
;;; eval: (put 'dummy-package 'scheme-indent-function 1)
|
|
|
|
|
;;; End:
|