Simplify Nix code (#674)

* Simplify Nix usage * Remove separate pyk version bump * Set Version: 0.1.82 --------- Co-authored-by: devops <[email protected]>
runtimeverification · Jul 11, 2024 · 521a6c8 · 521a6c8
1 parent 0eec76c
commit 521a6c8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 194 deletions.
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
@@ -47,7 +47,6 @@ jobs:
         run: |
           K_VERSION=v"$(cat deps/k_release)"
           sed -i 's!    k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
-          sed -i 's!    pyk.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+?dir=pyk"!    pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true
       - name: 'Push updates'

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,12 +6,11 @@
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";
-    pyk.url = "github:runtimeverification/k/v7.1.54?dir=pyk";
-    poetry2nix.follows = "pyk/poetry2nix";
+    poetry2nix.follows = "k-framework/poetry2nix";
   };
 
   outputs =
-    { self, k-framework, nixpkgs, flake-utils, rv-utils, pyk, poetry2nix }:
+    { self, k-framework, nixpkgs, flake-utils, rv-utils, poetry2nix }:
     let
       overlay = (final: prev:
         let
@@ -28,7 +27,7 @@
             inherit src version;
 
             buildInputs = with prev; [
-              k-framework.packages.${system}.k
+              k
               final.kwasm-pyk 
               python310
             ];
@@ -50,7 +49,7 @@
                 --prefix PATH : ${
                   prev.lib.makeBinPath [
                     prev.which
-                    k-framework.packages.${prev.system}.k
+                    prev.k
                   ]
                 } \
                 --set KDIST_DIR $out
@@ -131,7 +130,7 @@
           inherit system;
           overlays = [
             poetry2nix.overlays.default
-            pyk.overlay
+            k-framework.overlay
             overlay
           ];
         };

diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.81
+0.1.82
diff --git a/pykwasm/pyproject.toml b/pykwasm/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pykwasm"
-version = "0.1.81"
+version = "0.1.82"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",