diff options
| author | Vincent Haupert <mail@vincent-haupert.de> | 2021-02-21 17:51:01 +0100 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2021-03-06 16:26:22 -0800 |
| commit | 62f9a381a030e188b826bcffeabc3653117bb4b9 (patch) | |
| tree | 59e1a465acef068b1b0f67f09accd25943cbfbf4 /pkgs/shells | |
| parent | 1941313b6cbee671a8df964ab1ab2505e330f2fa (diff) | |
fish: 3.1.2 -> 3.2.0
functions/{type.fish,_.fish}: removed, now a builtin
macOS: disable codesigning with CMake flag instead of patching the
CMakeLists.txt.
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/shells/fish/dont-codesign-on-mac.diff | 12 |
2 files changed, 5 insertions, 24 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index e36e32d043f8..3d1c138c8d8d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -130,7 +130,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -139,14 +139,10 @@ let # the shell's actual version (and what it displays when running `fish # --version`), as well as the local documentation for all builtins (and # maybe other things). - url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm"; + url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE="; }; - # We don't have access to the codesign executable, so we patch this out. - # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952 - patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff; - nativeBuildInputs = [ cmake ]; @@ -159,6 +155,8 @@ let cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish" + ] ++ lib.optionals stdenv.isDarwin [ + "-DMAC_CODESIGN_ID=OFF" ]; preConfigure = '' @@ -179,13 +177,8 @@ let postInstall = with lib; '' sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" - sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ -i "$out/share/fish/functions/fish_prompt.fish" - sed -e "s|gettext |${gettext}/bin/gettext |" \ - -e "s|which |${which}/bin/which |" \ - -i "$out/share/fish/functions/_.fish" sed -e "s|uname|${coreutils}/bin/uname|" \ -i "$out/share/fish/functions/__fish_pwd.fish" \ "$out/share/fish/functions/prompt_pwd.fish" diff --git a/pkgs/shells/fish/dont-codesign-on-mac.diff b/pkgs/shells/fish/dont-codesign-on-mac.diff deleted file mode 100644 index c61350b0549f..000000000000 --- a/pkgs/shells/fish/dont-codesign-on-mac.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7d220a032..786b60e6e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target) - # Define a function to link dependencies. - FUNCTION(FISH_LINK_DEPS_AND_SIGN target) - TARGET_LINK_LIBRARIES(${target} fishlib) -- CODESIGN_ON_MAC(${target}) - ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) - - # Define libfish.a. |