Update Nix Dependencies

AUCOHL · Oct 20, 2024 · 5eb008b · 5eb008b
1 parent b656891
commit 5eb008b
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 282 deletions.
diff --git a/default.nix b/default.nix
@@ -9,105 +9,107 @@
   yosys,
   verilog,
   quaigh,
-  nl2bench,
   ncurses,
   makeBinaryWrapper,
-}:
-let
+}: let
   generated = swiftpm2nix.helpers ./nix;
-  pyenv = (python3.withPackages(ps: with ps; [pyverilog]));
+  pyenv = python3.withPackages (ps: with ps; [nl2bench pyverilog]);
   stdenv = swiftPackages.stdenv;
 in
-stdenv.mkDerivation (finalAttrs: {
-	name = "fault";
-
-	src = nix-gitignore.gitignoreSourcePure ./.gitignore ./.;
-
-	swiftpmFlags = [
-    "--verbose"
-  ];
-  # ++ lib.lists.optional swiftPackages.stdenv.isDarwin [
-  #   "-Xcc"
-  #   "-mmacosx-version-min=11"
-  #   "-Xcc"
-  #   "-target"
-  #   "-Xcc"
-  #   "x86_64-apple-macosx11"
-  #   "-Xswiftc"
-  #   "-target"
-  #   "-Xswiftc"
-  #   "x86_64-apple-macosx11"
-  # ];
-  nativeBuildInputs = [ swift swiftpm makeBinaryWrapper ];
-
-  buildInputs = with swiftPackages; [
-    Foundation
-    XCTest
-  ] ++ lib.lists.optional (!stdenv.isDarwin) [Dispatch];
-
-  propagatedBuildInputs = [
-    pyenv
-    yosys
-    verilog
-    quaigh
-    nl2bench
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytest
-  ];
-
-  configurePhase = generated.configure;
-
-  # This doesn't work on Linux otherwise and I don't know why.
-  preBuild = if stdenv.isDarwin then "" else ''
-    export LD_LIBRARY_PATH=${swiftPackages.Dispatch}/lib:$LD_LIBRARY_PATH
-  '';
-
-  doCheck = true;
-
-  faultEnv = ''
-    export PYTHONPATH=${pyenv}/${pyenv.sitePackages}
-    export PATH=${verilog}/bin:$PATH
-    export PATH=${yosys}/bin:$PATH
-    export PYTHON_LIBRARY=${pyenv}/lib/lib${pyenv.libPrefix}${swiftPackages.stdenv.hostPlatform.extensions.sharedLibrary}
-    export FAULT_IVL_BASE=${verilog}/lib/ivl
-  '';
-
-  checkPhase = ''
-    runHook preCheck
-    ${finalAttrs.faultEnv}
-    PYTEST_FAULT_BIN="$(swiftpmBinPath)/fault" pytest
-    runHook postCheck
-  '';
+  stdenv.mkDerivation (finalAttrs: {
+    name = "fault";
 
-  installPhase = ''
-    runHook preInstall
-    binPath="$(swiftpmBinPath)"
-    mkdir -p $out/bin
-    cp $binPath/fault $out/bin/fault
-    ln -s ${nl2bench}/bin/nl2bench $out/bin/nl2bench
-    runHook postInstall
-  '';
-
-  fixupPhase = ''
-    runHook preFixup
-    wrapProgram $out/bin/fault\
-      --prefix PYTHONPATH : ${pyenv}/${pyenv.sitePackages}\
-      --prefix PATH : ${verilog}/bin\
-      --prefix PATH : ${quaigh}/bin\
-      --prefix PATH : ${yosys}/bin\
-      --set PYTHON_LIBRARY ${pyenv}/lib/lib${pyenv.libPrefix}${swiftPackages.stdenv.hostPlatform.extensions.sharedLibrary}\
-      --set FAULT_IVL_BASE ${verilog}/lib/ivl
-    runHook postFixup
-  '';
-
-  meta = with lib; {
-    description = "Open-source EDA's missing DFT toolchain";
-    homepage = "https://github.com/AUCOHL/Fault";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-
-  shellHook = finalAttrs.faultEnv + finalAttrs.preBuild;
-})
+    src = nix-gitignore.gitignoreSourcePure ./.gitignore ./.;
+
+    swiftpmFlags = [
+      "--verbose"
+    ];
+    # ++ lib.lists.optional swiftPackages.stdenv.isDarwin [
+    #   "-Xcc"
+    #   "-mmacosx-version-min=11"
+    #   "-Xcc"
+    #   "-target"
+    #   "-Xcc"
+    #   "x86_64-apple-macosx11"
+    #   "-Xswiftc"
+    #   "-target"
+    #   "-Xswiftc"
+    #   "x86_64-apple-macosx11"
+    # ];
+    nativeBuildInputs = [swift swiftpm makeBinaryWrapper];
+
+    buildInputs = with swiftPackages;
+      [
+        Foundation
+        XCTest
+      ]
+      ++ lib.lists.optional (!stdenv.isDarwin) [Dispatch];
+
+    propagatedBuildInputs = [
+      pyenv
+      yosys
+      verilog
+      quaigh
+    ];
+
+    nativeCheckInputs = with python3.pkgs; [
+      pytest
+    ];
+
+    configurePhase = generated.configure;
+
+    # This doesn't work on Linux otherwise and I don't know why.
+    preBuild =
+      if stdenv.isDarwin
+      then ""
+      else ''
+        export LD_LIBRARY_PATH=${swiftPackages.Dispatch}/lib:$LD_LIBRARY_PATH
+      '';
+
+    doCheck = true;
+
+    faultEnv = ''
+      export PYTHONPATH=${pyenv}/${pyenv.sitePackages}
+      export PATH=${verilog}/bin:$PATH
+      export PATH=${yosys}/bin:$PATH
+      export PYTHON_LIBRARY=${pyenv}/lib/lib${pyenv.libPrefix}${swiftPackages.stdenv.hostPlatform.extensions.sharedLibrary}
+      export FAULT_IVL_BASE=${verilog}/lib/ivl
+    '';
+
+    checkPhase = ''
+      runHook preCheck
+      ${finalAttrs.faultEnv}
+      PYTEST_FAULT_BIN="$(swiftpmBinPath)/fault" pytest
+      runHook postCheck
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      binPath="$(swiftpmBinPath)"
+      mkdir -p $out/bin
+      cp $binPath/fault $out/bin/fault
+      ln -s ${python3.pkgs.nl2bench}/bin/nl2bench $out/bin/nl2bench
+      runHook postInstall
+    '';
+
+    fixupPhase = ''
+      runHook preFixup
+      wrapProgram $out/bin/fault\
+        --prefix PYTHONPATH : ${pyenv}/${pyenv.sitePackages}\
+        --prefix PATH : ${verilog}/bin\
+        --prefix PATH : ${quaigh}/bin\
+        --prefix PATH : ${yosys}/bin\
+        --set PYTHON_LIBRARY ${pyenv}/lib/lib${pyenv.libPrefix}${swiftPackages.stdenv.hostPlatform.extensions.sharedLibrary}\
+        --set FAULT_IVL_BASE ${verilog}/lib/ivl
+      runHook postFixup
+    '';
+
+    meta = with lib; {
+      description = "Open-source EDA's missing DFT toolchain";
+      homepage = "https://github.com/AUCOHL/Fault";
+      license = licenses.asl20;
+      platforms = platforms.linux ++ platforms.darwin;
+    };
+
+    shellHook = finalAttrs.faultEnv + finalAttrs.preBuild;
+  })