nix flakes support #85

Merged
sb10q merged 13 commits from mwojcik/zynq-rs:flakes_support into master 1 year ago
mwojcik commented 1 year ago
Owner

Hopefully this time I didn't miss any packages/commands.

Would love to get rid of cargoSha256 in favour of Cargo.lock for experiments/szl but I don't think I can generate that (cd experiments; cargo generate-lockfile only updates lockfile for the main repo?).

Are we supposed to build FSBL only for ZC706? Could simplify that if that's the case.

Hopefully this time I didn't miss any packages/commands. Would love to get rid of ``cargoSha256`` in favour of ``Cargo.lock`` for experiments/szl but I don't think I can generate that (``cd experiments; cargo generate-lockfile`` only updates lockfile for the main repo?). Are we supposed to build FSBL only for ZC706? Could simplify that if that's the case.
mwojcik added 8 commits 1 year ago
Owner

cd experiments; cargo generate-lockfile only updates lockfile for the main repo?

Is this a problem?

Are we supposed to build FSBL only for ZC706? Could simplify that if that's the case.

FSBL is Xilinx software and only supports the ZC706, we didn't port it to any other board.
All boards use its replacement SZL, we only used FSBL for development and debugging.

> cd experiments; cargo generate-lockfile only updates lockfile for the main repo? Is this a problem? > Are we supposed to build FSBL only for ZC706? Could simplify that if that's the case. FSBL is Xilinx software and only supports the ZC706, we didn't port it to any other board. All boards use its replacement SZL, we only used FSBL for development and debugging.
mwojcik added 2 commits 1 year ago
Poster
Owner

Is this a problem?

No, it's not a problem at all. Just explaining why they still refer to CargoSha256.

FSBL is Xilinx software and only supports the ZC706, we didn't port it to any other board.
All boards use its replacement SZL, we only used FSBL for development and debugging.

I thought that somehow SZL is booted after FSBL - now it all makes sense.

> Is this a problem? No, it's not a problem at all. Just explaining why they still refer to CargoSha256. >FSBL is Xilinx software and only supports the ZC706, we didn't port it to any other board. All boards use its replacement SZL, we only used FSBL for development and debugging. I thought that somehow SZL is booted after FSBL - now it all makes sense.
Owner

I mean, why is cargoLock unable to work for these?
NAC3 also has multiple targets and it works fine there.

I mean, why is cargoLock unable to work for these? NAC3 also has multiple targets and it works fine there.
mwojcik added 1 commit 1 year ago
Poster
Owner

Yep, you're right, I got confused by different sha256s. No problem at all.

Yep, you're right, I got confused by different sha256s. No problem at all.
sb10q reviewed 1 year ago
};
cargoSha256Experiments = "1bvffgr4588bbkjwnhim8rvkjvbnajaiv7hc98b19sr8kb7rcj63";
cargoSha256SZL = "13022ssk6s2fgxmmh5msbx01fzcmk2cj95fjpxcsmfy14k9wd77l";
Owner

Still there?

Still there?
sb10q reviewed 1 year ago
flake.nix Outdated
in {
packages.x86_64-linux = allOutputs;
hydraJobs = allOutputs;
Owner

You can just use rec above and do hydraJobs = packages.x86_64-linux I believe.

You can just use ``rec`` above and do ``hydraJobs = packages.x86_64-linux`` I believe.
mwojcik added 1 commit 1 year ago
sb10q reviewed 1 year ago
{
description = "Bare-metal Rust on Zynq-7000";
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
Owner

NB: artiq-zynq is broken on 21.11, though it is likely fixable easily.

NB: artiq-zynq is broken on 21.11, though it is likely fixable easily.
Poster
Owner

Do nix-pkgs have to match with future artiq-zynq flake?

Probably I would fix it while flakifying artiq-zynq anyway...

Do nix-pkgs have to match with future artiq-zynq flake? Probably I would fix it while flakifying artiq-zynq anyway...
Owner

It can (should) be overriden in artiq-zynq with input.follows. But it should be easy to fix anyway, just a heads-up.

It can (should) be overriden in artiq-zynq with ``input.follows``. But it should be easy to fix anyway, just a heads-up.
sb10q reviewed 1 year ago
flake.nix Outdated
llvmPackages_9.clang-unwrapped
mkbootimage ];
};
defaultPackage.x86_64-linux = allTargetCrates.zc706-szl;
Owner

I would suggest the multi-board szl package here, or even just no default package at all.

I would suggest the multi-board ``szl`` package here, or even just no default package at all.
mwojcik added 1 commit 1 year ago
sb10q merged commit 24e0d724f2 into master 1 year ago
sb10q referenced this issue from a commit 1 year ago
The pull request has been merged as 24e0d724f2.
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/zynq-rs#85
Loading…
There is no content yet.