From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id HLm7GcMhfWH9ogAAgWs5BA (envelope-from ) for ; Sat, 30 Oct 2021 12:43:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WI7XFMMhfWFLRAAA1q6Kng (envelope-from ) for ; Sat, 30 Oct 2021 10:43:15 +0000 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 2BE843E5EA for ; Sat, 30 Oct 2021 12:43:15 +0200 (CEST) Received: from localhost ([::1]:51482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mglpS-0000vt-B6 for larch@yhetil.org; Sat, 30 Oct 2021 06:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mglpG-0000ts-Ec for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mglpG-0001s8-64 for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mglpF-0002b3-Tp for guix-patches@gnu.org; Sat, 30 Oct 2021 06:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50873] [PATCH v3 0/8] Fixes to =?UTF-8?Q?=E2=80=98guix?= home =?UTF-8?Q?import=E2=80=99?= Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Oct 2021 10:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50873@debbugs.gnu.org, Oleg Pykhalov , Andrew Tropin , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 50873-submit@debbugs.gnu.org id=B50873.16355905549855 (code B ref 50873); Sat, 30 Oct 2021 10:43:01 +0000 Received: (at 50873) by debbugs.gnu.org; 30 Oct 2021 10:42:34 +0000 Received: from localhost ([127.0.0.1]:56707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglon-0002Yn-SI for submit@debbugs.gnu.org; Sat, 30 Oct 2021 06:42:34 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59242 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mglol-0002YU-Bm for 50873@debbugs.gnu.org; Sat, 30 Oct 2021 06:42:32 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635590544; bh=xvskgzMZ/isGEDfyTcQlecHmJJUdMKXW3v3mPn2IbdY=; h=From:To:Subject:In-Reply-To:References:Date; b=RLnFvs1afTAjSXX7fB+qLsFUTAVjYWixpv7kwD6kNtyHBAGVc0bvX957bHRc56hdM pxS8WQ5CApD8gqZM0J+1kGcMM8B6VXuZBRgwgeM9e6zvuHXz+NEct4mdWyj7zzCGGt c40bSSnfAiPOetqJD3aJMSL7jccf3WCqO/A6H5Bk= In-Reply-To: References: Message-Id: Date: Sat, 30 Oct 2021 12:42:21 +0200 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635590595; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc: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=vBUNEik3U+em4+KZQFTTdnF9NnxGcZ0s0Iq0o9f7NyM=; b=nlDAQ47hRC7MIYtBjv1kNeWCAE80UtYnyKOFZ8AaporiuyPIp+ctvs/B3nnpmbtFImKtIM vmIoXGoRaRRE5l3MSntN/6+NAQwQWMlbQcgduPLbUzmOKe49lGoqX/8qCN6VhATMCRjS5t 881coPm4TiwybBBd6iFy1gAK7wlJugPqvoBrpqTod3Js2BwkCcT54fupoR2U9QHL+5Z+0j 30dIfHWjTHpjvaRh3K1d9mJaGgXvQPTMgfF0BYnOjvW3EODpIG7DeOlBSlnTNxJt3o79gr yCea5c0H35r1FE14AS4lAPslYtT/XEw8W/w6Pk9nRQ+TmSx7adAmvPLsHtZZTw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635590595; a=rsa-sha256; cv=none; b=qMBsLqtXTwj7hKN0No8eAHv/ePOYVk6zigCjK/CeRh1lmahnzfunLQqn/N2DkKWwx47MKK X8lcSsfTKXr2QcHP80yLwZfGoj/4/NNZ68efdtc726VrXhSzpFivSoV2XCuwFwCnAEkg7R V2LljTpZ7mb18RwW1Ga8azv5jPQ/RA/f7JPRlM2C40JPS48L94XtODmEBxg0B0qdZyK1Gh Catiprjpem12T/ysjXlPdA2F7q/afNXHVpVpxUWRTQIoOc5uPngqkVt2O/ber3Gm9s2Ubp B2YsJAhnJ4iPEDtFqOIjNrmB6gM1ZiTkHBv1Zq2qH/xt3T3Oe4WWyv64QMnurQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=RLnFvs1a; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=RLnFvs1a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 2BE843E5EA X-Spam-Score: -0.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: CqeM+2QmuNRI --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Changes since v2: * Call =E2=80=98local-file=E2=80=99 with a =E2=80=98name=E2=80=99 argument = to make the /gnu/store/=E2=80=A6 file name more readable. * Import some missing modules. * Remove the =E2=80=98%destination-directory=E2=80=99 parameter, and instea= d pass the directory to =E2=80=98generate-bash-configuration+modules=E2=80=99. * Other minor cleanups. Xinglu Chen (8): guix home: import: Make the user to specify a destination directory. guix home: import: Allow multiple modules to be imported for each service. guix home: import: Fix module name for Bash service. guix home: import: Don=E2=80=99t use 'slurp-file-gexp'. guix home: import: Delete duplicate modules when importing. doc: Document the =E2=80=98guix home import=E2=80=99 subcommand. Add tests for =E2=80=98guix home import=E2=80=99. guix home: import: Call =E2=80=98local-file=E2=80=99 with =E2=80=98name= =E2=80=99 argument. Makefile.am | 1 + doc/guix.texi | 32 +++++++ guix/scripts/home.scm | 24 +++-- guix/scripts/home/import.scm | 137 ++++++++++++++++---------- tests/home-import.scm | 180 +++++++++++++++++++++++++++++++++++ 5 files changed, 313 insertions(+), 61 deletions(-) create mode 100644 tests/home-import.scm base-commit: c6adc0947396daa6d85ab08837f9cbc86f4d8722 =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmF9IY0VHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5l/UP/0xijD8WP/DC7nHUsmBymKTK0Isi u3nNopzGQ+bqRPZuB6qO76MG0H3Nor0zxk95Wpmju2PdehRJcq8oK+Vus+APjGcB UagG+jawaHZn+1wreqxb4JQpeF01lAYlmArtAlc8CM8rONd2g5Y2oLd07ajwgCi8 11X9lycAIvyetar7QLUAyNwv4gyZ2URcBx4enfwgd6OPs2j7Ggmxuz75ESHj7WfN lV4Z/zvSpCMqJAK03I9H6TFUhuVvRS9iEgzWMiXzJwJQfrar8aRtS/uYbmUlBQJo 6qg9OKeksc98WaaNlclv0PQbOHXe1hdrD1v8uJ7H4TlqKSTyLKyPC5FABzEP08uf xhR9ZLLzuCAgs7SmetgvTtg92omCEQQpN3kbCeLBitwtrd/wZsOkOkSnRSasx85I mZgOUjr2tBxoCzzcSdnLOXThyUocrggqjrDhNMN69u9WjV6QYDYPANqykFRh2atk hwDzLecVV9mG+3/frq3CReDJlXCISs32gWMJS/vfhiFTgX/kNLUMsLDN1XZ9ivcI wCqDCsLHo0H96xSi8g/cfDds2LSsJtLaueyG2Du91oIanvVqBoQrq2SFdiowSZHR KfbRFezuYZJysmHx1WQw7jM830ut1JwiQvVfaVcB07HKDS22ZUe1NhKgEMXvMxvK L67IpszGLwF0FL5H =LMbt -----END PGP SIGNATURE----- --=-=-=--