From 5cb9dd034e44f6cf6a2a9d1bea27b6962ad1058b Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@proton.me>
Date: Wed, 21 Feb 2024 19:46:35 +0100
Subject: [PATCH] chore: add questa to flake

---
 flake.lock | 33 +++++++++++++++++++++++++++------
 flake.nix  | 12 +++++++++---
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9ca56e0..ac1f2be 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,26 @@
         "type": "github"
       }
     },
+    "nix-fpga": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1708537570,
+        "narHash": "sha256-LBz4Ec/3RZU3egADKL8DIFTD7cIG7JyitVeJxZdK6dA=",
+        "owner": "Rutherther",
+        "repo": "nix-fpga",
+        "rev": "8b09797a99d2dd65753b92d503bc2b28f2eb0096",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Rutherther",
+        "repo": "nix-fpga",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -41,11 +61,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705697961,
-        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
+        "lastModified": 1708501555,
+        "narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
+        "rev": "b50a77c03d640716296021ad58950b1bb0345799",
         "type": "github"
       },
       "original": {
@@ -66,11 +86,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1705060653,
-        "narHash": "sha256-puYyylgrBS4AFAHeyVRTjTUVD8DZdecJfymWJe7H438=",
+        "lastModified": 1708175019,
+        "narHash": "sha256-B7wY2pNrLc3X9uYRo1LUmVzI6oH6fX8oi+96GdUpayU=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "e0b44e9e2d3aa855d1dd77b06f067cd0e0c3860d",
+        "rev": "403d923ea8e2e6cedce3a0f04a9394c4244cb806",
         "type": "github"
       },
       "original": {
@@ -81,6 +101,7 @@
     },
     "root": {
       "inputs": {
+        "nix-fpga": "nix-fpga",
         "nixpkgs": "nixpkgs",
         "poetry2nix": "poetry2nix"
       }
diff --git a/flake.nix b/flake.nix
index 710e5d1..fabc940 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,14 @@
       url = "github:nix-community/poetry2nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-fpga = {
+      url = "github:Rutherther/nix-fpga";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, poetry2nix, nixpkgs }:
+  outputs = { self, poetry2nix, nixpkgs, nix-fpga }:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
@@ -51,7 +56,8 @@
         meta.mainProgram = "nvc";
         paths = [
           pkgs.ghdl
-          # pkgs.nvc
+          pkgs.nvc
+          nix-fpga.packages.${system}.questa
         ];
       };
     in {
@@ -121,7 +127,7 @@
             python-env
           ];
 
-          VUNIT_SIMULATOR = "nvc";
+          VUNIT_SIMULATOR = "modelsim";
         };
       };
     };
-- 
2.49.0