commit 8c4ec38841e7760cfe01a16b9b478bc0e8ce8cd2 · pyrox.dev/nixpkgs

+4 -4

nixos/tests/netdata.nix

···

       33
       33
        
           };

     

       34
       34
        
       

     

       35
       35
        
           testScript = ''

     

       36
       36
       -
               start_all()

     

       36
       36
       +
             start_all()

     

       37
       37
        
       

     

       38
       38
       -
               netdata.wait_for_unit("netdata.service")

     

       38
       38
       +
             netdata.wait_for_unit("netdata.service")

     

       39
       39
        
       

     

       40
       40
       -
               # wait for the service to listen before sending a request

     

       41
       41
       -
               netdata.wait_for_open_port(19999)

     

       40
       40
       +
             # wait for the service to listen before sending a request

     

       41
       41
       +
             netdata.wait_for_open_port(19999)

     

       42
       42
        
       

     

       43
       43
        
             # check if the netdata main page loads.

     

       44
       44
        
             netdata.succeed("curl --fail http://127.0.0.1:19999")

+8 -10

pkgs/tools/system/netdata/default.nix

···

       44
       44
        
         withConnPrometheus ? false,

     

       45
       45
        
         withConnPubSub ? false,

     

       46
       46
        
         withCups ? false,

     

       47
       47
       -
         withDBengine ? false,

     

       47
       47
       +
         withDBengine ? true,

     

       48
       48
        
         withDebug ? false,

     

       49
       49
        
         withEbpf ? false,

     

       50
       50
        
         withIpmi ? (stdenv.hostPlatform.isLinux),

     
···

       57
       57
        
         withML ? true,

     

       58
       58
        
       }:

     

       59
       59
        
       stdenv.mkDerivation (finalAttrs: {

     

       60
       60
       -
         version = "2.4.0";

     

       60
       60
       +
         version = "2.5.1";

     

       61
       61
        
         pname = "netdata";

     

       62
       62
        
       

     

       63
       63
        
         src = fetchFromGitHub {

     

       64
       64
        
           owner = "netdata";

     

       65
       65
        
           repo = "netdata";

     

       66
       66
        
           rev = "v${finalAttrs.version}";

     

       67
       67
       -
           hash = "sha256-egHsWmhnrl8D59gr7uD5hBnleCOI8gVEBGwdO5GSnOg=";

     

       67
       67
       +
           hash = "sha256-77k93mg7iED53k38jATbS2Y1N0eLKhjo0RYyinApkuE=";

     

       68
       68
        
           fetchSubmodules = true;

     

       69
       69
        
         };

     

       70
       70
        
       

     
···

       133
       133
        
           ++ lib.optional withCloudUi (

     

       134
       134
        
             replaceVars ./dashboard-v3-add.patch {

     

       135
       135
        
               # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved

     

       136
       136
       -
               # last update 03/16/2025 23:56:24

     

       136
       136
       +
               # last update 04/01/2025 04:45:14

     

       137
       137
        
               dashboardTarball = fetchurl {

     

       138
       138
       -
                 url = "https://web.archive.org/web/20250316235624/https://app.netdata.cloud/agent.tar.gz";

     

       139
       139
       -
                 hash = "sha256-Vtw+CbBgqGRenkis0ZR2/TLsoM83NjNA6mbndb95EK8=";

     

       138
       138
       +
                 url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz";

     

       139
       139
       +
                 hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE=";

     

       140
       140
        
               };

     

       141
       141
        
             }

     

       142
       142
        
           );

     
···

       220
       220
        
         cmakeFlags = [

     

       221
       221
        
           "-DWEB_DIR=share/netdata/web"

     

       222
       222
        
           (lib.cmakeBool "ENABLE_DASHBOARD" withCloudUi)

     

       223
       223
       -
           # FIXME uncomment when https://github.com/netdata/netdata/issues/19901#issuecomment-2819701451 resolved

     

       224
       224
       -
           (lib.cmakeBool "ENABLE_DBENGINE" true)

     

       225
       225
       -
           # (lib.cmakeBool "ENABLE_DBENGINE" withDBengine)

     

       223
       223
       +
           (lib.cmakeBool "ENABLE_DBENGINE" withDBengine)

     

       226
       224
        
           (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus)

     

       227
       225
        
           (lib.cmakeBool "ENABLE_JEMALLOC" true)

     

       228
       226
        
           (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace)

     
···

       260
       258
        
       

     

       261
       259
        
               sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";

     

       262
       260
        
       

     

       263
       263
       -
               vendorHash = "sha256-PgQs3+++iD9Lg8psTBVzF4b+kGJzhV5yNQBkw/+Dqks=";

     

       261
       261
       +
               vendorHash = "sha256-N03IGTtF78PCo4kf0Sdtzv6f8z47ohg8g3YIXtINRjU=";

     

       264
       262
        
               doCheck = false;

     

       265
       263
        
               proxyVendor = true;

     

       266
       264