From patchwork Sat Jun 29 05:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 14424 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 181DE17128; Sat, 29 Jun 2019 06:51:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D4D8917110 for ; Sat, 29 Jun 2019 06:51:07 +0100 (BST) Received: from localhost ([::1]:37954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hh6GP-0004lU-Cs for patchwork@mira.cbaines.net; Sat, 29 Jun 2019 01:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56518) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hh6GM-0004lC-Tf for guix-patches@gnu.org; Sat, 29 Jun 2019 01:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hh6GL-0001iy-Tx for guix-patches@gnu.org; Sat, 29 Jun 2019 01:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hh6GL-0001ih-Q6 for guix-patches@gnu.org; Sat, 29 Jun 2019 01:51:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hh6GL-0000rN-Lg for guix-patches@gnu.org; Sat, 29 Jun 2019 01:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36429] [PATCH] profiles: Adjust packages->manifest pattern for inferior packages. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Jun 2019 05:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36429@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15617874343270 (code B ref -1); Sat, 29 Jun 2019 05:51:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jun 2019 05:50:34 +0000 Received: from localhost ([127.0.0.1]:43296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hh6Ft-0000qg-Kb for submit@debbugs.gnu.org; Sat, 29 Jun 2019 01:50:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:46490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hh6Fr-0000qY-Ll for submit@debbugs.gnu.org; Sat, 29 Jun 2019 01:50:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56458) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hh6Fq-0004iN-Jv for guix-patches@gnu.org; Sat, 29 Jun 2019 01:50:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hh6Fp-0001Sc-KN for guix-patches@gnu.org; Sat, 29 Jun 2019 01:50:30 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:51257) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hh6Fp-0001RY-4p for guix-patches@gnu.org; Sat, 29 Jun 2019 01:50:29 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id DD3D07496B; Sat, 29 Jun 2019 01:50:26 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=UedbLSYrrb8clMs8UvcMC4dqV KQ=; b=SpVyzBD2uqvtt1pI+1GkUhDgXWAvxq/hfTsFHimw5H2yK6fTz0Zar7fxA K4OMRAtxhR+O2ZpfG6Q4pEeOWHwzz3zS2bymMsuByB4l+wDk9NL9DOJ5L3wbK2lv tNf9i1WGOs6/9qy5cMg4aUxs4PwTSmF1hLsh4gJnqp5+h0LGQA= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id D4FC97496A; Sat, 29 Jun 2019 01:50:26 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=6ItNDkORzPE2QfbPV9Gv6weGGplbtCuUqon2WWFC+04=; b=tOUxz47cxkvKb3wYfgUTblyzNRYqZ1SAKiTZWKwkPijXNgU0+Gvg4NlxopEfFqbzlqUW7JrHTBraqFqzCbwxfKoOVnpizJtnmYBS0W9lheXWwOUJ5L4gYa2qTl3V32B2ylJVlw49Vpq01ugFMFRRAwoxKxCtcRncuMnEvYC9fxs= Received: from hylob.local (unknown [71.233.97.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 068BA74968; Sat, 29 Jun 2019 01:50:23 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer Date: Sat, 29 Jun 2019 01:50:15 -0400 Message-Id: <20190629055015.3886-1-kyle@kyleam.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Pobox-Relay-ID: C9DA7642-9A31-11E9-91A6-B0405B776F7B-24757444!pb-smtp20.pobox.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- guix/profiles.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ;;; Copyright © 2017 Huang Ying ;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2019 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -337,7 +338,7 @@ (define (packages->manifest packages) (manifest (map (match-lambda - ((package output) + (((? package? package) output) (package->manifest-entry package output)) ((? package? package) (package->manifest-entry package))