Merge remote-tracking branch 'origin/develop'

runtimeverification · May 23, 2024 · e21966f · e21966f
2 parents f96245d + 2e22359
commit e21966f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6
+6e195d1cdd2e3f56389521a23d28125edc607c6e
diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release
@@ -1 +1 @@
-0.1.26
+0.1.28
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,11 +1,11 @@
 {
   description = "K Framework";
   inputs = {
-    haskell-backend.url = "github:runtimeverification/haskell-backend/e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/6e195d1cdd2e3f56389521a23d28125edc607c6e";
     nixpkgs.follows = "llvm-backend/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
     llvm-backend = {
-      url = "github:runtimeverification/llvm-backend/v0.1.26";
+      url = "github:runtimeverification/llvm-backend/v0.1.28";
       inputs.utils.follows = "flake-utils";
     };
     rv-utils.url = "github:runtimeverification/rv-nix-tools";

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6
		6e195d1cdd2e3f56389521a23d28125edc607c6e
+7 −7		flake.lock
+86 −179		include/kllvm/binary/ProofTraceParser.h
+172 −30		include/kllvm/binary/deserializer.h
+18 −5		lib/binary/ProofTraceParser.cpp
+42 −0		lib/binary/deserializer.cpp
+2 −2		nix/llvm-backend.nix
+1 −1		nix/overlay.nix
+1 −1		package/debian/changelog
+1 −1		package/version
+0 −1		test/lit.cfg.py