diff --git a/flake.nix b/flake.nix index 6437688..567e7a4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "ARTIQ port to the Zynq-7000 platform"; inputs.artiq.url = git+https://github.com/m-labs/artiq.git; - inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs; + inputs.zynq-rs.url = git+https://git.m-labs.hk/srenblad/zynq-rs/?ref=bump_to_llvm14; inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs"; outputs = { self, zynq-rs, artiq }: @@ -135,13 +135,13 @@ pkgs.gnumake (pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ])) zynqpkgs.cargo-xbuild - pkgs.llvmPackages_13.llvm - pkgs.llvmPackages_13.clang-unwrapped + pkgs.llvmPackages_14.llvm + pkgs.llvmPackages_14.clang-unwrapped ]; buildPhase = '' export ZYNQ_REV=${zynqRev} export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library" - export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include" + export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include" export CARGO_HOME=$(mktemp -d cargo-home.XXX) export ZYNQ_RS=${zynq-rs} make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype} @@ -376,8 +376,8 @@ name = "artiq-zynq-dev-shell"; buildInputs = with pkgs; [ rust - llvmPackages_13.llvm - llvmPackages_13.clang-unwrapped + llvmPackages_14.llvm + llvmPackages_14.clang-unwrapped gnumake cacert zynqpkgs.cargo-xbuild @@ -392,7 +392,7 @@ ]; ZYNQ_REV="${zynqRev}"; XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library"; - CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include"; + CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include"; ZYNQ_RS = "${zynq-rs}"; OPENOCD_ZYNQ = "${zynq-rs}/openocd"; SZL = "${zynqpkgs.szl}";