divnix/digga
1
1
Fork 0
mirror of https://github.com/divnix/digga.git synced 2024-12-22 23:51:39 +03:00
Code Issues Projects Releases Wiki Activity

imp: advise removal of */modules-list.nix on merge conflicts

Browse Source 
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.
This commit is contained in:
David Arnold 2021-07-31 23:03:19 -05:00
parent 73431f5709
commit 5bd943f97d
No known key found for this signature in database
GPG Key ID: AB15A6AF1101390D
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/module-list.nix
View File

@ -1 +1,2 @@
# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
[ ]

1
users/modules/module-list.nix
View File

@ -1 +1,2 @@
# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
[ ]