commit 5abb11bbe70cb68ed9b834fedac0029829482166 · pyrox.dev/nixpkgs

+2

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

···

       261
       261
        
       

     

       262
       262
        
       - `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.

     

       263
       263
        
       

     

       264
       264
       +
       - `services.bird2` has been renamed to `services.bird` and the default bird package has been switched to `bird3`. `bird2` can still be choosen via the `services.bird.package` option.

     

       265
       265
       +
       

     

       264
       266
        
       - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.

     

       265
       267
        
         Like upstream's docker images, renovate now runs on NodeJS 22.

     

       266
       268

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/bird.nix

···

       45
       45
        
         };

     

       46
       46
        
         serviceOpts = {

     

       47
       47
        
           serviceConfig = {

     

       48
       48
       -
             SupplementaryGroups = singleton (if cfg.birdVersion == 1 then "bird" else "bird2");

     

       48
       48
       +
             SupplementaryGroups = "bird";

     

       49
       49
        
             ExecStart = ''

     

       50
       50
        
               ${pkgs.prometheus-bird-exporter}/bin/bird_exporter \

     

       51
       51
        
                 -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

+1 -1

nixos/modules/services/networking/bird-lg.nix

···

       320
       320
        
             groups."bird-lg" = lib.mkIf (cfg.group == "bird-lg") { };

     

       321
       321
        
             users."bird-lg" = lib.mkIf (cfg.user == "bird-lg") {

     

       322
       322
        
               description = "Bird Looking Glass user";

     

       323
       323
       -
               extraGroups = lib.optionals (config.services.bird2.enable) [ "bird2" ];

     

       323
       323
       +
               extraGroups = lib.optionals (config.services.bird.enable) [ "bird" ];

     

       324
       324
        
               group = cfg.group;

     

       325
       325
        
               isSystemUser = true;

     

       326
       326
        
             };

+25 -19

nixos/modules/services/networking/bird.nix

···

       14
       14
        
           types

     

       15
       15
        
           ;

     

       16
       16
        
       

     

       17
       17
       -
         cfg = config.services.bird2;

     

       17
       17
       +
         cfg = config.services.bird;

     

       18
       18
        
         caps = [

     

       19
       19
        
           "CAP_NET_ADMIN"

     

       20
       20
        
           "CAP_NET_BIND_SERVICE"

     
···

       24
       24
        
       {

     

       25
       25
        
         ###### interface

     

       26
       26
        
         options = {

     

       27
       27
       -
           services.bird2 = {

     

       27
       27
       +
           services.bird = {

     

       28
       28
        
             enable = mkEnableOption "BIRD Internet Routing Daemon";

     

       29
       29
       -
             package = lib.mkPackageOption pkgs "bird2" { };

     

       29
       29
       +
             package = lib.mkPackageOption pkgs "bird3" { };

     

       30
       30
        
             config = mkOption {

     

       31
       31
        
               type = types.lines;

     

       32
       32
        
               description = ''

     
···

       38
       38
        
               type = types.bool;

     

       39
       39
        
               default = true;

     

       40
       40
        
               description = ''

     

       41
       41
       -
                 Whether bird2 should be automatically reloaded when the configuration changes.

     

       41
       41
       +
                 Whether bird should be automatically reloaded when the configuration changes.

     

       42
       42
        
               '';

     

       43
       43
        
             };

     

       44
       44
        
             checkConfig = mkOption {

     
···

       59
       59
        
               '';

     

       60
       60
        
               description = ''

     

       61
       61
        
                 Commands to execute before the config file check. The file to be checked will be

     

       62
       62
       -
                 available as `bird2.conf` in the current directory.

     

       62
       62
       +
                 available as `bird.conf` in the current directory.

     

       63
       63
        
       

     

       64
       64
        
                 Files created with this option will not be available at service runtime, only during

     

       65
       65
        
                 build time checking.

     
···

       69
       69
        
         };

     

       70
       70
        
       

     

       71
       71
        
         imports = [

     

       72
       72
       -
           (lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead")

     

       73
       73
       -
           (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead")

     

       72
       72
       +
           (lib.mkRemovedOptionModule [ "services" "bird2" ]

     

       73
       73
       +
             "Use services.bird instead. bird3 is the new default bird package. You can choose to remain with bird2 by setting the service.bird.package option."

     

       74
       74
       +
           )

     

       75
       75
       +
           (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird instead")

     

       74
       76
        
         ];

     

       75
       77
        
       

     

       76
       78
        
         ###### implementation

     

       77
       79
        
         config = mkIf cfg.enable {

     

       78
       80
        
           environment.systemPackages = [ cfg.package ];

     

       79
       81
        
       

     

       80
       80
       -
           environment.etc."bird/bird2.conf".source = pkgs.writeTextFile {

     

       81
       81
       -
             name = "bird2";

     

       82
       82
       +
           environment.etc."bird/bird.conf".source = pkgs.writeTextFile {

     

       83
       83
       +
             name = "bird";

     

       82
       84
        
             text = cfg.config;

     

       83
       85
        
             derivationArgs.nativeBuildInputs = lib.optional cfg.checkConfig cfg.package;

     

       84
       86
        
             checkPhase = optionalString cfg.checkConfig ''

     

       85
       85
       -
               ln -s $out bird2.conf

     

       87
       87
       +
               ln -s $out bird.conf

     

       86
       88
        
               ${cfg.preCheckConfig}

     

       87
       87
       -
               bird -d -p -c bird2.conf

     

       89
       89
       +
               bird -d -p -c bird.conf

     

       88
       90
        
             '';

     

       89
       91
        
           };

     

       90
       92
        
       

     

       91
       91
       -
           systemd.services.bird2 = {

     

       93
       93
       +
           systemd.services.bird = {

     

       92
       94
        
             description = "BIRD Internet Routing Daemon";

     

       93
       95
        
             wantedBy = [ "multi-user.target" ];

     

       94
       94
       -
             reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird2.conf".source;

     

       96
       96
       +
             reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird.conf".source;

     

       95
       97
        
             serviceConfig = {

     

       96
       98
        
               Type = "forking";

     

       97
       99
        
               Restart = "on-failure";

     

       98
       98
       -
               User = "bird2";

     

       99
       99
       -
               Group = "bird2";

     

       100
       100
       -
               ExecStart = "${lib.getExe' cfg.package "bird"} -c /etc/bird/bird2.conf";

     

       100
       100
       +
               User = "bird";

     

       101
       101
       +
               Group = "bird";

     

       102
       102
       +
               ExecStart = "${lib.getExe' cfg.package "bird"} -c /etc/bird/bird.conf";

     

       101
       103
        
               ExecReload = "${lib.getExe' cfg.package "birdc"} configure";

     

       102
       104
        
               ExecStop = "${lib.getExe' cfg.package "birdc"} down";

     

       103
       105
        
               RuntimeDirectory = "bird";

     
···

       114
       116
        
             };

     

       115
       117
        
           };

     

       116
       118
        
           users = {

     

       117
       117
       -
             users.bird2 = {

     

       119
       119
       +
             users.bird = {

     

       118
       120
        
               description = "BIRD Internet Routing Daemon user";

     

       119
       119
       -
               group = "bird2";

     

       121
       121
       +
               group = "bird";

     

       120
       122
        
               isSystemUser = true;

     

       121
       123
        
             };

     

       122
       122
       -
             groups.bird2 = { };

     

       124
       124
       +
             groups.bird = { };

     

       123
       125
        
           };

     

       126
       126
       +
         };

     

       127
       127
       +
       

     

       128
       128
       +
         meta = {

     

       129
       129
       +
           maintainers = with lib.maintainers; [ herbetom ];

     

       124
       130
        
         };

     

       125
       131
        
       }

+1 -1

nixos/modules/services/networking/birdwatcher.nix

···

       58
       58
        
       

     

       59
       59
        
                 [bird]

     

       60
       60
        
                 listen = "0.0.0.0:29184"

     

       61
       61
       -
                 config = "/etc/bird/bird2.conf"

     

       61
       61
       +
                 config = "/etc/bird/bird.conf"

     

       62
       62
        
                 birdc  = "''${pkgs.bird}/bin/birdc"

     

       63
       63
        
                 ttl = 5 # time to live (in minutes) for caching of cli output

     

       64
       64

+8 -8

nixos/tests/bird.nix

···

       13
       13
        
         inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       14
       14
        
         inherit (pkgs.lib) optionalString;

     

       15
       15
        
       

     

       16
       16
       -
         makeBird2Host =

     

       16
       16
       +
         makeBirdHost =

     

       17
       17
        
           hostId:

     

       18
       18
        
           { pkgs, ... }:

     

       19
       19
        
           {

     
···

       32
       32
        
               networkConfig.Address = "10.0.0.${hostId}/24";

     

       33
       33
        
             };

     

       34
       34
        
       

     

       35
       35
       -
             services.bird2 = {

     

       35
       35
       +
             services.bird = {

     

       36
       36
        
               enable = true;

     

       37
       37
        
       

     

       38
       38
        
               config = ''

     
···

       107
       107
        
           };

     

       108
       108
        
       in

     

       109
       109
        
       makeTest {

     

       110
       110
       -
         name = "bird2";

     

       110
       110
       +
         name = "bird";

     

       111
       111
        
       

     

       112
       112
       -
         nodes.host1 = makeBird2Host "1";

     

       113
       113
       -
         nodes.host2 = makeBird2Host "2";

     

       112
       112
       +
         nodes.host1 = makeBirdHost "1";

     

       113
       113
       +
         nodes.host2 = makeBirdHost "2";

     

       114
       114
        
       

     

       115
       115
        
         testScript = ''

     

       116
       116
        
           start_all()

     

       117
       117
        
       

     

       118
       118
       -
           host1.wait_for_unit("bird2.service")

     

       119
       119
       -
           host2.wait_for_unit("bird2.service")

     

       120
       120
       -
           host1.succeed("systemctl reload bird2.service")

     

       118
       118
       +
           host1.wait_for_unit("bird.service")

     

       119
       119
       +
           host2.wait_for_unit("bird.service")

     

       120
       120
       +
           host1.succeed("systemctl reload bird.service")

     

       121
       121
        
       

     

       122
       122
        
           with subtest("Waiting for advertised IPv4 routes"):

     

       123
       123
        
             host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")

+3 -3

nixos/tests/birdwatcher.nix

···

       17
       17
        
         nodes = {

     

       18
       18
        
           host1 = {

     

       19
       19
        
             environment.systemPackages = with pkgs; [ jq ];

     

       20
       20
       -
             services.bird2 = {

     

       20
       20
       +
             services.bird = {

     

       21
       21
        
               enable = true;

     

       22
       22
        
               config = ''

     

       23
       23
        
                 log syslog all;

     
···

       71
       71
        
                 filter_fields = []

     

       72
       72
        
                 [bird]

     

       73
       73
        
                 listen = "0.0.0.0:29184"

     

       74
       74
       -
                 config = "/etc/bird/bird2.conf"

     

       74
       74
       +
                 config = "/etc/bird/bird.conf"

     

       75
       75
        
                 birdc  = "${pkgs.bird}/bin/birdc"

     

       76
       76
        
                 ttl = 5 # time to live (in minutes) for caching of cli output

     

       77
       77
        
                 [parser]

     
···

       89
       89
        
         testScript = ''

     

       90
       90
        
           start_all()

     

       91
       91
        
       

     

       92
       92
       -
           host1.wait_for_unit("bird2.service")

     

       92
       92
       +
           host1.wait_for_unit("bird.service")

     

       93
       93
        
           host1.wait_for_unit("birdwatcher.service")

     

       94
       94
        
           host1.wait_for_open_port(29184)

     

       95
       95
        
           host1.succeed("curl http://[::]:29184/status | jq -r .status.message | grep 'Daemon is up and running'")

+2 -2

nixos/tests/fastnetmon-advanced.nix

···

       9
       9
        
             { ... }:

     

       10
       10
        
             {

     

       11
       11
        
               networking.firewall.allowedTCPPorts = [ 179 ];

     

       12
       12
       -
               services.bird2 = {

     

       12
       12
       +
               services.bird = {

     

       13
       13
        
                 enable = true;

     

       14
       14
        
                 config = ''

     

       15
       15
        
                   router id 192.168.1.1;

     
···

       59
       59
        
           ''

     

       60
       60
        
             start_all()

     

       61
       61
        
             fnm.wait_for_unit("fastnetmon.service")

     

       62
       62
       -
             bird.wait_for_unit("bird2.service")

     

       62
       62
       +
             bird.wait_for_unit("bird.service")

     

       63
       63
        
       

     

       64
       64
        
             fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "BGP daemon restarted correctly"')

     

       65
       65
        
             fnm.wait_until_succeeds("journalctl -eu gobgp.service | grep BGP_FSM_OPENCONFIRM")

+2 -2

nixos/tests/prometheus-exporters.nix

···

       116
       116
        
               enable = true;

     

       117
       117
        
             };

     

       118
       118
        
             metricProvider = {

     

       119
       119
       -
               services.bird2.enable = true;

     

       120
       120
       -
               services.bird2.config = ''

     

       119
       119
       +
               services.bird.enable = true;

     

       120
       120
       +
               services.bird.config = ''

     

       121
       121
        
                 router id 127.0.0.1;

     

       122
       122
        
       

     

       123
       123
        
                 protocol kernel MyObviousTestString {

+1 -1

pkgs/top-level/aliases.nix

···

       152
       152
        
         bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15

     

       153
       153
        
         bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15

     

       154
       154
        
         bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15

     

       155
       155
       -
         bird = bird2; # Added 2025-01-11

     

       155
       155
       +
         bird = bird3; # Added 2025-01-11

     

       156
       156
        
         bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17

     

       157
       157
        
         bitwarden = bitwarden-desktop; # Added 2024-02-25

     

       158
       158
        
         blender-with-packages = args: