Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions lib/icedos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@ let
# Map of repository baseUrl -> its config.toml `fetchOptionalDependencies`
# flag, so a repo's setting applies to all of its modules, including ones
# pulled in transitively as dependencies.

repositories = config.repositories or [];

repoFetchOptional = builtins.listToAttrs (
map (r: {
name = (_parseFlakeUrl r.url).baseUrl;
value = r.fetchOptionalDependencies or false;
}) config.repositories
}) repositories
);

# Map of repository baseUrl -> its config.toml `fetchDependencies` flag.
Expand All @@ -53,7 +56,7 @@ let
map (r: {
name = (_parseFlakeUrl r.url).baseUrl;
value = r.fetchDependencies or true;
}) config.repositories
}) repositories
);

# Apply patches to a flake source and return a realised, context-free store
Expand Down Expand Up @@ -109,7 +112,7 @@ let
name = "${repo.url}|${ip.module}|${ip.input}";
value = ip.patches;
}) (repo.inputPatches or [ ])
) config.repositories
) repositories
)
);

Expand Down Expand Up @@ -894,7 +897,7 @@ let

# Resolve external dependencies from config repositories
externalResult = resolveExternalDependencyRecursively {
newDeps = config.repositories;
newDeps = repositories;
loadOverrides = true;
};

Expand Down