From 123a2f0fcc96cc7828ef942a88d3608b55d6d81c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 12 Mar 2024 08:37:53 -0700 Subject: [PATCH] lib/systems: use lib.systems.parse and lib.systems.inspect.predicates instead of re-importing --- lib/systems/inspect.nix | 2 +- lib/systems/parse.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index c6a33781ae28..3ce1db2b8987 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -1,5 +1,5 @@ { lib }: -with import ./parse.nix { inherit lib; }; +with lib.systems.parse; with lib.attrsets; with lib.lists; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index b69ad669e187..7161b30dc571 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -19,7 +19,7 @@ with lib.lists; with lib.types; with lib.attrsets; with lib.strings; -with (import ./inspect.nix { inherit lib; }).predicates; +with lib.systems.inspect.predicates; let inherit (lib.options) mergeOneOption;