From patchwork Mon Mar 27 16:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 48750 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 DE5CE16FE9; Mon, 27 Mar 2023 17:57:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 089C116E86 for ; Mon, 27 Mar 2023 17:57:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgq9Y-0006xS-EQ; Mon, 27 Mar 2023 12:57:04 -0400 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 1pgq9X-0006vo-4i for guix-patches@gnu.org; Mon, 27 Mar 2023 12:57:03 -0400 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 1pgq9W-0001V9-SM; Mon, 27 Mar 2023 12:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgq9W-0004v2-HW; Mon, 27 Mar 2023 12:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62489] [PATCH] system: Remove obsolete GUIX_LOCPATH workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Mon, 27 Mar 2023 16:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62489 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62489@debbugs.gnu.org Cc: Bruno Victal , ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ludo@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167993621618892 (code B ref -1); Mon, 27 Mar 2023 16:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Mar 2023 16:56:56 +0000 Received: from localhost ([127.0.0.1]:48334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgq9Q-0004ue-FA for submit@debbugs.gnu.org; Mon, 27 Mar 2023 12:56:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:44910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgq9O-0004uW-IF for submit@debbugs.gnu.org; Mon, 27 Mar 2023 12:56:54 -0400 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 1pgq9O-0006us-1f for guix-patches@gnu.org; Mon, 27 Mar 2023 12:56:54 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgq9M-0001R8-8y for guix-patches@gnu.org; Mon, 27 Mar 2023 12:56:53 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 01A7F20DE7 for ; Mon, 27 Mar 2023 18:56:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id A1EE98009A; Mon, 27 Mar 2023 18:56:40 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sYFpIVMrIabx; Mon, 27 Mar 2023 18:56:40 +0200 (CEST) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 3399680079; Mon, 27 Mar 2023 18:56:40 +0200 (CEST) From: Bruno Victal Date: Mon, 27 Mar 2023 17:56:14 +0100 Message-Id: <2ced3f32bcdcffee3983494d35a5a262f98b95ab.1679934713.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.105.233; envelope-from=mirai@makinata.eu; helo=smtpm2.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system.scm (operating-system-environment-variables): Do not set GUIX_LOCPATH. --- Tested with: make check-system TESTS="basic mcron mpd mympd" gnu/system.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 48cc68f449..c17c6e4e98 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1201,15 +1201,7 @@ (define (operating-system-environment-variables os) ;; By default, applications that use D-Bus, such as Emacs, abort at startup ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. - ("DBUS_FATAL_WARNINGS" . "0") - - ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package - ;; used to look things up in 'PREFIX/lib/locale' instead of - ;; '/run/current-system/locale' as was intended. Keep this hack around so - ;; that people who still have glibc@2.23-using packages in their profiles - ;; can use them correctly. - ;; TODO: Remove when glibc@2.23 is long gone. - ("GUIX_LOCPATH" . "/run/current-system/locale"))) + ("DBUS_FATAL_WARNINGS" . "0"))) ;; Ensure LST is a list of records and warn otherwise. (define-with-syntax-properties (ensure-setuid-program-list (lst properties))