Merge branch 'master' into _update-deps/runtimeverification/k-web-theme

runtimeverification · Sep 16, 2024 · 76c2087 · 76c2087
2 parents 4d750e3 + 94bd37a
commit 76c2087
Show file tree

Hide file tree

Showing 25 changed files with 675 additions and 790 deletions.
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
@@ -54,7 +54,6 @@ jobs:
           BKP_VERSION=$(cat deps/blockchain-k-plugin_release)
           sed -i 's!    k-framework.url = "github:runtimeverification/k/[v0-9\.]*"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
           sed -i 's!        "github:runtimeverification/blockchain-k-plugin/[0-9a-f]*"!        "github:runtimeverification/blockchain-k-plugin/'"${BKP_VERSION}"'"!' flake.nix
-          sed -i 's!    pyk.url = "github:runtimeverification/k/[v0-9\.]*?dir=pyk"!    pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
           nix run .#update-from-submodules
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release
@@ -1 +1 @@
-300c9cf567eba4c8c88675ff67ebd859795ee169
+f1f7edb7cb7286906fe42aa37d2106036cef849f
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.1.125
+7.1.142
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		300c9cf567eba4c8c88675ff67ebd859795ee169
		f1f7edb7cb7286906fe42aa37d2106036cef849f