From cf0152b170f692b5326a16bc5b776aba308b7af8 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Tue, 2 Jul 2024 21:42:54 +0100 Subject: [PATCH 1/2] Use portable sed invocation (#4494) The `\|` operator is not portable to BSD / macOS sed, which makes some tests appear flaky when run on those platforms. This PR switches the offending command over to a wordier, but correct invocation. --- k-distribution/include/kframework/ktest-common.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k-distribution/include/kframework/ktest-common.mak b/k-distribution/include/kframework/ktest-common.mak index e87717e9d68..ce1a6102c5a 100644 --- a/k-distribution/include/kframework/ktest-common.mak +++ b/k-distribution/include/kframework/ktest-common.mak @@ -28,4 +28,4 @@ LLVM_KRUN=${K_BIN}/llvm-krun # and kdep KDEP=${K_BIN}/kdep # command to strip paths from test outputs -REMOVE_PATHS=| sed 's!\('`pwd`'\|'${BUILTIN_DIR}'\|/nix/store/.\+/include/kframework/builtin\)/\(\./\)\{0,2\}!!g' +REMOVE_PATHS=| sed 's!\('`pwd`'\)/\(\./\)\{0,2\}!!g' | sed 's!\('${BUILTIN_DIR}'\)/\(\./\)\{0,2\}!!g' | sed 's!\('/nix/store/..*/include/kframework/builtin'\)/\(\./\)\{0,2\}!!g' From c7cba689e0141201c198bb1c7729ed9d431ff8c0 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 2 Jul 2024 19:33:39 -0600 Subject: [PATCH 2/2] Update dependency: deps/haskell-backend_release (#4491) Co-authored-by: devops Co-authored-by: Jost Berthold --- deps/haskell-backend_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release index 3e9fab84ad3..fac8924a184 100644 --- a/deps/haskell-backend_release +++ b/deps/haskell-backend_release @@ -1 +1 @@ -v0.1.25 +v0.1.29 diff --git a/flake.lock b/flake.lock index ca2739a69a1..b0ebac8573b 100644 --- a/flake.lock +++ b/flake.lock @@ -63,16 +63,16 @@ "z3": "z3" }, "locked": { - "lastModified": 1719489268, - "narHash": "sha256-J480ZO5k/WjMbwCIfrhy+Kg4p+r5qgbIbCunkn1DhnA=", + "lastModified": 1719881076, + "narHash": "sha256-t9RTbVarwaobMiJkQjXykP8Qt+26miKzr3inONULvck=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "e82bc74a95ce6a78c6f8fec7cb255a36aa99e0c6", + "rev": "11265424aeb138168bc73f1f028273de192b5be4", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.25", + "ref": "v0.1.29", "repo": "haskell-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index a7047ef0364..f795fd2aec8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "K Framework"; inputs = { - haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.25"; + haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.29"; 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 e82bc74a95c..11265424aeb 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit e82bc74a95ce6a78c6f8fec7cb255a36aa99e0c6 +Subproject commit 11265424aeb138168bc73f1f028273de192b5be4