commit cb6adfec42c3ff3c172be7777d9988d49e4b41c7 · pyrox.dev/nixpkgs

doc/release-notes/rl-2511.section.md

···

       20
       20
        
       - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.

     

       21
       21
        
       - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.

     

       22
       22
        
       

     

       23
       23
       +
       - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.

     

       24
       24
       +
       

     

       23
       25
        
       - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).

     

       24
       26
        
       

     

       25
       27
        
       - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.

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

···

       80
       80
        
       

     

       81
       81
        
       - `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`

     

       82
       82
        
       

     

       83
       83
       +
       - [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.

     

       84
       84
       +
       

     

       83
       85
        
       - The `wstunnel` module was converted to RFC42-style settings, you will need to update your NixOS config if you make use of this module.

     

       84
       86
        
       

     

       85
       87
        
       ## Other Notable Changes {#sec-release-25.11-notable-changes}

+1 -1

nixos/modules/services/databases/victorialogs.nix

···

       28
       28
        
       {

     

       29
       29
        
         options.services.victorialogs = {

     

       30
       30
        
           enable = mkEnableOption "VictoriaLogs is an open source user-friendly database for logs from VictoriaMetrics";

     

       31
       31
       -
           package = mkPackageOption pkgs "victoriametrics" { };

     

       31
       31
       +
           package = mkPackageOption pkgs "victorialogs" { };

     

       32
       32
        
           listenAddress = mkOption {

     

       33
       33
        
             default = ":9428";

     

       34
       34
        
             type = types.str;

nixos/tests/all-tests.nix

···

       1478
       1478
        
         vector = import ./vector { inherit runTest; };

     

       1479
       1479
        
         velocity = runTest ./velocity.nix;

     

       1480
       1480
        
         vengi-tools = runTest ./vengi-tools.nix;

     

       1481
       1481
       +
         victorialogs = runTest ./victorialogs.nix;

     

       1481
       1482
        
         victoriametrics = handleTest ./victoriametrics { };

     

       1482
       1483
        
         vikunja = runTest ./vikunja.nix;

     

       1483
       1484
        
         virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };

+26

nixos/tests/victorialogs.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "victorialogs";

     

       4
       4
       +
         meta.maintainers = with lib.maintainers; [ marie ];

     

       5
       5
       +
       

     

       6
       6
       +
         nodes.machine =

     

       7
       7
       +
           { pkgs, ... }:

     

       8
       8
       +
           {

     

       9
       9
       +
             services.victorialogs.enable = true;

     

       10
       10
       +
       

     

       11
       11
       +
             services.journald.upload = {

     

       12
       12
       +
               enable = true;

     

       13
       13
       +
               settings = {

     

       14
       14
       +
                 Upload.URL = "http://localhost:9428/insert/journald";

     

       15
       15
       +
               };

     

       16
       16
       +
             };

     

       17
       17
       +
             environment.systemPackages = [ pkgs.curl ];

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           machine.wait_for_unit("victorialogs.service")

     

       22
       22
       +
       

     

       23
       23
       +
           machine.succeed("echo 'meow' | systemd-cat -p info")

     

       24
       24
       +
           machine.wait_until_succeeds("curl --fail http://localhost:9428/select/logsql/query -d 'query=\"meow\"' | grep meow")

     

       25
       25
       +
         '';

     

       26
       26
       +
       }

+77

pkgs/by-name/vi/victorialogs/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         nix-update-script,

     

       6
       6
       +
         nixosTests,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildGoModule (finalAttrs: {

     

       10
       10
       +
         pname = "VictoriaLogs";

     

       11
       11
       +
         version = "1.24.0";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "VictoriaMetrics";

     

       15
       15
       +
           repo = "VictoriaMetrics";

     

       16
       16
       +
           tag = "v${finalAttrs.version}-victorialogs";

     

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

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         vendorHash = null;

     

       21
       21
       +
       

     

       22
       22
       +
         subPackages = [

     

       23
       23
       +
           "app/victoria-logs"

     

       24
       24
       +
           "app/vlinsert"

     

       25
       25
       +
           "app/vlselect"

     

       26
       26
       +
           "app/vlstorage"

     

       27
       27
       +
           "app/vlogsgenerator"

     

       28
       28
       +
           "app/vlogscli"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         postPatch = ''

     

       32
       32
       +
           # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package

     

       33
       33
       +
           # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web

     

       34
       34
       +
           #

     

       35
       35
       +
           # This appears to be some kind of test server for development purposes only.

     

       36
       36
       +
           # rm -f app/vmui/packages/vmui/web/{go.mod,main.go}

     

       37
       37
       +
       

     

       38
       38
       +
           # Increase timeouts in tests to prevent failure on heavily loaded builders

     

       39
       39
       +
           substituteInPlace lib/storage/storage_test.go \

     

       40
       40
       +
             --replace-fail "time.After(10 " "time.After(120 " \

     

       41
       41
       +
             --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \

     

       42
       42
       +
             --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         ldflags = [

     

       46
       46
       +
           "-s"

     

       47
       47
       +
           "-w"

     

       48
       48
       +
           "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}"

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         preCheck = ''

     

       52
       52
       +
           # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset

     

       53
       53
       +
           export ldflags=''${ldflags//=${finalAttrs.version}/=}

     

       54
       54
       +
         '';

     

       55
       55
       +
       

     

       56
       56
       +
         __darwinAllowLocalNetworking = true;

     

       57
       57
       +
       

     

       58
       58
       +
         passthru = {

     

       59
       59
       +
           tests = {

     

       60
       60
       +
             inherit (nixosTests)

     

       61
       61
       +
               victorialogs

     

       62
       62
       +
               ;

     

       63
       63
       +
           };

     

       64
       64
       +
           updateScript = nix-update-script {

     

       65
       65
       +
             extraArgs = [ "--version-regex=(.*)-victorialogs" ];

     

       66
       66
       +
           };

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       69
       69
       +
         meta = {

     

       70
       70
       +
           homepage = "https://docs.victoriametrics.com/victorialogs/";

     

       71
       71
       +
           description = "User friendly log database from VictoriaMetrics";

     

       72
       72
       +
           license = lib.licenses.asl20;

     

       73
       73
       +
           maintainers = with lib.maintainers; [ marie ];

     

       74
       74
       +
           changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/${finalAttrs.src.tag}";

     

       75
       75
       +
           mainProgram = "victoria-logs";

     

       76
       76
       +
         };

     

       77
       77
       +
       })

-7

pkgs/by-name/vi/victoriametrics/package.nix

···

       9
       9
        
         withVmAuth ? true, # HTTP proxy for authentication

     

       10
       10
        
         withBackupTools ? true, # vmbackup, vmrestore

     

       11
       11
        
         withVmctl ? true, # vmctl is used to migrate time series

     

       12
       12
       -
         withVictoriaLogs ? true, # logs server

     

       13
       12
        
       }:

     

       14
       13
        
       

     

       15
       14
        
       buildGoModule (finalAttrs: {

     
···

       43
       42
        
           ++ lib.optionals withBackupTools [

     

       44
       43
        
             "app/vmbackup"

     

       45
       44
        
             "app/vmrestore"

     

       46
       46
       -
           ]

     

       47
       47
       -
           ++ lib.optionals withVictoriaLogs [

     

       48
       48
       -
             "app/victoria-logs"

     

       49
       49
       -
             "app/vlinsert"

     

       50
       50
       -
             "app/vlselect"

     

       51
       51
       -
             "app/vlstorage"

     

       52
       45
        
           ];

     

       53
       46
        
       

     

       54
       47
        
         postPatch = ''

-1

pkgs/by-name/vm/vmagent/package.nix

···

       6
       6
        
       lib.addMetaAttrs { mainProgram = "vmagent"; } (

     

       7
       7
        
         victoriametrics.override {

     

       8
       8
        
           withServer = false;

     

       9
       9
       -
           withVictoriaLogs = false;

     

       10
       9
        
           withVmAlert = false;

     

       11
       10
        
           withVmAuth = false;

     

       12
       11
        
           withBackupTools = false;