commit 693e2c32871dcea7fe2ef455ee77571d3a117499 · pyrox.dev/nixpkgs

+15 -9
nixos/lib/eval-config.nix
···

       38
       38
        
       in

     

       39
       39
        
       

     

       40
       40
        
       let

     

       41
       41
       +
         inherit (lib) optional;

     

       42
       42
       +
       

     

       41
       43
        
         evalModulesMinimal = (import ./default.nix {

     

       42
       44
        
           inherit lib;

     

       43
       45
        
           # Implicit use of feature is noted in implementation.

     
···

       47
       49
        
         pkgsModule = rec {

     

       48
       50
        
           _file = ./eval-config.nix;

     

       49
       51
        
           key = _file;

     

       50
       50
       -
           config = {

     

       51
       51
       -
             # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override

     

       52
       52
       -
             # this.  Since the latter defaults to the former, the former should

     

       53
       53
       -
             # default to the argument. That way this new default could propagate all

     

       54
       54
       -
             # they way through, but has the last priority behind everything else.

     

       55
       55
       -
             nixpkgs.system = lib.mkIf (system != null) (lib.mkDefault system);

     

       56
       56
       -
       

     

       57
       57
       -
             _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);

     

       58
       58
       -
           };

     

       52
       52
       +
           config = lib.mkMerge (

     

       53
       53
       +
             (optional (system != null) {

     

       54
       54
       +
               # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override

     

       55
       55
       +
               # this.  Since the latter defaults to the former, the former should

     

       56
       56
       +
               # default to the argument. That way this new default could propagate all

     

       57
       57
       +
               # they way through, but has the last priority behind everything else.

     

       58
       58
       +
               nixpkgs.system = lib.mkDefault system;

     

       59
       59
       +
             })

     

       60
       60
       +
             ++

     

       61
       61
       +
             (optional (pkgs_ != null) {

     

       62
       62
       +
               _module.args.pkgs = lib.mkForce pkgs_;

     

       63
       63
       +
             })

     

       64
       64
       +
           );

     

       59
       65
        
         };

     

       60
       66
        
       

     

       61
       67
        
         withWarnings = x: