M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

artiq-full: replace variants list with readDir of sinara-systems #42

Merged
sb10q merged 1 commits from astro/nix-scripts:target-list into master 2021-02-12 09:32:30 +08:00
Conversation 2 Commits 1 Files Changed 1 +30 -86
astro commented 2021-02-10 08:51:03 +08:00
Contributor
Copy Link

Depends on:

Is it good to take this variantsVersionInfo into the second evaluation, or should I rather get the artiq version from <artiq-fast> in the first evaluation?

Depends on: - https://github.com/m-labs/artiq/pull/1608 - https://git.m-labs.hk/M-Labs/sinara-systems/pulls/1 Is it good to take this variantsVersionInfo into the second evaluation, or should I rather get the artiq version from `<artiq-fast>` in the first evaluation?
sb10q commented 2021-02-10 16:27:24 +08:00
Owner
Copy Link

Is it good to take this variantsVersionInfo into the second evaluation, or should I rather get the artiq version from <artiq-fast> in the first evaluation?

What do you mean?

variantsVersionInfo contains the minimum supported versions, no? Not the actual ARTIQ version being built. So the answer to this question should be obvious, or am I misunderstanding something?

> Is it good to take this variantsVersionInfo into the second evaluation, or should I rather get the artiq version from `<artiq-fast>` in the first evaluation? What do you mean? `variantsVersionInfo` contains the *minimum* supported versions, no? Not the actual ARTIQ version being built. So the answer to this question should be obvious, or am I misunderstanding something?
sb10q reviewed 2021-02-10 16:31:01 +08:00
sb10q reviewed 2021-02-10 16:34:09 +08:00
artiq-full.nix Outdated
@ -131,0 +61,4 @@
"\n \"" + variant + "\" = \"" + pkgs.lib.attrByPath [variant "min_artiq_version"] "0" variants + "\";"
) (builtins.attrNames variants)
)}
};
sb10q commented 2021-02-10 16:34:09 +08:00
Owner
Copy Link

Is there no simpler way of doing this?

Is there no simpler way of doing this?
astro marked this conversation as resolved
astro force-pushed target-list from 3a70059831 to 646c007d99 2021-02-11 03:04:28 +08:00 Compare
astro commented 2021-02-11 03:29:23 +08:00
Author
Contributor
Copy Link

Updated with a cleaner way of filtering by min_artiq_version in the first evaluation.

Updated with a cleaner way of filtering by min_artiq_version in the first evaluation.
sb10q reviewed 2021-02-11 14:41:30 +08:00
artiq-full.nix Outdated
@ -3,3 +3,3 @@
let
sinaraSystemsSrc = <sinaraSystemsSrc>;
standaloneVariants =
artiqVersion = pkgs.callPackage <artiq-fast/pkgs/artiq-version.nix> {};
sb10q commented 2021-02-11 14:41:30 +08:00
Owner
Copy Link

callPackage should only be used on derivations. Use import.

``callPackage`` should only be used on derivations. Use ``import``.
sb10q commented 2021-02-11 14:49:31 +08:00
Owner
Copy Link

(I know some of the existing code also makes this mistake, we should probably clean it up)

(I know some of the existing code also makes this mistake, we should probably clean it up)
astro force-pushed target-list from 646c007d99 to 33c33d49df 2021-02-12 04:41:40 +08:00 Compare
sb10q merged commit 33c33d49df into master 2021-02-12 09:32:30 +08:00
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/nix-scripts#42
No description provided.
Delete Branch "astro/nix-scripts:target-list"

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?