M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 13 Pull Requests Releases Wiki Activity

Flake support #164

Closed
mwojcik wants to merge 7 commits from mwojcik:flake_support into master
pull from: mwojcik:flake_support
merge into: M-Labs:master
Conversation 1 Commits 7 Files Changed 6 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba6c33ad21 - Show all commits

3
README.md
View File

@ -33,7 +33,7 @@ not implemented as it seems not very useful.
Development instructions
------------------------
ARTIQ Zynq is packaged using the [Nix](https://nixos.org) Flakes system. Install Nix 2.4+ and enable flakes by adding ``experimental-features = nix-command flakes`` to ``nix.conf`` (e.g. ``~/.config/nix/nix.conf``).
ARTIQ on Zynq is packaged using the [Nix](https://nixos.org) Flakes system. Install Nix 2.4+ and enable flakes by adding ``experimental-features = nix-command flakes`` to ``nix.conf`` (e.g. ``~/.config/nix/nix.conf``).
Pure build with Nix and execution on a remote JTAG server:
@ -55,7 +55,6 @@ cd ..
Notes:
- This is developed with Nixpkgs 21.11, and the ``nixbld.m-labs.hk`` binary substituter can also be used here (see the ARTIQ manual for the public key and instructions).
- The impure build process is also compatible with non-Nix systems.
sb10q commented 2022-02-04 17:14:50 +08:00
Outdated
Review
Copy Link

No need to specify nixpkgs version here if we have flakes.

No need to specify nixpkgs version here if we have flakes.
- When calling make, you need to specify both the variant and firmware type.
- Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite.

2
flake.nix
View File

@ -3,7 +3,7 @@
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };
inputs.zynq-rs.url = git+file:///home/spaqin/m-labs/zynq-rs;
inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;
sb10q commented 2022-02-04 17:15:28 +08:00
Outdated
Review
Copy Link

That won't work outside your machine.

That won't work outside your machine.
mwojcik commented 2022-02-04 17:16:36 +08:00
Outdated
Review
Copy Link

Oh yes I completely forgot! Also need to do a zynq-rs PR first before this can be merged.

Oh yes I completely forgot! Also need to do a zynq-rs PR first before this can be merged.
mwojcik commented 2022-02-04 17:29:06 +08:00
Outdated
Review
Copy Link

flake.lock will also need updating after the merge...

flake.lock will also need updating after the merge...
inputs.artiq.url = git+https://github.com/m-labs/artiq.git;
sb10q commented 2022-02-04 18:59:38 +08:00
Review
Copy Link

You should sync nixpkgs, otherwise there can be three different versions of it involved, resulting in bloat. I suggest using ARTIQ nixpkgs as reference, so I guess it would be something like:

zynq-rs.inputs.nixpkgs.follows = inputs.artiq.nixpkgs;

and below:

pkgs = import artiq.inputs.nixpkgs { system = ...

and remove input.nixpkgs.

You should sync nixpkgs, otherwise there can be three different versions of it involved, resulting in bloat. I suggest using ARTIQ nixpkgs as reference, so I guess it would be something like: ``` zynq-rs.inputs.nixpkgs.follows = inputs.artiq.nixpkgs; ``` and below: ``` pkgs = import artiq.inputs.nixpkgs { system = ... ``` and remove ``input.nixpkgs``.
outputs = { self, nixpkgs, mozilla-overlay, zynq-rs, artiq }: