commit f677cbabe93e039a9d4ac995a49f9ca7991d0a9c · pyrox.dev/nixpkgs

+2 -1

nixos/lib/testing/legacy.nix

···

       3
        
         inherit (lib) mkIf mkOption types;

     

       4
        
       in

     

       5
        
       {

     

       6
       -
         # This needs options.warnings, which we don't have (yet?).

     

       7
        
         # imports = [

     

       8
        
         #   (lib.mkRenamedOptionModule [ "machine" ] [ "nodes" "machine" ])

     

       0
        
       
     

       9
        
         # ];

     

       10
        
       

     

       11
        
         options = {

···

       3
        
         inherit (lib) mkIf mkOption types;

     

       4
        
       in

     

       5
        
       {

     

       6
       +
         # This needs options.warnings and options.assertions, which we don't have (yet?).

     

       7
        
         # imports = [

     

       8
        
         #   (lib.mkRenamedOptionModule [ "machine" ] [ "nodes" "machine" ])

     

       9
       +
         #   (lib.mkRemovedOptionModule [ "minimal" ] "The minimal kernel module was removed as it was broken and not used any more in nixpkgs.")

     

       10
        
         # ];

     

       11
        
       

     

       12
        
         options = {

+1 -9

nixos/lib/testing/nodes.nix

···

       23
        
                     nixpkgs.config.allowAliases = false;

     

       24
        
                   })

     

       25
        
                 testModuleArgs.config.extraBaseModules

     

       26
       -
               ] ++ optional config.minimal ../../modules/testing/minimal-kernel.nix;

     

       27
        
           };

     

       28
        
       

     

       29
        
       

     
···

       75
        
               An attribute set of arbitrary values that will be made available as module arguments during the resolution of module `imports`.

     

       76
        
       

     

       77
        
               Note that it is not possible to override these from within the NixOS configurations. If you argument is not relevant to `imports`, consider setting {option}`defaults._module.args.<name>` instead.

     

       78
       -
             '';

     

       79
       -
           };

     

       80
       -
       

     

       81
       -
           minimal = mkOption {

     

       82
       -
             type = types.bool;

     

       83
       -
             default = false;

     

       84
       -
             description = mdDoc ''

     

       85
       -
               Enable to configure all [{option}`nodes`](#test-opt-nodes) to run with a minimal kernel.

     

       86
        
             '';

     

       87
        
           };

     

       88

···

       23
        
                     nixpkgs.config.allowAliases = false;

     

       24
        
                   })

     

       25
        
                 testModuleArgs.config.extraBaseModules

     

       26
       +
               ];

     

       27
        
           };

     

       28
        
       

     

       29
        
       

     
···

       75
        
               An attribute set of arbitrary values that will be made available as module arguments during the resolution of module `imports`.

     

       76
        
       

     

       77
        
               Note that it is not possible to override these from within the NixOS configurations. If you argument is not relevant to `imports`, consider setting {option}`defaults._module.args.<name>` instead.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       78
        
             '';

     

       79
        
           };

     

       80

-28

nixos/modules/testing/minimal-kernel.nix

···

       1
       -
       { config, pkgs, lib, ... }:

     

       2
       -
       

     

       3
       -
       let

     

       4
       -
         configfile = builtins.storePath (builtins.toFile "config" (lib.concatStringsSep "\n"

     

       5
       -
           (map (builtins.getAttr "configLine") config.system.requiredKernelConfig))

     

       6
       -
         );

     

       7
       -
       

     

       8
       -
         origKernel = pkgs.buildLinux {

     

       9
       -
           inherit (pkgs.linux) src version stdenv;

     

       10
       -
           inherit configfile;

     

       11
       -
           allowImportFromDerivation = true;

     

       12
       -
           kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];

     

       13
       -
         };

     

       14
       -
       

     

       15
       -
         kernel = origKernel // (derivation (origKernel.drvAttrs // {

     

       16
       -
           configurePhase = ''

     

       17
       -
             runHook preConfigure

     

       18
       -
             mkdir ../build

     

       19
       -
             make $makeFlags "''${makeFlagsArray[@]}" mrproper

     

       20
       -
             make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig

     

       21
       -
             runHook postConfigure

     

       22
       -
           '';

     

       23
       -
         }));

     

       24
       -
       

     

       25
       -
          kernelPackages = pkgs.linuxPackagesFor kernel;

     

       26
       -
       in {

     

       27
       -
         boot.kernelPackages = kernelPackages;

     

       28
       -
       }