aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-06-29 01:50:15 -0400
committerLudovic Courtès <ludo@gnu.org>2019-07-03 12:03:07 +0200
commit723f5b1dc984f3111ce06ad186b400c867ebb235 (patch)
treeb4273430d2e7d8e7ef420b4a456dba4b41ed4bc3
parentf20d86523915584d7ed65b4ad969d96cb22a244e (diff)
downloadguix-723f5b1dc984f3111ce06ad186b400c867ebb235.tar.gz
guix-723f5b1dc984f3111ce06ad186b400c867ebb235.zip
profiles: Adjust packages->manifest pattern for inferior packages.
* guix/profiles.scm (packages->manifest): Add package? predicate to `(package output)' pattern to avoid incorrectly matching `(inferior-package output)', which should be handled by a later clause. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/profiles.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index dfc9ba1ca0..f5c863945c 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -337,7 +338,7 @@ denoting a specific output of a package."
(manifest
(map (match-lambda
- ((package output)
+ (((? package? package) output)
(package->manifest-entry package output))
((? package? package)
(package->manifest-entry package))
td> 2018-03-07gnu: commencement: 'glibc-final' inherits the replacement of 'glibc'....Ludovic Courtès 2018-03-07gnu: commencement: 'glibc-final' now inherits from 'glibc'....Ludovic Courtès 2018-02-27gnu: commencement: Add commentary regarding grafts....Chris Marusich 2018-02-20gnu: commencement: Update phase style....Tobias Geerinckx-Rice 2018-01-18gnu: commencement: Memoize 'linux-libre-headers-boot0'....Ludovic Courtès 2018-01-18gnu: gcc@4.9: Fix building with glibc@2.26....Efraim Flashner 2018-01-11Merge branch 'master' into core-updatesLeo Famulari 2018-01-11gnu: grep: Add dependency on PCRE....Ludovic Courtès 2017-12-07Merge branch 'master' into core-updatesMarius Bakke 2017-12-05gnu: commencement: Do not graft early bootstrap packages....Ludovic Courtès 2017-11-01Merge remote-tracking branch 'origin/master' into core-updatesEfraim Flashner 2017-10-27gnu: gcc: Add unversioned 'gcc-toolchain' variable....Ludovic Courtès 2017-10-08gnu: libstdc++: Rewrite as 'make-libstdc++' package....Efraim Flashner 2017-10-08gnu: binutils-boot0: Use 'modify-phases' syntax....Efraim Flashner 2017-10-05gnu: gcc: Fix manual pages....Maxim Cournoyer 2017-10-01gnu: Remove package/inherit from commencement....Efraim Flashner 2017-10-01gnu: binutils: Update to 2.28.1....Efraim Flashner 2017-10-01Merge remote-tracking branch 'origin/master' into core-updatesEfraim Flashner 2017-09-17gnu: binutils: Fix security issues....Efraim Flashner 2017-09-05gnu: file: Fix CVE-2017-1000249....Efraim Flashner 2017-09-05gnu: glibc: Add "static" output....Ludovic Courtès 2017-07-10Merge branch 'master' into core-updatesLeo Famulari 2017-07-03packages: Mark 'replacement' as an "innate" field....Ludovic Courtès 2017-06-26Merge branch 'master' into core-updatesMark H Weaver 2017-06-24gnu: glibc-final: Add support for grafted glibc....Mark H Weaver 2017-06-02gnu: commencement: 'bash-final' inherits from 'bash-minimal'....Ludovic Courtès 2017-05-29gnu: glibc: Move i686 patch to source field....Ricardo Wurmus 2017-05-24Merge branch 'master' into core-updatesRicardo Wurmus 2017-05-04gnu: Add gcc-toolchain@7....Ludovic Courtès 2017-04-29gnu: glibc/linux: Fix runtime crashes on i686 systems....Ricardo Wurmus 2017-04-20gnu: ld-wrapper: Build with Guile 2.2....Ludovic Courtès