commit 9748d7c60ba4fd94a5be3d2c5783608e65baea95 · pyrox.dev/nixpkgs

-1

nixos/modules/rename.nix

···

       9
       9
        
           (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ])

     

       10
       10
        
           (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ])

     

       11
       11
        
       

     

       12
       12
       -
           (mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ])

     

       13
       12
        
           (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])

     

       14
       13
        
           (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])

     

       15
       14
        
           (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ])

+1 -1

nixos/modules/services/misc/disnix.nix

···

       47
       47
        
         ###### implementation

     

       48
       48
        
       

     

       49
       49
        
         config = mkIf cfg.enable {

     

       50
       50
       -
           services.dysnomia.enable = true;

     

       50
       50
       +
           dysnomia.enable = true;

     

       51
       51
        
       

     

       52
       52
        
           environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;

     

       53
       53

+5 -5

nixos/modules/services/misc/dysnomia.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.services.dysnomia;

     

       6
       6
       +
         cfg = config.dysnomia;

     

       7
       7
        
       

     

       8
       8
        
         printProperties = properties:

     

       9
       9
        
           concatMapStrings (propertyName:

     
···

       69
       69
        
       in

     

       70
       70
        
       {

     

       71
       71
        
         options = {

     

       72
       72
       -
           services.dysnomia = {

     

       72
       72
       +
           dysnomia = {

     

       73
       73
        
       

     

       74
       74
        
             enable = mkOption {

     

       75
       75
        
               type = types.bool;

     
···

       142
       142
        
       

     

       143
       143
        
           environment.systemPackages = [ cfg.package ];

     

       144
       144
        
       

     

       145
       145
       -
           services.dysnomia.package = pkgs.dysnomia.override (origArgs: {

     

       145
       145
       +
           dysnomia.package = pkgs.dysnomia.override (origArgs: {

     

       146
       146
        
             enableApacheWebApplication = config.services.httpd.enable;

     

       147
       147
        
             enableAxis2WebService = config.services.tomcat.axis2.enable;

     

       148
       148
        
             enableEjabberdDump = config.services.ejabberd.enable;

     
···

       153
       153
        
             enableMongoDatabase = config.services.mongodb.enable;

     

       154
       154
        
           });

     

       155
       155
        
       

     

       156
       156
       -
           services.dysnomia.properties = {

     

       156
       156
       +
           dysnomia.properties = {

     

       157
       157
        
             hostname = config.networking.hostName;

     

       158
       158
        
             inherit (config.nixpkgs.localSystem) system;

     

       159
       159
        
       

     
···

       171
       171
        
             }}");

     

       172
       172
        
           };

     

       173
       173
        
       

     

       174
       174
       -
           services.dysnomia.containers = lib.recursiveUpdate ({

     

       174
       174
       +
           dysnomia.containers = lib.recursiveUpdate ({

     

       175
       175
        
             process = {};

     

       176
       176
        
             wrapper = {};

     

       177
       177
        
           }