commit 11ef076aabc57b14586ad6b99d8f762d843ffce8 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       452
       452
        
         kerberos = handleTest ./kerberos/default.nix {};

     

       453
       453
        
         kernel-generic = handleTest ./kernel-generic.nix {};

     

       454
       454
        
         kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};

     

       455
       455
       -
         kernel-rust = runTestOn ["x86_64-linux"] ./kernel-rust.nix;

     

       455
       455
       +
         kernel-rust = handleTestOn ["x86_64-linux"] ./kernel-rust.nix {};

     

       456
       456
        
         keter = handleTest ./keter.nix {};

     

       457
       457
        
         kexec = handleTest ./kexec.nix {};

     

       458
       458
        
         keycloak = discoverTests (import ./keycloak.nix);

+39 -26

nixos/tests/kernel-rust.nix

···

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

     

       2
       2
       -
         name = "kernel-rust";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; {

     

       4
       4
       -
           maintainers = [ blitz ];

     

       5
       5
       -
         };

     

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? { }

     

       3
       3
       +
       , pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       6
       5
        
       

     

       7
       7
       -
         nodes.machine = { config, pkgs, ... }:

     

       8
       8
       -
           {

     

       9
       9
       -
             boot.kernelPackages = pkgs.linuxPackages_testing;

     

       6
       6
       +
       let

     

       7
       7
       +
         inherit (pkgs.lib) const filterAttrs mapAttrs;

     

       10
       8
        
       

     

       11
       11
       -
             boot.extraModulePackages = [

     

       12
       12
       -
               config.boot.kernelPackages.rust-out-of-tree-module

     

       13
       13
       -
             ];

     

       14
       14
       -
       

     

       15
       15
       -
             boot.kernelPatches = [

     

       16
       16
       -
               {

     

       17
       17
       -
                 name = "Rust Support";

     

       18
       18
       -
                 patch = null;

     

       19
       19
       -
                 features = {

     

       20
       20
       -
                   rust = true;

     

       21
       21
       -
                 };

     

       22
       22
       -
               }

     

       23
       23
       -
             ];

     

       9
       9
       +
         kernelRustTest = kernelPackages: import ./make-test-python.nix ({ lib, ... }: {

     

       10
       10
       +
           name = "kernel-rust";

     

       11
       11
       +
           meta.maintainers = with lib.maintainers; [ blitz ma27 ];

     

       12
       12
       +
           nodes.machine = { config, ... }: {

     

       13
       13
       +
             boot = {

     

       14
       14
       +
               inherit kernelPackages;

     

       15
       15
       +
               extraModulePackages = [ config.boot.kernelPackages.rust-out-of-tree-module ];

     

       16
       16
       +
               kernelPatches = [

     

       17
       17
       +
                 {

     

       18
       18
       +
                   name = "Rust Support";

     

       19
       19
       +
                   patch = null;

     

       20
       20
       +
                   features = {

     

       21
       21
       +
                     rust = true;

     

       22
       22
       +
                   };

     

       23
       23
       +
                 }

     

       24
       24
       +
               ];

     

       25
       25
       +
             };

     

       24
       26
        
           };

     

       27
       27
       +
           testScript = ''

     

       28
       28
       +
             machine.wait_for_unit("default.target")

     

       29
       29
       +
             machine.succeed("modprobe rust_out_of_tree")

     

       30
       30
       +
           '';

     

       31
       31
       +
         });

     

       25
       32
        
       

     

       26
       26
       -
         testScript = ''

     

       27
       27
       -
           machine.wait_for_unit("default.target")

     

       28
       28
       -
           machine.succeed("modprobe rust_out_of_tree")

     

       29
       29
       -
         '';

     

       30
       30
       -
       }

     

       33
       33
       +
         kernels = {

     

       34
       34
       +
           inherit (pkgs.linuxKernel.packages) linux_testing;

     

       35
       35
       +
         }

     

       36
       36
       +
         // filterAttrs

     

       37
       37
       +
           (const (x: let

     

       38
       38
       +
             inherit (builtins.tryEval (

     

       39
       39
       +
               x.rust-out-of-tree-module or null != null

     

       40
       40
       +
             )) success value;

     

       41
       41
       +
           in success && value))

     

       42
       42
       +
           pkgs.linuxKernel.vanillaPackages;

     

       43
       43
       +
       in mapAttrs (const kernelRustTest) kernels