Minor nix cleanup (#696)

* Minor nix cleanup * Set Version: 0.1.104 * fix poetry2nix version used * Set Version: 0.1.105 --------- Co-authored-by: devops <[email protected]>
runtimeverification · Sep 9, 2024 · fd23f08 · fd23f08
1 parent 296ae4a
commit fd23f08
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 51 deletions.
diff --git a/flake.nix b/flake.nix
@@ -9,8 +9,7 @@
     poetry2nix.follows = "k-framework/poetry2nix";
   };
 
-  outputs =
-    { self, k-framework, nixpkgs, flake-utils, rv-utils, poetry2nix }:
+  outputs = { self, k-framework, nixpkgs, flake-utils, rv-utils, ... }@inputs:
     let
       overlay = (final: prev:
         let
@@ -19,18 +18,14 @@
             "flake.lock"
             ./.gitignore
           ] ./.);
-
+          poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; };
           version = self.rev or "dirty";
         in {
           kwasm = prev.stdenv.mkDerivation {
             pname = "kwasm";
             inherit src version;
 
-            buildInputs = with prev; [
-              k
-              final.kwasm-pyk 
-              python310
-            ];
+            buildInputs = with prev; [ k final.kwasm-pyk python310 ];
 
             nativeBuildInputs = [ prev.makeWrapper ];
 
@@ -46,41 +41,22 @@
               cp -r ./kdist-*/* $out/
               mkdir -p $out/bin
               makeWrapper ${final.kwasm-pyk}/bin/kwasm $out/bin/kwasm \
-                --prefix PATH : ${
-                  prev.lib.makeBinPath [
-                    prev.which
-                    prev.k
-                  ]
-                } \
+                --prefix PATH : ${prev.lib.makeBinPath [ prev.which prev.k ]} \
                 --set KDIST_DIR $out
             '';
           };
 
-          kwasm-pyk = prev.poetry2nix.mkPoetryApplication {
+          kwasm-pyk = poetry2nix.mkPoetryApplication {
             python = prev.python310;
             projectDir = ./pykwasm;
 
-            overrides = prev.poetry2nix.overrides.withDefaults
+            overrides = poetry2nix.overrides.withDefaults
               (finalPython: prevPython: {
-                pyk = prev.pyk-python310;
-
-                pygments = prevPython.pygments.overridePythonAttrs
-                  (old: {
-                    buildInputs = (old.buildInputs or [ ])
-                      ++ [ prevPython.hatchling ];
-                    });
-
-                xdg-base-dirs = prevPython.xdg-base-dirs.overridePythonAttrs
-                  (old: {
-                    propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
-                      ++ [ finalPython.poetry ];
-                  });
-
-                py-wasm = prevPython.py-wasm.overridePythonAttrs
-                  (old: {
-                    buildInputs = (old.buildInputs or [ ])
-                      ++ [ prevPython.setuptools ];
-                  });
+                kframework = prev.pyk-python310;
+                py-wasm = prevPython.py-wasm.overridePythonAttrs (old: {
+                  buildInputs = (old.buildInputs or [ ])
+                    ++ [ prevPython.setuptools ];
+                });
               });
 
             checkGroups = [ ];
@@ -92,12 +68,7 @@
             pname = "kwasm-test";
             src = final.kwasm.src;
 
-            buildInputs = with final; [
-              kwasm
-              kwasm-pyk
-              which
-              git
-            ];
+            buildInputs = with final; [ kwasm kwasm-pyk which git ];
 
             patchPhase = with final; ''
               substituteInPlace Makefile                                                  \
@@ -128,18 +99,14 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [
-            poetry2nix.overlays.default
-            k-framework.overlay
-            overlay
-          ];
+          overlays = [ k-framework.overlay overlay ];
         };
       in {
         packages = rec {
           inherit (pkgs) kwasm kwasm-pyk kwasm-test;
           default = kwasm;
         };
-    }) // {
-      overlays.default = overlay;
-    };
+      }) // {
+        overlays.default = overlay;
+      };
 }
diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.104
+0.1.105
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.104"
+version = "0.1.105"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",