From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55294) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNm1D-0005yB-Eq for guix-patches@gnu.org; Sun, 12 Apr 2020 19:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNm1C-0001nN-18 for guix-patches@gnu.org; Sun, 12 Apr 2020 19:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNm1B-0001n0-So for guix-patches@gnu.org; Sun, 12 Apr 2020 19:28:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNm1B-0006Up-Nj for guix-patches@gnu.org; Sun, 12 Apr 2020 19:28:01 -0400 Subject: [bug#40588] [PATCH] gnu: fish: Upgrade to 3.1.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:55257) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNm0n-0005wa-69 for guix-patches@gnu.org; Sun, 12 Apr 2020 19:27:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNm0l-0001cJ-5K for guix-patches@gnu.org; Sun, 12 Apr 2020 19:27:36 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:40977) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNm0k-0001c9-SA for guix-patches@gnu.org; Sun, 12 Apr 2020 19:27:35 -0400 Received: by mail-pl1-x630.google.com with SMTP id d24so2787686pll.8 for ; Sun, 12 Apr 2020 16:27:34 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::429]) by smtp.gmail.com with ESMTPSA id k5sm7109653pfp.147.2020.04.12.16.27.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Apr 2020 16:27:32 -0700 (PDT) From: John Soo Date: Sun, 12 Apr 2020 16:27:30 -0700 Message-ID: <871rosjndp.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40588@debbugs.gnu.org --=-=-= Content-Type: text/plain Hi Guix, Fish shell had a large minor release a couple months ago. Here are the patches to use the updated version. It features a cmake build system, an extensive test suite and a lot of new features and bug fixes. I also include what I think might be a patch to export some variables that should be exposed all the time but I am not sure. That patch might not be desirable to have on master yet, as it is mostly my research into issue #30265. Thanks! John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-fish-export-extra-directories.patch Content-Description: export-extra-directories >From 2277db5acc05cea916f96c9c7d6d417bd92eff5f Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 12 Apr 2020 15:53:35 -0700 Subject: [PATCH 1/2] gnu: fish: export extra directories. * gnu/packages/shells.scm (fish): [arguments] export extra directories when patching __fish_build_paths.fish. --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8708b703ef..6b03b6bc0f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -161,15 +161,15 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") " variables.\n" "set -l __guix_profile_paths ~/.guix-profile" " /run/current-system/profile\n" - "set __extra_completionsdir" + "set -xg __extra_completionsdir" " $__guix_profile_paths\"/etc/fish/completions\"" " $__guix_profile_paths\"/share/fish/vendor_completions.d\"" " $__extra_completionsdir\n" - "set __extra_functionsdir" + "set -xg __extra_functionsdir" " $__guix_profile_paths\"/etc/fish/functions\"" " $__guix_profile_paths\"/share/fish/vendor_functions.d\"" " $__extra_functionsdir\n" - "set __extra_confdir" + "set -xg __extra_confdir" " $__guix_profile_paths\"/etc/fish/conf.d\"" " $__guix_profile_paths\"/share/fish/vendor_conf.d\"" " $__extra_confdir\n") -- 2.26.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-fish-Upgrade-to-3.1.0.patch Content-Description: upgrade-fish >From f3e813e2374b0bf38391488442a1bded1c4016b2 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 12 Apr 2020 14:18:30 -0700 Subject: [PATCH 2/2] gnu: fish: Upgrade to 3.1.0. * gnu/packages/shells (fish):[version] Update to 3.1.0. [arguments] Enable tests, patch test files, and avoid patches that no longer apply. [inputs] Make groff a native-input. --- gnu/packages/shells.scm | 74 +++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6b03b6bc0f..b64c319eb8 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages libbsd) #:use-module (gnu packages libedit) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -48,13 +49,15 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages scheme) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public dash (package @@ -95,7 +98,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (define-public fish (package (name "fish") - (version "3.0.2") + (version "3.1.0") (source (origin (method url-fetch) @@ -103,38 +106,53 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") "releases/download/" version "/" "fish-" version ".tar.gz")) (sha256 - (base32 "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl")))) - (build-system gnu-build-system) + (base32 "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5")))) + (build-system cmake-build-system) (inputs `(("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 (native-inputs - `(("doxygen" ,doxygen))) + `(("doxygen" ,doxygen) + ; for 'fish --help' + ("groff" ,groff))) (arguments - '(#:tests? #f ; no check target - #:phases + '(#: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. - (add-before 'install 'embed-absolute-paths - (lambda _ - (substitute* '("share/functions/__fish_config_interactive.fish" - "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)) + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils")) + (bash (assoc-ref inputs "bash"))) + ;; These try to open a terminal + (delete-file "tests/checks/interactive.fish") + (delete-file "tests/checks/login-interactive.fish") + ;; These contain absolute path references + (substitute* "src/fish_tests.cpp" + (("/bin/echo" echo) (string-append coreutils echo)) + (("/bin/ca" ca) (string-append coreutils ca)) + (("\"(/bin/c)\"" _ c) (string-append "\"" coreutils c "\"")) + (("/bin/ls_not_a_path" ls-not-a-path) + (string-append coreutils ls-not-a-path)) + (("/bin/ls" ls) (string-append coreutils ls)) + (("(/bin/)\"" _ bin) (string-append coreutils bin "\"")) + (("/bin -" bin) (string-append coreutils bin)) + (((string-append + "do_test\\(is_potential_path\\(" + "L\"/usr\", wds, vars, PATH_REQUIRE_DIR\\)\\);")) + "")) + (substitute* + (append (find-files "tests" ".*\\.(in|out|err)$") + (find-files "tests/checks" ".*\\.fish")) + (("/bin/pwd" pwd) (string-append coreutils pwd)) + (("/bin/echo" echo) (string-append coreutils echo)) + (("/bin/sh" sh) (string-append bash sh)) + (("/bin/ls" ls) (string-append coreutils ls))) + (substitute* (find-files "tests" ".*\\.(in|out|err)$") + (("/usr/bin") (string-append coreutils "/bin"))) + #t))) ;; Source /etc/fish/config.fish from $__fish_sysconf_dir/config.fish. - (add-before 'install 'patch-fish-config + (add-after 'patch-tests 'patch-fish-config (lambda _ (let ((port (open-file "etc/config.fish" "a"))) (display (string-append @@ -147,6 +165,12 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") port) (close-port port)) #t)) + ;; Embed absolute paths. + (add-before 'install 'embed-absolute-paths + (lambda _ + (substitute* "share/functions/__fish_print_help.fish" + (("nroff") (which "nroff"))) + #t)) ;; Enable completions, functions and configurations in user's and ;; system's guix profiles by adding them to __extra_* variables. (add-before 'install 'patch-fish-extra-paths -- 2.26.0 --=-=-=--