From 68ab0a0705ec08eea3259e957fbd4db5107ee6a6 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 5 Aug 2020 01:52:12 +0000 Subject: [PATCH] chore(edef/users/depot-scan): move to a subdir Change-Id: If202b466aa0874048e89e0dc270ff14883510131 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1652 Reviewed-by: edef Tested-by: BuildkiteCI --- users/edef/{depot-scan.nix => depot-scan/default.nix} | 2 +- users/edef/{ => depot-scan}/depot-scan.pl | 0 users/edef/{depot-scan-wrap.nix => depot-scan/wrap.nix} | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename users/edef/{depot-scan.nix => depot-scan/default.nix} (65%) rename users/edef/{ => depot-scan}/depot-scan.pl (100%) rename users/edef/{depot-scan-wrap.nix => depot-scan/wrap.nix} (98%) diff --git a/users/edef/depot-scan.nix b/users/edef/depot-scan/default.nix similarity index 65% rename from users/edef/depot-scan.nix rename to users/edef/depot-scan/default.nix index f0654188c..a9c0f382f 100644 --- a/users/edef/depot-scan.nix +++ b/users/edef/depot-scan/default.nix @@ -8,5 +8,5 @@ pkgs.writeShellScriptBin "depot-scan" '' attr="''${path//\//.}" root="$(git rev-parse --show-toplevel)" echo "scanning //$path" >&2 - nix-instantiate -E "import ${./depot-scan-wrap.nix} {} $root" -A "$attr" -vv 2> >(${pkgs.perl}/bin/perl ${./depot-scan.pl}) >&2 + nix-instantiate -E "import ${./wrap.nix} $root" -A "$attr" -vv 2> >(${pkgs.perl}/bin/perl ${./depot-scan.pl}) >&2 '' diff --git a/users/edef/depot-scan.pl b/users/edef/depot-scan/depot-scan.pl similarity index 100% rename from users/edef/depot-scan.pl rename to users/edef/depot-scan/depot-scan.pl diff --git a/users/edef/depot-scan-wrap.nix b/users/edef/depot-scan/wrap.nix similarity index 98% rename from users/edef/depot-scan-wrap.nix rename to users/edef/depot-scan/wrap.nix index 52ea5cc85..dcb557a24 100644 --- a/users/edef/depot-scan-wrap.nix +++ b/users/edef/depot-scan/wrap.nix @@ -1,7 +1,5 @@ # this wraps import to override readFile and readDir to trace the files it touches # technique inspired by lorri -{ ... }: - let global = {