commit 295846a2545c91567a21f375c181aa5c51da42e2 · pyrox.dev/nixpkgs

nixos/modules/misc/ids.nix

···

       220
       220
        
             grafana = 196;

     

       221
       221
        
             skydns = 197;

     

       222
       222
        
             ripple-rest = 198;

     

       223
       223
       +
             nix-serve = 199;

     

       223
       224
        
       

     

       224
       225
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       225
       226
        
       

     
···

       418
       419
        
             #grafana = 196; #unused

     

       419
       420
        
             #skydns = 197; #unused

     

       420
       421
        
             #ripple-rest = 198; #unused

     

       422
       422
       +
             #nix-serve = 199; #unused

     

       421
       423
        
       

     

       422
       424
        
             # When adding a gid, make sure it doesn't match an existing

     

       423
       425
        
             # uid. Users and groups with the same name should have equal

+15 -1

nixos/modules/services/networking/nix-serve.nix

···

       26
       26
        
               '';

     

       27
       27
        
             };

     

       28
       28
        
       

     

       29
       29
       +
             secretKeyFile = mkOption {

     

       30
       30
       +
               type = types.nullOr types.str;

     

       31
       31
       +
               default = null;

     

       32
       32
       +
               description = ''

     

       33
       33
       +
                 The path to the file used for signing derivation data.

     

       34
       34
       +
               '';

     

       35
       35
       +
             };

     

       36
       36
       +
       

     

       29
       37
        
             extraParams = mkOption {

     

       30
       38
        
               type = types.string;

     

       31
       39
        
               default = "";

     
···

       44
       52
        
       

     

       45
       53
        
             path = [ config.nix.package pkgs.bzip2 ];

     

       46
       54
        
             environment.NIX_REMOTE = "daemon";

     

       55
       55
       +
             environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;

     

       47
       56
        
       

     

       48
       57
        
             serviceConfig = {

     

       49
       58
        
               ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +

     

       50
       59
        
                 "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";

     

       51
       51
       -
               User = "nobody";

     

       60
       60
       +
               User = "nix-serve";

     

       52
       61
        
               Group = "nogroup";

     

       53
       62
        
             };

     

       63
       63
       +
           };

     

       64
       64
       +
       

     

       65
       65
       +
           users.extraUsers.nix-serve = {

     

       66
       66
       +
             description = "Nix-serve user";

     

       67
       67
       +
             uid = config.ids.uids.nix-serve;

     

       54
       68
        
           };

     

       55
       69
        
         };

     

       56
       70
        
       }