diff --git a/pkgs/by-name/ka/kati/package.nix b/pkgs/by-name/ka/kati/package.nix index e956e4798851..f3e1e621ff97 100644 --- a/pkgs/by-name/ka/kati/package.nix +++ b/pkgs/by-name/ka/kati/package.nix @@ -2,20 +2,25 @@ lib, stdenv, fetchFromGitHub, + replaceVars, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "kati-unstable"; - version = "2019-09-23"; + version = "0-unstable-2026-02-12"; src = fetchFromGitHub { owner = "google"; repo = "kati"; - rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f"; - sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866"; + rev = "985493689b70e28970952bde44ac2a8433257b5e"; + sha256 = "sha256-fn+eA/TBmiyQYeUQvviL/zc9qxUYfW1BaeqNCILsk+w="; }; - patches = [ ./version.patch ]; + patches = [ + (replaceVars ./version.patch { + version = finalAttrs.src.rev; + }) + ]; installPhase = '' install -D ckati $out/bin/ckati @@ -29,4 +34,4 @@ stdenv.mkDerivation { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danielfullmer ]; }; -} +}) diff --git a/pkgs/by-name/ka/kati/version.patch b/pkgs/by-name/ka/kati/version.patch index 1821ac6bbb73..fa0c19f2bb8c 100644 --- a/pkgs/by-name/ka/kati/version.patch +++ b/pkgs/by-name/ka/kati/version.patch @@ -1,19 +1,22 @@ diff --git a/Makefile.ckati b/Makefile.ckati -index e4067bb..15518f3 100644 +index d585106..7e15d08 100644 --- a/Makefile.ckati +++ b/Makefile.ckati -@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o +@@ -101,16 +101,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o $(KATI_LD) $^ -o $@ $(KATI_LIBS) # Rule to generate version.cc --KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel) +-KATI_GIT_DIR := $(shell cd $(KATI_SRC_PATH); realpath `git rev-parse --git-dir`) + KATI_VERSION_DEPS := -ifneq ($(KATI_GIT_DIR),) --KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index +-KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index) +-endif +-ifneq ($(KATI_VERSION_DEPS),) -KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) -else - KATI_VERSION_DEPS := - KATI_VERSION := unknown +-KATI_VERSION := unknown -endif ++KATI_VERSION := @version@ $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS) @mkdir -p $(dir $@) echo '// +build ignore' > $@