lol

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.

authored by

Vincent Haupert and committed by helbling.dev 62f9a381 1941313b

+5 -24
+5 -12
pkgs/shells/fish/default.nix
··· 130 130 131 131 fish = stdenv.mkDerivation rec { 132 132 pname = "fish"; 133 - version = "3.1.2"; 133 + version = "3.2.0"; 134 134 135 135 src = fetchurl { 136 136 # There are differences between the release tarball and the tarball GitHub ··· 139 139 # the shell's actual version (and what it displays when running `fish 140 140 # --version`), as well as the local documentation for all builtins (and 141 141 # maybe other things). 142 - url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; 143 - sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm"; 142 + url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; 143 + sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE="; 144 144 }; 145 145 146 - # We don't have access to the codesign executable, so we patch this out. 147 - # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952 148 - patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff; 149 - 150 146 nativeBuildInputs = [ 151 147 cmake 152 148 ]; ··· 159 155 160 156 cmakeFlags = [ 161 157 "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish" 158 + ] ++ lib.optionals stdenv.isDarwin [ 159 + "-DMAC_CODESIGN_ID=OFF" 162 160 ]; 163 161 164 162 preConfigure = '' ··· 179 177 postInstall = with lib; '' 180 178 sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ 181 179 -i "$out/share/fish/functions/grep.fish" 182 - sed -i "s|which |${which}/bin/which |" \ 183 - "$out/share/fish/functions/type.fish" 184 180 sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ 185 181 -i "$out/share/fish/functions/fish_prompt.fish" 186 - sed -e "s|gettext |${gettext}/bin/gettext |" \ 187 - -e "s|which |${which}/bin/which |" \ 188 - -i "$out/share/fish/functions/_.fish" 189 182 sed -e "s|uname|${coreutils}/bin/uname|" \ 190 183 -i "$out/share/fish/functions/__fish_pwd.fish" \ 191 184 "$out/share/fish/functions/prompt_pwd.fish"
-12
pkgs/shells/fish/dont-codesign-on-mac.diff
··· 1 - diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index 7d220a032..786b60e6e 100644 3 - --- a/CMakeLists.txt 4 - +++ b/CMakeLists.txt 5 - @@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target) 6 - # Define a function to link dependencies. 7 - FUNCTION(FISH_LINK_DEPS_AND_SIGN target) 8 - TARGET_LINK_LIBRARIES(${target} fishlib) 9 - - CODESIGN_ON_MAC(${target}) 10 - ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) 11 - 12 - # Define libfish.a.