diff --git a/flake.lock b/flake.lock index 281ec32..defc7d7 100644 --- a/flake.lock +++ b/flake.lock @@ -116,10 +116,27 @@ "type": "github" } }, + "nixpkgs_old": { + "locked": { + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "artiq": "artiq", "mozilla-overlay": "mozilla-overlay", + "nixpkgs_old": "nixpkgs_old", "zynq-rs": "zynq-rs" } }, diff --git a/flake.nix b/flake.nix index 18ebba9..9fea9d7 100644 --- a/flake.nix +++ b/flake.nix @@ -6,12 +6,16 @@ inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs; inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs"; - outputs = { self, mozilla-overlay, zynq-rs, artiq }: + inputs.nixpkgs_old.url = "github:nixos/nixpkgs?ref=nixos-23.11"; + + outputs = { self, mozilla-overlay, zynq-rs, artiq, nixpkgs_old }: let + pkgs_old = import nixpkgs_old { system = "x86_64-linux";}; pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; zynqpkgs = zynq-rs.packages.x86_64-linux; artiqpkgs = artiq.packages.x86_64-linux; - llvmPackages_11 = zynq-rs.llvmPackages_11; + # llvmPackages_11 = zynq-rs.llvmPackages_11; + llvmPackages_11 = pkgs_old.llvmPackages_11; rust = zynq-rs.rust; rustPlatform = zynq-rs.rustPlatform; @@ -381,7 +385,7 @@ zynqpkgs.mkbootimage openocd openssh rsync - (python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq artiq-netboot ps.jsonschema ps.pyftdi ]))) + (python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq artiq-netboot ps.jsonschema ps.pyftdi ps.pillow ]))) artiqpkgs.artiq artiqpkgs.vivado binutils-arm diff --git a/local_run.sh b/local_run.sh index a244e19..b39f98b 100755 --- a/local_run.sh +++ b/local_run.sh @@ -13,7 +13,7 @@ fi impure=0 load_bitstream=1 -board_type="kasli_soc" +board_type="zc706" fw_type="runtime" while getopts "ilb:t:f:" opt; do @@ -36,7 +36,7 @@ done if [ -z "$board_host" ]; then case $board_type in kasli_soc) board_host="192.168.1.56";; - zc706) board_host="192.168.1.52";; + zc706) board_host="192.168.1.14";; *) echo "Unknown board type"; exit 1;; esac fi @@ -58,4 +58,4 @@ else load_bitstream_cmd="-g $result_dir/top.bit" fi artiq_netboot $load_bitstream_cmd -f $result_dir/$fw_type.bin -b $board_host -fi \ No newline at end of file +fi