Merge branch 'master' into pyproject-nix-overlay

tothtamas28 · web-flow · commit a384c5ecc3f8 · 2026-04-15T15:37:06.000+02:00
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.1.301
+7.1.318
diff --git a/deps/pyproject-build-systems b/deps/pyproject-build-systems
@@ -1 +1 @@
-dbfc0483b5952c6b86e36f8b3afeb9dde30ea4b5
+042904167604c681a090c07eb6967b4dd4dae88c
diff --git a/deps/uv2nix b/deps/uv2nix
@@ -1 +1 @@
-b6ed0901aec29583532abe65117b18d86a49b617
+9d357f0d2ce6f5f35ec7959d7e704452352eb4da
diff --git a/deps/uv_release b/deps/uv_release
@@ -1 +1 @@
-0.9.2
+0.9.22
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,9 +5,9 @@
     nixpkgs.follows = "rv-nix-tools/nixpkgs";
 
     flake-utils.url = "github:numtide/flake-utils";
-    k-framework.url = "github:runtimeverification/k/v7.1.301";
+    k-framework.url = "github:runtimeverification/k/v7.1.318";
     k-framework.inputs.nixpkgs.follows = "nixpkgs";
-    uv2nix.url = "github:pyproject-nix/uv2nix/b6ed0901aec29583532abe65117b18d86a49b617";
+    uv2nix.url = "github:pyproject-nix/uv2nix/9d357f0d2ce6f5f35ec7959d7e704452352eb4da";
     # uv2nix requires a newer version of nixpkgs
     # therefore, we pin uv2nix specifically to a newer version of nixpkgs
     # until we replaced our stale version of nixpkgs with an upstream one as well
@@ -16,7 +16,7 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     uv2nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     # uv2nix.inputs.nixpkgs.follows = "nixpkgs";
-    pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/dbfc0483b5952c6b86e36f8b3afeb9dde30ea4b5";
+    pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/042904167604c681a090c07eb6967b4dd4dae88c";
     pyproject-build-systems = {
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.uv2nix.follows = "uv2nix";
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ description = ""
 readme = "README.md"
 requires-python = "~=3.10"
 dependencies = [
-    "kframework==7.1.301",
+    "kframework==7.1.318",
 ]
 
 [[project.authors]]
diff --git a/src/kimp/kimp.py b/src/kimp/kimp.py
@@ -73,7 +73,7 @@ def same_loop(self, c1: CTerm, c2: CTerm) -> bool:
     def can_make_custom_step(self, c: CTerm) -> bool:
         return False
 
-    def custom_step(self, c: CTerm, cs: CTermSymbolic) -> KCFGExtendResult | None:
+    def custom_step(self, c: CTerm, cs: CTermSymbolic, node_id: int) -> KCFGExtendResult | None:
         return None
 
     def is_mergeable(self, c1: CTerm, c2: CTerm) -> bool:
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-dbfc0483b5952c6b86e36f8b3afeb9dde30ea4b5`
	`1`	`+042904167604c681a090c07eb6967b4dd4dae88c`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b6ed0901aec29583532abe65117b18d86a49b617`
	`1`	`+9d357f0d2ce6f5f35ec7959d7e704452352eb4da`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ description = ""`
`9`	`9`	`readme = "README.md"`
`10`	`10`	`requires-python = "~=3.10"`
`11`	`11`	`dependencies = [`
`12`		`- "kframework==7.1.301",`
	`12`	`+ "kframework==7.1.318",`
`13`	`13`	`]`
`14`	`14`
`15`	`15`	`[[project.authors]]`