commit 5ca7fffe87d042042f1961a24c64da4579b9ecc4 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       225
       225
        
       - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package

     

       226
       226
        
         and `withGstreamer`/`withVlc` override options have been removed due to this.

     

       227
       227
        
       

     

       228
       228
       +
       - `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details.

     

       229
       229
       +
       

     

       228
       230
        
       - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI

     

       229
       231
        
       

     

       230
       232
        
       - [](#opt-services.nextcloud.config.dbtype) is unset by default, the previous default was `sqlite`.

+255 -111

nixos/modules/services/monitoring/nezha-agent.nix

···

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
        
         cfg = config.services.nezha-agent;

     

       9
       9
       +
       

     

       10
       10
       +
         # nezha-agent uses yaml as the configuration file format.

     

       11
       11
       +
         # Since we need to use jq to update the content, so here we generate json

     

       12
       12
       +
         settingsFormat = pkgs.formats.json { };

     

       13
       13
       +
         configFile = settingsFormat.generate "config.json" cfg.settings;

     

       9
       14
        
       in

     

       10
       15
        
       {

     

       11
       16
        
         meta = {

     
···

       16
       21
        
             enable = lib.mkEnableOption "Agent of Nezha Monitoring";

     

       17
       22
        
       

     

       18
       23
        
             package = lib.mkPackageOption pkgs "nezha-agent" { };

     

       24
       24
       +
       

     

       19
       25
        
             debug = lib.mkEnableOption "verbose log";

     

       20
       20
       -
             tls = lib.mkOption {

     

       21
       21
       -
               type = lib.types.bool;

     

       22
       22
       -
               default = false;

     

       26
       26
       +
       

     

       27
       27
       +
             settings = lib.mkOption {

     

       23
       28
        
               description = ''

     

       24
       24
       -
                 Enable SSL/TLS encryption.

     

       29
       29
       +
                 Generate to {file}`config.json` as a Nix attribute set.

     

       30
       30
       +
                 Check the [guide](https://nezha.wiki/en_US/guide/agent.html)

     

       31
       31
       +
                 for possible options.

     

       25
       32
        
               '';

     

       26
       26
       -
             };

     

       27
       27
       -
             gpu = lib.mkOption {

     

       28
       28
       -
               type = lib.types.bool;

     

       29
       29
       -
               default = true;

     

       30
       30
       -
               description = ''

     

       31
       31
       -
                 Enable GPU monitoring.

     

       32
       32
       -
               '';

     

       33
       33
       -
             };

     

       34
       34
       -
             temperature = lib.mkOption {

     

       35
       35
       -
               type = lib.types.bool;

     

       36
       36
       -
               default = true;

     

       37
       37
       -
               description = ''

     

       38
       38
       -
                 Enable temperature monitoring.

     

       39
       39
       -
               '';

     

       33
       33
       +
               type = lib.types.submodule {

     

       34
       34
       +
                 freeformType = settingsFormat.type;

     

       35
       35
       +
       

     

       36
       36
       +
                 options = {

     

       37
       37
       +
                   disable_command_execute = lib.mkOption {

     

       38
       38
       +
                     type = lib.types.bool;

     

       39
       39
       +
                     default = true;

     

       40
       40
       +
                     description = ''

     

       41
       41
       +
                       Disable executing the command from dashboard.

     

       42
       42
       +
                     '';

     

       43
       43
       +
                   };

     

       44
       44
       +
                   disable_nat = lib.mkOption {

     

       45
       45
       +
                     type = lib.types.bool;

     

       46
       46
       +
                     default = false;

     

       47
       47
       +
                     description = ''

     

       48
       48
       +
                       Disable NAT penetration.

     

       49
       49
       +
                     '';

     

       50
       50
       +
                   };

     

       51
       51
       +
                   disable_send_query = lib.mkOption {

     

       52
       52
       +
                     type = lib.types.bool;

     

       53
       53
       +
                     default = false;

     

       54
       54
       +
                     description = ''

     

       55
       55
       +
                       Disable sending TCP/ICMP/HTTP requests.

     

       56
       56
       +
                     '';

     

       57
       57
       +
                   };

     

       58
       58
       +
                   gpu = lib.mkOption {

     

       59
       59
       +
                     type = lib.types.bool;

     

       60
       60
       +
                     default = false;

     

       61
       61
       +
                     description = ''

     

       62
       62
       +
                       Enable GPU monitoring.

     

       63
       63
       +
                     '';

     

       64
       64
       +
                   };

     

       65
       65
       +
                   tls = lib.mkOption {

     

       66
       66
       +
                     type = lib.types.bool;

     

       67
       67
       +
                     default = false;

     

       68
       68
       +
                     description = ''

     

       69
       69
       +
                       Enable SSL/TLS encryption.

     

       70
       70
       +
                     '';

     

       71
       71
       +
                   };

     

       72
       72
       +
                   temperature = lib.mkOption {

     

       73
       73
       +
                     type = lib.types.bool;

     

       74
       74
       +
                     default = true;

     

       75
       75
       +
                     description = ''

     

       76
       76
       +
                       Enable temperature monitoring.

     

       77
       77
       +
                     '';

     

       78
       78
       +
                   };

     

       79
       79
       +
                   use_ipv6_country_code = lib.mkOption {

     

       80
       80
       +
                     type = lib.types.bool;

     

       81
       81
       +
                     default = true;

     

       82
       82
       +
                     description = ''

     

       83
       83
       +
                       Use ipv6 countrycode to report location.

     

       84
       84
       +
                     '';

     

       85
       85
       +
                   };

     

       86
       86
       +
                   skip_connection_count = lib.mkOption {

     

       87
       87
       +
                     type = lib.types.bool;

     

       88
       88
       +
                     default = false;

     

       89
       89
       +
                     description = ''

     

       90
       90
       +
                       Do not monitor the number of connections.

     

       91
       91
       +
                     '';

     

       92
       92
       +
                   };

     

       93
       93
       +
                   skip_procs_count = lib.mkOption {

     

       94
       94
       +
                     type = lib.types.bool;

     

       95
       95
       +
                     default = false;

     

       96
       96
       +
                     description = ''

     

       97
       97
       +
                       Do not monitor the number of processes.

     

       98
       98
       +
                     '';

     

       99
       99
       +
                   };

     

       100
       100
       +
                   report_delay = lib.mkOption {

     

       101
       101
       +
                     type = lib.types.enum [

     

       102
       102
       +
                       1

     

       103
       103
       +
                       2

     

       104
       104
       +
                       3

     

       105
       105
       +
                       4

     

       106
       106
       +
                     ];

     

       107
       107
       +
                     default = 3;

     

       108
       108
       +
                     description = ''

     

       109
       109
       +
                       The interval between system status reportings.

     

       110
       110
       +
                       The value must be an integer from 1 to 4.

     

       111
       111
       +
                     '';

     

       112
       112
       +
                   };

     

       113
       113
       +
                   server = lib.mkOption {

     

       114
       114
       +
                     type = lib.types.str;

     

       115
       115
       +
                     example = "127.0.0.1:8008";

     

       116
       116
       +
                     description = ''

     

       117
       117
       +
                       Address to the dashboard.

     

       118
       118
       +
                     '';

     

       119
       119
       +
                   };

     

       120
       120
       +
                   uuid = lib.mkOption {

     

       121
       121
       +
                     type = with lib.types; nullOr str;

     

       122
       122
       +
                     # pre-defined uuid of Dns in RFC 4122

     

       123
       123
       +
                     example = "6ba7b810-9dad-11d1-80b4-00c04fd430c8";

     

       124
       124
       +
                     default = null;

     

       125
       125
       +
                     description = ''

     

       126
       126
       +
                       Must be set to a unique identifier, preferably a UUID according to

     

       127
       127
       +
                       RFC 4122. UUIDs can be generated with `uuidgen` command, found in

     

       128
       128
       +
                       the `util-linux` package.

     

       129
       129
       +
       

     

       130
       130
       +
                       Set {option}`services.nezha-agent.genUuid` to true to generate uuid

     

       131
       131
       +
                       from {option}`networking.fqdn` automatically.

     

       132
       132
       +
                     '';

     

       133
       133
       +
                   };

     

       134
       134
       +
                 };

     

       135
       135
       +
               };

     

       40
       136
        
             };

     

       41
       41
       -
             useIPv6CountryCode = lib.mkOption {

     

       42
       42
       -
               type = lib.types.bool;

     

       43
       43
       -
               default = true;

     

       44
       44
       -
               description = ''

     

       45
       45
       -
                 Use ipv6 countrycode to report location.

     

       46
       46
       -
               '';

     

       47
       47
       -
             };

     

       48
       48
       -
             disableCommandExecute = lib.mkOption {

     

       49
       49
       -
               type = lib.types.bool;

     

       50
       50
       -
               default = true;

     

       51
       51
       -
               description = ''

     

       52
       52
       -
                 Disable executing the command from dashboard.

     

       53
       53
       -
               '';

     

       54
       54
       -
             };

     

       55
       55
       -
             disableNat = lib.mkOption {

     

       137
       137
       +
       

     

       138
       138
       +
             genUuid = lib.mkOption {

     

       56
       139
        
               type = lib.types.bool;

     

       57
       140
        
               default = false;

     

       58
       141
        
               description = ''

     

       59
       59
       -
                 Disable NAT penetration.

     

       60
       60
       -
               '';

     

       61
       61
       -
             };

     

       62
       62
       -
             disableSendQuery = lib.mkOption {

     

       63
       63
       -
               type = lib.types.bool;

     

       64
       64
       -
               default = false;

     

       65
       65
       -
               description = ''

     

       66
       66
       -
                 Disable sending TCP/ICMP/HTTP requests.

     

       67
       67
       -
               '';

     

       68
       68
       -
             };

     

       69
       69
       -
             skipConnection = lib.mkOption {

     

       70
       70
       -
               type = lib.types.bool;

     

       71
       71
       -
               default = false;

     

       72
       72
       -
               description = ''

     

       73
       73
       -
                 Do not monitor the number of connections.

     

       74
       74
       -
               '';

     

       75
       75
       -
             };

     

       76
       76
       -
             skipProcess = lib.mkOption {

     

       77
       77
       -
               type = lib.types.bool;

     

       78
       78
       -
               default = false;

     

       79
       79
       -
               description = ''

     

       80
       80
       -
                 Do not monitor the number of processes.

     

       81
       81
       -
               '';

     

       82
       82
       -
             };

     

       83
       83
       -
             reportDelay = lib.mkOption {

     

       84
       84
       -
               type = lib.types.enum [

     

       85
       85
       -
                 1

     

       86
       86
       -
                 2

     

       87
       87
       -
                 3

     

       88
       88
       -
                 4

     

       89
       89
       -
               ];

     

       90
       90
       -
               default = 1;

     

       91
       91
       -
               description = ''

     

       92
       92
       -
                 The interval between system status reportings.

     

       93
       93
       -
                 The value must be an integer from 1 to 4

     

       142
       142
       +
                 Whether to generate uuid from fqdn automatically.

     

       143
       143
       +
                 Please note that changes in hostname/domain will result in different uuid.

     

       94
       144
        
               '';

     

       95
       145
        
             };

     

       96
       96
       -
             passwordFile = lib.mkOption {

     

       97
       97
       -
               type = with lib.types; nullOr str;

     

       146
       146
       +
       

     

       147
       147
       +
             clientSecretFile = lib.mkOption {

     

       148
       148
       +
               type = with lib.types; nullOr path;

     

       98
       149
        
               default = null;

     

       99
       150
        
               description = ''

     

       100
       100
       -
                 Path to the file contained the password from dashboard.

     

       101
       101
       -
               '';

     

       102
       102
       -
             };

     

       103
       103
       -
             server = lib.mkOption {

     

       104
       104
       -
               type = lib.types.str;

     

       105
       105
       -
               description = ''

     

       106
       106
       -
                 Address to the dashboard

     

       107
       107
       -
               '';

     

       108
       108
       -
             };

     

       109
       109
       -
             extraFlags = lib.mkOption {

     

       110
       110
       -
               type = lib.types.listOf lib.types.str;

     

       111
       111
       -
               default = [ ];

     

       112
       112
       -
               example = [ "--gpu" ];

     

       113
       113
       -
               description = ''

     

       114
       114
       -
                 Extra command-line flags passed to nezha-agent.

     

       151
       151
       +
                 Path to the file contained the client_secret of the dashboard.

     

       115
       152
        
               '';

     

       116
       153
        
             };

     

       117
       154
        
           };

     

       118
       155
        
         };

     

       119
       156
        
       

     

       157
       157
       +
         imports = with lib; [

     

       158
       158
       +
           (mkRenamedOptionModule

     

       159
       159
       +
             [ "services" "nezha-agent" "disableCommandExecute" ]

     

       160
       160
       +
             [ "services" "nezha-agent" "settings" "disable_command_execute" ]

     

       161
       161
       +
           )

     

       162
       162
       +
           (mkRenamedOptionModule

     

       163
       163
       +
             [ "services" "nezha-agent" "disableNat" ]

     

       164
       164
       +
             [ "services" "nezha-agent" "settings" "disable_nat" ]

     

       165
       165
       +
           )

     

       166
       166
       +
           (mkRenamedOptionModule

     

       167
       167
       +
             [ "services" "nezha-agent" "disableSendQuery" ]

     

       168
       168
       +
             [ "services" "nezha-agent" "settings" "disable_send_query" ]

     

       169
       169
       +
           )

     

       170
       170
       +
           (mkRenamedOptionModule

     

       171
       171
       +
             [ "services" "nezha-agent" "gpu" ]

     

       172
       172
       +
             [ "services" "nezha-agent" "settings" "gpu" ]

     

       173
       173
       +
           )

     

       174
       174
       +
           (mkRenamedOptionModule

     

       175
       175
       +
             [ "services" "nezha-agent" "tls" ]

     

       176
       176
       +
             [ "services" "nezha-agent" "settings" "tls" ]

     

       177
       177
       +
           )

     

       178
       178
       +
           (mkRenamedOptionModule

     

       179
       179
       +
             [ "services" "nezha-agent" "temperature" ]

     

       180
       180
       +
             [ "services" "nezha-agent" "settings" "temperature" ]

     

       181
       181
       +
           )

     

       182
       182
       +
           (mkRenamedOptionModule

     

       183
       183
       +
             [ "services" "nezha-agent" "useIPv6CountryCode" ]

     

       184
       184
       +
             [ "services" "nezha-agent" "settings" "use_ipv6_country_code" ]

     

       185
       185
       +
           )

     

       186
       186
       +
           (mkRenamedOptionModule

     

       187
       187
       +
             [ "services" "nezha-agent" "skipConnection" ]

     

       188
       188
       +
             [ "services" "nezha-agent" "settings" "skip_connection_count" ]

     

       189
       189
       +
           )

     

       190
       190
       +
           (mkRenamedOptionModule

     

       191
       191
       +
             [ "services" "nezha-agent" "skipProcess" ]

     

       192
       192
       +
             [ "services" "nezha-agent" "settings" "skip_procs_count" ]

     

       193
       193
       +
           )

     

       194
       194
       +
           (mkRenamedOptionModule

     

       195
       195
       +
             [ "services" "nezha-agent" "reportDelay" ]

     

       196
       196
       +
             [ "services" "nezha-agent" "settings" "report_delay" ]

     

       197
       197
       +
           )

     

       198
       198
       +
           (mkRenamedOptionModule

     

       199
       199
       +
             [ "services" "nezha-agent" "server" ]

     

       200
       200
       +
             [ "services" "nezha-agent" "settings" "server" ]

     

       201
       201
       +
           )

     

       202
       202
       +
           (lib.mkRemovedOptionModule [ "services" "nezha-agent" "extraFlags" ] ''

     

       203
       203
       +
             Use `services.nezha-agent.settings` instead.

     

       204
       204
       +
       

     

       205
       205
       +
             Nezha-agent v1 is no longer configured via command line flags.

     

       206
       206
       +
           '')

     

       207
       207
       +
           (lib.mkRemovedOptionModule [ "services" "nezha-agent" "passwordFile" ] ''

     

       208
       208
       +
             Use `services.nezha-agent.clientSecretFile` instead.

     

       209
       209
       +
       

     

       210
       210
       +
             Nezha-agent v1 uses the client secret from the dashboard to connect.

     

       211
       211
       +
           '')

     

       212
       212
       +
         ];

     

       213
       213
       +
       

     

       120
       214
        
         config = lib.mkIf cfg.enable {

     

       121
       121
       -
           systemd.packages = [ cfg.package ];

     

       215
       215
       +
           assertions = [

     

       216
       216
       +
             {

     

       217
       217
       +
               assertion = cfg.settings.uuid == null -> cfg.genUuid;

     

       218
       218
       +
               message = "Please set `service.nezha-agent.settings.uuid` while `genUuid` is false.";

     

       219
       219
       +
             }

     

       220
       220
       +
             {

     

       221
       221
       +
               assertion = cfg.settings.uuid != null -> !cfg.genUuid;

     

       222
       222
       +
               message = "When `service.nezha-agent.genUuid = true`, `settings.uuid` cannot be set.";

     

       223
       223
       +
             }

     

       224
       224
       +
           ];

     

       225
       225
       +
       

     

       226
       226
       +
           services.nezha-agent.settings = {

     

       227
       227
       +
             debug = cfg.debug;

     

       228
       228
       +
             # Automatic updates should never be enabled in NixOS.

     

       229
       229
       +
             disable_auto_update = true;

     

       230
       230
       +
             disable_force_update = true;

     

       231
       231
       +
           };

     

       122
       232
        
       

     

       123
       233
        
           systemd.services.nezha-agent = {

     

       124
       234
        
             serviceConfig = {

     

       125
       125
       -
               ProtectSystem = "full";

     

       235
       235
       +
               Restart = "on-failure";

     

       236
       236
       +
               StateDirectory = "nezha-agent";

     

       237
       237
       +
               RuntimeDirectory = "nezha-agent";

     

       238
       238
       +
               WorkingDirectory = "/var/lib/nezha-agent";

     

       239
       239
       +
               ReadWritePaths = "/var/lib/nezha-agent";

     

       240
       240
       +
       

     

       241
       241
       +
               LoadCredential = lib.optionalString (

     

       242
       242
       +
                 cfg.clientSecretFile != null

     

       243
       243
       +
               ) "client-secret:${cfg.clientSecretFile}";

     

       244
       244
       +
       

     

       245
       245
       +
               # Hardening

     

       246
       246
       +
               ProcSubset = "all"; # Needed to get host information

     

       247
       247
       +
               DynamicUser = true;

     

       248
       248
       +
               RemoveIPC = true;

     

       249
       249
       +
               LockPersonality = true;

     

       250
       250
       +
               ProtectClock = true;

     

       251
       251
       +
               MemoryDenyWriteExecute = true;

     

       252
       252
       +
               PrivateUsers = true;

     

       253
       253
       +
               ProtectHostname = true;

     

       254
       254
       +
               RestrictSUIDSGID = true;

     

       255
       255
       +
               AmbientCapabilities = [ ];

     

       256
       256
       +
               CapabilityBoundingSet = "";

     

       257
       257
       +
               NoNewPrivileges = true;

     

       258
       258
       +
               PrivateTmp = true;

     

       259
       259
       +
               ProtectControlGroups = true;

     

       260
       260
       +
               ProtectHome = true;

     

       261
       261
       +
               ProtectKernelLogs = true;

     

       262
       262
       +
               ProtectKernelModules = true;

     

       263
       263
       +
               ProtectKernelTunables = true;

     

       264
       264
       +
               ProtectProc = "invisible";

     

       265
       265
       +
               ProtectSystem = "strict";

     

       266
       266
       +
               RestrictNamespaces = true;

     

       267
       267
       +
               RestrictRealtime = true;

     

       268
       268
       +
               SystemCallArchitectures = "native";

     

       269
       269
       +
               UMask = "0066";

     

       270
       270
       +
               SystemCallFilter = [

     

       271
       271
       +
                 "@system-service"

     

       272
       272
       +
                 "~@privileged"

     

       273
       273
       +
               ];

     

       274
       274
       +
               RestrictAddressFamilies = [

     

       275
       275
       +
                 "AF_INET"

     

       276
       276
       +
                 "AF_INET6"

     

       277
       277
       +
               ];

     

       126
       278
        
               PrivateDevices = "yes";

     

       127
       127
       -
               PrivateTmp = "yes";

     

       128
       128
       -
               NoNewPrivileges = true;

     

       129
       279
        
             };

     

       130
       130
       -
             path = [ cfg.package ];

     

       280
       280
       +
             environment.HOME = "/var/lib/nezha-agent";

     

       281
       281
       +
             enableStrictShellChecks = true;

     

       131
       282
        
             startLimitIntervalSec = 10;

     

       132
       283
        
             startLimitBurst = 3;

     

       133
       133
       -
             script = lib.concatStringsSep " " (

     

       134
       134
       -
               [

     

       135
       135
       -
                 "${lib.getExe cfg.package}"

     

       136
       136
       -
                 "--disable-auto-update"

     

       137
       137
       -
                 "--disable-force-update"

     

       138
       138
       -
                 "--password $(cat ${cfg.passwordFile})"

     

       139
       139
       -
               ]

     

       140
       140
       -
               ++ lib.optional cfg.debug "--debug"

     

       141
       141
       -
               ++ lib.optional cfg.disableCommandExecute "--disable-command-execute"

     

       142
       142
       -
               ++ lib.optional cfg.disableNat "--disable-nat"

     

       143
       143
       -
               ++ lib.optional cfg.disableSendQuery "--disable-send-query"

     

       144
       144
       -
               ++ lib.optional (cfg.reportDelay != null) "--report-delay ${toString cfg.reportDelay}"

     

       145
       145
       -
               ++ lib.optional (cfg.server != null) "--server ${cfg.server}"

     

       146
       146
       -
               ++ lib.optional cfg.skipConnection "--skip-conn"

     

       147
       147
       -
               ++ lib.optional cfg.skipProcess "--skip-procs"

     

       148
       148
       -
               ++ lib.optional cfg.tls "--tls"

     

       149
       149
       -
               ++ lib.optional cfg.gpu "--gpu"

     

       150
       150
       -
               ++ lib.optional cfg.temperature "--temperature"

     

       151
       151
       -
               ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"

     

       152
       152
       -
               ++ cfg.extraFlags

     

       153
       153
       -
             );

     

       284
       284
       +
             script = ''

     

       285
       285
       +
               cp "${configFile}" "''${RUNTIME_DIRECTORY}"/config.json

     

       286
       286
       +
               ${lib.optionalString (cfg.clientSecretFile != null) ''

     

       287
       287
       +
                 ${lib.getExe pkgs.jq} --arg client_secret "$(<"''${CREDENTIALS_DIRECTORY}"/client-secret)" \

     

       288
       288
       +
                   '. + { client_secret: $client_secret }' < "''${RUNTIME_DIRECTORY}"/config.json > "''${RUNTIME_DIRECTORY}"/config.json.tmp

     

       289
       289
       +
                 mv "''${RUNTIME_DIRECTORY}"/config.json.tmp "''${RUNTIME_DIRECTORY}"/config.json

     

       290
       290
       +
               ''}

     

       291
       291
       +
               ${lib.optionalString cfg.genUuid ''

     

       292
       292
       +
                 ${lib.getExe pkgs.jq} --arg uuid "$(${lib.getExe' pkgs.util-linux "uuidgen"} --md5 -n @dns -N "${config.networking.fqdn}")" \

     

       293
       293
       +
                   '. + { uuid: $uuid }' < "''${RUNTIME_DIRECTORY}"/config.json > "''${RUNTIME_DIRECTORY}"/config.json.tmp

     

       294
       294
       +
                 mv "''${RUNTIME_DIRECTORY}"/config.json.tmp "''${RUNTIME_DIRECTORY}"/config.json

     

       295
       295
       +
               ''}

     

       296
       296
       +
               ${lib.getExe cfg.package} --config "''${RUNTIME_DIRECTORY}"/config.json

     

       297
       297
       +
             '';

     

       154
       298
        
             wantedBy = [ "multi-user.target" ];

     

       155
       299
        
           };

     

       156
       300
        
         };

+8 -5

pkgs/by-name/ne/nezha-agent/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "nezha-agent";

     

       11
       11
       -
         version = "0.20.5";

     

       11
       11
       +
         version = "1.9.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "nezhahq";

     

       15
       15
        
           repo = "agent";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-CVE1c0LLheGlH8oMWQWs6fox7mlHc5Y2O9XQ6kqXAwI=";

     

       17
       17
       +
           hash = "sha256-bXzTZ8GCD3gNQsJzvXGlcufKxbX2aTq51toy5P02BxY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-ytFsTHl6kVwmqCabaMDxxijszY3jzWWUIZKBCebPMkI=";

     

       20
       20
       +
         vendorHash = "sha256-klwWNTKR7Vdqg3BDDMTyfnVfC+XZ+sFV/17pq7YdJTs=";

     

       21
       21
        
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-s"

     

       24
       24
       -
           "-w"

     

       25
       25
       -
           "-X main.version=${version}"

     

       24
       24
       +
           "-X github.com/nezhahq/agent/pkg/monitor.Version=${version}"

     

       26
       25
        
           "-X main.arch=${stdenv.hostPlatform.system}"

     

       27
       26
        
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         preBuild = ''

     

       29
       29
       +
           go generate ./...

     

       30
       30
       +
         '';

     

       28
       31
        
       

     

       29
       32
        
         checkFlags =

     

       30
       33
        
           let

+85 -18

pkgs/by-name/ne/nezha/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         buildGoModule,

     

       3
       3
       +
         buildGo124Module,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         go-swag,

     

       5
       6
        
         versionCheckHook,

     

       6
       7
        
         dbip-country-lite,

     

       8
       8
       +
         formats,

     

       7
       9
        
         nix-update-script,

     

       10
       10
       +
         nezha-theme-admin,

     

       11
       11
       +
         nezha-theme-user,

     

       12
       12
       +
         withThemes ? [ ],

     

       8
       13
        
       }:

     

       9
       14
        
       

     

       10
       10
       -
       buildGoModule rec {

     

       15
       15
       +
       let

     

       11
       16
        
         pname = "nezha";

     

       12
       12
       -
         version = "0.20.13";

     

       17
       17
       +
         version = "1.9.5";

     

       18
       18
       +
       

     

       19
       19
       +
         frontendName = lib.removePrefix "nezha-theme-";

     

       20
       20
       +
       

     

       21
       21
       +
         frontend-templates =

     

       22
       22
       +
           let

     

       23
       23
       +
             mkTemplate = theme: {

     

       24
       24
       +
               path = "${frontendName theme.pname}-dist";

     

       25
       25
       +
               name = frontendName theme.pname;

     

       26
       26
       +
               repository = theme.meta.homepage;

     

       27
       27
       +
               author = theme.src.owner;

     

       28
       28
       +
               version = theme.version;

     

       29
       29
       +
               isofficial = false;

     

       30
       30
       +
               isadmin = false;

     

       31
       31
       +
             };

     

       32
       32
       +
           in

     

       33
       33
       +
           (formats.yaml { }).generate "frontend-templates.yaml" (

     

       34
       34
       +
             [

     

       35
       35
       +
               (

     

       36
       36
       +
                 mkTemplate nezha-theme-admin

     

       37
       37
       +
                 // {

     

       38
       38
       +
                   name = "OfficialAdmin";

     

       39
       39
       +
                   isadmin = true;

     

       40
       40
       +
                   isofficial = true;

     

       41
       41
       +
                 }

     

       42
       42
       +
               )

     

       43
       43
       +
               (

     

       44
       44
       +
                 mkTemplate nezha-theme-user

     

       45
       45
       +
                 // {

     

       46
       46
       +
                   name = "Official";

     

       47
       47
       +
                   isofficial = true;

     

       48
       48
       +
                 }

     

       49
       49
       +
               )

     

       50
       50
       +
             ]

     

       51
       51
       +
             ++ map mkTemplate withThemes

     

       52
       52
       +
           );

     

       53
       53
       +
       in

     

       54
       54
       +
       buildGo124Module {

     

       55
       55
       +
         inherit pname version;

     

       13
       56
        
       

     

       14
       57
        
         src = fetchFromGitHub {

     

       15
       15
       -
           owner = "naiba";

     

       58
       58
       +
           owner = "nezhahq";

     

       16
       59
        
           repo = "nezha";

     

       17
       60
        
           tag = "v${version}";

     

       18
       18
       -
           hash = "sha256-fJvL2cESQoiW93aj2RHPyZXvP8246Mf8hIRiP/DSRRY=";

     

       61
       61
       +
           hash = "sha256-06x/M3Np8223ovMVj1K6e7WyoI5+QZohEIHNs/9+bJ0=";

     

       19
       62
        
         };

     

       20
       63
        
       

     

       21
       21
       -
         postPatch = ''

     

       22
       22
       -
           cp ${dbip-country-lite.mmdb} pkg/geoip/geoip.db

     

       23
       23
       -
         '';

     

       64
       64
       +
         proxyVendor = true;

     

       65
       65
       +
       

     

       66
       66
       +
         prePatch =

     

       67
       67
       +
           ''

     

       68
       68
       +
             rm -rf cmd/dashboard/*-dist

     

       69
       69
       +
       

     

       70
       70
       +
             cp ${frontend-templates} service/singleton/frontend-templates.yaml

     

       71
       71
       +
           ''

     

       72
       72
       +
           + lib.concatStringsSep "\n" (

     

       73
       73
       +
             map (theme: "cp -r ${theme} cmd/dashboard/${frontendName theme.pname}-dist") (

     

       74
       74
       +
               [

     

       75
       75
       +
                 nezha-theme-admin

     

       76
       76
       +
                 nezha-theme-user

     

       77
       77
       +
               ]

     

       78
       78
       +
               ++ withThemes

     

       79
       79
       +
             )

     

       80
       80
       +
           );

     

       24
       81
        
       

     

       25
       82
        
         patches = [

     

       26
       83
        
           # Nezha originally used ipinfo.mmdb to provide geoip query feature.

     
···

       29
       86
        
           ./dbip.patch

     

       30
       87
        
         ];

     

       31
       88
        
       

     

       32
       32
       -
         vendorHash = "sha256-SYefkgc0CsAEdkL7rxu9fpz7dpBnx1LwabIadUeOKco=";

     

       89
       89
       +
         postPatch = ''

     

       90
       90
       +
           cp ${dbip-country-lite.mmdb} pkg/geoip/geoip.db

     

       91
       91
       +
         '';

     

       92
       92
       +
       

     

       93
       93
       +
         nativeBuildInputs = [ go-swag ];

     

       94
       94
       +
       

     

       95
       95
       +
         # Generate code for Swagger documentation endpoints (see cmd/dashboard/docs).

     

       96
       96
       +
         preBuild = ''

     

       97
       97
       +
           GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false

     

       98
       98
       +
         '';

     

       99
       99
       +
       

     

       100
       100
       +
         vendorHash = "sha256-q9/P6xSoGtMExhdwl5UuyvXTAaI+mD7MfIAidRz0rxw=";

     

       33
       101
        
       

     

       34
       102
        
         ldflags = [

     

       35
       103
        
           "-s"

     

       36
       36
       -
           "-w"

     

       37
       37
       -
           "-X github.com/naiba/nezha/service/singleton.Version=${version}"

     

       104
       104
       +
           "-X github.com/nezhahq/nezha/service/singleton.Version=${version}"

     

       38
       105
        
         ];

     

       39
       106
        
       

     

       40
       107
        
         checkFlags = "-skip=^TestSplitDomainSOA$";

     
···

       43
       110
        
           mv $out/bin/dashboard $out/bin/nezha

     

       44
       111
        
         '';

     

       45
       112
        
       

     

       46
       46
       -
         nativeInstallCheckInputs = [

     

       47
       47
       -
           versionCheckHook

     

       48
       48
       -
         ];

     

       49
       49
       -
         versionCheckProgramArg = [ "--version" ];

     

       113
       113
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       114
       114
       +
         versionCheckProgramArg = [ "-v" ];

     

       50
       115
        
         doInstallCheck = true;

     

       51
       116
        
       

     

       52
       52
       -
         passthru.updateScript = nix-update-script { };

     

       117
       117
       +
         passthru = {

     

       118
       118
       +
           updateScript = nix-update-script { };

     

       119
       119
       +
         };

     

       53
       120
        
       

     

       54
       121
        
         meta = {

     

       55
       122
        
           description = "Self-hosted, lightweight server and website monitoring and O&M tool";

     

       56
       56
       -
           homepage = "https://github.com/naiba/nezha";

     

       57
       57
       -
           changelog = "https://github.com/naiba/nezha/releases/tag/v${version}";

     

       123
       123
       +
           homepage = "https://github.com/nezhahq/nezha";

     

       124
       124
       +
           changelog = "https://github.com/nezhahq/nezha/releases/tag/v${version}";

     

       58
       125
        
           license = lib.licenses.asl20;

     

       59
       126
        
           maintainers = with lib.maintainers; [ moraxyc ];

     

       60
       127
        
           mainProgram = "nezha";