Flake support #164

mwojcik · 2022-02-04T17:06:23+08:00

mwojcik commented

2022-02-04 17:06:23 +08:00

Tested nix develop to build kasli-soc fw; nix build for zc706 in various variants.

Weirdly enough didn't get any errors when using nixpkgs, that would indicate that an older version is required.

Tested ``nix develop`` to build kasli-soc fw; ``nix build`` for zc706 in various variants. Weirdly enough didn't get any errors when using nixpkgs, that would indicate that an older version is required.

mwojcik added 5 commits 2022-02-04 17:06:23 +08:00

add flake 3f64f000e0

update readme for flake 2473a1b5a4

flake: fix sha256, missing artiq package 1c421a1c47

flake: fix wrong hash ec7b3d4602

remove old nix files eb90adf89f

mwojcik referenced this pull request from M-Labs/nix-scripts

2022-02-04 17:13:16 +08:00

hydra: add zynq-beta flake job #80

sb10q reviewed 2022-02-04 17:14:50 +08:00

README.md Outdated

						
				@ -63,3 +56,3 @@

				Notes:

				- This is developed with Nixpkgs 21.05[^1], and the ``nixbld.m-labs.hk`` binary substituter can also be used here (see the ARTIQ manual for the public key and instructions).

				- 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).

sb10q commented

2022-02-04 17:14:50 +08:00

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

sb10q reviewed 2022-02-04 17:15:28 +08:00

flake.nix Outdated

						
				@ -0,0 +3,4 @@

				  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;

sb10q commented

2022-02-04 17:15:28 +08:00

That won't work outside your machine.

mwojcik commented

2022-02-04 17:16:36 +08:00

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

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

mwojcik added 1 commit 2022-02-04 17:30:55 +08:00

flake: fix forgotten file reference, readme ba6c33ad21

sb10q reviewed 2022-02-04 18:46:16 +08:00

README.md Outdated

						
				@ -70,3 +62,1 @@

				- To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``zynq-rs.nix`` in sync.

				[^1]: Thus, on newer version of NixOS, you should run `nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/21.05.tar.gz` instead

				- To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``flake.nix`` in sync.

sb10q commented

2022-02-04 18:46:16 +08:00

That would be flake.lock.

That would be ``flake.lock``.

mwojcik added 1 commit 2022-02-04 18:48:51 +08:00

update flake.lock 5513db9e75

sb10q reviewed 2022-02-04 18:59:38 +08:00

flake.nix

						
				@ -0,0 +4,4 @@

				  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;

				  inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };

				  inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;

				  inputs.artiq.url = git+https://github.com/m-labs/artiq.git;

sb10q commented

2022-02-04 18:59:38 +08:00

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``.