|
88 | 88 | filterNoStdFeatures = lib.filter (m: !(lib.elem m noStdFeatures));
|
89 | 89 | mkFeatures = lib.concatStringsSep ",";
|
90 | 90 |
|
91 |
| - allStdCompatFeatures = mkFeatures (filterNoStdFeatures allFeatures); |
92 |
| - allStdStableCompatFeatures = mkFeatures ( |
| 91 | + allStdFeatures = mkFeatures (filterNoStdFeatures allFeatures); |
| 92 | + allStdStableFeatures = mkFeatures ( |
93 | 93 | lib.filter (m: !(lib.elem m (noStdFeatures ++ nightlyFeatures))) allFeatures
|
94 | 94 | );
|
95 | 95 |
|
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 | + # }; |
104 | 125 | };
|
105 | 126 | in {
|
106 | 127 | packages = {
|
107 | 128 | testsuite = craneLib.buildPackage {
|
108 | 129 | inherit src;
|
109 |
| - inherit cargoArtifacts; |
| 130 | + cargoArtifacts = cargoArtifacts.stdNightly; |
110 | 131 | cargoExtraArgs = "-p testsuite";
|
111 | 132 | };
|
112 | 133 |
|
113 | 134 | # 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 | + # }; |
119 | 140 | };
|
120 | 141 |
|
121 | 142 | checks = let
|
|
126 | 147 | value = craneLibNightly.cargoTest {
|
127 | 148 | pname = "w5500-${p}";
|
128 | 149 | inherit src;
|
129 |
| - cargoArtifacts = cargoArtifactsNightly; |
| 150 | + cargoArtifacts = cargoArtifacts.stdNightly; |
130 | 151 | cargoExtraArgs = let
|
131 | 152 | featuresNoDefmt = mkFeatures (filterNoStdFeatures (lib.getAttr p features));
|
132 | 153 | featureArgs =
|
|
143 | 164 | {
|
144 | 165 | clippy = craneLibNightly.cargoClippy {
|
145 | 166 | inherit src;
|
146 |
| - cargoArtifacts = cargoArtifactsNightly; |
| 167 | + cargoArtifacts = cargoArtifacts.stdNightly; |
147 | 168 | cargoClippyExtraArgs = "--all-features --all-targets -- --deny warnings";
|
148 | 169 | };
|
149 | 170 |
|
150 | 171 | rustfmt = craneLibNightly.cargoFmt {inherit src;};
|
151 | 172 |
|
152 | 173 | docs = craneLibNightly.cargoDoc {
|
153 | 174 | inherit src;
|
154 |
| - cargoArtifacts = cargoArtifactsNightly; |
| 175 | + cargoArtifacts = cargoArtifacts.stdNightly; |
155 | 176 |
|
156 | 177 | RUSTDOCFLAGS = "-D warnings --cfg docsrs";
|
157 | 178 |
|
|
0 commit comments