flattenTree: use / as the key separator

That character is less likely to be used in normal packaging names.
This commit is contained in:
zimbatm 2020-07-22 11:35:14 +02:00
parent 5973a46a75
commit 8e1f14e82d
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
4 changed files with 9 additions and 6 deletions

View File

@ -58,8 +58,8 @@ Returns:
```nix ```nix
{ {
hello = «derivation»; hello = «derivation»;
gitAndTools_git = «derivation»; "gitAndTools/git" = «derivation»;
gitAndTools_hub = «derivation»; "gitAndTools/hub" = «derivation»;
# ... # ...
} }
``` ```

View File

@ -52,8 +52,8 @@ let
# #
# { # {
# hello = «derivation»; # hello = «derivation»;
# gitAndTools_git = «derivation»; # "gitAndTools/git" = «derivation»;
# gitAndTools_hub = «derivation»; # "gitAndTools/hub" = «derivation»;
# # ... # # ...
# } # }
flattenTree = tree: import ./flattenTree.nix tree; flattenTree = tree: import ./flattenTree.nix tree;

View File

@ -7,7 +7,10 @@
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system}; in let pkgs = nixpkgs.legacyPackages.${system}; in
rec { rec {
packages.hello = pkgs.hello; packages = flake-utils.lib.flattenTree {
hello = pkgs.hello;
gitAndTools = pkgs.gitAndTools;
};
defaultPackage = packages.hello; defaultPackage = packages.hello;
apps.hello = flake-utils.lib.mkApp { drv = packages.hello; }; apps.hello = flake-utils.lib.mkApp { drv = packages.hello; };
defaultApp = apps.hello; defaultApp = apps.hello;

View File

@ -2,7 +2,7 @@ tree:
let let
op = sum: path: val: op = sum: path: val:
let let
pathStr = builtins.concatStringsSep "_" path; pathStr = builtins.concatStringsSep "/" path;
in in
if (builtins.typeOf val) != "set" then if (builtins.typeOf val) != "set" then
# ignore that value # ignore that value