commit 519a435b08992188861e589948246679ad1319a9 · pyrox.dev/nixpkgs

+13 -2

nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix

···

       193
       193
        
             # even shortly after the previous lookup. This *also* applies to the daemon.

     

       194
       194
        
             narinfo-cache-negative-ttl = 0

     

       195
       195
        
           '';

     

       196
       196
       -
           services.hercules-ci-agent.tomlFile =

     

       197
       197
       -
             format.generate "hercules-ci-agent.toml" cfg.settings;

     

       196
       196
       +
           services.hercules-ci-agent = {

     

       197
       197
       +
             tomlFile =

     

       198
       198
       +
               format.generate "hercules-ci-agent.toml" cfg.settings;

     

       199
       199
       +
       

     

       200
       200
       +
             settings.labels = {

     

       201
       201
       +
               agent.source =

     

       202
       202
       +
                 if options.services.hercules-ci-agent.package.highestPrio == (lib.modules.mkOptionDefault { }).priority

     

       203
       203
       +
                 then "nixpkgs"

     

       204
       204
       +
                 else lib.mkOptionDefault "override";

     

       205
       205
       +
               pkgs.version = pkgs.lib.version;

     

       206
       206
       +
               lib.version = lib.version;

     

       207
       207
       +
             };

     

       208
       208
       +
           };

     

       198
       209
        
         };

     

       199
       210
        
       }

+17 -1

nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix

···

       68
       68
        
           # Trusted user allows simplified configuration and better performance

     

       69
       69
        
           # when operating in a cluster.

     

       70
       70
        
           nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ];

     

       71
       71
       -
           services.hercules-ci-agent.settings.nixUserIsTrusted = true;

     

       71
       71
       +
           services.hercules-ci-agent = {

     

       72
       72
       +
             settings = {

     

       73
       73
       +
               nixUserIsTrusted = true;

     

       74
       74
       +
               labels =

     

       75
       75
       +
                 let

     

       76
       76
       +
                   mkIfNotNull = x: mkIf (x != null) x;

     

       77
       77
       +
                 in

     

       78
       78
       +
                 {

     

       79
       79
       +
                   nixos.configurationRevision = mkIfNotNull config.system.configurationRevision;

     

       80
       80
       +
                   nixos.release = config.system.nixos.release;

     

       81
       81
       +
                   nixos.label = mkIfNotNull config.system.nixos.label;

     

       82
       82
       +
                   nixos.codeName = config.system.nixos.codeName;

     

       83
       83
       +
                   nixos.tags = config.system.nixos.tags;

     

       84
       84
       +
                   nixos.systemName = mkIfNotNull config.system.name;

     

       85
       85
       +
                 };

     

       86
       86
       +
             };

     

       87
       87
       +
           };

     

       72
       88
        
       

     

       73
       89
        
           users.users.hercules-ci-agent = {

     

       74
       90
        
             home = cfg.settings.baseDirectory;