fix: Various minor fixes for new repository layout
This commit is contained in:
parent
61c8ac4338
commit
a65cb50252
3 changed files with 3 additions and 3 deletions
|
@ -6,7 +6,7 @@
|
|||
# to the key in nixpkgs which represents the program you want to run.
|
||||
set -ueo pipefail
|
||||
|
||||
readonly REPO_ROOT=$(dirname $0)/../..
|
||||
readonly REPO_ROOT=$(dirname $0)/..
|
||||
TARGET_TOOL=$(basename $0)
|
||||
|
||||
case "${TARGET_TOOL}" in
|
||||
|
|
|
@ -29,7 +29,7 @@ let
|
|||
readTree' = import ./read-tree.nix;
|
||||
|
||||
localPkgs = readTree: {
|
||||
fun = readTree ./ops;
|
||||
fun = readTree ./fun;
|
||||
nix = readTree ./nix;
|
||||
ops = readTree ./ops;
|
||||
third_party = readTree ./third_party;
|
||||
|
|
|
@ -56,6 +56,6 @@ let
|
|||
value = importWithMark p (parts ++ [ c ]);
|
||||
}) nixFiles;
|
||||
in if dir ? "default.nix"
|
||||
then self // (listToAttrs children)
|
||||
then (if isAttrs self then self // (listToAttrs children) else self)
|
||||
else listToAttrs (nixChildren ++ children);
|
||||
in readTree initPath [ (baseNameOf initPath) ]
|
||||
|
|
Loading…
Reference in a new issue