2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2017-03-12 12:53:58 +01:00
|
|
|
|
;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
2012-10-29 22:39:46 +01:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-10-29 22:39:46 +01:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-10-29 22:39:46 +01: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-10-29 22:39:46 +01: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-10-29 22:39:46 +01:00
|
|
|
|
|
|
|
|
|
(define-module (test-union)
|
2014-08-23 19:18:01 +02:00
|
|
|
|
#:use-module (guix tests)
|
2012-10-29 22:39:46 +01:00
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module (guix derivations)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix build union)
|
|
|
|
|
#:use-module ((guix build utils)
|
|
|
|
|
#:select (with-directory-excursion directory-exists?))
|
2013-01-18 01:06:24 +01:00
|
|
|
|
#:use-module (gnu packages bootstrap)
|
2013-01-02 01:04:37 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2012-10-29 22:39:46 +01:00
|
|
|
|
#:use-module (srfi srfi-64)
|
2014-04-02 23:08:44 +02:00
|
|
|
|
#:use-module (rnrs io ports)
|
2012-10-29 22:39:46 +01:00
|
|
|
|
#:use-module (ice-9 match))
|
|
|
|
|
|
|
|
|
|
;; Exercise the (guix build union) module.
|
|
|
|
|
|
|
|
|
|
(define %store
|
2014-08-23 19:18:01 +02:00
|
|
|
|
(open-connection-for-tests))
|
2012-10-29 22:39:46 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(test-begin "union")
|
|
|
|
|
|
2014-04-02 23:08:44 +02:00
|
|
|
|
(test-assert "union-build with symlink to directory"
|
|
|
|
|
;; http://bugs.gnu.org/17083
|
|
|
|
|
;; Here both ONE and TWO provide an element called 'foo', but in ONE it's a
|
|
|
|
|
;; directory whereas in TWO it's a symlink to a directory.
|
|
|
|
|
(let* ((one (build-expression->derivation
|
|
|
|
|
%store "one"
|
|
|
|
|
'(begin
|
|
|
|
|
(use-modules (guix build utils) (srfi srfi-26))
|
|
|
|
|
(let ((foo (string-append %output "/foo")))
|
|
|
|
|
(mkdir-p foo)
|
|
|
|
|
(call-with-output-file (string-append foo "/one")
|
|
|
|
|
(cut display "one" <>))))
|
|
|
|
|
#:modules '((guix build utils))))
|
|
|
|
|
(two (build-expression->derivation
|
|
|
|
|
%store "two"
|
|
|
|
|
'(begin
|
|
|
|
|
(use-modules (guix build utils) (srfi srfi-26))
|
|
|
|
|
(let ((foo (string-append %output "/foo"))
|
|
|
|
|
(bar (string-append %output "/bar")))
|
|
|
|
|
(mkdir-p bar)
|
|
|
|
|
(call-with-output-file (string-append bar "/two")
|
|
|
|
|
(cut display "two" <>))
|
|
|
|
|
(symlink "bar" foo)))
|
|
|
|
|
#:modules '((guix build utils))))
|
|
|
|
|
(builder '(begin
|
|
|
|
|
(use-modules (guix build union))
|
|
|
|
|
|
|
|
|
|
(union-build (assoc-ref %outputs "out")
|
|
|
|
|
(list (assoc-ref %build-inputs "one")
|
|
|
|
|
(assoc-ref %build-inputs "two")))))
|
|
|
|
|
(drv
|
|
|
|
|
(build-expression->derivation %store "union-collision-symlink"
|
|
|
|
|
builder
|
|
|
|
|
#:inputs `(("one" ,one) ("two" ,two))
|
|
|
|
|
#:modules '((guix build union)))))
|
|
|
|
|
(and (build-derivations %store (list drv))
|
|
|
|
|
(with-directory-excursion (pk (derivation->output-path drv))
|
|
|
|
|
(and (string=? "one"
|
|
|
|
|
(call-with-input-file "foo/one" get-string-all))
|
|
|
|
|
(string=? "two"
|
|
|
|
|
(call-with-input-file "foo/two" get-string-all))
|
|
|
|
|
(string=? "two"
|
|
|
|
|
(call-with-input-file "bar/two" get-string-all))
|
|
|
|
|
(not (file-exists? "bar/one")))))))
|
|
|
|
|
|
2015-02-23 23:41:26 +01:00
|
|
|
|
(test-skip (if (and %store (network-reachable?))
|
2012-12-13 22:06:45 +01:00
|
|
|
|
0
|
|
|
|
|
1))
|
2012-10-29 22:39:46 +01:00
|
|
|
|
|
|
|
|
|
(test-assert "union-build"
|
|
|
|
|
(let* ((inputs (map (match-lambda
|
|
|
|
|
((name package)
|
|
|
|
|
`(,name ,(package-derivation %store package))))
|
2013-02-06 22:51:24 +01:00
|
|
|
|
|
|
|
|
|
;; Purposefully leave duplicate entries.
|
|
|
|
|
(append %bootstrap-inputs
|
|
|
|
|
(take %bootstrap-inputs 3))))
|
2012-10-29 22:39:46 +01:00
|
|
|
|
(builder `(begin
|
|
|
|
|
(use-modules (guix build union))
|
|
|
|
|
(union-build (assoc-ref %outputs "out")
|
|
|
|
|
(map cdr %build-inputs))))
|
|
|
|
|
(drv
|
|
|
|
|
(build-expression->derivation %store "union-test"
|
derivations: Use more keyword parameters for 'build-expression->derivation'.
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
2013-12-04 16:07:36 +01:00
|
|
|
|
builder
|
|
|
|
|
#:inputs inputs
|
2012-10-29 22:39:46 +01:00
|
|
|
|
#:modules '((guix build union)))))
|
|
|
|
|
(and (build-derivations %store (list (pk 'drv drv)))
|
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
|
|
|
|
(with-directory-excursion (derivation->output-path drv)
|
2012-10-29 22:39:46 +01:00
|
|
|
|
(and (file-exists? "bin/touch")
|
|
|
|
|
(file-exists? "bin/gcc")
|
|
|
|
|
(file-exists? "bin/ld")
|
|
|
|
|
(file-exists? "lib/libc.so")
|
|
|
|
|
(directory-exists? "lib/gcc")
|
2013-09-02 23:03:03 +02:00
|
|
|
|
(file-exists? "include/unistd.h")
|
|
|
|
|
|
2013-11-16 22:10:03 +01:00
|
|
|
|
;; The 'include/c++' sub-directory is only found in
|
|
|
|
|
;; gcc-bootstrap, so it should be unified in a
|
2013-09-02 23:03:03 +02:00
|
|
|
|
;; straightforward way, without traversing it.
|
2013-11-16 22:10:03 +01:00
|
|
|
|
(eq? 'symlink (stat:type (lstat "include/c++")))
|
2013-09-02 23:03:03 +02:00
|
|
|
|
|
|
|
|
|
;; Conversely, several inputs have a 'bin' sub-directory, so
|
|
|
|
|
;; unifying it requires traversing them all, and creating a
|
|
|
|
|
;; new 'bin' sub-directory in the profile.
|
|
|
|
|
(eq? 'directory (stat:type (lstat "bin"))))))))
|
2012-10-29 22:39:46 +01:00
|
|
|
|
|
2017-03-12 12:53:58 +01:00
|
|
|
|
(test-assert "union-build #:create-all-directories? #t"
|
|
|
|
|
(let* ((build `(begin
|
|
|
|
|
(use-modules (guix build union))
|
|
|
|
|
(union-build (assoc-ref %outputs "out")
|
|
|
|
|
(map cdr %build-inputs)
|
|
|
|
|
#:create-all-directories? #t)))
|
|
|
|
|
(input (package-derivation %store %bootstrap-guile))
|
|
|
|
|
(drv (build-expression->derivation %store "union-test-all-dirs"
|
|
|
|
|
build
|
|
|
|
|
#:modules '((guix build union))
|
|
|
|
|
#:inputs `(("g" ,input)))))
|
|
|
|
|
(and (build-derivations %store (list drv))
|
|
|
|
|
(with-directory-excursion (derivation->output-path drv)
|
|
|
|
|
;; Even though there's only one input to the union,
|
|
|
|
|
;; #:create-all-directories? #t must have created bin/ rather than
|
|
|
|
|
;; making it a symlink to Guile's bin/.
|
|
|
|
|
(and (file-exists? "bin/guile")
|
|
|
|
|
(file-is-directory? "bin")
|
|
|
|
|
(eq? 'symlink (stat:type (lstat "bin/guile"))))))))
|
|
|
|
|
|
2012-10-29 22:39:46 +01:00
|
|
|
|
(test-end)
|