aboutsummaryrefslogtreecommitdiff
path: root/tests/union.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-02 01:04:37 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-02 01:04:37 +0100
commit97d3998e7a8a8e22fbef2e42db66456b826b1695 (patch)
tree28c146b97e8e79cdcb36e5b83d1c649b04beeea9 /tests/union.scm
parent52b8e5fc30f42914c1dadeca4243a5b55467be48 (diff)
downloadguix-97d3998e7a8a8e22fbef2e42db66456b826b1695.tar
guix-97d3998e7a8a8e22fbef2e42db66456b826b1695.tar.gz
tests: Adjust to not rely on /bin/sh.
* tests/derivations.scm (%bash): New variable. Replace occurrences of "/bin/sh" by %BASH. * tests/union.scm ("union-build"): Delete duplicates from %BOOTSTRAP-INPUTS.
Diffstat (limited to 'tests/union.scm')
-rw-r--r--tests/union.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/union.scm b/tests/union.scm
index c839855ef4..b2242a834b 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -1,5 +1,5 @@
;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
-;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of Guix.
;;;
@@ -26,6 +26,7 @@
#:use-module ((guix build utils)
#:select (with-directory-excursion directory-exists?))
#:use-module (distro packages bootstrap)
+ #:use-module (srfi srfi-1)
#:use-module (srfi srfi-64)
#:use-module (ice-9 match))
@@ -74,7 +75,9 @@
(let* ((inputs (map (match-lambda
((name package)
`(,name ,(package-derivation %store package))))
- %bootstrap-inputs))
+ (delete-duplicates %bootstrap-inputs
+ (lambda (i1 i2)
+ (eq? (second i1) (second i2))))))
(builder `(begin
(use-modules (guix build union))
(union-build (assoc-ref %outputs "out")