From 50cf7fe9dce6149dcf84d454ca278888cce1a3f1 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sat, 16 May 2026 13:48:58 -0400 Subject: [PATCH] stdenv/check-meta: move to within lib/ This is going to be used in lib.systems, which isn't allowed to import from outside the lib folder. We don't actually expose this through lib, though. --- {pkgs/stdenv/generic => lib}/meta-types.nix | 3 ++- pkgs/stdenv/generic/check-meta.nix | 2 +- pkgs/stdenv/generic/problems.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename {pkgs/stdenv/generic => lib}/meta-types.nix (97%) diff --git a/pkgs/stdenv/generic/meta-types.nix b/lib/meta-types.nix similarity index 97% rename from pkgs/stdenv/generic/meta-types.nix rename to lib/meta-types.nix index 1396243e3002..73512531ae44 100644 --- a/pkgs/stdenv/generic/meta-types.nix +++ b/lib/meta-types.nix @@ -1,6 +1,7 @@ { lib }: # Simple internal type checks for meta. -# This file is not a stable interface and may be changed arbitrarily. +# This file is only intended for internal nixpkgs use. +# It is not a stable interface and may be changed arbitrarily. # # TODO: add a method to the module system types # see https://github.com/NixOS/nixpkgs/pull/273935#issuecomment-1854173100 diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 70c009c3e83a..780e98ed3adc 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -300,7 +300,7 @@ let metaType = let - types = import ./meta-types.nix { inherit lib; }; + types = import ../../../lib/meta-types.nix { inherit lib; }; inherit (types) str union diff --git a/pkgs/stdenv/generic/problems.nix b/pkgs/stdenv/generic/problems.nix index 0f03c393e384..114d586c0df6 100644 --- a/pkgs/stdenv/generic/problems.nix +++ b/pkgs/stdenv/generic/problems.nix @@ -242,7 +242,7 @@ rec { # The type for meta.problems problemsType = let - types = import ./meta-types.nix { inherit lib; }; + types = import ../../../lib/meta-types.nix { inherit lib; }; inherit (types) str listOf