From 75f6bdb6a10accb54b4b3ef1b167f822a8a54caa Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 30 May 2023 16:21:06 +0800 Subject: [PATCH] flake: add boards dev shell --- flake.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1dc522ae5..4e5b15e29 100644 --- a/flake.nix +++ b/flake.nix @@ -381,7 +381,10 @@ defaultPackage.x86_64-linux = pkgs.python3.withPackages(ps: [ packages.x86_64-linux.artiq ]); - devShell.x86_64-linux = pkgs.mkShell { + # Main development shell with everything you need to develop ARTIQ on Linux. + # ARTIQ itself is not included in the environment, you can make Python use the current sources using e.g. + # export PYTHONPATH=`pwd`:$PYTHONPATH + devShells.x86_64-linux.default = pkgs.mkShell { name = "artiq-dev-shell"; buildInputs = [ (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc ps.paramiko microscope ] ++ artiq.propagatedBuildInputs )) @@ -408,6 +411,21 @@ ''; }; + # Lighter development shell optimized for building firmware and flashing boards. + devShells.x86_64-linux.boards = pkgs.mkShell { + name = "artiq-boards-shell"; + buildInputs = [ + (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ])) + rust + pkgs.cargo-xbuild + pkgs.llvmPackages_11.clang-unwrapped + pkgs.llvm_11 + pkgs.lld_11 + packages.x86_64-linux.vivado + packages.x86_64-linux.openocd-bscanspi + ]; + }; + packages.aarch64-linux = { openocd-bscanspi = openocd-bscanspi-f pkgs-aarch64; };