diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-13 11:35:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-13 11:35:44 +0200 |
commit | 41efb3b9f3a7dad7fad5ffb3b72c0c1b64170367 (patch) | |
tree | b4210d842e7ab1fcfe6958d82efe9ca769eeb92b /pkgs/applications | |
parent | f293e4ebbc93cf68f4d46ff3da79b5eef109db18 (diff) | |
parent | 1f6513a145cc61dd1533a4a385ba3e995835001a (diff) |
Merge pull request #310339 from wahjava/update-kakoune
kakoune: 2023.08.05 -> 2024.05.09
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/kakoune/default.nix | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index fa0e485d71287..9a3522c5a5311 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,30 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kakoune-unwrapped"; - version = "2023.08.05"; + version = "2024.05.09"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "v${version}"; - sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Dfp33zk9ZUMrCZRfPNfoSX6rgQKItvOQx+CuRNQgtTA="; }; - patches = [ - # Use explicit target types for gather calls to bypass clang regression - # - # Since clang-16 there has been a regression in the P0522R0 support. - # (Bug report at https://github.com/llvm/llvm-project/issue/63281) - # - # Closes mawww/kakoune#4892 - (fetchpatch { - url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; - hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; - }) - ]; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; - preConfigure = '' - export version="v${version}" + postPatch = '' + echo "v${finalAttrs.version}" >.version ''; enableParallelBuilding = true; @@ -51,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra ]; platforms = platforms.unix; }; -} +}) |