From 5bd943f97da8e63c4b8a6c234d71fcdb7b7e7193 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sat, 31 Jul 2021 23:03:19 -0500 Subject: [PATCH] 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. --- modules/module-list.nix | 1 + users/modules/module-list.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/module-list.nix b/modules/module-list.nix index 1e3ec721..254e4020 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -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 [ ] diff --git a/users/modules/module-list.nix b/users/modules/module-list.nix index 1e3ec721..254e4020 100644 --- a/users/modules/module-list.nix +++ b/users/modules/module-list.nix @@ -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 [ ]