Skip to content

Only redirect to buildable targets #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

Only redirect to buildable targets #2356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions modules/install-plan/redirect.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let
else existing.${(builtins.head available).id}.components.${collectionName}.${name};
componentsWithPrefix = collectionName: prefix:
lib.listToAttrs (lib.concatLists (lib.mapAttrsToList (n: available:
lib.optional (lib.hasPrefix "${prefix}:" n && (builtins.length available != 1 || !builtins.elem (builtins.head available) ["TargetNotBuildable" "TargetNotLocal"])) (
lib.optional (lib.hasPrefix "${prefix}:" n && (builtins.length available != 1 || !builtins.elem (builtins.head available) ["TargetNotLocal"])) (
let
name = lib.removePrefix "${prefix}:" n;
value = lookupComponent collectionName name available;
Expand All @@ -45,6 +45,9 @@ let
(_: d: pkgs.haskell-nix.haskellLib.check d)
(lib.filterAttrs (_: d: d.config.doCheck) components.tests)));
};
buildableTargets = lib.filter (x: x.available != []) (
lib.map (x: x // { available = lib.filter (n: n != "TargetNotBuildable") x.available; })
config.plan-json.targets);
in {
options.hsPkgs = lib.mkOption {
type = lib.types.unspecified;
Expand All @@ -63,10 +66,10 @@ in {
components = err;
checks = err;
}
else redirect existing packageName packageTargets) (builtins.groupBy (x: x.pkg-name) config.plan-json.targets)) config.preExistingPkgs
else redirect existing packageName packageTargets) (builtins.groupBy (x: x.pkg-name) buildableTargets)) config.preExistingPkgs

# Redirect for `${name}-${version}`
// builtins.mapAttrs (packageNameAndVersion: packageTargets: redirect existing packageNameAndVersion packageTargets)
(builtins.groupBy (x: "${x.pkg-name}-${x.pkg-version}") config.plan-json.targets);
(builtins.groupBy (x: "${x.pkg-name}-${x.pkg-version}") buildableTargets);
};
}
Loading