commit f171f4ffd47a3cc3ad571a70f265bb9c5e73503b · pyrox.dev/nixpkgs

+6 -1

nixos/modules/virtualisation/incus.nix

···

       111
       111
        
       

     

       112
       112
        
             package = lib.mkPackageOption pkgs "incus-lts" { };

     

       113
       113
        
       

     

       114
       114
       -
             lxcPackage = lib.mkPackageOption pkgs "lxc" { };

     

       114
       114
       +
             lxcPackage = lib.mkOption {

     

       115
       115
       +
               type = lib.types.package;

     

       116
       116
       +
               default = config.virtualisation.lxc.package;

     

       117
       117
       +
               defaultText = lib.literalExpression "config.virtualisation.lxc.package";

     

       118
       118
       +
               description = "The lxc package to use.";

     

       119
       119
       +
             };

     

       115
       120
        
       

     

       116
       121
        
             clientPackage = lib.mkOption {

     

       117
       122
        
               type = lib.types.package;

+5 -4

nixos/modules/virtualisation/lxc.nix

···

       32
       32
        
                   {manpage}`lxc.system.conf(5)`.

     

       33
       33
        
                 '';

     

       34
       34
        
             };

     

       35
       35
       +
           package = lib.mkPackageOption pkgs "lxc" { };

     

       35
       36
        
       

     

       36
       37
        
           defaultConfig =

     

       37
       38
        
             lib.mkOption {

     
···

       57
       58
        
         ###### implementation

     

       58
       59
        
       

     

       59
       60
        
         config = lib.mkIf cfg.enable {

     

       60
       60
       -
           environment.systemPackages = [ pkgs.lxc ];

     

       61
       61
       +
           environment.systemPackages = [ cfg.package ];

     

       61
       62
        
           environment.etc."lxc/lxc.conf".text = cfg.systemConfig;

     

       62
       63
        
           environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig;

     

       63
       64
        
           environment.etc."lxc/default.conf".text = cfg.defaultConfig;

     

       64
       65
        
           systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];

     

       65
       66
        
       

     

       66
       66
       -
           security.apparmor.packages = [ pkgs.lxc ];

     

       67
       67
       +
           security.apparmor.packages = [ cfg.package ];

     

       67
       68
        
           security.apparmor.policies = {

     

       68
       69
        
             "bin.lxc-start".profile = ''

     

       69
       69
       -
               include ${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start

     

       70
       70
       +
               include ${cfg.package}/etc/apparmor.d/usr.bin.lxc-start

     

       70
       71
        
             '';

     

       71
       72
        
             "lxc-containers".profile = ''

     

       72
       72
       -
               include ${pkgs.lxc}/etc/apparmor.d/lxc-containers

     

       73
       73
       +
               include ${cfg.package}/etc/apparmor.d/lxc-containers

     

       73
       74
        
             '';

     

       74
       75
        
           };

     

       75
       76
        
         };

+5 -4

nixos/modules/virtualisation/lxd.nix

···

       35
       35
        
       

     

       36
       36
        
             package = lib.mkPackageOption pkgs "lxd-lts" { };

     

       37
       37
        
       

     

       38
       38
       -
             lxcPackage = lib.mkPackageOption pkgs "lxc" {

     

       39
       39
       -
               extraDescription = ''

     

       40
       40
       -
                 Required for AppArmor profiles.

     

       41
       41
       -
               '';

     

       38
       38
       +
             lxcPackage = lib.mkOption {

     

       39
       39
       +
               type = lib.types.package;

     

       40
       40
       +
               default = config.virtualisation.lxc.package;

     

       41
       41
       +
               defaultText = lib.literalExpression "config.virtualisation.lxc.package";

     

       42
       42
       +
               description = "The lxc package to use.";

     

       42
       43
        
             };

     

       43
       44
        
       

     

       44
       45
        
             zfsSupport = lib.mkOption {