From 1e45aee26685d86c7d3849987ef0d6d099804b36 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 20 Mar 2025 00:09:42 +0000 Subject: [PATCH] fix(default.nix): drop usersFilter There's no //users anymore. Change-Id: If43427a3c21d272b698559dbc39c16404682bb8b Reviewed-on: https://cl.snix.dev/c/snix/+/30166 Tested-by: besadii Reviewed-by: Ryan Lahfa Autosubmit: Florian Klink --- default.nix | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/default.nix b/default.nix index e087dda81..1545be724 100644 --- a/default.nix +++ b/default.nix @@ -13,36 +13,9 @@ let readTree = import ./nix/readTree { }; - # Disallow access to //users from other depot parts. - usersFilter = readTree.restrictFolder { - folder = "users"; - reason = '' - Code under //users is not considered stable or dependable in the - wider depot context. If a project under //users is required by - something else, please move it to a different depot path. - ''; - - exceptions = [ - # machines is allowed to access //users for several reasons: - # - # 1. User SSH keys are set in //users. - # 2. Some personal websites or demo projects are served from it. - [ "ops" "machines" "gerrit01" ] - [ "ops" "machines" "public01" ] - [ "ops" "machines" "build01" ] - [ "ops" "machines" "meta01" ] - - # Due to evaluation order this also affects these targets. - # TODO(tazjin): Can this one be removed somehow? - [ "ops" "nixos" ] - [ "ops" "machines" "all-systems" ] - ]; - }; - readDepot = depotArgs: readTree { args = depotArgs; path = ./.; - filter = parts: args: usersFilter parts args; scopedArgs = { # FIXME(Lix): this cannot work in Lix itself. # __findFile = _: _: throw "Do not import from NIX_PATH in the depot!";