From patchwork Mon Jan 21 08:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 780 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 2D5C916A5C; Mon, 21 Jan 2019 14:35:48 +0000 (GMT) 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, UNPARSEABLE_RELAY,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 33BD616A4B for ; Mon, 21 Jan 2019 14:35:47 +0000 (GMT) Received: from localhost ([127.0.0.1]:54661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glafy-0008V6-AK for patchwork@mira.cbaines.net; Mon, 21 Jan 2019 09:35:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glUpM-0001HU-Bj for guix-patches@gnu.org; Mon, 21 Jan 2019 03:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glUpK-0002Zg-N9 for guix-patches@gnu.org; Mon, 21 Jan 2019 03:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glUpK-0002ZP-Hl for guix-patches@gnu.org; Mon, 21 Jan 2019 03:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1glUpK-000494-5f for guix-patches@gnu.org; Mon, 21 Jan 2019 03:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34153] [PATCH] Update fish to 3.0.0. Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Jan 2019 08:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34153@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154805881015844 (code B ref -1); Mon, 21 Jan 2019 08:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2019 08:20:10 +0000 Received: from localhost ([127.0.0.1]:39385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glUoH-00046o-K9 for submit@debbugs.gnu.org; Mon, 21 Jan 2019 03:20:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glUoC-00046Y-GH for submit@debbugs.gnu.org; Mon, 21 Jan 2019 03:19:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:58264) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1glUo7-0001kM-1n for submit@debbugs.gnu.org; Mon, 21 Jan 2019 03:19:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glUo5-00012R-11 for guix-patches@gnu.org; Mon, 21 Jan 2019 03:19:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glUo3-0001iV-8W for guix-patches@gnu.org; Mon, 21 Jan 2019 03:19:45 -0500 Received: from knopi.disroot.org ([178.21.23.139]:41754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1glUo2-0001g8-CC for guix-patches@gnu.org; Mon, 21 Jan 2019 03:19:43 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id ECD1723F75 for ; Mon, 21 Jan 2019 09:19:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZBuQEU_pZJih for ; Mon, 21 Jan 2019 09:19:37 +0100 (CET) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7b8cb7e4 for ; Mon, 21 Jan 2019 08:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1548058777; bh=L/Dnpa68zShxSgxQK1O7N/mHorIDA5EwKe6b87i1TWo=; h=From:To:Subject:Date; b=Pf/WOL0h4xjr2DrLt0htxyzNNGEPSBy2kApmg16tlz/pk3W7Oxhv4PIGVKJgwG5NA LT35/zlfr/vxAkptrMlGaLFQg5zh3rVoKiMPcujdo5of/TVplocnaDKTv1X3umKKEp LHQh979nZftqpgRqozF94glsotdEB/drK8JH2WYGgocn9Slh6MyYfkeLno8qp53Lls 7PvRS/QK5O+3FuQs0/kjU4VvBLsXAIZfoGsad0OvgSJx0YRLI69PdhvJNOjjBrqUzS I6xrzibEYRAMvIX8cAm2XXKWkV6GGDe1J78KyHmuqupadsKKSEFNwDhiLZptzE8EBF chCvuLjnGe5bg== User-agent: mu4e 1.0; emacs 26.1 From: Meiyo Peng Date: Mon, 21 Jan 2019 16:19:29 +0800 Message-ID: <8736pm2zji.fsf@disroot.org> 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: 209.51.188.43 X-Mailman-Approved-At: Mon, 21 Jan 2019 09:35:38 -0500 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 Hi, This patch series updates fish shell to 3.0.0 and enable fish to source /etc/profile using fish-foreign-env. --- Meiyo Peng https://www.pengmeiyu.com/ From aadeb9dea8aff0db8a339cc11d006abff4736fdb Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 20 Jan 2019 21:42:15 +0800 Subject: [PATCH 3/3] gnu: fish: Use fish-foreign-env to source /etc/profile. * gnu/packages/shells.scm (fish): Use fish-foreign-env to source /etc/profile when user logs in. --- gnu/packages/shells.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8e2ca2a9a..d0561559e 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -102,7 +102,8 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (base32 "1kzjd0n0sfslkd36lzrvvvgy3qwkd9y466bkrqlnhd5h9dhx77ga")))) (build-system gnu-build-system) (inputs - `(("groff" ,groff) ; for 'fish --help' + `(("fish-foreign-env" ,fish-foreign-env) + ("groff" ,groff) ; for 'fish --help' ("ncurses" ,ncurses) ("pcre2" ,pcre2) ; don't use the bundled PCRE2 ("python" ,python))) ; for fish_config and manpage completions @@ -170,6 +171,25 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") " $__extra_confdir\n") port) (close-port port)) + #t)) + ;; Use fish-foreign-env to source /etc/profile. + (add-before 'install 'source-etc-profile + (lambda* (#:key inputs #:allow-other-keys) + (let ((port (open-file "share/__fish_build_paths.fish" "a"))) + (display + (string-append + "\n\n" + "# Patched by Guix.\n" + "# Use fish-foreign-env to source /etc/profile.\n" + "if status is-login\n" + " set fish_function_path " + (assoc-ref inputs "fish-foreign-env") "/share/fish/functions" + " $__fish_datadir/functions\n" + " fenv source /etc/profile\n" + " set -e fish_function_path\n" + "end\n") + port) + (close-port port)) #t))))) (synopsis "The friendly interactive shell") (description -- 2.20.1