robin/cynthion-flake
1
0
Fork 0
mirror of https://github.com/icewind1991/cynthion-flake.git synced 2026-06-03 14:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move away from deprecated crossLists

Browse source
This commit is contained in:
Robin Appelman 2024-09-21 13:53:19 +02:00
commit 64704717c0
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkgs/cynthion/gateware.nix
View file

@ -5,14 +5,22 @@
lib, lib,
... ...
}: let }: let
inherit (lib) crossLists; inherit (lib) mapCartesianProduct;
platformVersions = ["0D1" "0D2" "0D3" "0D4" "0D5" "0D6" "0D7" "1D0" "1D1" "1D2" "1D3" "1D4"]; platformVersions = ["0D1" "0D2" "0D3" "0D4" "0D5" "0D6" "0D7" "1D0" "1D1" "1D2" "1D3" "1D4"];
bitstreams = ["analyzer" "selftest" "facedancer"]; bitstreams = ["analyzer" "selftest" "facedancer"];
gatewares = crossLists (platform: bitstream: (cynthion-gateware-single.override { gatewares =
mapCartesianProduct ({
platform,
bitstream,
}: (cynthion-gateware-single.override {
inherit bitstream; inherit bitstream;
platform = "CynthionPlatformRev${platform}"; platform = "CynthionPlatformRev${platform}";
})) [platformVersions bitstreams]; })) {
in symlinkJoin { platform = platformVersions;
bitstream = bitstreams;
};
in
symlinkJoin {
name = "cynthion-gateware-${cynthion-unwrapped.version}"; name = "cynthion-gateware-${cynthion-unwrapped.version}";
paths = gatewares; paths = gatewares;
} }

3
pkgs/cynthion/single-gateware.nix
View file

@ -8,7 +8,8 @@
bitstream ? null, bitstream ? null,
platform ? null, platform ? null,
... ...
}: stdenvNoCC.mkDerivation { }:
stdenvNoCC.mkDerivation {
pname = "cynthion-gateware-${bitstream}"; pname = "cynthion-gateware-${bitstream}";
version = "${cynthion-unwrapped.version}-${platform}"; version = "${cynthion-unwrapped.version}-${platform}";