From 27ae33ced9ccab0319ae61a1d43e748aefc6a829 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 20 Jun 2024 01:23:16 -0600 Subject: [PATCH] Update dependency: deps/haskell-backend_release (#4446) Co-authored-by: devops Co-authored-by: Sam Balco --- deps/haskell-backend_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- pyk/src/tests/integration/kore/test_kore_client.py | 12 ++++++++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release index bf42c7d4ea3..600c0076132 100644 --- a/deps/haskell-backend_release +++ b/deps/haskell-backend_release @@ -1 +1 @@ -v0.1.10 +v0.1.14 diff --git a/flake.lock b/flake.lock index 773258f0b95..7df2d6a9a38 100644 --- a/flake.lock +++ b/flake.lock @@ -63,16 +63,16 @@ "z3": "z3" }, "locked": { - "lastModified": 1718284603, - "narHash": "sha256-fLAY8og1RbE9rVcrEbIATUZIpkcajN8CNxDMq5x9I+s=", + "lastModified": 1718711620, + "narHash": "sha256-HipdmxMVwN0c7DXyc5VZgMFyZV+RC9+weGVroqByGeo=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "9520aa33a9d770395cdc23cbd4c025876f548a78", + "rev": "8102c7dd2ad5b69cc1c8daa87e6bc7227d9dbed5", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.10", + "ref": "v0.1.14", "repo": "haskell-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index 61ac4965466..a40b480d72c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "K Framework"; inputs = { - haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.10"; + haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.14"; nixpkgs.follows = "llvm-backend/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; llvm-backend = { diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index 9520aa33a9d..8102c7dd2ad 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit 9520aa33a9d770395cdc23cbd4c025876f548a78 +Subproject commit 8102c7dd2ad5b69cc1c8daa87e6bc7227d9dbed5 diff --git a/pyk/src/tests/integration/kore/test_kore_client.py b/pyk/src/tests/integration/kore/test_kore_client.py index eb161763186..de0059ca9cf 100644 --- a/pyk/src/tests/integration/kore/test_kore_client.py +++ b/pyk/src/tests/integration/kore/test_kore_client.py @@ -112,16 +112,20 @@ def state(n: int) -> State: term=term(3), rule_id='ae0c978867ef4cc5cbfbadf7be2ff55e30e59465697ceaffa1d9fd5343a21fc6', rule_substitution={ - EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar("Var'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL), - EVar('K', SORT_K): EVar("Var'Unds'DotVar1", SORT_K), + EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar( + "RuleVar'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL + ), + EVar('K', SORT_K): EVar("RuleVar'Unds'DotVar1", SORT_K), }, ), State( term=term(4), rule_id='37a544ff4b6da9b4fb839f86d2ad51b770bcaf3dd578b716c38cf0da33458374', rule_substitution={ - EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar("Var'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL), - EVar('K', SORT_K): EVar("Var'Unds'DotVar1", SORT_K), + EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar( + "RuleVar'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL + ), + EVar('K', SORT_K): EVar("RuleVar'Unds'DotVar1", SORT_K), }, ), ),