forked from M-Labs/nix-scripts
zynq: use new zynq-rs
This commit is contained in:
parent
354f653a13
commit
53838bd55f
|
@ -107,7 +107,6 @@
|
|||
"inputs": {
|
||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||
"mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false },
|
||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false },
|
||||
"zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false },
|
||||
"artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
|
||||
|
|
19
zynq.nix
19
zynq.nix
|
@ -1,24 +1,11 @@
|
|||
let
|
||||
pkgs = import <nixpkgs> {};
|
||||
zynq-rs = import <zynq-rs> { mozillaOverlay = import <mozillaOverlay>; };
|
||||
zynq-rs = import <zynq-rs>;
|
||||
artiq-zynq = import <artiq-zynq>;
|
||||
pkgs = import <nixpkgs> {};
|
||||
artiq-fast = import <artiq-fast> { inherit pkgs; };
|
||||
addBuildProducts = drv: drv.overrideAttrs (oldAttrs: {
|
||||
installPhase = ''
|
||||
${oldAttrs.installPhase}
|
||||
mkdir -p $out/nix-support
|
||||
for f in $out/*.elf ; do
|
||||
echo file binary-dist $f >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
'';
|
||||
});
|
||||
in
|
||||
(
|
||||
builtins.mapAttrs (name: drv:
|
||||
pkgs.lib.hydraJob (
|
||||
addBuildProducts drv
|
||||
)
|
||||
) zynq-rs.zc706
|
||||
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs
|
||||
) // (
|
||||
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
|
||||
) // {
|
||||
|
|
Loading…
Reference in New Issue