sync with latest core #12

Merged
teutat3s merged 2 commits from refs/pull/12/head into core 2021-08-24 12:04:49 +00:00

2 commits

Author SHA1 Message Date
teutat3s 5aea1e8089
Merge remote-tracking branch 'devos/core' into core 2021-08-23 23:22:55 +02:00
David Arnold 5bd943f97d
imp: advise removal of */modules-list.nix on merge conflicts
During merge conflicts, these lines should appear in the hunks
and give instructions on how to handle them in the face of the
implementation of `rakeLeaves` for modules in https://git.io/JB1Wk via
`importModules`, that knows how to rake leaves by walking the folder
tree on it's own and collecting leaves that are normal nix files or
folers who contain a `default.nix` mmicking strongly a "recursive"
import-ish syntax.
2021-07-31 23:03:19 -05:00