mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Various minor fixes for new repository layout

Browse source
This commit is contained in:
Vincent Ambo 2019-12-20 20:44:00 +00:00
parent 61c8ac4338
commit a65cb50252
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/__dispatch.sh
View file

@ -6,7 +6,7 @@
# to the key in nixpkgs which represents the program you want to run. # to the key in nixpkgs which represents the program you want to run.
set -ueo pipefail set -ueo pipefail
readonly REPO_ROOT=$(dirname $0)/../.. readonly REPO_ROOT=$(dirname $0)/..
TARGET_TOOL=$(basename $0) TARGET_TOOL=$(basename $0)
case "${TARGET_TOOL}" in case "${TARGET_TOOL}" in

2
default.nix
View file

@ -29,7 +29,7 @@ let
readTree' = import ./read-tree.nix; readTree' = import ./read-tree.nix;
localPkgs = readTree: { localPkgs = readTree: {
fun = readTree ./ops; fun = readTree ./fun;
nix = readTree ./nix; nix = readTree ./nix;
ops = readTree ./ops; ops = readTree ./ops;
third_party = readTree ./third_party; third_party = readTree ./third_party;

2
read-tree.nix
View file

@ -56,6 +56,6 @@ let
value = importWithMark p (parts ++ [ c ]); value = importWithMark p (parts ++ [ c ]);
}) nixFiles; }) nixFiles;
in if dir ? "default.nix" in if dir ? "default.nix"
then self // (listToAttrs children) then (if isAttrs self then self // (listToAttrs children) else self)
else listToAttrs (nixChildren ++ children); else listToAttrs (nixChildren ++ children);
in readTree initPath [ (baseNameOf initPath) ] in readTree initPath [ (baseNameOf initPath) ]