2 files changed, 20 insertions(+), 22 deletions(-)

M flake.lock
M flake.nix

@@ 20,16 20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696177401,
-        "narHash": "sha256-xSVZ+arFlQqWIArSGBA2wSyKHy9SRnIvkAHhDiMsT7o=",
+        "lastModified": 1699343069,
+        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fcf981a219ef7b910c83871ba202a883cbf7b3d6",
+        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

@@ 2,7 2,7 @@
   description = "PAP verilog environment";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 


@@ 17,31 17,29 @@
               inherit system;
               crossSystem.config = "riscv32-none-elf";
             };
-            verilog-toolchain = with pkgs; symlinkJoin {
-              name = "verilog-toolchain";
-              meta.mainProgram = "verilog";
-              paths = [
-                verilog
-                verilator
-                gtkwave
-              ];
-            };
         in rec {
+          devShells.default = pkgs.mkShell {
+            name = "pap-processor-singlecycle";
 
-          packages.verilog = verilog-toolchain;
-          packages.verilog-lsp = pkgs.svls;
-          packages.default = packages.verilog;
+            packages = [
+              # verilog simulation
+              pkgs.verilog
+              pkgs.verilator
 
-          devShells.default = pkgs.mkShell {
-            name = "pap-verilog";
+              # wave viewer
+              pkgs.gtkwave
 
-            packages = with pkgs; [
+              # riscv toolchain
+              # building c, assembly
               riscPkgs.buildPackages.binutils
               riscPkgs.buildPackages.gcc
 
-              packages.verilog
+              # for testing
+              pkgs.python3
+
               # lsp
-              packages.verilog-lsp
+              pkgs.svls
+              pkgs.pyright
             ];
           };
         }