From 65a0dccb3325c4469c25693cc4fc48dc577886a0 Mon Sep 17 00:00:00 2001
From: xenia <xenia.agda@gmail.com>
Date: Sun, 21 Jan 2024 22:49:32 +0100
Subject: [PATCH] Rename nix targets

---
 flake.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1499f0e..46edb5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,13 +26,13 @@
              : 3 > $out
           '';
 
-          alu-sim = pkgs.runCommandCC "alu-sim" {} ''
+          alu-test = pkgs.runCommandCC "alu-sim" {} ''
             ${verilate-src "--cc --build --exe ./simulation/tester.cpp ./simulation/test_alu.cpp -top alu"}
             mv obj_dir "$out"
-            mkdir "$out/bin" && cp "$out/Valu" "$out/bin/alu-sim"
+            mkdir "$out/bin" && cp "$out/Valu" "$out/bin/alu-test"
           '';
 
-          alu-sim-trace = pkgs.runCommandCC "alu-sim-trace" {} ''
+          alu-test-trace = pkgs.runCommandCC "alu-sim-trace" {} ''
             ${verilate-src "--cc --build --exe --trace -CFLAGS -DTRACE=1 ./simulation/tester.cpp ./simulation/test_alu.cpp -top alu"}
             mv obj_dir "$out"
             mkdir "$out/bin" && cp "$out/Valu" "$out/bin/alu-sim"
@@ -41,13 +41,13 @@
             chmod u+x $out/bin/alu-sim-trace
           '';
 
-          alu-synth = pkgs.runCommandCC "alu-synth" {} ''
+          synth = pkgs.runCommandCC "synth" {} ''
             mkdir -p "$out"
             find ${./src} -name '*.v' -exec ${yosys}/bin/yosys -f ' -sv' -Q -p "synth_ice40 -top topmost -json $out/synth.json -dsp" {} +
           '';
 
-          alu-synth-view = pkgs.writeScriptBin "alu-synth-view" ''
-            ${pkgs.nextpnrWithGui}/bin/nextpnr-ice40 --up5k --package sg48 --pcf ${./fpga-files/rot.pcf} --json ${alu-synth}/synth.json --gui
+          pnr-interactive = pkgs.writeScriptBin "pnr-interactive" ''
+            ${pkgs.nextpnrWithGui}/bin/nextpnr-ice40 --up5k --package sg48 --pcf ${./fpga-files/rot.pcf} --json ${synth}/synth.json --gui
           '';
 
           deps = [
@@ -58,15 +58,13 @@
 
         packages.lint = lint;
 
-        packages.alu-sim = alu-sim;
-        packages.alu-sim-trace = alu-sim-trace;
+        packages.alu-test = alu-test;
+        packages.alu-test-trace = alu-test-trace;
 
-        packages.alu-synth = alu-synth;
-        packages.alu-synth-view = alu-synth-view;
+        packages.synth = synth;
+        packages.pnr-interactive = pnr-interactive;
 
-        devShells.default = pkgs.mkShell {
-          packages = deps;
-        };
+        devShells.default = pkgs.mkShell { packages = deps; };
       }
     );
 }