;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Mathieu Lirzin ;;; ;;; 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
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/tests/telephony.scm')
-rw-r--r--gnu/tests/telephony.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm
index 83fa7228c8..28a466ff67 100644
--- a/gnu/tests/telephony.scm
+++ b/gnu/tests/telephony.scm
@@ -273,6 +273,7 @@ jami account used as part of the jami configuration are left *unspecified*."
(marionette-eval
'(begin
(use-modules (gnu services herd)
+ (ice-9 match)
(rnrs base)
(srfi srfi-1))
@@ -349,7 +350,7 @@ jami account used as part of the jami configuration are left *unspecified*."
(gexp->derivation (if provisioning?
(if partial?
"jami-provisioning-partial-test"
- "jami-provisioning-partial")
+ "jami-provisioning-test")
"jami-test")
test))
ersion p1) (package-version p2))))) (lambda* (name #:optional version) "Return the list of packages with the given NAME. If VERSION is not #f, then only return packages whose version is prefixed by VERSION, sorted in decreasing version order." (let ((matching (sort (vhash-fold* cons '() name (force packages)) version>?))) (if version (filter (lambda (package) (string-prefix? version (package-version package))) matching) matching))))) (define find-newest-available-packages (mlambda () "Return a vhash keyed by package names, and with associated values of the form (newest-version newest-package ...) where the preferred package is listed first." ;; FIXME: Currently, the preferred package is whichever one ;; was found last by 'fold-packages'. Find a better solution. (fold-packages (lambda (p r) (let ((name (package-name p)) (version (package-version p))) (match (vhash-assoc name r) ((_ newest-so-far . pkgs) (case (version-compare version newest-so-far) ((>) (vhash-cons name `(,version ,p) r)) ((=) (vhash-cons name `(,version ,p ,@pkgs) r)) ((<) r))) (#f (vhash-cons name `(,version ,p) r))))) vlist-null))) (define (find-best-packages-by-name name version) "If version is #f, return the list of packages named NAME with the highest version numbers; otherwise, return the list of packages named NAME and at VERSION." (if version (find-packages-by-name name version) (match (vhash-assoc name (find-newest-available-packages)) ((_ version pkgs ...) pkgs) (#f '())))) (define %sigint-prompt ;; The prompt to jump to upon SIGINT. (make-prompt-tag "interruptible")) (define (call-with-sigint-handler thunk handler) "Call THUNK and return its value. Upon SIGINT, call HANDLER with the signal number in the context of the continuation of the call to this function, and return its return value." (call-with-prompt %sigint-prompt (lambda () (sigaction SIGINT (lambda (signum) (sigaction SIGINT SIG_DFL) (abort-to-prompt %sigint-prompt signum))) (dynamic-wind (const #t) thunk (cut sigaction SIGINT SIG_DFL))) (lambda (k signum) (handler signum)))) ;;; ;;; Package specification. ;;; (define* (%find-package spec name version) (match (find-best-packages-by-name name version) ((pkg . pkg*) (unless (null? pkg*) (warning (G_ "ambiguous package specification `~a'~%") spec) (warning (G_ "choosing ~a@~a from ~a~%") (package-name pkg) (package-version pkg) (location->string (package-location pkg)))) (match (package-superseded pkg) ((? package? new) (info (G_ "package '~a' has been superseded by '~a'~%") (package-name pkg) (package-name new)) new) (#f pkg))) (x (if version (leave (G_ "~A: package not found for version ~a~%") name version) (leave (G_ "~A: unknown package~%") name))))) (define (specification->package spec) "Return a package matching SPEC. SPEC may be a package name, or a package name followed by an at-sign and a version number. If the version number is not present, return the preferred newest version." (let-values (((name version) (package-name->name+version spec))) (%find-package spec name version))) (define* (specification->package+output spec #:optional (output "out")) "Return the package and output specified by SPEC, or #f and #f; SPEC may optionally contain a version number and an output name, as in these examples: guile guile@2.0.9 guile:debug guile@2.0.9:debug If SPEC does not specify a version number, return the preferred newest version; if SPEC does not specify an output, return OUTPUT." (let-values (((name version sub-drv) (package-specification->name+version+output spec output))) (match (%find-package spec name version) (#f (values #f #f)) (package (if (member sub-drv (package-outputs package)) (values package sub-drv) (leave (G_ "package `~a' lacks output `~a'~%") (package-full-name package) sub-drv)))))) (define (specifications->manifest specs) "Given SPECS, a list of specifications such as \"emacs@25.2\" or \"guile:debug\", return a profile manifest." ;; This procedure exists mostly so users of 'guix package -m' don't have to ;; fiddle with multiple-value returns. (packages->manifest (map (compose list specification->package+output) specs)))