From ccfca16452e91705330abc09cea1f9dd897c00f7 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:05:49 -0600 Subject: doctrine/lib: rename importAll.nix -> import-all.nix --- doctrine/lib/default.nix | 2 +- doctrine/lib/import-all.nix | 21 +++++++++++++++++++++ doctrine/lib/importAll.nix | 21 --------------------- 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 doctrine/lib/import-all.nix delete mode 100644 doctrine/lib/importAll.nix diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix index 5e2eb44..f189e21 100644 --- a/doctrine/lib/default.nix +++ b/doctrine/lib/default.nix @@ -15,6 +15,6 @@ closeFull = close {inherit lib pkgs doctrine;}; in { inherit close; - importAll = closeLib ./importAll.nix; + importAll = closeLib ./import-all.nix; mkModule = closeFull ./mk-module.nix; } diff --git a/doctrine/lib/import-all.nix b/doctrine/lib/import-all.nix new file mode 100644 index 0000000..423dd9c --- /dev/null +++ b/doctrine/lib/import-all.nix @@ -0,0 +1,21 @@ +{ + lib, + root, + exclude ? ["default"], +}: +with builtins; +with lib; +# http://chriswarbo.net/projects/nixos/useful_hacks.html + let + basename = removeSuffix ".nix"; + + isMatch = name: type: + (hasSuffix ".nix" name || type == "directory") + && ! elem (basename name) exclude; + + entry = name: _: { + name = basename name; + value = import (root + "/${name}"); + }; + in + mapAttrs' entry (filterAttrs isMatch (readDir root)) diff --git a/doctrine/lib/importAll.nix b/doctrine/lib/importAll.nix deleted file mode 100644 index 423dd9c..0000000 --- a/doctrine/lib/importAll.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - root, - exclude ? ["default"], -}: -with builtins; -with lib; -# http://chriswarbo.net/projects/nixos/useful_hacks.html - let - basename = removeSuffix ".nix"; - - isMatch = name: type: - (hasSuffix ".nix" name || type == "directory") - && ! elem (basename name) exclude; - - entry = name: _: { - name = basename name; - value = import (root + "/${name}"); - }; - in - mapAttrs' entry (filterAttrs isMatch (readDir root)) -- cgit v1.2.3