mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 10:34:16 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
20 lines
695 B
Diff
20 lines
695 B
Diff
diff --git a/Makefile.ckati b/Makefile.ckati
|
|
index e4067bb..15518f3 100644
|
|
--- a/Makefile.ckati
|
|
+++ b/Makefile.ckati
|
|
@@ -102,14 +102,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)
|
|
-ifneq ($(KATI_GIT_DIR),)
|
|
-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index
|
|
-KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)
|
|
-else
|
|
KATI_VERSION_DEPS :=
|
|
KATI_VERSION := unknown
|
|
-endif
|
|
$(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS)
|
|
@mkdir -p $(dir $@)
|
|
echo '// +build ignore' > $@
|