mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-01 14:55:55 +02:00
Ludovic Courtès
0d5a559f0f
* 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.
118 lines
4.4 KiB
Scheme
118 lines
4.4 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; 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/>.
|
|
|
|
|
|
(define-module (test-builders)
|
|
#:use-module (guix download)
|
|
#:use-module (guix build-system)
|
|
#:use-module (guix build-system gnu)
|
|
#:use-module (guix store)
|
|
#:use-module (guix utils)
|
|
#:use-module (guix base32)
|
|
#:use-module (guix derivations)
|
|
#:use-module (guix hash)
|
|
#:use-module (guix tests)
|
|
#:use-module ((guix packages)
|
|
#:select (package-derivation package-native-search-paths))
|
|
#:use-module (gnu packages bootstrap)
|
|
#:use-module (ice-9 match)
|
|
#:use-module (srfi srfi-1)
|
|
#:use-module (srfi srfi-64))
|
|
|
|
;; Test the higher-level builders.
|
|
|
|
(define %store
|
|
(open-connection-for-tests))
|
|
|
|
(define %bootstrap-inputs
|
|
;; Use the bootstrap inputs so it doesn't take ages to run these tests.
|
|
;; This still involves building Make, Diffutils, and Findutils.
|
|
;; XXX: We're relying on the higher-level `package-derivations' here.
|
|
(and %store
|
|
(map (match-lambda
|
|
((name package)
|
|
(list name (package-derivation %store package))))
|
|
(@@ (gnu packages commencement) %boot0-inputs))))
|
|
|
|
(define %bootstrap-search-paths
|
|
;; Search path specifications that go with %BOOTSTRAP-INPUTS.
|
|
(append-map (match-lambda
|
|
((name package _ ...)
|
|
(package-native-search-paths package)))
|
|
(@@ (gnu packages commencement) %boot0-inputs)))
|
|
|
|
(define network-reachable?
|
|
(false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
|
|
|
|
|
|
(test-begin "builders")
|
|
|
|
(unless network-reachable? (test-skip 1))
|
|
(test-assert "url-fetch"
|
|
(let* ((url '("http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz"
|
|
"ftp://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz"))
|
|
(hash (nix-base32-string->bytevector
|
|
"0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))
|
|
(drv (url-fetch %store url 'sha256 hash
|
|
#:guile %bootstrap-guile))
|
|
(out-path (derivation->output-path drv)))
|
|
(and (build-derivations %store (list drv))
|
|
(file-exists? out-path)
|
|
(valid-path? %store out-path))))
|
|
|
|
(test-assert "url-fetch, file"
|
|
(let* ((file (search-path %load-path "guix.scm"))
|
|
(hash (call-with-input-file file port-sha256))
|
|
(out (url-fetch %store file 'sha256 hash)))
|
|
(and (file-exists? out)
|
|
(valid-path? %store out))))
|
|
|
|
(test-assert "url-fetch, file URI"
|
|
(let* ((file (search-path %load-path "guix.scm"))
|
|
(hash (call-with-input-file file port-sha256))
|
|
(out (url-fetch %store
|
|
(string-append "file://" (canonicalize-path file))
|
|
'sha256 hash)))
|
|
(and (file-exists? out)
|
|
(valid-path? %store out))))
|
|
|
|
(test-assert "gnu-build-system"
|
|
(build-system? gnu-build-system))
|
|
|
|
(unless network-reachable? (test-skip 1))
|
|
(test-assert "gnu-build"
|
|
(let* ((url "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz")
|
|
(hash (nix-base32-string->bytevector
|
|
"0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))
|
|
(tarball (url-fetch %store url 'sha256 hash
|
|
#:guile %bootstrap-guile))
|
|
(build (gnu-build %store "hello-2.8"
|
|
`(("source" ,tarball)
|
|
,@%bootstrap-inputs)
|
|
#:guile %bootstrap-guile
|
|
#:search-paths %bootstrap-search-paths))
|
|
(out (derivation->output-path build)))
|
|
(and (build-derivations %store (list (pk 'hello-drv build)))
|
|
(valid-path? %store out)
|
|
(file-exists? (string-append out "/bin/hello")))))
|
|
|
|
(test-end "builders")
|
|
|
|
|
|
(exit (= (test-runner-fail-count (test-runner-current)) 0))
|