esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

zynq: use new zynq-rs

This commit is contained in:
Sebastien Bourdeauducq 2020-09-09 16:51:03 +08:00
parent 354f653a13
commit 53838bd55f
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hydra/artiq.nix
View File

@ -107,7 +107,6 @@
"inputs": { "inputs": {
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false }, "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 }, "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 }, "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 }, "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 } "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }

19
zynq.nix
View File

@ -1,24 +1,11 @@
let let
pkgs = import <nixpkgs> {}; zynq-rs = import <zynq-rs>;
zynq-rs = import <zynq-rs> { mozillaOverlay = import <mozillaOverlay>; };
artiq-zynq = import <artiq-zynq>; artiq-zynq = import <artiq-zynq>;
pkgs = import <nixpkgs> {};
artiq-fast = import <artiq-fast> { inherit pkgs; }; 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 in
( (
builtins.mapAttrs (name: drv: builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs
pkgs.lib.hydraJob (
addBuildProducts drv
)
) zynq-rs.zc706
) // ( ) // (
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
) // { ) // {