From d2227af71d57652ca69f42b5db4345a5c1a615c2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 24 Apr 2025 02:16:02 +0200 Subject: [PATCH] overlays.default: Only set `nix` We should keep users' pkgs tidy. --- flake.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index d22426e1b..09a553735 100644 --- a/flake.nix +++ b/flake.nix @@ -302,9 +302,21 @@ in { - # A Nixpkgs overlay that overrides the 'nix' and - # 'nix-perl-bindings' packages. - overlays.default = overlayFor (p: p.stdenv); + overlays.internal = overlayFor (p: p.stdenv); + + /** + A Nixpkgs overlay that sets `nix` to something like `packages..nix-everything`, + except dependencies aren't taken from (flake) `nix.inputs.nixpkgs`, but from the Nixpkgs packages + where the overlay is used. + */ + overlays.default = + final: prev: + let + packageSets = packageSetsFor { pkgs = final; }; + in + { + nix = packageSets.nixComponents.nix-everything; + }; hydraJobs = import ./packaging/hydra.nix { inherit