Merge pull request #90 from snowfallorg/dev

fix: convert path to string in fs helpers
This commit is contained in:
Jake Hamilton
2024-05-23 14:48:46 -07:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

View File

@@ -35,8 +35,8 @@ in {
## ```nix
## "/user-source/systems"
## ```
#@ String -> String
get-file = path: "${user-inputs.src}/${path}";
#@ String -> Path
get-file = path: user-inputs.src + "/${path}";
## Get a file path relative to the user's snowfall directory.
## Example Usage:
@@ -47,8 +47,8 @@ in {
## ```nix
## "/user-source/snowfall-dir/systems"
## ```
#@ String -> String
get-snowfall-file = path: "${snowfall-config.root}/${path}";
#@ String -> Path
get-snowfall-file = path: snowfall-config.root + "/${path}";
## Get a file path relative to the this flake.
## Example Usage:
@@ -59,8 +59,8 @@ in {
## ```nix
## "/user-source/systems"
## ```
#@ String -> String
internal-get-file = path: "${core-inputs.src}/${path}";
#@ String -> Path
internal-get-file = path: core-inputs.src + "/${path}";
## Safely read from a directory if it exists.
## Example Usage:

View File

@@ -28,7 +28,7 @@ in {
user-modules = snowfall-lib.fs.get-default-nix-files-recursive src;
create-module-metadata = module: {
name = let
path-name = builtins.replaceStrings [src "/default.nix"] ["" ""] (builtins.unsafeDiscardStringContext module);
path-name = builtins.replaceStrings [(builtins.toString src) "/default.nix"] ["" ""] (builtins.unsafeDiscardStringContext module);
in
if hasPrefix "/" path-name
then builtins.substring 1 ((builtins.stringLength path-name) - 1) path-name