2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2016-02-22 16:29:44 +01:00
|
|
|
|
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
|
|
|
|
(define-module (test-packages)
|
2014-08-23 19:18:01 +02:00
|
|
|
|
#:use-module (guix tests)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
#:use-module (guix store)
|
2015-01-03 19:46:07 +01:00
|
|
|
|
#:use-module (guix monads)
|
2016-03-04 23:01:47 +01:00
|
|
|
|
#:use-module (guix grafts)
|
2014-10-08 23:06:19 +02:00
|
|
|
|
#:use-module ((guix utils)
|
|
|
|
|
;; Rename the 'location' binding to allow proper syntax
|
|
|
|
|
;; matching when setting the 'location' field of a package.
|
|
|
|
|
#:renamer (lambda (name)
|
|
|
|
|
(cond ((eq? name 'location) 'make-location)
|
|
|
|
|
(else name))))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
#:use-module (guix hash)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
#:use-module (guix derivations)
|
|
|
|
|
#:use-module (guix packages)
|
2016-02-22 16:29:44 +01:00
|
|
|
|
#:use-module (guix grafts)
|
2015-12-20 14:34:36 +01:00
|
|
|
|
#:use-module (guix search-paths)
|
2013-03-30 22:56:38 +01:00
|
|
|
|
#:use-module (guix build-system)
|
2012-09-10 22:47:10 +02:00
|
|
|
|
#:use-module (guix build-system trivial)
|
2012-07-07 20:14:20 +02:00
|
|
|
|
#:use-module (guix build-system gnu)
|
2015-01-03 19:46:07 +01:00
|
|
|
|
#:use-module (guix profiles)
|
|
|
|
|
#:use-module (guix scripts package)
|
2013-01-18 01:06:47 +01:00
|
|
|
|
#:use-module (gnu packages)
|
2013-01-18 01:06:24 +01:00
|
|
|
|
#:use-module (gnu packages base)
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
#:use-module (gnu packages guile)
|
2013-01-18 01:06:24 +01:00
|
|
|
|
#:use-module (gnu packages bootstrap)
|
2015-01-03 19:46:07 +01:00
|
|
|
|
#:use-module (gnu packages xml)
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2013-05-27 23:41:35 +02:00
|
|
|
|
#:use-module (srfi srfi-34)
|
2015-01-20 10:17:24 +01:00
|
|
|
|
#:use-module (srfi srfi-35)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (srfi srfi-64)
|
2012-12-04 23:46:50 +01:00
|
|
|
|
#:use-module (rnrs io ports)
|
2014-10-08 23:06:19 +02:00
|
|
|
|
#:use-module (ice-9 regex)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (ice-9 match))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
|
|
|
|
;; Test the high-level packaging layer.
|
|
|
|
|
|
|
|
|
|
(define %store
|
2014-08-23 19:18:01 +02:00
|
|
|
|
(open-connection-for-tests))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2016-03-05 00:06:15 +01:00
|
|
|
|
;; Globally disable grafting to avoid rebuilding the world ('graft-derivation'
|
|
|
|
|
;; can trigger builds early.)
|
|
|
|
|
(%graft? #f)
|
|
|
|
|
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
|
|
|
|
|
(test-begin "packages")
|
|
|
|
|
|
2014-10-08 23:06:19 +02:00
|
|
|
|
(test-assert "printer with location"
|
2016-01-24 17:42:39 +01:00
|
|
|
|
(string-match "^#<package foo@0 foo.scm:42 [[:xdigit:]]+>$"
|
2014-10-08 23:06:19 +02:00
|
|
|
|
(with-output-to-string
|
|
|
|
|
(lambda ()
|
|
|
|
|
(write
|
|
|
|
|
(dummy-package "foo"
|
|
|
|
|
(location (make-location "foo.scm" 42 7))))))))
|
|
|
|
|
|
|
|
|
|
(test-assert "printer without location"
|
2016-01-24 17:42:39 +01:00
|
|
|
|
(string-match "^#<package foo@0 [[:xdigit:]]+>$"
|
2014-10-08 23:06:19 +02:00
|
|
|
|
(with-output-to-string
|
|
|
|
|
(lambda ()
|
|
|
|
|
(write
|
|
|
|
|
(dummy-package "foo" (location #f)))))))
|
|
|
|
|
|
2013-04-22 23:07:13 +02:00
|
|
|
|
(test-assert "package-field-location"
|
|
|
|
|
(let ()
|
|
|
|
|
(define (goto port line column)
|
|
|
|
|
(unless (and (= (port-column port) (- column 1))
|
|
|
|
|
(= (port-line port) (- line 1)))
|
|
|
|
|
(unless (eof-object? (get-char port))
|
|
|
|
|
(goto port line column))))
|
|
|
|
|
|
|
|
|
|
(define read-at
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <location> file line column)
|
|
|
|
|
(call-with-input-file (search-path %load-path file)
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(goto port line column)
|
|
|
|
|
(read port))))))
|
|
|
|
|
|
2013-07-08 22:53:31 +02:00
|
|
|
|
;; Until Guile 2.0.6 included, source properties were added only to pairs.
|
|
|
|
|
;; Thus, check against both VALUE and (FIELD VALUE).
|
|
|
|
|
(and (member (read-at (package-field-location %bootstrap-guile 'name))
|
|
|
|
|
(let ((name (package-name %bootstrap-guile)))
|
|
|
|
|
(list name `(name ,name))))
|
|
|
|
|
(member (read-at (package-field-location %bootstrap-guile 'version))
|
|
|
|
|
(let ((version (package-version %bootstrap-guile)))
|
|
|
|
|
(list version `(version ,version))))
|
2013-04-24 14:43:31 +02:00
|
|
|
|
(not (package-field-location %bootstrap-guile 'does-not-exist)))))
|
2013-04-22 23:07:13 +02:00
|
|
|
|
|
2013-11-18 23:56:07 +01:00
|
|
|
|
;; Make sure we don't change the file name to an absolute file name.
|
|
|
|
|
(test-equal "package-field-location, relative file name"
|
|
|
|
|
(location-file (package-location %bootstrap-guile))
|
|
|
|
|
(with-fluids ((%file-port-name-canonicalization 'absolute))
|
|
|
|
|
(location-file (package-field-location %bootstrap-guile 'version))))
|
|
|
|
|
|
2012-07-07 20:14:20 +02:00
|
|
|
|
(test-assert "package-transitive-inputs"
|
|
|
|
|
(let* ((a (dummy-package "a"))
|
|
|
|
|
(b (dummy-package "b"
|
|
|
|
|
(propagated-inputs `(("a" ,a)))))
|
|
|
|
|
(c (dummy-package "c"
|
|
|
|
|
(inputs `(("a" ,a)))))
|
|
|
|
|
(d (dummy-package "d"
|
|
|
|
|
(propagated-inputs `(("x" "something.drv")))))
|
|
|
|
|
(e (dummy-package "e"
|
|
|
|
|
(inputs `(("b" ,b) ("c" ,c) ("d" ,d))))))
|
|
|
|
|
(and (null? (package-transitive-inputs a))
|
|
|
|
|
(equal? `(("a" ,a)) (package-transitive-inputs b))
|
|
|
|
|
(equal? `(("a" ,a)) (package-transitive-inputs c))
|
|
|
|
|
(equal? (package-propagated-inputs d)
|
|
|
|
|
(package-transitive-inputs d))
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
(equal? `(("b" ,b) ("c" ,c) ("d" ,d)
|
|
|
|
|
("a" ,a) ("x" "something.drv"))
|
2012-07-07 20:14:20 +02:00
|
|
|
|
(pk 'x (package-transitive-inputs e))))))
|
|
|
|
|
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
(test-assert "package-transitive-inputs, no duplicates"
|
|
|
|
|
(let* ((a (dummy-package "a"))
|
|
|
|
|
(b (dummy-package "b"
|
|
|
|
|
(inputs `(("a+" ,a)))
|
|
|
|
|
(native-inputs `(("a*" ,a)))
|
|
|
|
|
(propagated-inputs `(("a" ,a)))))
|
|
|
|
|
(c (dummy-package "c"
|
|
|
|
|
(propagated-inputs `(("b" ,b)))))
|
|
|
|
|
(d (dummy-package "d"
|
|
|
|
|
(inputs `(("a" ,a) ("c" ,c)))))
|
|
|
|
|
(e (dummy-package "e"
|
|
|
|
|
(inputs `(("b" ,b) ("c" ,c))))))
|
|
|
|
|
(and (null? (package-transitive-inputs a))
|
|
|
|
|
(equal? `(("a*" ,a) ("a+" ,a) ("a" ,a)) ;here duplicates are kept
|
|
|
|
|
(package-transitive-inputs b))
|
|
|
|
|
(equal? `(("b" ,b) ("a" ,a))
|
|
|
|
|
(package-transitive-inputs c))
|
|
|
|
|
(equal? `(("a" ,a) ("c" ,c) ("b" ,b)) ;duplicate A removed
|
|
|
|
|
(package-transitive-inputs d))
|
|
|
|
|
(equal? `(("b" ,b) ("c" ,c) ("a" ,a))
|
|
|
|
|
(package-transitive-inputs e))))) ;ditto
|
|
|
|
|
|
2014-10-17 23:20:39 +02:00
|
|
|
|
(test-equal "package-transitive-supported-systems"
|
2014-11-03 21:26:48 +01:00
|
|
|
|
'(("x" "y" "z") ;a
|
|
|
|
|
("x" "y") ;b
|
|
|
|
|
("y") ;c
|
|
|
|
|
("y") ;d
|
|
|
|
|
("y")) ;e
|
2015-04-11 12:41:49 +02:00
|
|
|
|
;; Use TRIVIAL-BUILD-SYSTEM because it doesn't add implicit inputs and thus
|
|
|
|
|
;; doesn't restrict the set of supported systems.
|
|
|
|
|
(let* ((a (dummy-package "a"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(supported-systems '("x" "y" "z"))))
|
|
|
|
|
(b (dummy-package "b"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(supported-systems '("x" "y"))
|
|
|
|
|
(inputs `(("a" ,a)))))
|
|
|
|
|
(c (dummy-package "c"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(supported-systems '("y" "z"))
|
|
|
|
|
(inputs `(("b" ,b)))))
|
|
|
|
|
(d (dummy-package "d"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(supported-systems '("x" "y" "z"))
|
|
|
|
|
(inputs `(("b" ,b) ("c" ,c)))))
|
|
|
|
|
(e (dummy-package "e"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(supported-systems '("x" "y" "z"))
|
|
|
|
|
(inputs `(("d" ,d))))))
|
2014-10-17 23:20:39 +02:00
|
|
|
|
(list (package-transitive-supported-systems a)
|
|
|
|
|
(package-transitive-supported-systems b)
|
2014-11-03 21:26:48 +01:00
|
|
|
|
(package-transitive-supported-systems c)
|
|
|
|
|
(package-transitive-supported-systems d)
|
|
|
|
|
(package-transitive-supported-systems e))))
|
2014-10-17 23:20:39 +02:00
|
|
|
|
|
2015-09-10 22:39:44 +02:00
|
|
|
|
(test-equal "origin-actual-file-name"
|
|
|
|
|
"foo-1.tar.gz"
|
|
|
|
|
(let ((o (dummy-origin (uri "http://www.example.com/foo-1.tar.gz"))))
|
|
|
|
|
(origin-actual-file-name o)))
|
|
|
|
|
|
|
|
|
|
(test-equal "origin-actual-file-name, file-name"
|
|
|
|
|
"foo-1.tar.gz"
|
|
|
|
|
(let ((o (dummy-origin
|
|
|
|
|
(uri "http://www.example.com/tarball")
|
|
|
|
|
(file-name "foo-1.tar.gz"))))
|
|
|
|
|
(origin-actual-file-name o)))
|
|
|
|
|
|
2015-04-24 14:57:51 +02:00
|
|
|
|
(let* ((o (dummy-origin))
|
|
|
|
|
(u (dummy-origin))
|
|
|
|
|
(i (dummy-origin))
|
|
|
|
|
(a (dummy-package "a"))
|
|
|
|
|
(b (dummy-package "b"
|
|
|
|
|
(inputs `(("a" ,a) ("i" ,i)))))
|
|
|
|
|
(c (package (inherit b) (source o)))
|
|
|
|
|
(d (dummy-package "d"
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(source u) (inputs `(("c" ,c))))))
|
|
|
|
|
(test-assert "package-direct-sources, no source"
|
|
|
|
|
(null? (package-direct-sources a)))
|
|
|
|
|
(test-equal "package-direct-sources, #f source"
|
|
|
|
|
(list i)
|
|
|
|
|
(package-direct-sources b))
|
|
|
|
|
(test-equal "package-direct-sources, not input source"
|
|
|
|
|
(list u)
|
|
|
|
|
(package-direct-sources d))
|
|
|
|
|
(test-assert "package-direct-sources"
|
|
|
|
|
(let ((s (package-direct-sources c)))
|
|
|
|
|
(and (= (length (pk 's-sources s)) 2)
|
|
|
|
|
(member o s)
|
|
|
|
|
(member i s))))
|
|
|
|
|
(test-assert "package-transitive-sources"
|
|
|
|
|
(let ((s (package-transitive-sources d)))
|
|
|
|
|
(and (= (length (pk 'd-sources s)) 3)
|
|
|
|
|
(member o s)
|
|
|
|
|
(member i s)
|
|
|
|
|
(member u s)))))
|
|
|
|
|
|
2015-07-22 03:45:54 +02:00
|
|
|
|
(test-assert "transitive-input-references"
|
|
|
|
|
(let* ((a (dummy-package "a"))
|
|
|
|
|
(b (dummy-package "b"))
|
|
|
|
|
(c (dummy-package "c"
|
|
|
|
|
(inputs `(("a" ,a)))
|
|
|
|
|
(propagated-inputs `(("boo" ,b)))))
|
|
|
|
|
(d (dummy-package "d"
|
|
|
|
|
(inputs `(("c*" ,c)))))
|
|
|
|
|
(keys (map (match-lambda
|
|
|
|
|
(('assoc-ref 'l key)
|
|
|
|
|
key))
|
|
|
|
|
(pk 'refs (transitive-input-references
|
|
|
|
|
'l (package-inputs d))))))
|
|
|
|
|
(and (= (length keys) 2)
|
|
|
|
|
(member "c*" keys)
|
|
|
|
|
(member "boo" keys))))
|
|
|
|
|
|
2015-04-11 12:41:49 +02:00
|
|
|
|
(test-equal "package-transitive-supported-systems, implicit inputs"
|
|
|
|
|
%supported-systems
|
|
|
|
|
|
|
|
|
|
;; Here GNU-BUILD-SYSTEM adds implicit inputs that build only on
|
|
|
|
|
;; %SUPPORTED-SYSTEMS. Thus the others must be ignored.
|
|
|
|
|
(let ((p (dummy-package "foo"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(supported-systems
|
|
|
|
|
`("does-not-exist" "foobar" ,@%supported-systems)))))
|
|
|
|
|
(package-transitive-supported-systems p)))
|
|
|
|
|
|
2015-04-19 16:49:09 +02:00
|
|
|
|
(test-assert "supported-package?"
|
|
|
|
|
(let ((p (dummy-package "foo"
|
|
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(supported-systems '("x86_64-linux" "does-not-exist")))))
|
|
|
|
|
(and (supported-package? p "x86_64-linux")
|
|
|
|
|
(not (supported-package? p "does-not-exist"))
|
|
|
|
|
(not (supported-package? p "i686-linux")))))
|
|
|
|
|
|
2013-08-24 16:58:44 +02:00
|
|
|
|
(test-skip (if (not %store) 8 0))
|
|
|
|
|
|
|
|
|
|
(test-assert "package-source-derivation, file"
|
|
|
|
|
(let* ((file (search-path %load-path "guix.scm"))
|
|
|
|
|
(package (package (inherit (dummy-package "p"))
|
|
|
|
|
(source file)))
|
|
|
|
|
(source (package-source-derivation %store
|
|
|
|
|
(package-source package))))
|
|
|
|
|
(and (store-path? source)
|
|
|
|
|
(valid-path? %store source)
|
|
|
|
|
(equal? (call-with-input-file source get-bytevector-all)
|
|
|
|
|
(call-with-input-file file get-bytevector-all)))))
|
|
|
|
|
|
|
|
|
|
(test-assert "package-source-derivation, store path"
|
|
|
|
|
(let* ((file (add-to-store %store "guix.scm" #t "sha256"
|
|
|
|
|
(search-path %load-path "guix.scm")))
|
|
|
|
|
(package (package (inherit (dummy-package "p"))
|
|
|
|
|
(source file)))
|
|
|
|
|
(source (package-source-derivation %store
|
|
|
|
|
(package-source package))))
|
|
|
|
|
(string=? file source)))
|
2013-01-20 22:17:58 +01:00
|
|
|
|
|
2013-11-12 23:44:47 +01:00
|
|
|
|
(test-assert "package-source-derivation, indirect store path"
|
|
|
|
|
(let* ((dir (add-to-store %store "guix-build" #t "sha256"
|
|
|
|
|
(dirname (search-path %load-path
|
|
|
|
|
"guix/build/utils.scm"))))
|
|
|
|
|
(package (package (inherit (dummy-package "p"))
|
|
|
|
|
(source (string-append dir "/utils.scm"))))
|
|
|
|
|
(source (package-source-derivation %store
|
|
|
|
|
(package-source package))))
|
|
|
|
|
(and (direct-store-path? source)
|
|
|
|
|
(string-suffix? "utils.scm" source))))
|
|
|
|
|
|
2015-02-23 23:41:26 +01:00
|
|
|
|
(unless (network-reachable?) (test-skip 1))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(test-equal "package-source-derivation, snippet"
|
|
|
|
|
"OK"
|
2015-04-22 22:54:13 +02:00
|
|
|
|
(let* ((file (search-bootstrap-binary (match (%current-system)
|
|
|
|
|
("armhf-linux"
|
|
|
|
|
"guile-2.0.11.tar.xz")
|
|
|
|
|
(_
|
|
|
|
|
"guile-2.0.9.tar.xz"))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(%current-system)))
|
|
|
|
|
(sha256 (call-with-input-file file port-sha256))
|
2015-01-14 14:42:10 +01:00
|
|
|
|
(fetch (lambda* (url hash-algo hash
|
2013-11-07 22:41:21 +01:00
|
|
|
|
#:optional name #:key system)
|
|
|
|
|
(pk 'fetch url hash-algo hash name system)
|
2015-01-14 14:42:10 +01:00
|
|
|
|
(interned-file url)))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(source (bootstrap-origin
|
|
|
|
|
(origin
|
|
|
|
|
(method fetch)
|
|
|
|
|
(uri file)
|
|
|
|
|
(sha256 sha256)
|
|
|
|
|
(patch-inputs
|
|
|
|
|
`(("tar" ,%bootstrap-coreutils&co)
|
|
|
|
|
("xz" ,%bootstrap-coreutils&co)
|
|
|
|
|
("patch" ,%bootstrap-coreutils&co)))
|
2013-11-08 21:58:09 +01:00
|
|
|
|
(patch-guile %bootstrap-guile)
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(modules '((guix build utils)))
|
|
|
|
|
(imported-modules modules)
|
|
|
|
|
(snippet '(begin
|
|
|
|
|
;; We end up in 'bin', because it's the first
|
|
|
|
|
;; directory, alphabetically. Not a very good
|
|
|
|
|
;; example but hey.
|
|
|
|
|
(chmod "." #o777)
|
|
|
|
|
(symlink "guile" "guile-rocks")
|
|
|
|
|
(copy-recursively "../share/guile/2.0/scripts"
|
2015-09-24 10:36:24 +02:00
|
|
|
|
"scripts")
|
|
|
|
|
|
|
|
|
|
;; Make sure '.file_list' can be created.
|
|
|
|
|
(chmod ".." #o777))))))
|
2013-11-07 22:41:21 +01:00
|
|
|
|
(package (package (inherit (dummy-package "with-snippet"))
|
|
|
|
|
(source source)
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(inputs
|
|
|
|
|
`(("tar" ,(search-bootstrap-binary "tar"
|
|
|
|
|
(%current-system)))
|
|
|
|
|
("xz" ,(search-bootstrap-binary "xz"
|
|
|
|
|
(%current-system)))))
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder
|
|
|
|
|
(let ((tar (assoc-ref %build-inputs "tar"))
|
|
|
|
|
(xz (assoc-ref %build-inputs "xz"))
|
|
|
|
|
(source (assoc-ref %build-inputs "source")))
|
|
|
|
|
(and (zero? (system* tar "xvf" source
|
|
|
|
|
"--use-compress-program" xz))
|
|
|
|
|
(string=? "guile" (readlink "bin/guile-rocks"))
|
|
|
|
|
(file-exists? "bin/scripts/compile.scm")
|
|
|
|
|
(let ((out (assoc-ref %outputs "out")))
|
|
|
|
|
(call-with-output-file out
|
|
|
|
|
(lambda (p)
|
|
|
|
|
(display "OK" p))))))))))
|
|
|
|
|
(drv (package-derivation %store package))
|
|
|
|
|
(out (derivation->output-path drv)))
|
|
|
|
|
(and (build-derivations %store (list (pk 'snippet-drv drv)))
|
|
|
|
|
(call-with-input-file out get-string-all))))
|
|
|
|
|
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(test-assert "return value"
|
|
|
|
|
(let ((drv (package-derivation %store (dummy-package "p"))))
|
|
|
|
|
(and (derivation? drv)
|
|
|
|
|
(file-exists? (derivation-file-name drv)))))
|
2012-09-10 22:47:10 +02:00
|
|
|
|
|
2013-02-16 01:37:26 +01:00
|
|
|
|
(test-assert "package-output"
|
|
|
|
|
(let* ((package (dummy-package "p"))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(drv (package-derivation %store package)))
|
|
|
|
|
(and (derivation? drv)
|
|
|
|
|
(string=? (derivation->output-path drv)
|
2013-02-16 01:37:26 +01:00
|
|
|
|
(package-output %store package "out")))))
|
|
|
|
|
|
2015-01-20 10:17:24 +01:00
|
|
|
|
(test-assert "patch not found yields a run-time error"
|
|
|
|
|
(guard (c ((condition-has-type? c &message)
|
|
|
|
|
(and (string-contains (condition-message c)
|
|
|
|
|
"does-not-exist.patch")
|
|
|
|
|
(string-contains (condition-message c)
|
|
|
|
|
"not found"))))
|
|
|
|
|
(let ((p (package
|
|
|
|
|
(inherit (dummy-package "p"))
|
|
|
|
|
(source (origin
|
|
|
|
|
(method (const #f))
|
|
|
|
|
(uri "http://whatever")
|
|
|
|
|
(patches
|
|
|
|
|
(list (search-patch "does-not-exist.patch")))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
|
|
|
|
"0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks4")))))))
|
|
|
|
|
(package-derivation %store p)
|
|
|
|
|
#f)))
|
|
|
|
|
|
2015-01-24 22:50:40 +01:00
|
|
|
|
(test-assert "reference to non-existent output"
|
|
|
|
|
;; See <http://bugs.gnu.org/19630>.
|
2015-02-06 18:04:19 +01:00
|
|
|
|
(parameterize ((%graft? #f))
|
|
|
|
|
(let* ((dep (dummy-package "dep"))
|
|
|
|
|
(p (dummy-package "p"
|
|
|
|
|
(inputs `(("dep" ,dep "non-existent"))))))
|
|
|
|
|
(guard (c ((derivation-missing-output-error? c)
|
|
|
|
|
(and (string=? (derivation-missing-output c) "non-existent")
|
|
|
|
|
(equal? (package-derivation %store dep)
|
|
|
|
|
(derivation-error-derivation c)))))
|
|
|
|
|
(package-derivation %store p)))))
|
2015-01-24 22:50:40 +01:00
|
|
|
|
|
2012-09-10 22:47:10 +02:00
|
|
|
|
(test-assert "trivial"
|
|
|
|
|
(let* ((p (package (inherit (dummy-package "trivial"))
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(source #f)
|
|
|
|
|
(arguments
|
2012-10-06 01:24:46 +02:00
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder
|
2012-09-10 22:47:10 +02:00
|
|
|
|
(begin
|
|
|
|
|
(mkdir %output)
|
|
|
|
|
(call-with-output-file (string-append %output "/test")
|
|
|
|
|
(lambda (p)
|
|
|
|
|
(display '(hello guix) p))))))))
|
|
|
|
|
(d (package-derivation %store p)))
|
|
|
|
|
(and (build-derivations %store (list d))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(let ((p (pk 'drv d (derivation->output-path d))))
|
2012-09-10 22:47:10 +02:00
|
|
|
|
(equal? '(hello guix)
|
|
|
|
|
(call-with-input-file (string-append p "/test") read))))))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2012-12-04 23:46:50 +01:00
|
|
|
|
(test-assert "trivial with local file as input"
|
|
|
|
|
(let* ((i (search-path %load-path "ice-9/boot-9.scm"))
|
|
|
|
|
(p (package (inherit (dummy-package "trivial-with-input-file"))
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(source #f)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder (copy-file (assoc-ref %build-inputs "input")
|
|
|
|
|
%output)))
|
|
|
|
|
(inputs `(("input" ,i)))))
|
|
|
|
|
(d (package-derivation %store p)))
|
|
|
|
|
(and (build-derivations %store (list d))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(let ((p (pk 'drv d (derivation->output-path d))))
|
2012-12-04 23:46:50 +01:00
|
|
|
|
(equal? (call-with-input-file p get-bytevector-all)
|
|
|
|
|
(call-with-input-file i get-bytevector-all))))))
|
|
|
|
|
|
2013-09-26 21:50:05 +02:00
|
|
|
|
(test-assert "trivial with source"
|
|
|
|
|
(let* ((i (search-path %load-path "ice-9/boot-9.scm"))
|
|
|
|
|
(p (package (inherit (dummy-package "trivial-with-source"))
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(source i)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder (copy-file (assoc-ref %build-inputs "source")
|
|
|
|
|
%output)))))
|
|
|
|
|
(d (package-derivation %store p)))
|
|
|
|
|
(and (build-derivations %store (list d))
|
|
|
|
|
(let ((p (derivation->output-path d)))
|
|
|
|
|
(equal? (call-with-input-file p get-bytevector-all)
|
|
|
|
|
(call-with-input-file i get-bytevector-all))))))
|
|
|
|
|
|
2012-10-21 16:57:50 +02:00
|
|
|
|
(test-assert "trivial with system-dependent input"
|
|
|
|
|
(let* ((p (package (inherit (dummy-package "trivial-system-dependent-input"))
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(source #f)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder
|
|
|
|
|
(let ((out (assoc-ref %outputs "out"))
|
|
|
|
|
(bash (assoc-ref %build-inputs "bash")))
|
|
|
|
|
(zero? (system* bash "-c"
|
|
|
|
|
(format #f "echo hello > ~a" out))))))
|
2013-01-24 23:33:30 +01:00
|
|
|
|
(inputs `(("bash" ,(search-bootstrap-binary "bash"
|
|
|
|
|
(%current-system)))))))
|
2012-10-21 16:57:50 +02:00
|
|
|
|
(d (package-derivation %store p)))
|
|
|
|
|
(and (build-derivations %store (list d))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(let ((p (pk 'drv d (derivation->output-path d))))
|
2012-10-21 16:57:50 +02:00
|
|
|
|
(eq? 'hello (call-with-input-file p read))))))
|
|
|
|
|
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(test-assert "search paths"
|
|
|
|
|
(let* ((p (make-prompt-tag "return-search-paths"))
|
|
|
|
|
(s (build-system
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(name 'raw)
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(description "Raw build system with direct store access")
|
2014-10-05 16:32:25 +02:00
|
|
|
|
(lower (lambda* (name #:key source inputs system target
|
|
|
|
|
#:allow-other-keys)
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(bag
|
|
|
|
|
(name name)
|
2014-10-05 16:32:25 +02:00
|
|
|
|
(system system) (target target)
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(build-inputs inputs)
|
|
|
|
|
(build
|
|
|
|
|
(lambda* (store name inputs
|
|
|
|
|
#:key outputs system search-paths)
|
|
|
|
|
search-paths)))))))
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(x (list (search-path-specification
|
|
|
|
|
(variable "GUILE_LOAD_PATH")
|
packages: Add 'file-type' field to 'search-path-specification'.
Fixes <http://bugs.gnu.org/18033>.
* guix/packages.scm (<search-path-specification>): Rename 'directories'
field to 'files'. Add 'file-type'.
(search-path-specification->sexp): Honor 'file-type'.
* gnu/packages/autotools.scm, gnu/packages/bootstrap.scm,
gnu/packages/cross-base.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/glib.scm,
gnu/packages/guile.scm, gnu/packages/man.scm,
gnu/packages/perl.scm, gnu/packages/pkg-config.scm,
gnu/packages/python.scm, gnu/packages/ruby.scm,
gnu/packages/xfce.scm: Change 'directories' to 'files'.
* tests/packages.scm ("search paths"): Change 'directories' field to
'files'.
* guix/scripts/environment.scm (for-each-search-path): Likewise.
2014-12-27 23:22:08 +01:00
|
|
|
|
(files '("share/guile/site/2.0")))
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(search-path-specification
|
|
|
|
|
(variable "GUILE_LOAD_COMPILED_PATH")
|
packages: Add 'file-type' field to 'search-path-specification'.
Fixes <http://bugs.gnu.org/18033>.
* guix/packages.scm (<search-path-specification>): Rename 'directories'
field to 'files'. Add 'file-type'.
(search-path-specification->sexp): Honor 'file-type'.
* gnu/packages/autotools.scm, gnu/packages/bootstrap.scm,
gnu/packages/cross-base.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/glib.scm,
gnu/packages/guile.scm, gnu/packages/man.scm,
gnu/packages/perl.scm, gnu/packages/pkg-config.scm,
gnu/packages/python.scm, gnu/packages/ruby.scm,
gnu/packages/xfce.scm: Change 'directories' to 'files'.
* tests/packages.scm ("search paths"): Change 'directories' field to
'files'.
* guix/scripts/environment.scm (for-each-search-path): Likewise.
2014-12-27 23:22:08 +01:00
|
|
|
|
(files '("share/guile/site/2.0")))))
|
2013-03-30 22:56:38 +01:00
|
|
|
|
(a (package (inherit (dummy-package "guile"))
|
|
|
|
|
(build-system s)
|
|
|
|
|
(native-search-paths x)))
|
|
|
|
|
(b (package (inherit (dummy-package "guile-foo"))
|
|
|
|
|
(build-system s)
|
|
|
|
|
(inputs `(("guile" ,a)))))
|
|
|
|
|
(c (package (inherit (dummy-package "guile-bar"))
|
|
|
|
|
(build-system s)
|
|
|
|
|
(inputs `(("guile" ,a)
|
|
|
|
|
("guile-foo" ,b))))))
|
|
|
|
|
(let-syntax ((collect (syntax-rules ()
|
|
|
|
|
((_ body ...)
|
|
|
|
|
(call-with-prompt p
|
|
|
|
|
(lambda ()
|
|
|
|
|
body ...)
|
|
|
|
|
(lambda (k search-paths)
|
|
|
|
|
search-paths))))))
|
|
|
|
|
(and (null? (collect (package-derivation %store a)))
|
|
|
|
|
(equal? x (collect (package-derivation %store b)))
|
|
|
|
|
(equal? x (collect (package-derivation %store c)))))))
|
|
|
|
|
|
2015-12-20 14:34:36 +01:00
|
|
|
|
(test-assert "package-transitive-native-search-paths"
|
|
|
|
|
(let* ((sp (lambda (name)
|
|
|
|
|
(list (search-path-specification
|
|
|
|
|
(variable name)
|
|
|
|
|
(files '("foo/bar"))))))
|
|
|
|
|
(p0 (dummy-package "p0" (native-search-paths (sp "PATH0"))))
|
|
|
|
|
(p1 (dummy-package "p1" (native-search-paths (sp "PATH1"))))
|
|
|
|
|
(p2 (dummy-package "p2"
|
|
|
|
|
(native-search-paths (sp "PATH2"))
|
|
|
|
|
(inputs `(("p0" ,p0)))
|
|
|
|
|
(propagated-inputs `(("p1" ,p1)))))
|
|
|
|
|
(p3 (dummy-package "p3"
|
|
|
|
|
(native-search-paths (sp "PATH3"))
|
|
|
|
|
(native-inputs `(("p0" ,p0)))
|
|
|
|
|
(propagated-inputs `(("p2" ,p2))))))
|
|
|
|
|
(lset= string=?
|
|
|
|
|
'("PATH1" "PATH2" "PATH3")
|
|
|
|
|
(map search-path-specification-variable
|
|
|
|
|
(package-transitive-native-search-paths p3)))))
|
|
|
|
|
|
2013-05-24 22:21:24 +02:00
|
|
|
|
(test-assert "package-cross-derivation"
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(let ((drv (package-cross-derivation %store (dummy-package "p")
|
|
|
|
|
"mips64el-linux-gnu")))
|
|
|
|
|
(and (derivation? drv)
|
|
|
|
|
(file-exists? (derivation-file-name drv)))))
|
2013-05-24 22:21:24 +02:00
|
|
|
|
|
2013-05-24 23:53:06 +02:00
|
|
|
|
(test-assert "package-cross-derivation, trivial-build-system"
|
|
|
|
|
(let ((p (package (inherit (dummy-package "p"))
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(arguments '(#:builder (exit 1))))))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(let ((drv (package-cross-derivation %store p "mips64el-linux-gnu")))
|
|
|
|
|
(derivation? drv))))
|
2013-05-24 23:53:06 +02:00
|
|
|
|
|
2013-05-27 23:41:35 +02:00
|
|
|
|
(test-assert "package-cross-derivation, no cross builder"
|
|
|
|
|
(let* ((b (build-system (inherit trivial-build-system)
|
build-system: Introduce "bags" as an intermediate representation.
* guix/build-system.scm (<build-system>)[build, cross-build]: Remove.
[lower]: New field.
(<bag>): New record type.
(make-bag): New procedure.
* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs,
bag-transitive-host-inputs, bag-transitive-target-inputs,
package->bag): New procedures.
(package-derivation): Use it; use the bag, apply its build procedure,
etc.
(package-cross-derivation): Likewise.
* gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure.
(%bootstrap-guile): Use them.
* guix/build-system/trivial.scm (lower): New procedure.
(trivial-build, trivial-cross-build): Remove 'source' parameter. Pass
INPUTS as is.
(trivial-build-system): Adjust accordingly.
* guix/build-system/gnu.scm (%store, inputs-search-paths,
standard-search-paths, expand-inputs, standard-inputs): Remove.
(gnu-lower): New procedure.
(gnu-build): Remove 'source' and #:implicit-inputs? parameters.
Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get
the source from INPUT-DRVS.
(gnu-cross-build): Likewise.
(standard-cross-packages): Remove call to 'standard-packages'.
(standard-cross-inputs, standard-cross-search-paths): Remove.
(gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'.
* guix/build-system/cmake.scm (lower): New procedure.
(cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and
SEARCH-PATHS as is. Get the source from INPUTS.
* guix/build-system/perl.scm: Likewise.
* guix/build-system/python.scm: Likewise.
* guix/build-system/ruby.scm: Likewise.
* gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers"
to "linux-headers".
(cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f.
Likewise. In 'propagated-inputs', change "cross-linux-headers" to
"linux-headers".
* guix/git-download.scm (git-fetch): Use 'standard-packages' instead of
'standard-inputs'.
* tests/builders.scm ("gnu-build-system"): Remove use of
'build-system-builder'.
("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to
'gnu-build'.
* tests/packages.scm ("search paths"): Adjust to new build system API.
("package-cross-derivation, no cross builder"): Likewise.
* doc/guix.texi (Build Systems): Add paragraph on bags.
2014-10-03 18:06:16 +02:00
|
|
|
|
(lower (const #f))))
|
2013-05-27 23:41:35 +02:00
|
|
|
|
(p (package (inherit (dummy-package "p"))
|
|
|
|
|
(build-system b))))
|
|
|
|
|
(guard (c ((package-cross-build-system-error? c)
|
|
|
|
|
(eq? (package-error-package c) p)))
|
|
|
|
|
(package-cross-derivation %store p "mips64el-linux-gnu")
|
|
|
|
|
#f)))
|
|
|
|
|
|
2016-03-05 00:06:15 +01:00
|
|
|
|
;; XXX: The next two tests can trigger builds when the distro defines
|
|
|
|
|
;; replacements on core packages, so they're disable for lack of a better
|
|
|
|
|
;; solution.
|
|
|
|
|
|
|
|
|
|
;; (test-equal "package-derivation, direct graft"
|
|
|
|
|
;; (package-derivation %store gnu-make #:graft? #f)
|
|
|
|
|
;; (let ((p (package (inherit coreutils)
|
|
|
|
|
;; (replacement gnu-make))))
|
|
|
|
|
;; (package-derivation %store p #:graft? #t)))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
|
2016-03-05 00:06:15 +01:00
|
|
|
|
;; (test-equal "package-cross-derivation, direct graft"
|
|
|
|
|
;; (package-cross-derivation %store gnu-make "mips64el-linux-gnu"
|
|
|
|
|
;; #:graft? #f)
|
|
|
|
|
;; (let ((p (package (inherit coreutils)
|
|
|
|
|
;; (replacement gnu-make))))
|
|
|
|
|
;; (package-cross-derivation %store p "mips64el-linux-gnu"
|
|
|
|
|
;; #:graft? #t)))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
|
|
|
|
|
(test-assert "package-grafts, indirect grafts"
|
|
|
|
|
(let* ((new (dummy-package "dep"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
(dep (package (inherit new) (version "0.0")))
|
|
|
|
|
(dep* (package (inherit dep) (replacement new)))
|
|
|
|
|
(dummy (dummy-package "dummy"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
(inputs `(("dep" ,dep*))))))
|
|
|
|
|
(equal? (package-grafts %store dummy)
|
|
|
|
|
(list (graft
|
|
|
|
|
(origin (package-derivation %store dep))
|
|
|
|
|
(replacement (package-derivation %store new)))))))
|
|
|
|
|
|
|
|
|
|
(test-assert "package-grafts, indirect grafts, cross"
|
|
|
|
|
(let* ((new (dummy-package "dep"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
(dep (package (inherit new) (version "0.0")))
|
|
|
|
|
(dep* (package (inherit dep) (replacement new)))
|
|
|
|
|
(dummy (dummy-package "dummy"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
(inputs `(("dep" ,dep*)))))
|
|
|
|
|
(target "mips64el-linux-gnu"))
|
2016-03-05 00:06:15 +01:00
|
|
|
|
;; XXX: There might be additional grafts, for instance if the distro
|
|
|
|
|
;; defines replacements for core packages like Perl.
|
|
|
|
|
(member (graft
|
|
|
|
|
(origin (package-cross-derivation %store dep target))
|
|
|
|
|
(replacement
|
|
|
|
|
(package-cross-derivation %store new target)))
|
|
|
|
|
(package-grafts %store dummy #:target target))))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
|
|
|
|
|
(test-assert "package-grafts, indirect grafts, propagated inputs"
|
|
|
|
|
(let* ((new (dummy-package "dep"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
(dep (package (inherit new) (version "0.0")))
|
|
|
|
|
(dep* (package (inherit dep) (replacement new)))
|
|
|
|
|
(prop (dummy-package "propagated"
|
|
|
|
|
(propagated-inputs `(("dep" ,dep*)))
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
(dummy (dummy-package "dummy"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
(inputs `(("prop" ,prop))))))
|
|
|
|
|
(equal? (package-grafts %store dummy)
|
|
|
|
|
(list (graft
|
|
|
|
|
(origin (package-derivation %store dep))
|
|
|
|
|
(replacement (package-derivation %store new)))))))
|
|
|
|
|
|
2016-03-04 23:01:47 +01:00
|
|
|
|
(test-assert "package-grafts, same replacement twice"
|
|
|
|
|
(let* ((new (dummy-package "dep"
|
|
|
|
|
(version "1")
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
(dep (package (inherit new) (version "0") (replacement new)))
|
|
|
|
|
(p1 (dummy-package "intermediate1"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
(inputs `(("dep" ,dep)))))
|
|
|
|
|
(p2 (dummy-package "intermediate2"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
;; Here we copy DEP to have an equivalent package that is not
|
|
|
|
|
;; 'eq?' to DEP. This is similar to what happens with
|
|
|
|
|
;; 'package-with-explicit-inputs' & co.
|
|
|
|
|
(inputs `(("dep" ,(package (inherit dep)))))))
|
|
|
|
|
(p3 (dummy-package "final"
|
|
|
|
|
(arguments '(#:implicit-inputs? #f))
|
|
|
|
|
(inputs `(("p1" ,p1) ("p2" ,p2))))))
|
|
|
|
|
(equal? (package-grafts %store p3)
|
|
|
|
|
(list (graft
|
|
|
|
|
(origin (package-derivation %store
|
|
|
|
|
(package (inherit dep)
|
|
|
|
|
(replacement #f))))
|
|
|
|
|
(replacement (package-derivation %store new)))))))
|
|
|
|
|
|
2016-02-27 23:06:50 +01:00
|
|
|
|
;;; XXX: Nowadays 'graft-derivation' needs to build derivations beforehand to
|
|
|
|
|
;;; find out about their run-time dependencies, so this test is no longer
|
|
|
|
|
;;; applicable since it would trigger a full rebuild.
|
|
|
|
|
;;
|
|
|
|
|
;; (test-assert "package-derivation, indirect grafts"
|
|
|
|
|
;; (let* ((new (dummy-package "dep"
|
|
|
|
|
;; (arguments '(#:implicit-inputs? #f))))
|
|
|
|
|
;; (dep (package (inherit new) (version "0.0")))
|
|
|
|
|
;; (dep* (package (inherit dep) (replacement new)))
|
|
|
|
|
;; (dummy (dummy-package "dummy"
|
|
|
|
|
;; (arguments '(#:implicit-inputs? #f))
|
|
|
|
|
;; (inputs `(("dep" ,dep*)))))
|
|
|
|
|
;; (guile (package-derivation %store (canonical-package guile-2.0)
|
|
|
|
|
;; #:graft? #f)))
|
|
|
|
|
;; (equal? (package-derivation %store dummy)
|
|
|
|
|
;; (graft-derivation %store
|
|
|
|
|
;; (package-derivation %store dummy #:graft? #f)
|
|
|
|
|
;; (package-grafts %store dummy)
|
|
|
|
|
|
|
|
|
|
;; ;; Use the same Guile as 'package-derivation'.
|
|
|
|
|
;; #:guile guile))))
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
|
2014-10-05 16:32:25 +02:00
|
|
|
|
(test-equal "package->bag"
|
|
|
|
|
`("foo86-hurd" #f (,(package-source gnu-make))
|
|
|
|
|
(,(canonical-package glibc)) (,(canonical-package coreutils)))
|
|
|
|
|
(let ((bag (package->bag gnu-make "foo86-hurd")))
|
|
|
|
|
(list (bag-system bag) (bag-target bag)
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "source")
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "libc")
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "coreutils"))))
|
|
|
|
|
|
|
|
|
|
(test-equal "package->bag, cross-compilation"
|
|
|
|
|
`(,(%current-system) "foo86-hurd"
|
|
|
|
|
(,(package-source gnu-make))
|
|
|
|
|
(,(canonical-package glibc)) (,(canonical-package coreutils)))
|
|
|
|
|
(let ((bag (package->bag gnu-make (%current-system) "foo86-hurd")))
|
|
|
|
|
(list (bag-system bag) (bag-target bag)
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "source")
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "libc")
|
|
|
|
|
(assoc-ref (bag-build-inputs bag) "coreutils"))))
|
|
|
|
|
|
2014-10-16 23:22:07 +02:00
|
|
|
|
(test-assert "package->bag, propagated inputs"
|
|
|
|
|
(let* ((dep (dummy-package "dep"))
|
|
|
|
|
(prop (dummy-package "prop"
|
|
|
|
|
(propagated-inputs `(("dep" ,dep)))))
|
|
|
|
|
(dummy (dummy-package "dummy"
|
|
|
|
|
(inputs `(("prop" ,prop)))))
|
|
|
|
|
(inputs (bag-transitive-inputs (package->bag dummy #:graft? #f))))
|
packages: Rewrite 'transitive-inputs' to be linear and remove duplicates.
There were two issues:
1. Use of 'delete-duplicates', which is quadratic, was a serious problem for
closures with lots of propagated inputs, such as that of the 'hydra'
package (several minutes for 'guix build hydra -n'!).
2. The 'delete-duplicates' call essentially had no effect since duplicate
inputs typically had a different label and were thus kept. For
instance, (bag-transitive-inputs (package->bag inkscape)) would return
216 items whereas (delete-duplicates (map cdr THAT)) contains only 67
items.
The new implementation returns 67 items in this case. For 'hydra', we're
down from 42211 items to 361, and roughly 13s for 'guix build hydra'.
* guix/packages.scm (transitive-inputs): Rewrite as a breadth-first
traversal. Remove duplicate propagated inputs.
* tests/packages.scm ("package-transitive-inputs", "package->bag, propagated
inputs"): Adjust to use simple labels for propagated inputs, without "/".
("package-transitive-inputs, no duplicates"): New test.
2015-07-11 23:13:24 +02:00
|
|
|
|
(match (assoc "dep" inputs)
|
|
|
|
|
(("dep" package)
|
2014-10-16 23:22:07 +02:00
|
|
|
|
(eq? package dep)))))
|
|
|
|
|
|
2014-10-05 16:32:25 +02:00
|
|
|
|
(test-assert "bag->derivation"
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(parameterize ((%graft? #f))
|
|
|
|
|
(let ((bag (package->bag gnu-make))
|
|
|
|
|
(drv (package-derivation %store gnu-make)))
|
|
|
|
|
(parameterize ((%current-system "foox86-hurd")) ;should have no effect
|
|
|
|
|
(equal? drv (bag->derivation %store bag))))))
|
2014-10-05 16:32:25 +02:00
|
|
|
|
|
|
|
|
|
(test-assert "bag->derivation, cross-compilation"
|
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
2014-10-27 18:09:00 +01:00
|
|
|
|
(parameterize ((%graft? #f))
|
|
|
|
|
(let* ((target "mips64el-linux-gnu")
|
|
|
|
|
(bag (package->bag gnu-make (%current-system) target))
|
|
|
|
|
(drv (package-cross-derivation %store gnu-make target)))
|
|
|
|
|
(parameterize ((%current-system "foox86-hurd") ;should have no effect
|
|
|
|
|
(%current-target-system "foo64-linux-gnu"))
|
|
|
|
|
(equal? drv (bag->derivation %store bag))))))
|
2014-10-05 16:32:25 +02:00
|
|
|
|
|
2015-02-23 23:52:28 +01:00
|
|
|
|
(when (or (not (network-reachable?)) (shebang-too-long?))
|
|
|
|
|
(test-skip 1))
|
2012-11-09 23:59:11 +01:00
|
|
|
|
(test-assert "GNU Make, bootstrap"
|
|
|
|
|
;; GNU Make is the first program built during bootstrap; we choose it
|
|
|
|
|
;; here so that the test doesn't last for too long.
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-27 00:25:17 +02:00
|
|
|
|
(let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0)))
|
2012-11-09 23:59:11 +01:00
|
|
|
|
(and (package? gnu-make)
|
|
|
|
|
(or (location? (package-location gnu-make))
|
|
|
|
|
(not (package-location gnu-make)))
|
|
|
|
|
(let* ((drv (package-derivation %store gnu-make))
|
derivations: 'derivation' and related procedures return a single value.
* guix/derivations.scm (derivation->output-path,
derivation->output-paths): New procedures.
(derivation-path->output-path): Use 'derivation->output-path'.
(derivation-path->output-paths): Use 'derivation->output-paths'.
(derivation): Accept 'derivation?' objects as inputs. Return a single
value.
(build-derivations): New procedure.
(compiled-modules): Use 'derivation->output-paths'.
(build-expression->derivation)[source-path]: Add case for when the
input matches 'derivation?'.
[prologue]: Accept 'derivation?' objects in INPUTS.
[mod-dir, go-dir]: Use 'derivation->output-path'.
* guix/download.scm (url-fetch): Adjust to the single-value return.
* guix/packages.scm (package-output): Use 'derivation->output-path'.
* guix/scripts/build.scm (guix-build): When the argument is
'derivation-path?', pass it through 'read-derivation'.
Use 'derivation-file-name' to print out the .drv file names, and to
register them. Use 'derivation->output-path' instead of
'derivation-path->output-path'.
* guix/scripts/package.scm (roll-back): Adjust to the single-value
return.
(guix-package): Use 'derivation->output-path'.
* guix/ui.scm (show-what-to-build): Adjust to deal with 'derivation?'
objects instead of .drv file names.
* gnu/system/grub.scm (grub-configuration-file): Use
'derivation->output-path' instead of 'derivation-path->output-path'.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Likewise.
* tests/builders.scm, tests/derivations.scm, tests/packages.scm,
tests/store.scm, tests/union.scm: Adjust to the new calling
convention.
* doc/guix.texi (Defining Packages, The Store, Derivations): Adjust
accordingly.
2013-09-18 17:01:40 +02:00
|
|
|
|
(out (derivation->output-path drv)))
|
2012-10-06 01:24:46 +02:00
|
|
|
|
(and (build-derivations %store (list drv))
|
2012-11-09 23:59:11 +01:00
|
|
|
|
(file-exists? (string-append out "/bin/make")))))))
|
2012-06-28 01:24:34 +02:00
|
|
|
|
|
2012-11-19 22:37:50 +01:00
|
|
|
|
(test-eq "fold-packages" hello
|
|
|
|
|
(fold-packages (lambda (p r)
|
|
|
|
|
(if (string=? (package-name p) "hello")
|
|
|
|
|
p
|
|
|
|
|
r))
|
|
|
|
|
#f))
|
|
|
|
|
|
2012-06-30 16:37:19 +02:00
|
|
|
|
(test-assert "find-packages-by-name"
|
|
|
|
|
(match (find-packages-by-name "hello")
|
|
|
|
|
(((? (cut eq? hello <>))) #t)
|
|
|
|
|
(wrong (pk 'find-packages-by-name wrong #f))))
|
|
|
|
|
|
|
|
|
|
(test-assert "find-packages-by-name with version"
|
|
|
|
|
(match (find-packages-by-name "hello" (package-version hello))
|
|
|
|
|
(((? (cut eq? hello <>))) #t)
|
|
|
|
|
(wrong (pk 'find-packages-by-name wrong #f))))
|
|
|
|
|
|
2015-01-03 19:46:07 +01:00
|
|
|
|
(test-assert "--search-paths with pattern"
|
|
|
|
|
;; Make sure 'guix package --search-paths' correctly reports environment
|
|
|
|
|
;; variables when file patterns are used (in particular, it must follow
|
|
|
|
|
;; symlinks when looking for 'catalog.xml'.) To do that, we rely on the
|
|
|
|
|
;; libxml2 package specification, which contains such a definition.
|
|
|
|
|
(let* ((p1 (package
|
|
|
|
|
(name "foo") (version "0") (source #f)
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:modules ((guix build utils))
|
|
|
|
|
#:builder (begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(let ((out (assoc-ref %outputs "out")))
|
|
|
|
|
(mkdir-p (string-append out "/xml/bar/baz"))
|
|
|
|
|
(call-with-output-file
|
|
|
|
|
(string-append out "/xml/bar/baz/catalog.xml")
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display "xml? wat?!" port)))))))
|
|
|
|
|
(synopsis #f) (description #f)
|
|
|
|
|
(home-page #f) (license #f)))
|
|
|
|
|
(p2 (package
|
|
|
|
|
;; Provide a fake libxml2 to avoid building the real one. This
|
|
|
|
|
;; is OK because 'guix package' gets search path specifications
|
|
|
|
|
;; from the same-named package found in the distro.
|
|
|
|
|
(name "libxml2") (version "0.0.0") (source #f)
|
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:guile ,%bootstrap-guile
|
|
|
|
|
#:builder (mkdir (assoc-ref %outputs "out"))))
|
|
|
|
|
(native-search-paths (package-native-search-paths libxml2))
|
|
|
|
|
(synopsis #f) (description #f)
|
|
|
|
|
(home-page #f) (license #f)))
|
|
|
|
|
(prof (run-with-store %store
|
|
|
|
|
(profile-derivation
|
|
|
|
|
(manifest (map package->manifest-entry
|
|
|
|
|
(list p1 p2)))
|
2015-04-15 22:44:51 +02:00
|
|
|
|
#:hooks '())
|
2015-01-03 19:46:07 +01:00
|
|
|
|
#:guile-for-build (%guile-for-build))))
|
|
|
|
|
(build-derivations %store (list prof))
|
|
|
|
|
(string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n"
|
|
|
|
|
(derivation->output-path prof))
|
|
|
|
|
(with-output-to-string
|
|
|
|
|
(lambda ()
|
|
|
|
|
(guix-package "-p" (derivation->output-path prof)
|
|
|
|
|
"--search-paths"))))))
|
|
|
|
|
|
2016-03-08 11:48:21 +01:00
|
|
|
|
(test-equal "specification->package when not found"
|
|
|
|
|
'quit
|
|
|
|
|
(catch 'quit
|
|
|
|
|
(lambda ()
|
|
|
|
|
;; This should call 'leave', producing an error message.
|
|
|
|
|
(specification->package "this-package-does-not-exist"))
|
|
|
|
|
(lambda (key . args)
|
|
|
|
|
key)))
|
|
|
|
|
|
2012-06-28 01:24:34 +02:00
|
|
|
|
(test-end "packages")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(exit (= (test-runner-fail-count (test-runner-current)) 0))
|
|
|
|
|
|
|
|
|
|
;;; Local Variables:
|
2012-07-07 20:14:20 +02:00
|
|
|
|
;;; eval: (put 'dummy-package 'scheme-indent-function 1)
|
2012-06-28 01:24:34 +02:00
|
|
|
|
;;; End:
|