M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flake: add aarch64 openocd package

This commit is contained in:
Sebastien Bourdeauducq 2022-07-08 11:35:17 +08:00
parent 734b2a6747
commit 9ba239b8b2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -16,6 +16,7 @@
outputs = { self, nixpkgs, mozilla-overlay, sipyco, src-pythonparser, artiq-comtools, src-migen, src-misoc }: outputs = { self, nixpkgs, mozilla-overlay, sipyco, src-pythonparser, artiq-comtools, src-migen, src-misoc }:
let let
pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
pkgs-aarch64 = import nixpkgs { system = "aarch64-linux"; };
artiqVersionMajor = 7; artiqVersionMajor = 7;
artiqVersionMinor = self.sourceInfo.revCount or 0; artiqVersionMinor = self.sourceInfo.revCount or 0;
@ -305,7 +306,7 @@
dontFixup = true; dontFixup = true;
}; };
openocd-bscanspi = let openocd-bscanspi-f = pkgs: let
bscan_spi_bitstreams-pkg = pkgs.stdenv.mkDerivation { bscan_spi_bitstreams-pkg = pkgs.stdenv.mkDerivation {
name = "bscan_spi_bitstreams"; name = "bscan_spi_bitstreams";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -362,8 +363,9 @@
}; };
in rec { in rec {
packages.x86_64-linux = { packages.x86_64-linux = {
inherit pythonparser qasync openocd-bscanspi artiq; inherit pythonparser qasync artiq;
inherit migen misoc asyncserial microscope vivadoEnv vivado; inherit migen misoc asyncserial microscope vivadoEnv vivado;
openocd-bscanspi = openocd-bscanspi-f pkgs;
artiq-board-kc705-nist_clock = makeArtiqBoardPackage { artiq-board-kc705-nist_clock = makeArtiqBoardPackage {
target = "kc705"; target = "kc705";
variant = "nist_clock"; variant = "nist_clock";
@ -443,6 +445,10 @@
''; '';
}; };
packages.aarch64-linux = {
openocd-bscanspi = openocd-bscanspi-f pkgs-aarch64;
};
hydraJobs = { hydraJobs = {
inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock openocd-bscanspi; inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock openocd-bscanspi;
kc705-hitl = pkgs.stdenv.mkDerivation { kc705-hitl = pkgs.stdenv.mkDerivation {