From patchwork Sun Oct 21 20:45:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 1594 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 7BF831672F; Sun, 21 Oct 2018 21:46: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=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 1C5221672E for ; Sun, 21 Oct 2018 21:46:08 +0100 (BST) Received: from localhost ([::1]:60163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEKbv-0008IZ-GK for patchwork@mira.cbaines.net; Sun, 21 Oct 2018 16:46:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEKbq-0008IU-S7 for guix-patches@gnu.org; Sun, 21 Oct 2018 16:46:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEKbp-0003DI-U3 for guix-patches@gnu.org; Sun, 21 Oct 2018 16:46:02 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58603) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gEKbp-0003DD-Ph for guix-patches@gnu.org; Sun, 21 Oct 2018 16:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gEKbp-000768-K3 for guix-patches@gnu.org; Sun, 21 Oct 2018 16:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33111] [PATCH 0/3] Have the binary tarball populate ~root/.config/guix/current Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Oct 2018 20:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33111 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33111@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154015475727054 (code B ref -1); Sun, 21 Oct 2018 20:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Oct 2018 20:45:57 +0000 Received: from localhost ([127.0.0.1]:34628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gEKbf-0006xj-6C for submit@debbugs.gnu.org; Sun, 21 Oct 2018 16:45:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gEKbd-0006s0-JE for submit@debbugs.gnu.org; Sun, 21 Oct 2018 16:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEKbX-0002z6-9J for submit@debbugs.gnu.org; Sun, 21 Oct 2018 16:45:44 -0400 Received: from lists.gnu.org ([2001:4830:134:3::11]:38307) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEKbT-0002wa-8L for submit@debbugs.gnu.org; Sun, 21 Oct 2018 16:45:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEKbS-0008Fu-Di for guix-patches@gnu.org; Sun, 21 Oct 2018 16:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEKbM-0002tn-Ok for guix-patches@gnu.org; Sun, 21 Oct 2018 16:45:36 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEKbB-0002mQ-Cw; Sun, 21 Oct 2018 16:45:21 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33172 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gEKb7-0003GR-2t; Sun, 21 Oct 2018 16:45:21 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 21 Oct 2018 22:45:06 +0200 Message-Id: <20181021204506.1978-1-ludo@gnu.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 208.118.235.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 Hello Guix! Currently the binary tarball populates ~root/.guix-profile. This creates confusion when people realize that ‘guix pull’, instead, updates ~root/.config/guix; it’s also inconvenient because it forces root to do “guix pull && guix package -u guix” or similar if they want to update the default Guix revision on the distro. These patches address this by having the binary tarball populate ~root/.config/guix/current like ‘guix pull’ does. There’s one downside though: with the last patch, the ‘glibc-utf8-locales’ is no longer included because ~root/.config/guix/current would be the wrong place for it. Consequently, users have to explicitly install it in ~root/.guix-profile and set GUIX_LOCPATH accordingly. A possible fix would be to modify ‘guix pack’ so that it can create not just two profiles, where ~root/.guix-profile would contain ‘glibc-utf8-locales’. That’d be a non-trivial change, though. Thoughts? Thanks, Ludo’. Ludovic Courtès (3): install: Parameterize the profile name for 'populate-single-profile-directory'. pack: Add '--profile-name'. build: Binary tarball now populates the "current-guix" profile. Makefile.am | 6 ++---- doc/guix.texi | 37 +++++++++++++++++++++++-------------- etc/guix-daemon.conf.in | 2 +- etc/guix-daemon.service.in | 4 ++-- etc/guix-install.sh | 21 +++++++++++---------- etc/guix-publish.conf.in | 2 +- etc/guix-publish.service.in | 4 ++-- gnu/build/install.scm | 24 ++++++++++++++++++------ guix/scripts/pack.scm | 20 +++++++++++++++++++- tests/guix-pack.sh | 17 +++++++++++++++-- 10 files changed, 94 insertions(+), 43 deletions(-)