Update to NixOS 25.05

Author: SuperSandro2000

checks/bird.nix

@@ -1,9 +1,7 @@
 { self, pkgs, ... }:
 
 let
-  bird = if pkgs.lib.versionAtLeast pkgs.lib.version "25.05" then "bird" else "bird2";
-
-  makeBird2Host = hostId: { pkgs, ... }: {
+  makeBirdHost = hostId: { pkgs, ... }: {
     imports = [
       self.nixosModules.default
     ];
@@ -23,7 +21,7 @@ let
       networkConfig.Address = "10.0.0.${hostId}/24";
     };
 
-    services.${bird} = {
+    services.bird = {
       enable = true;
 
       routerId = "10.0.0.${hostId}";
@@ -101,15 +99,15 @@ in
 pkgs.testers.nixosTest {
   name = "bird";
 
-  nodes.host1 = makeBird2Host "1";
-  nodes.host2 = makeBird2Host "2";
+  nodes.host1 = makeBirdHost "1";
+  nodes.host2 = makeBirdHost "2";
 
-  testScript = ''
+  testScript = /* python */ ''
     start_all()
 
-    host1.wait_for_unit("${bird}.service")
-    host2.wait_for_unit("${bird}.service")
-    host1.succeed("systemctl reload ${bird}.service")
+    host1.wait_for_unit("bird.service")
+    host2.wait_for_unit("bird.service")
+    host1.succeed("systemctl reload bird.service")
 
     with subtest("Waiting for advertised IPv4 routes"):
       host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")

flake.lock

@@ -1,7 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
+
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
   };
 
   outputs = { self, nixpkgs, flake-utils, ... }:

flake.nix

@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  bird = if lib.versionAtLeast lib.version "25.05" then "bird" else "bird2";
-  cfg = config.services.${bird};
+  cfg = config.services.bird;
 in
 {
-  options.services.${bird} = {
+  options.services.bird = {
     # we do not wan't merged config's to result in multiple routerId's
     routerId = lib.mkOption {
       type = lib.types.str;
@@ -53,7 +52,7 @@ in
   );
 
   config = lib.mkIf cfg.enable {
-    services.${bird} = {
+    services.bird = {
       config =
         let
           mkTemplate = { name, type, conf }: ''