Merge branch 'master' into sam/nix-cleanup

runtimeverification · Sep 9, 2024 · b9d9343 · b9d9343
2 parents afcdc9f + 296ae4a
commit b9d9343
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 49 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,11 +26,12 @@ RUN groupadd -g $GROUP_ID user && useradd -m -u $USER_ID -s /bin/sh -g user user
 USER user:user
 WORKDIR /home/user
 
-RUN    curl -sSL https://install.python-poetry.org | python3 - \
-    && poetry --version
+RUN    curl -sSL https://install.python-poetry.org | python3 -
 
 RUN pip3 install --user  \
            cytoolz       \
            numpy
 
-ENV PATH=/home/user/wabt/build:/home/user/.local/bin:$PATH
+ENV PATH=/home/user/.local/bin:$PATH
+
+RUN poetry --version
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.1.129
+7.1.137
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "K Semantics of WebAssembly";
 
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v7.1.129";
+    k-framework.url = "github:runtimeverification/k/v7.1.137";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";

diff --git a/pykwasm/poetry.lock b/pykwasm/poetry.lock
diff --git a/pykwasm/pyproject.toml b/pykwasm/pyproject.toml
@@ -23,7 +23,7 @@ wasm-semantics = "pykwasm.kdist.plugin"
 python = "^3.10"
 cytoolz = "^0.12.1"
 numpy = "^1.24.2"
-kframework = "7.1.129"
+kframework = "7.1.137"
 py-wasm = { git = "https://github.com/runtimeverification/py-wasm.git", tag="0.2.1" }
 
 [tool.poetry.group.dev.dependencies]