diff --git a/flake.lock b/flake.lock index a4d418ea2..d57a66a94 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1780303090, - "narHash": "sha256-wSN5A+RmstGozf+wjtMagDYBXV8hpNoODWd0hl3ua18=", + "lastModified": 1780410653, + "narHash": "sha256-GgjcPoL9ZDuasunwIP0I9JTkP2oGvoZ93Vzwbwz1ldI=", "owner": "lowRISC", "repo": "lowrisc-nix", - "rev": "3c33a8aa466ea802355d704a17d600117ddea8d3", + "rev": "560d419c61cb216001f05db14ac64a310b64e4af", "type": "github" }, "original": { @@ -119,16 +119,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1780203844, + "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1779411315, - "narHash": "sha256-IMFlxeyClau51KplhhSRGhdGTvD/knShHdybP1UOTuk=", + "lastModified": 1780358675, + "narHash": "sha256-n4jX4svZwmoWpzhz3If9wkvEYKv3WuDvprE8vi57MRY=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "fdf2a76275d7a9c27deb5d2f2ab33526ac9052ff", + "rev": "3a557a9e78cc5b11bc9a610f27da4bdd5599edfe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 77b3fec7b..4c5f4e43f 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,6 @@ }; outputs = { - self, nixpkgs, flake-utils, lowrisc-nix, @@ -52,7 +51,7 @@ pythonSet = (pkgs.callPackage inputs.pyproject-nix.build.packages { - python = pkgs.python310; + python = pkgs.python312; }).overrideScope ( pkgs.lib.composeManyExtensions [ @@ -67,8 +66,9 @@ fpga = import nix/fpga.nix { inherit pkgs - pythonEnv; - llvm = lrPkgs.llvm_cheri; + pythonEnv + ; + llvm = lrPkgs.llvm_cheri; }; ftditool-cli = inputs.ftditool.packages.${system}.default; @@ -85,7 +85,6 @@ openocd uv pythonEnv - verilator verible srecord d2 @@ -101,6 +100,7 @@ commonPackages ++ (with lrPkgs; [ llvm_cheri + verilator_5_040 ]); buildInputs = with pkgs; [libelf zlib]; env = { diff --git a/nix/fpga.nix b/nix/fpga.nix index bdefb6458..28c027bcc 100644 --- a/nix/fpga.nix +++ b/nix/fpga.nix @@ -4,7 +4,7 @@ { pkgs, pythonEnv, - llvm + llvm, }: let bitstream_path = "build/lowrisc_mocha_chip_mocha_genesys2_0/synth-vivado"; bootrom_path = "build/sw/device/bootrom"; @@ -15,11 +15,11 @@ in { runtimeInputs = [pythonEnv llvm pkgs.gnumake pkgs.cmake pkgs.srecord]; text = '' # Ask fusesoc to evaluate and generate the dependencies list. - fusesoc --cores-root=. run --target=synth --setup lowrisc:mocha:chip_mocha_genesys2 1> /dev/null + fusesoc --cores-root=. run --target=synth --setup lowrisc:mocha:chip_mocha_genesys2 1> /dev/null # Build the bootROM because it's cheap, and copy the vmem to the src to be hashed. cmake -DCMAKE_BUILD_TYPE=Release -B build/sw -S sw 1> /dev/null - cmake --build build/sw --target bootrom 1> /dev/null + cmake --build build/sw --target bootrom 1> /dev/null cp ${bootrom_path}/bootrom.vmem ${bitstream_path} # Hash the dependency list generated by fusesoc