From 270426ab6e55cbd07ac0e3c07ae693dbaaa1fd3a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 3 Dec 2021 12:15:20 +0000 Subject: [PATCH] pkgs.pkgsModule: init Having `pkgs` as a module argument is common, beyond just NixOS, making this a useful convenience for setting it. (cherry picked from commit dd6d8e3f0c38370ac8fb082ea7a3be06c949deed) --- pkgs/top-level/all-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1e2011a4cfb..b703139bebd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33245,6 +33245,20 @@ with pkgs; in c.config.system.build // c; + /* + A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. + */ + pkgsModule = { lib, options, ... }: { + config = + if options?nixpkgs.pkgs then { + # legacy / nixpkgs.nix style + nixpkgs.pkgs = pkgs; + } + else { + # minimal + _module.args.pkgs = pkgs; + }; + }; /* * Run a NixOS VM network test using this evaluation of Nixpkgs.