Update dependency: deps/kwasm_release (#296)

* deps/kwasm_release: Set Version 0.1.69 * Set Version: 0.1.88 * kmultiversx/: sync poetry files 0.1.69 * flake.{nix,lock}: update Nix derivations * deps/kwasm_release: Set Version 0.1.70 * kmultiversx/: sync poetry files 0.1.70 * deps/k_release: sync release file version 7.1.30 * flake.{nix,lock}: update Nix derivations * Fix hypothesis issue * kmultiversx/: sync poetry files 0.1.70 * Two-step fix --------- Co-authored-by: devops <[email protected]> Co-authored-by: Bruce Collie <[email protected]>
runtimeverification · Jun 27, 2024 · 8ee34fe · 8ee34fe
1 parent 3b0736a
commit 8ee34fe
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 101 deletions.
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.1.21
+7.1.30
diff --git a/deps/kwasm_release b/deps/kwasm_release
@@ -1 +1 @@
-0.1.68
+0.1.70
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,9 +2,9 @@
   description = "K Semantics of MultiversX";
 
   inputs = {
-    wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.68";
-    k-framework.url = "github:runtimeverification/k/v7.1.21";
-    pyk.url = "github:runtimeverification/k/v7.1.21?dir=pyk";
+    wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.70";
+    k-framework.url = "github:runtimeverification/k/v7.1.30";
+    pyk.url = "github:runtimeverification/k/v7.1.30?dir=pyk";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.url = "github:runtimeverification/rv-nix-tools";
@@ -112,14 +112,19 @@
             };
             overrides = poetry2nix.overrides.withDefaults
             (finalPython: prevPython: {
-              pyk = nixpkgs-pyk.pyk-python310;
-              pykwasm = wasm-semantics.packages.${prev.system}.kwasm-pyk;
-              hypothesis = prevPython.hypothesis.overridePythonAttrs (old: {
+              kframework = nixpkgs-pyk.pyk-python310.overridePythonAttrs
+                (old: {
                   propagatedBuildInputs = prev.lib.filter
-                    (x: !(prev.lib.strings.hasInfix "attrs" x.name || prev.lib.strings.hasInfix "exceptiongroup" x.name))
-                    old.propagatedBuildInputs;
-                  buildInputs = (old.buildInputs or []) ++ [ finalPython.attrs finalPython.exceptiongroup ];
-              });
+                    (x: !(prev.lib.strings.hasInfix "hypothesis" x.name))
+                    old.propagatedBuildInputs ++ [ finalPython.hypothesis ];
+                });
+              pykwasm =
+                wasm-semantics.packages.${prev.system}.kwasm-pyk.overridePythonAttrs
+                  (old: {
+                    propagatedBuildInputs = prev.lib.filter
+                      (x: !(prev.lib.strings.hasInfix "kframework" x.name))
+                      old.propagatedBuildInputs ++ [ finalPython.kframework ];
+                  });
             });
             groups = [ ];
             checkGroups = [ ];