From unknown Sun Jun 22 07:57:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#34003: [PATCH] gnu: fish: Update to 3.0.0. Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 07 Jan 2019 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34003 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 34003@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15468290014745 (code B ref -1); Mon, 07 Jan 2019 02:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2019 02:43:21 +0000 Received: from localhost ([127.0.0.1]:47505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggKsj-0001EJ-GK for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggKsd-0001Dq-9P for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:58498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ggKsY-0007SQ-1N for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggKsW-0006vk-J0 for bug-guix@gnu.org; Sun, 06 Jan 2019 21:43:01 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggKsU-0007N4-B7 for bug-guix@gnu.org; Sun, 06 Jan 2019 21:43:00 -0500 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:41139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggKsR-00079p-Pw for bug-guix@gnu.org; Sun, 06 Jan 2019 21:42:57 -0500 Received: by mail-pg1-x532.google.com with SMTP id m1so20055219pgq.8 for ; Sun, 06 Jan 2019 18:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=da/ADOxLwtCEkXgEXYNeongH9f/H5d9irNB7HY5mCms=; b=W/tK5YNQtUVzDdKgRt2m4YD3cuxNBz/9hu/c4rifoU0ubQaQ3CjTBd4cqs6rs4hkBw FrVip/+UpZB5/QHXsg+DBpS+tiykb7opqi5tMannAt//2GauLp3L08NhnUVyhh9Lc0cL 1Jet7xMlJMwfP+I7HB6eGE/Z54Pi5tG02rXH9NCynp8rVgCsPCMK117vdVWRNIQj6+ri xYLWCmQUj6Bqc5iqAnFliA+byU538E8nVdNxa6x51eutRkxRhcwnK4H278Zx8dOy14aT 9rf1NxxjAim5duExy2kpk3WplHClOnQbu4cb1xZjY0oo+3KwDAoN1lbYFEZB4ZdaDCDi p5aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=da/ADOxLwtCEkXgEXYNeongH9f/H5d9irNB7HY5mCms=; b=a+9cCr8RzAu6SHsoue0p77J9jGzXUghQlnTm+fHx8yTE3SJSOdhZU0+s6B635KlX7l bcfJtwY/bKkYeEaRfQp9kW/1/WtbBy952SEuE6h78RFvQfvlSPkkTkO2JTJvYLyf84Bi eASBHjwI5Wd31BGdFN44MxIqm4g6Ob+zrLqx4ggxVItrcNerWju9r+unD50zhLX6Mr76 VbE3z2OyEiWvWFnuTbKXyeXNbakfLIJYaRRvtprnPchaDcStkjSQFuJ2MPKOjXI5IZGT vFbs+rxHXCTwKaUs0Zbu6pIlROfMvnvkJIwEIahGX6iHcz9TLi2weQFw0mqzt5sEMJ4Y tfqg== X-Gm-Message-State: AJcUukfll4dyxBUfFuVPXDiYnO+YhS/kHTNm6UoP17Uw2rRgwm1ItDPc X4wUwNKLnfXPwenmWCbPJN4Po3uY6EY= X-Google-Smtp-Source: ALg8bN5VD3ZJagJiqG1gVBnqfm9okH52t+2oSxsrwAvcTKG93HTbNoQAa3YBAxpGy87vV37WqWYTvg== X-Received: by 2002:a63:3507:: with SMTP id c7mr9496533pga.315.1546828971290; Sun, 06 Jan 2019 18:42:51 -0800 (PST) Received: from dinosaur (144.34.217.65.16clouds.com. [144.34.217.65]) by smtp.gmail.com with ESMTPSA id n70sm101118427pfi.185.2019.01.06.18.42.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 06 Jan 2019 18:42:50 -0800 (PST) From: Meiyo Peng Date: Mon, 07 Jan 2019 10:42:36 +0800 Message-ID: <875zv1rxwj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::532 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain Hi, This patch updates fish shell to 3.0.0. I tested this patch on my computer. It seems bug#30265 (https://lists.gnu.org/archive/html/bug-guix/2018-01/msg00296.html) has gone. * gnu/packages/shells.scm (fish): Update to 3.0.0. [source]: Remove dead URL. [inputs]: Remove bc. Replace python-wrapper with python. [arguments]: Remove configure-flags. Add multiple phases to patch fish. Enable fish to source /etc/fish/config.sh. Add user's and system's guix profiles to __extra_* variables. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-fish-Update-to-3.0.0.patch Content-Transfer-Encoding: quoted-printable >From 204527a56b31174777c6eee6512a7aaaacbcffe6 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 6 Jan 2019 22:11:36 +0800 Subject: [PATCH] gnu: fish: Update to 3.0.0. * gnu/packages/shells.scm (fish): Update to 3.0.0. [source]: Remove dead URL. [inputs]: Remove bc. Replace python-wrapper with python. [arguments]: Remove configure-flags. Add multiple phases to patch fish. Enable fish to source /etc/fish/config.sh. Add user's and system's guix profiles to __extra_* variables. --- gnu/packages/shells.scm | 104 ++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 36 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 38eeaa783..c9511fba6 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2017, 2018 Nils Gillmann ;;; Copyright =C2=A9 2017, 2018 Leo Famulari ;;; Copyright =C2=A9 2017 Arun Isaac +;;; Copyright =C2=A9 2019 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,6 @@ =20 (define-module (gnu packages shells) #:use-module (gnu packages) - #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -88,51 +88,83 @@ direct descendant of NetBSD's Almquist Shell (@command{= ash}).") (define-public fish (package (name "fish") - (version "2.7.1") - (source (origin - (method url-fetch) - (uri - (list - (string-append "https://fishshell.com/files/" - version "/fish-" version ".tar.gz") - (string-append "https://github.com/fish-shell/fish-shell/" - "releases/download/" version "/" - name "-" version ".tar.gz"))) - (sha256 - (base32 - "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4")) - (modules '((guix build utils))) - ;; Don't try to install /etc/fish/config.fish. - (snippet '(begin - (substitute* "Makefile.in" - ((".*INSTALL.*sysconfdir.*fish.*") "")) - #t)))) + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fish-shell/fish-shell/" + "releases/download/" version "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1kzjd0n0sfslkd36lzrvvvgy3qwkd9y466bkrqlnhd5h9dhx77ga")))) (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses) + ("groff" ,groff) ; for 'fish --help' + ("pcre2" ,pcre2) ; don't use the bundled PCRE2 + ("python" ,python))) ; for fish_config and manpage complet= ions (native-inputs `(("doxygen" ,doxygen))) - (inputs - `(("bc" ,bc) - ("ncurses" ,ncurses) - ("groff" ,groff) ;for 'fish --help' - ("pcre2" ,pcre2) ;don't use the bundled PCRE2 - ("python" ,python-wrapper))) ;for fish_config and manpage complet= ions (arguments - '(#:tests? #f ; no check target - #:configure-flags '("--sysconfdir=3D/etc") + '(#:tests? #f ; no check target #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("build_tools/build_commands_hdr.sh" + "build_tools/build_user_doc.sh") + (("/usr/bin/env") "env")) + #t)) ;; Embed absolute paths to store items. (add-after 'unpack 'embed-store-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("share/functions/math.fish" - "share/functions/seq.fish") - (("\\| bc") - (string-append "| " (assoc-ref %build-inputs "bc") - "/bin/bc"))) - (substitute* "share/functions/fish_update_completions.fish" - (("python") (which "python"))) + (lambda _ + (substitute* '("share/functions/__fish_config_interactive.fis= h" + "share/functions/fish_config.fish" + "share/functions/fish_update_completions.fish") + (("python3") (which "python3"))) (substitute* "share/functions/__fish_print_help.fish" (("nroff") (which "nroff"))) + #t)) + ;; Source /etc/fish/config.fish from etc/fish/config.fish. + ;; TODO: Generate /etc/fish/config.fish to setup Guix environment + ;; variables. Similar to /etc/profile. + (add-before 'install 'patch-fish-config + (lambda _ + (let ((port (open-file "etc/config.fish" "a"))) + (display (string-append + "\n\n" + "# Added by Guix.\n" + "if test -f /etc/fish/config.fish\n" + " source /etc/fish/config.fish\n" + "end\n") + port) + (close-port port)) + #t)) + ;; Add user's and system's guix profiles to __extra_* variables. + (add-before 'install 'patch-fish-extra-paths + (lambda _ + (let ((port (open-file "share/__fish_build_paths.fish" "a"))) + (display + (string-append + "\n\n" + "# Added by Guix.\n" + "set -l __guix_profile_paths ~/.guix-profile " + "/run/current-system/profile\n" + "set __extra_completionsdir " + "$__guix_profile_paths\"/etc/fish/completions\" " + "$__guix_profile_paths\"/share/fish/vendor_completions.d\= " " + "$__extra_completionsdir\n" + "set __extra_functionsdir " + "$__guix_profile_paths\"/etc/fish/functions\" " + "$__guix_profile_paths\"/share/fish/vendor_functions.d\" " + "$__extra_functionsdir\n" + "set __extra_confdir " + "$__guix_profile_paths\"/etc/fish/conf.d\" " + "$__guix_profile_paths\"/share/fish/vendor_conf.d\" " + "$__extra_confdir\n") + port) + (close-port port)) #t))))) (synopsis "The friendly interactive shell") (description --=20 2.20.1 --=-=-= Content-Type: text/plain -- Meiyo Peng https://www.pengmeiyu.com/ --=-=-=-- From unknown Sun Jun 22 07:57:48 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Meiyo Peng Subject: bug#34003: closed (Re: bug#34003: ([PATCH] gnu: fish: Update to 3.0.0.)) Message-ID: References: <87k1izfl13.fsf@disroot.org> <875zv1rxwj.fsf@gmail.com> X-Gnu-PR-Message: they-closed 34003 X-Gnu-PR-Package: guix X-Gnu-PR-Keywords: patch Reply-To: 34003@debbugs.gnu.org Date: Sun, 20 Jan 2019 15:00:05 +0000 Content-Type: multipart/mixed; boundary="----------=_1547996405-13149-1" This is a multi-part message in MIME format... ------------=_1547996405-13149-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #34003: [PATCH] gnu: fish: Update to 3.0.0. which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 34003@debbugs.gnu.org. --=20 34003: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D34003 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1547996405-13149-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 34003-done) by debbugs.gnu.org; 20 Jan 2019 14:59:36 +0000 Received: from localhost ([127.0.0.1]:39077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glEZT-0003Oq-Fl for submit@debbugs.gnu.org; Sun, 20 Jan 2019 09:59:36 -0500 Received: from knopi.disroot.org ([178.21.23.139]:36268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glEIy-0002ii-Gg for 34003-done@debbugs.gnu.org; Sun, 20 Jan 2019 09:42:33 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6B65923F47 for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 15:42:30 +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 COH1EqY8BQSt for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 15:42:29 +0100 (CET) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bfc64e6a for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 14:42:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1547995349; bh=SEdneGW0MakHKUGt+FjP13EGxEDXphGAmzLeyG1vp+4=; h=References:From:To:Subject:In-reply-to:Date; b=aQwnOsi6LypXLez6f2ZCJKcIsA7wvTgADUdmJ16zOrdFWk+9cM8PMYXhpXe5KJm4e bLM0I0an2wtQMokIqIVk9KjgH1LS6C60ve8i6lQeU9KEkLr2QZW3cOUWyvVkKWgJwc 0AIk01Ib5P6Hzo+TFT6CRbbia85/dY7PrtEw29hhRg4Yca04vcXOIGrM8ofUOmYS/x m8Mt/JYA7Yrf/JpsSp4P9wp5iXYublS1squDG3XPFQG2zmKkyPGHeUGLVNBOXXDU59 JPiKE8epnOw4o9YHQHFw5AfsCByI7EIS64s/CQGtPyn9MJYdnh2gxxZZI+/TSL3b5Z /WlAw6MRLK8oQ== References: <875zv1rxwj.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.1 From: Meiyo Peng To: 34003-done@debbugs.gnu.org Subject: Re: bug#34003: ([PATCH] gnu: fish: Update to 3.0.0.) In-reply-to: Date: Sun, 20 Jan 2019 22:42:16 +0800 Message-ID: <87k1izfl13.fsf@disroot.org> Mime-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 34003-done X-Mailman-Approved-At: Sun, 20 Jan 2019 09:59:34 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, I will submit a new patch series for fish shell later. Close this bug for now. -- Meiyo Peng https://www.pengmeiyu.com/ ------------=_1547996405-13149-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Jan 2019 02:43:21 +0000 Received: from localhost ([127.0.0.1]:47505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggKsj-0001EJ-GK for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggKsd-0001Dq-9P for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:58498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ggKsY-0007SQ-1N for submit@debbugs.gnu.org; Sun, 06 Jan 2019 21:43:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggKsW-0006vk-J0 for bug-guix@gnu.org; Sun, 06 Jan 2019 21:43:01 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggKsU-0007N4-B7 for bug-guix@gnu.org; Sun, 06 Jan 2019 21:43:00 -0500 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:41139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggKsR-00079p-Pw for bug-guix@gnu.org; Sun, 06 Jan 2019 21:42:57 -0500 Received: by mail-pg1-x532.google.com with SMTP id m1so20055219pgq.8 for ; Sun, 06 Jan 2019 18:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=da/ADOxLwtCEkXgEXYNeongH9f/H5d9irNB7HY5mCms=; b=W/tK5YNQtUVzDdKgRt2m4YD3cuxNBz/9hu/c4rifoU0ubQaQ3CjTBd4cqs6rs4hkBw FrVip/+UpZB5/QHXsg+DBpS+tiykb7opqi5tMannAt//2GauLp3L08NhnUVyhh9Lc0cL 1Jet7xMlJMwfP+I7HB6eGE/Z54Pi5tG02rXH9NCynp8rVgCsPCMK117vdVWRNIQj6+ri xYLWCmQUj6Bqc5iqAnFliA+byU538E8nVdNxa6x51eutRkxRhcwnK4H278Zx8dOy14aT 9rf1NxxjAim5duExy2kpk3WplHClOnQbu4cb1xZjY0oo+3KwDAoN1lbYFEZB4ZdaDCDi p5aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=da/ADOxLwtCEkXgEXYNeongH9f/H5d9irNB7HY5mCms=; b=a+9cCr8RzAu6SHsoue0p77J9jGzXUghQlnTm+fHx8yTE3SJSOdhZU0+s6B635KlX7l bcfJtwY/bKkYeEaRfQp9kW/1/WtbBy952SEuE6h78RFvQfvlSPkkTkO2JTJvYLyf84Bi eASBHjwI5Wd31BGdFN44MxIqm4g6Ob+zrLqx4ggxVItrcNerWju9r+unD50zhLX6Mr76 VbE3z2OyEiWvWFnuTbKXyeXNbakfLIJYaRRvtprnPchaDcStkjSQFuJ2MPKOjXI5IZGT vFbs+rxHXCTwKaUs0Zbu6pIlROfMvnvkJIwEIahGX6iHcz9TLi2weQFw0mqzt5sEMJ4Y tfqg== X-Gm-Message-State: AJcUukfll4dyxBUfFuVPXDiYnO+YhS/kHTNm6UoP17Uw2rRgwm1ItDPc X4wUwNKLnfXPwenmWCbPJN4Po3uY6EY= X-Google-Smtp-Source: ALg8bN5VD3ZJagJiqG1gVBnqfm9okH52t+2oSxsrwAvcTKG93HTbNoQAa3YBAxpGy87vV37WqWYTvg== X-Received: by 2002:a63:3507:: with SMTP id c7mr9496533pga.315.1546828971290; Sun, 06 Jan 2019 18:42:51 -0800 (PST) Received: from dinosaur (144.34.217.65.16clouds.com. [144.34.217.65]) by smtp.gmail.com with ESMTPSA id n70sm101118427pfi.185.2019.01.06.18.42.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 06 Jan 2019 18:42:50 -0800 (PST) From: Meiyo Peng To: bug-guix@gnu.org Subject: [PATCH] gnu: fish: Update to 3.0.0. Date: Mon, 07 Jan 2019 10:42:36 +0800 Message-ID: <875zv1rxwj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::532 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain Hi, This patch updates fish shell to 3.0.0. I tested this patch on my computer. It seems bug#30265 (https://lists.gnu.org/archive/html/bug-guix/2018-01/msg00296.html) has gone. * gnu/packages/shells.scm (fish): Update to 3.0.0. [source]: Remove dead URL. [inputs]: Remove bc. Replace python-wrapper with python. [arguments]: Remove configure-flags. Add multiple phases to patch fish. Enable fish to source /etc/fish/config.sh. Add user's and system's guix profiles to __extra_* variables. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-fish-Update-to-3.0.0.patch Content-Transfer-Encoding: quoted-printable >From 204527a56b31174777c6eee6512a7aaaacbcffe6 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 6 Jan 2019 22:11:36 +0800 Subject: [PATCH] gnu: fish: Update to 3.0.0. * gnu/packages/shells.scm (fish): Update to 3.0.0. [source]: Remove dead URL. [inputs]: Remove bc. Replace python-wrapper with python. [arguments]: Remove configure-flags. Add multiple phases to patch fish. Enable fish to source /etc/fish/config.sh. Add user's and system's guix profiles to __extra_* variables. --- gnu/packages/shells.scm | 104 ++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 36 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 38eeaa783..c9511fba6 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2017, 2018 Nils Gillmann ;;; Copyright =C2=A9 2017, 2018 Leo Famulari ;;; Copyright =C2=A9 2017 Arun Isaac +;;; Copyright =C2=A9 2019 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,6 @@ =20 (define-module (gnu packages shells) #:use-module (gnu packages) - #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -88,51 +88,83 @@ direct descendant of NetBSD's Almquist Shell (@command{= ash}).") (define-public fish (package (name "fish") - (version "2.7.1") - (source (origin - (method url-fetch) - (uri - (list - (string-append "https://fishshell.com/files/" - version "/fish-" version ".tar.gz") - (string-append "https://github.com/fish-shell/fish-shell/" - "releases/download/" version "/" - name "-" version ".tar.gz"))) - (sha256 - (base32 - "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4")) - (modules '((guix build utils))) - ;; Don't try to install /etc/fish/config.fish. - (snippet '(begin - (substitute* "Makefile.in" - ((".*INSTALL.*sysconfdir.*fish.*") "")) - #t)))) + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fish-shell/fish-shell/" + "releases/download/" version "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1kzjd0n0sfslkd36lzrvvvgy3qwkd9y466bkrqlnhd5h9dhx77ga")))) (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses) + ("groff" ,groff) ; for 'fish --help' + ("pcre2" ,pcre2) ; don't use the bundled PCRE2 + ("python" ,python))) ; for fish_config and manpage complet= ions (native-inputs `(("doxygen" ,doxygen))) - (inputs - `(("bc" ,bc) - ("ncurses" ,ncurses) - ("groff" ,groff) ;for 'fish --help' - ("pcre2" ,pcre2) ;don't use the bundled PCRE2 - ("python" ,python-wrapper))) ;for fish_config and manpage complet= ions (arguments - '(#:tests? #f ; no check target - #:configure-flags '("--sysconfdir=3D/etc") + '(#:tests? #f ; no check target #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("build_tools/build_commands_hdr.sh" + "build_tools/build_user_doc.sh") + (("/usr/bin/env") "env")) + #t)) ;; Embed absolute paths to store items. (add-after 'unpack 'embed-store-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("share/functions/math.fish" - "share/functions/seq.fish") - (("\\| bc") - (string-append "| " (assoc-ref %build-inputs "bc") - "/bin/bc"))) - (substitute* "share/functions/fish_update_completions.fish" - (("python") (which "python"))) + (lambda _ + (substitute* '("share/functions/__fish_config_interactive.fis= h" + "share/functions/fish_config.fish" + "share/functions/fish_update_completions.fish") + (("python3") (which "python3"))) (substitute* "share/functions/__fish_print_help.fish" (("nroff") (which "nroff"))) + #t)) + ;; Source /etc/fish/config.fish from etc/fish/config.fish. + ;; TODO: Generate /etc/fish/config.fish to setup Guix environment + ;; variables. Similar to /etc/profile. + (add-before 'install 'patch-fish-config + (lambda _ + (let ((port (open-file "etc/config.fish" "a"))) + (display (string-append + "\n\n" + "# Added by Guix.\n" + "if test -f /etc/fish/config.fish\n" + " source /etc/fish/config.fish\n" + "end\n") + port) + (close-port port)) + #t)) + ;; Add user's and system's guix profiles to __extra_* variables. + (add-before 'install 'patch-fish-extra-paths + (lambda _ + (let ((port (open-file "share/__fish_build_paths.fish" "a"))) + (display + (string-append + "\n\n" + "# Added by Guix.\n" + "set -l __guix_profile_paths ~/.guix-profile " + "/run/current-system/profile\n" + "set __extra_completionsdir " + "$__guix_profile_paths\"/etc/fish/completions\" " + "$__guix_profile_paths\"/share/fish/vendor_completions.d\= " " + "$__extra_completionsdir\n" + "set __extra_functionsdir " + "$__guix_profile_paths\"/etc/fish/functions\" " + "$__guix_profile_paths\"/share/fish/vendor_functions.d\" " + "$__extra_functionsdir\n" + "set __extra_confdir " + "$__guix_profile_paths\"/etc/fish/conf.d\" " + "$__guix_profile_paths\"/share/fish/vendor_conf.d\" " + "$__extra_confdir\n") + port) + (close-port port)) #t))))) (synopsis "The friendly interactive shell") (description --=20 2.20.1 --=-=-= Content-Type: text/plain -- Meiyo Peng https://www.pengmeiyu.com/ --=-=-=-- ------------=_1547996405-13149-1-- From unknown Sun Jun 22 07:57:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#34003: ([PATCH] gnu: fish: Update to 3.0.0.) Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 20 Jan 2019 15:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34003 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 34003-done@debbugs.gnu.org Received: via spool by 34003-done@debbugs.gnu.org id=D34003.154799644613346 (code D ref 34003); Sun, 20 Jan 2019 15:01:01 +0000 Received: (at 34003-done) by debbugs.gnu.org; 20 Jan 2019 15:00:46 +0000 Received: from localhost ([127.0.0.1]:39084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glEac-0003TC-F3 for submit@debbugs.gnu.org; Sun, 20 Jan 2019 10:00:46 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glEab-0003T1-60 for 34003-done@debbugs.gnu.org; Sun, 20 Jan 2019 10:00:45 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1A3E823F4B for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 16:00:44 +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 p2sjS-uUJAbj for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 16:00:43 +0100 (CET) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5c6a8ed3 for <34003-done@debbugs.gnu.org>; Sun, 20 Jan 2019 15:00:36 +0000 (UTC) References: <875zv1rxwj.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.1 From: Meiyo Peng In-reply-to: Date: Sun, 20 Jan 2019 23:00:36 +0800 Message-ID: <87imyjfk6j.fsf@disroot.org> Mime-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Hi, I will submit a new patch series for fish shell later. Close this bug for now. -- Meiyo Peng https://www.pengmeiyu.com/