fix: make vm tests eval

RossComputerGuy · Feb 6, 2025 · 3685503 · 3685503
1 parent 15f034f
commit 3685503
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packaging/components.nix b/packaging/components.nix
@@ -34,7 +34,7 @@ in
 {
   version = with zixVersion; baseVersion + versionSuffix;
   inherit (zixVersion) versionSuffix;
-  inherit nixVersion;
+  inherit nixVersion zixVersion;
 
   nix-util = callPackage ../src/libutil/package.nix { };
   nix-util-c = callPackage ../src/libutil-c/package.nix { };

diff --git a/src/nix/package.nix b/src/nix/package.nix
@@ -11,6 +11,7 @@
 
   version,
   nixVersion,
+  zixVersion,
 }:
 
 let
@@ -19,7 +20,7 @@ in
 
 mkMesonExecutable (finalAttrs: {
   pname = "zix";
-  inherit version;
+  inherit (nixVersion) version;
 
   workDir = ./.;
   fileset = fileset.unions (
@@ -102,7 +103,7 @@ mkMesonExecutable (finalAttrs: {
       echo ${nixVersion.version} > ../../../.version
 
       chmod u+w ./.zix-version
-      echo ${nixVersion.version} > ../../../.zix-version
+      echo ${version} > ../../../.zix-version
     '';
 
   mesonFlags = [