From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WDyuK06YZ2OA7gAAbAwnHQ (envelope-from ) for ; Sun, 06 Nov 2022 12:19:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id sD+yK06YZ2OOSQEA9RJhRA (envelope-from ) for ; Sun, 06 Nov 2022 12:19:42 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 49CE56B43 for ; Sun, 6 Nov 2022 12:19:42 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ordgA-00056e-1C; Sun, 06 Nov 2022 06:19:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ordg8-00056M-3f for bug-guix@gnu.org; Sun, 06 Nov 2022 06:19:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ordg6-0004ir-AL for bug-guix@gnu.org; Sun, 06 Nov 2022 06:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ordg6-0006pg-79 for bug-guix@gnu.org; Sun, 06 Nov 2022 06:19:02 -0500 Subject: bug#58861: [PATCH] shell: Fix '--emulate-fhs' sometimes not including 'glibc-for-fhs'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Date: Sun, 06 Nov 2022 11:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 58861 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: John Kehayias Cc: 58861-done@debbugs.gnu.org Mail-Followup-To: 58861@debbugs.gnu.org, ludo@gnu.org, john.kehayias@protonmail.com Received: via spool by 58861-done@debbugs.gnu.org id=D58861.166773351926226 (code D ref 58861); Sun, 06 Nov 2022 11:19:01 +0000 Received: (at 58861-done) by debbugs.gnu.org; 6 Nov 2022 11:18:39 +0000 Received: from localhost ([127.0.0.1]:58797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ordfj-0006ow-Aj for submit@debbugs.gnu.org; Sun, 06 Nov 2022 06:18:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ordfh-0006oh-1G for 58861-done@debbugs.gnu.org; Sun, 06 Nov 2022 06:18:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ordfb-0004h2-MR; Sun, 06 Nov 2022 06:18:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=kjACC/snVots0bP6l0Nctp83mC4U0vuaAoemgIibQh8=; b=pZ1W1z8+yBkQFYKPOgnC mNLDRRIJXpuvaj5lAx22EKob5JD1kRwvca7hcKELsFHMdDeWUhy7AFm6lNf8FRdq6FMS0NS0nuWTi tX6XNikeFxdeI541Y1SeOCAOJ6BieJw0VFkYyLI4oW0pzdM7RKD1wHoxkP3H+muiNhcsadL/nSID9 30qW+Sk75+/p1jujfUugIkz5PcAeRnskII5PTS5CAeZGdNaair/wBBDwEWWLa+/LYCmvfkV6ja4JI FJj4saO26ZHtirmew8yLEBJoec6nXZ5kk5c4NOxQ862BBgBhHj8v8dNIyGREWu3xIqu1J3NNLrfCJ TDeQrC7spmUwIw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ordfa-00073G-Ut; Sun, 06 Nov 2022 06:18:31 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87tu3n9oxd.fsf@protonmail.com> <87sfj1tkwy.fsf@gnu.org> <87pme3dg9s.fsf@protonmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 16 Brumaire an 231 de la =?UTF-8?Q?R=C3=A9volution, ?= jour du Chervis X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 06 Nov 2022 12:18:28 +0100 In-Reply-To: <87pme3dg9s.fsf@protonmail.com> (John Kehayias's message of "Thu, 03 Nov 2022 18:50:14 +0000") Message-ID: <87mt94gwl7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "bug-Guix" Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667733582; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kjACC/snVots0bP6l0Nctp83mC4U0vuaAoemgIibQh8=; b=CYOhXse2JRPQa4yN/R50lRFYQ62aLzUA6oyWcgQfyAxXuEGqL7iBAl7SZ/ya93QUc3MkeQ YXZ8+Md2cEDcutjsZoNfg4G2E9tRRwhGp085NMjqlUWs5GTCl+vbSQfQo8ZBz9aTu1QHrz 8PHXheFgrzB7jIWnTbggwHdPp5Wvu8BxMNStOU6/ZFH3wC5/Xe/QTCte8ggZNM9EVFErMg OdXhrHhtuo+RKxuhkFwWf+GQPXU082k3dt5HgjkIMKe2hn3teZJs2AAAbiuwW9E+yVBsy8 s9ddc7MXJSncOXRGYqyvriNh+2Yz8KanLZDOO7M6y0bfDhEE8xl3a/eMb3aoXw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667733582; a=rsa-sha256; cv=none; b=IPLwl9xbS80vMsqjs9kQaie/2hFR41rLrRcE8O+8QWSOiDyhubZMSdpVc1A3OXvfUxmQ1H ZeX3iULZsAlYEM8n+yhZsJoGNUOoG+2XAdCVJZR2PTUyOZ21VgxX7CGFEDMdgdbfCYaCwM tHcnA2yan3MImMib6xFvVreLqotyVFTAc5I3CNyuCdygwIpu7h6cAd52DQAnL6lAaRgHSf izG2cFRcP0/W0FSRmldYVNcNhc5Uai2PculN5q5EWDZ/YRM/3/tbeCV3nm0D+4hAFQ1Mhw 1EadwxdA6jSR2Wuv8tOvmOvJiHEsWrrZr3FWqTKsPpzRIXgQCHSmugvWMLDUtA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pZ1W1z8+; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pZ1W1z8+; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 49CE56B43 X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: Z7wNu9Zfq2Oj Hi, John Kehayias skribis: > From 72be4a15a10916ae8d51dfb2998d6179bc57be59 Mon Sep 17 00:00:00 2001 > From: John Kehayias > Date: Thu, 3 Nov 2022 14:25:09 -0400 > Subject: [PATCH] shell: Fix '--emulate-fhs' sometimes not including > 'glibc-for-fhs'. > > Fixes . > > Previously the order of the options giving to 'guix shell' could mean tha= t the > 'glibc-for-fhs' package included with the '--emulate-fhs' option would not > appear in the container. For example, using the development option with a > package using the 'gnu-build-system', e.g. 'guix shell -CFD hello', would > include the regular 'glibc' package. The option ordered mattered: 'guix = shell > -CD hello -F' would include the expected 'glibc-for-fhs'. We fix this by > having 'glibc-for-fhs' added to the package list just before calling > 'options-with-caching' so the option order given by the user does not mat= ter. > > * guix/scripts/shell.scm (%options): Move the '--emulate-fhs' (expression > . ...) component from here... > (parse-args): ... to here. > * tests/guix-environment-container.sh: Add a test to check that > 'glibc-for-fhs' is in the container even when 'glibc' is included in the = 'guix > shell' package list. Perfect; applied, thanks! Ludo=E2=80=99.