Nix Cleanup

AUCOHL · Jul 26, 2024 · ce56d20 · ce56d20
1 parent 2998f51
commit ce56d20
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/Tests/test_fault.py b/Tests/test_fault.py
@@ -10,7 +10,7 @@ def run(label, steps):
         if step[0] == "nl2bench":
             cmd = step
         else:
-            cmd = ["swift", "run", "fault"] + step
+            cmd = shlex.split(os.getenv("PYTEST_FAULT_BIN", "swift run Fault")) + step
         print(f"$ {shlex.join(cmd)}")
         subprocess.check_call(cmd)
 

diff --git a/default.nix b/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
 
 	src = nix-gitignore.gitignoreSourcePure ./.gitignore ./.;
 
-  nativeBuildInputs = [ swift swiftpm makeBinaryWrapper ];
 	swiftpmFlags = [
     "--verbose"
   ];
@@ -39,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
   #   "-Xswiftc"
   #   "x86_64-apple-macosx11"
   # ];
+  nativeBuildInputs = [ swift swiftpm makeBinaryWrapper ];
+
+  buildInputs = with swiftPackages; [
+    Foundation
+    XCTest
+  ] ++ lib.lists.optional (!stdenv.isDarwin) [Dispatch];
 
   propagatedBuildInputs = [
     pyenv
@@ -48,10 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
     nl2bench
   ];
 
-  buildInputs = with swiftPackages; [
-    Foundation
-    XCTest
-  ] ++ lib.lists.optional (!stdenv.isDarwin) [Dispatch];
+  nativeCheckInputs = with python3.pkgs; [
+    pytest
+  ];
 
   configurePhase = generated.configure;
 
@@ -66,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
     export LD_LIBRARY_PATH=${swiftPackages.Dispatch}/lib:$LD_LIBRARY_PATH
   '';
 
-  doCheck = !swiftPackages.stdenv.isDarwin;
+  doCheck = true;
 
-  preCheck = ''
+  faultEnv = ''
     export PYTHONPATH=${pyenv}/${pyenv.sitePackages}
     export PATH=${verilog}/bin:$PATH
     export PATH=${yosys}/bin:$PATH
@@ -77,9 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   checkPhase = ''
-    ${finalAttrs.preCheck}
-    echo $PATH
-    swift test
+    ${finalAttrs.faultEnv}
+    PYTEST_FAULT_BIN="$(swiftpmBinPath)/fault" pytest
   '';
 
   fixupPhase = ''
@@ -98,5 +101,5 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.linux ++ platforms.darwin;
   };
 
-  shellHook = finalAttrs.preCheck + finalAttrs.preBuild;
+  shellHook = finalAttrs.faultEnv + finalAttrs.preBuild;
 })
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
     nix-eda.url = github:efabless/nix-eda;
     nl2bench.url = github:donn/nl2bench;
     quaigh = {
-      url = github:coloquinte/quaigh;
+      url = github:donn/quaigh/fix_nix_linux;
       inputs.nixpkgs.follows = "nix-eda/nixpkgs";
     };
   };