Skip to content

Commit 00075f6

Browse files
authored
Fix build set issues (#252)
* Remove false dependency of `buildPerSystem` available build sets `buildPerSystem` should be generated for every supported system, not only for systems in available build sets. * If there are no build sets for a system use empty list `buildSetsPerSystem.${system}` is a list of build sets for `system`. However, if there are no build sets for a system (e.g. because they were filtered out), we want to use an empty list rather than failing.
1 parent 6b42ffb commit 00075f6

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

flake.nix

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@
4242
defaultBuildSetsPerSystem = partitionBuildSetsBySystem defaultBuildSets;
4343

4444
mkBuildPerSystem =
45-
buildSetPerSystem:
46-
builtins.mapAttrs (
47-
system: buildSet: nixpkgs.legacyPackages.${system}.callPackage builder/lib/build.nix { }
48-
) buildSetPerSystem;
49-
50-
defaultBuildPerSystem = mkBuildPerSystem defaultBuildSetsPerSystem;
45+
systems:
46+
builtins.listToAttrs (
47+
builtins.map (system: {
48+
name = system;
49+
value = nixpkgs.legacyPackages.${system}.callPackage builder/lib/build.nix { };
50+
}) systems
51+
);
52+
buildPerSystem = mkBuildPerSystem systems;
5153

5254
# The lib output consists of two parts:
5355
#
@@ -90,8 +92,7 @@
9092
|| abort "`torchVersions` must be a function taking one argument (the default version set)";
9193
let
9294
buildSets = mkBuildSets (torchVersions torchVersions') systems;
93-
buildSetPerSystem = partitionBuildSetsBySystem buildSets;
94-
buildPerSystem = mkBuildPerSystem buildSetPerSystem;
95+
buildSetsPerSystem = partitionBuildSetsBySystem buildSets;
9596
in
9697
flake-utils.lib.eachSystem systems (
9798
system:
@@ -106,11 +107,10 @@
106107
pythonNativeCheckInputs
107108
;
108109
build = buildPerSystem.${system};
109-
buildSets = buildSetPerSystem.${system};
110+
buildSets = buildSetsPerSystem.${system} or [ ];
110111
}
111112
);
112113
};
113-
#// defaultBuildPerSystem;
114114
in
115115
flake-utils.lib.eachSystem systems (
116116
system:
@@ -178,7 +178,7 @@
178178
rec {
179179
checks.default = pkgs.callPackage ./builder/lib/checks.nix {
180180
inherit buildSets;
181-
build = defaultBuildPerSystem.${system};
181+
build = buildPerSystem.${system};
182182
};
183183

184184
devShells = devShellByBackend // {

0 commit comments

Comments
 (0)