Skip to content

Commit 7678b1a

Browse files
committed
flake: wip
1 parent 4d7e886 commit 7678b1a

File tree

1 file changed

+40
-19
lines changed

1 file changed

+40
-19
lines changed

flake.nix

+40-19
Original file line numberDiff line numberDiff line change
@@ -88,34 +88,55 @@
8888
filterNoStdFeatures = lib.filter (m: !(lib.elem m noStdFeatures));
8989
mkFeatures = lib.concatStringsSep ",";
9090

91-
allStdCompatFeatures = mkFeatures (filterNoStdFeatures allFeatures);
92-
allStdStableCompatFeatures = mkFeatures (
91+
allStdFeatures = mkFeatures (filterNoStdFeatures allFeatures);
92+
allStdStableFeatures = mkFeatures (
9393
lib.filter (m: !(lib.elem m (noStdFeatures ++ nightlyFeatures))) allFeatures
9494
);
9595

96-
cargoArtifactsNightly = craneLibNightly.buildDepsOnly {
97-
inherit src;
98-
cargoExtraArgs = "--features ${allStdCompatFeatures}";
99-
};
100-
101-
cargoArtifacts = craneLibNightly.buildDepsOnly {
102-
inherit src;
103-
cargoExtraArgs = "--features ${allStdStableCompatFeatures}";
96+
cargoArtifacts = {
97+
stdNightly = craneLibNightly.buildDepsOnly {
98+
inherit src;
99+
cargoExtraArgs = "--features ${allStdFeatures}";
100+
};
101+
stdStable = craneLib.buildDepsOnly {
102+
inherit src;
103+
cargoExtraArgs = "--features ${allStdStableFeatures}";
104+
};
105+
# v6Nightly = craneLibNightly.buildDepsOnly {
106+
# inherit src;
107+
# cargoExtraArgs = "--features ${features}";
108+
# };
109+
# v6Stable = craneLib.buildDepsOnly {
110+
# inherit src;
111+
# cargoExtraArgs = "--features ${features}";
112+
# };
113+
# v7Nightly = craneLibNightly.buildDepsOnly {
114+
# inherit src;
115+
# cargoExtraArgs = "--features ${allFeatures}";
116+
# };
117+
# v7Stable = craneLib.buildDepsOnly {
118+
# inherit src;
119+
# cargoExtraArgs = let
120+
# features = mkFeatures (
121+
# lib.filter (m: !(lib.elem m nightlyFeatures)) allFeatures
122+
# );
123+
# in "--features ${features}";
124+
# };
104125
};
105126
in {
106127
packages = {
107128
testsuite = craneLib.buildPackage {
108129
inherit src;
109-
inherit cargoArtifacts;
130+
cargoArtifacts = cargoArtifacts.stdNightly;
110131
cargoExtraArgs = "-p testsuite";
111132
};
112133

113134
# TODO: check (v6, v7 x std, nightly)
114-
ll = craneLib.buildPackage {
115-
inherit src;
116-
inherit cargoArtifacts;
117-
cargoExtraArgs = "-p w5500-ll --target thumbv6m-none-eabi";
118-
};
135+
# llStable = craneLib.buildPackage {
136+
# inherit src;
137+
# cargoArtifacts = cargoArtifacts.v7Stable;
138+
# cargoExtraArgs = "-p w5500-ll --target thumbv7em-none-eabi";
139+
# };
119140
};
120141

121142
checks = let
@@ -126,7 +147,7 @@
126147
value = craneLibNightly.cargoTest {
127148
pname = "w5500-${p}";
128149
inherit src;
129-
cargoArtifacts = cargoArtifactsNightly;
150+
cargoArtifacts = cargoArtifacts.stdNightly;
130151
cargoExtraArgs = let
131152
featuresNoDefmt = mkFeatures (filterNoStdFeatures (lib.getAttr p features));
132153
featureArgs =
@@ -143,15 +164,15 @@
143164
{
144165
clippy = craneLibNightly.cargoClippy {
145166
inherit src;
146-
cargoArtifacts = cargoArtifactsNightly;
167+
cargoArtifacts = cargoArtifacts.stdNightly;
147168
cargoClippyExtraArgs = "--all-features --all-targets -- --deny warnings";
148169
};
149170

150171
rustfmt = craneLibNightly.cargoFmt {inherit src;};
151172

152173
docs = craneLibNightly.cargoDoc {
153174
inherit src;
154-
cargoArtifacts = cargoArtifactsNightly;
175+
cargoArtifacts = cargoArtifacts.stdNightly;
155176

156177
RUSTDOCFLAGS = "-D warnings --cfg docsrs";
157178

0 commit comments

Comments
 (0)