Merge remote-tracking branch 'origin/develop'

runtimeverification · Nov 28, 2023 · 7392d36 · 7392d36
2 parents 44db3e6 + 4d8cbf9
commit 7392d36
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release
@@ -1 +1 @@
-1b22ad45abf6209da1ec4c3d7bb65e4553072e1c
+c289a1a29575f9e5156fae75fb34e1c97cfffd02
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "K Framework";
   inputs = {
-    haskell-backend.url = "github:runtimeverification/haskell-backend/2f90bbf6a7a970fe0b8fc4c8a5c1ec3fd8aee4f1";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/b2bade8ce62e5f3add32d87e98244ceb31790f9f";
     booster-backend = {
-      url = "github:runtimeverification/hs-backend-booster/1b22ad45abf6209da1ec4c3d7bb65e4553072e1c";
+      url = "github:runtimeverification/hs-backend-booster/c289a1a29575f9e5156fae75fb34e1c97cfffd02";
       inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
       inputs.haskell-backend.follows = "haskell-backend";
       inputs.stacklock2nix.follows = "haskell-backend/stacklock2nix";

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1b22ad45abf6209da1ec4c3d7bb65e4553072e1c
		c289a1a29575f9e5156fae75fb34e1c97cfffd02
+19 −1		docs/2022-07-18-JSON-RPC-Server-API.md
+1 −0		kore-rpc-types/src/Kore/JsonRpc/Types.hs
+7 −0		kore/src/Kore/JsonRpc.hs
+1 −1		cabal.project
+1 −1		deps/haskell-backend_release
+4 −4		flake.lock
+1 −1		flake.nix
+7 −0		library/Booster/JsonRpc.hs
+1 −1		stack.yaml
+6 −6		stack.yaml.lock