M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Additional outputs to flakes #86

Merged
sb10q merged 3 commits from mwojcik/zynq-rs:flake_extra_outputs into master 2022-02-04 18:42:36 +08:00
Conversation 0 Commits 3 Files Changed 1 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -257,16 +257,16 @@
in in
commands + "ln -s ${szlResult}/szl.elf $out/szl-${target}.elf\n" commands + "ln -s ${szlResult}/szl.elf $out/szl-${target}.elf\n"
) "mkdir $out\n" targets); ) "mkdir $out\n" targets);
in rec {
sb10q commented 2022-02-04 18:35:26 +08:00
Review
Copy Link

Is rec necessary?

Is ``rec`` necessary?
mwojcik commented 2022-02-04 18:41:51 +08:00
Review
Copy Link

for hydraJobs = packages.x86_64-linux;

for ``hydraJobs = packages.x86_64-linux;``
allOutputs = { packages.x86_64-linux = {
inherit cargo-xbuild szl; inherit cargo-xbuild szl mkbootimage;
zc706-fsbl = fsbl { board = "zc706"; }; zc706-fsbl = fsbl { board = "zc706"; };
sb10q commented 2022-02-04 17:20:34 +08:00
Outdated
Review
Copy Link

Doesn't this break nix flake show / nix flake check?

Only derivations should be in packages.xxx, and I think rustPlatform isn't one.

Doesn't this break ``nix flake show`` / ``nix flake check``? Only derivations should be in ``packages.xxx``, and I think ``rustPlatform`` isn't one.
} // allTargetCrates ; } // allTargetCrates ;
in rec {
packages.x86_64-linux = allOutputs;
hydraJobs = packages.x86_64-linux; hydraJobs = packages.x86_64-linux;
inherit rustPlatform;
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
name = "zynq-rs-dev-shell"; name = "zynq-rs-dev-shell";
buildInputs = with pkgs; [ buildInputs = with pkgs; [