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

nix flakes support #85

Merged
sb10q merged 13 commits from mwojcik/zynq-rs:flakes_support into master 2022-01-27 16:26:33 +08:00
Conversation 4 Commits 13 Files Changed 14 +346 -22569
mwojcik commented 2022-01-27 13:05:44 +08:00
Owner
Copy Link

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 2022-01-27 13:05:45 +08:00
sb10q commented 2022-01-27 14:23:49 +08:00
Owner
Copy Link

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 2022-01-27 14:48:41 +08:00
mwojcik commented 2022-01-27 14:54:14 +08:00
Author
Owner
Copy Link

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.
sb10q commented 2022-01-27 14:55:16 +08:00
Owner
Copy Link

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 2022-01-27 15:03:26 +08:00
mwojcik commented 2022-01-27 15:04:04 +08:00
Author
Owner
Copy Link

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 2022-01-27 15:54:42 +08:00
flake.nix
@ -0,0 +214,4 @@
};
cargoSha256Experiments = "1bvffgr4588bbkjwnhim8rvkjvbnajaiv7hc98b19sr8kb7rcj63";
cargoSha256SZL = "13022ssk6s2fgxmmh5msbx01fzcmk2cj95fjpxcsmfy14k9wd77l";
sb10q commented 2022-01-27 15:54:42 +08:00
Owner
Copy Link

Still there?

Still there?
sb10q reviewed 2022-01-27 15:55:44 +08:00
flake.nix Outdated
@ -0,0 +268,4 @@
in {
packages.x86_64-linux = allOutputs;
hydraJobs = allOutputs;
sb10q commented 2022-01-27 15:55:44 +08:00
Owner
Copy Link

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 2022-01-27 15:55:54 +08:00
sb10q reviewed 2022-01-27 15:57:36 +08:00
flake.nix
@ -0,0 +1,285 @@
{
description = "Bare-metal Rust on Zynq-7000";
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
sb10q commented 2022-01-27 15:57:36 +08:00
Owner
Copy Link

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.
mwojcik commented 2022-01-27 16:09:01 +08:00
Author
Owner
Copy Link

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...
sb10q commented 2022-01-27 16:10:22 +08:00
Owner
Copy Link

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 2022-01-27 16:02:57 +08:00
flake.nix Outdated
@ -0,0 +280,4 @@
llvmPackages_9.clang-unwrapped
mkbootimage ];
};
defaultPackage.x86_64-linux = allTargetCrates.zc706-szl;
sb10q commented 2022-01-27 16:02:57 +08:00
Owner
Copy Link

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 2022-01-27 16:09:46 +08:00
sb10q merged commit 24e0d724f2 into master 2022-01-27 16:26:33 +08:00
sb10q referenced this issue from a commit 2022-01-27 16:26:34 +08:00
nix flakes support (#85)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/zynq-rs#85
No description provided.
Delete Branch "mwojcik/zynq-rs:flakes_support"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?