Merge pull request #310339 from wahjava/update-kakoune

kakoune: 2023.08.05 -> 2024.05.09

authored by Weijia Wang and committed by GitHub 41efb3b9 f293e4eb

+8 -20
+8 -20
pkgs/applications/editors/kakoune/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch }: 1 + { lib, stdenv, fetchFromGitHub }: 2 2 3 - stdenv.mkDerivation rec { 3 + stdenv.mkDerivation (finalAttrs: { 4 4 pname = "kakoune-unwrapped"; 5 - version = "2023.08.05"; 5 + version = "2024.05.09"; 6 6 src = fetchFromGitHub { 7 7 repo = "kakoune"; 8 8 owner = "mawww"; 9 - rev = "v${version}"; 10 - sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; 9 + rev = "v${finalAttrs.version}"; 10 + hash = "sha256-Dfp33zk9ZUMrCZRfPNfoSX6rgQKItvOQx+CuRNQgtTA="; 11 11 }; 12 - patches = [ 13 - # Use explicit target types for gather calls to bypass clang regression 14 - # 15 - # Since clang-16 there has been a regression in the P0522R0 support. 16 - # (Bug report at https://github.com/llvm/llvm-project/issue/63281) 17 - # 18 - # Closes mawww/kakoune#4892 19 - (fetchpatch { 20 - url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; 21 - hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; 22 - }) 23 - ]; 24 12 makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; 25 13 26 - preConfigure = '' 27 - export version="v${version}" 14 + postPatch = '' 15 + echo "v${finalAttrs.version}" >.version 28 16 ''; 29 17 30 18 enableParallelBuilding = true; ··· 51 39 maintainers = with maintainers; [ vrthra ]; 52 40 platforms = platforms.unix; 53 41 }; 54 - } 42 + })