nixpkgs-fmt
This commit is contained in:
parent
77f9b50c78
commit
39694ed1d8
6 changed files with 22 additions and 15 deletions
|
@ -3,7 +3,7 @@
|
|||
, cacert
|
||||
}:
|
||||
{ drv # derivation to build the image for
|
||||
# Name of the binary to run by default
|
||||
# Name of the binary to run by default
|
||||
, binName ? (builtins.parseDrvName drv.name).name
|
||||
, meta ? drv.meta
|
||||
}:
|
||||
|
@ -33,4 +33,4 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
image // { meta = meta // image.meta; }
|
||||
image // { meta = meta // image.meta; }
|
||||
|
|
|
@ -4,9 +4,11 @@ importFn: baseDir:
|
|||
let
|
||||
dirEntries =
|
||||
builtins.attrNames
|
||||
(lib.filterAttrs
|
||||
(k: v: v == "directory")
|
||||
(builtins.readDir baseDir));
|
||||
(
|
||||
lib.filterAttrs
|
||||
(k: v: v == "directory")
|
||||
(builtins.readDir baseDir)
|
||||
);
|
||||
|
||||
absDirs =
|
||||
builtins.map
|
||||
|
@ -18,4 +20,4 @@ let
|
|||
(dir: { name = builtins.baseNameOf dir; value = importFn dir; })
|
||||
absDirs;
|
||||
in
|
||||
builtins.listToAttrs imports
|
||||
builtins.listToAttrs imports
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue