From 9a35a7efd0e6223e201f591efd15795af9d702f8 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 15 Jun 2026 03:37:23 +0300 Subject: [PATCH] pkgsChecked, pkgsParallel, pkgsStructured: init --- pkgs/test/top-level/default.nix | 14 ++++++++++++++ pkgs/top-level/variants.nix | 15 +++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/pkgs/test/top-level/default.nix b/pkgs/test/top-level/default.nix index 3946b363b764..7d21549c9107 100644 --- a/pkgs/test/top-level/default.nix +++ b/pkgs/test/top-level/default.nix @@ -82,4 +82,18 @@ lib.recurseIntoAttrs { assert cross.makeWrapper ? __spliced; assert appended.makeWrapper ? __spliced; pkgs.emptyFile; + + massRebuildVariantComposition = + let + variants = [ + "pkgsChecked" + "pkgsParallel" + "pkgsStrict" + "pkgsStructured" + ]; + all = lib.getAttrFromPath variants pkgs; + all-reversed = lib.getAttrFromPath (lib.reverseList variants) pkgs; + in + assert pkgs.config.allowVariants -> (all.hello == all-reversed.hello); + pkgs.emptyFile; } diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index dd817788b5a9..fb6a38029c96 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -174,9 +174,24 @@ self: super: { ++ overlays; }; + pkgsChecked = nixpkgsFun { + config = super.config // { + doCheckByDefault = true; + }; + }; + pkgsParallel = nixpkgsFun { + config = super.config // { + enableParallelBuildingByDefault = true; + }; + }; pkgsStrict = nixpkgsFun { config = super.config // { strictDepsByDefault = true; }; }; + pkgsStructured = nixpkgsFun { + config = super.config // { + structuredAttrsByDefault = true; + }; + }; }