flake.lock: Update

.github/workflows/flake-check.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ "25.05", "unstable" ]
+        target: [ "25.11", "unstable" ]
 
     steps:
       - uses: actions/checkout@v5

checks/extended-next-hop.nix

@@ -14,24 +14,10 @@ let
       Name = "dummy0";
     };
     environment.systemPackages = [ pkgs.jq ];
-    networking.dn42.roagen = {
-      enable = true;
-      outputDir = pkgs.runCommand "stub-roa" {} ''
-        mkdir $out
-        cat >$out/dn42-roa4.conf <<EOF
-        route 172.20.0.0/24 max 24 as 64600;
-        route 172.20.1.0/24 max 24 as 64601;
-        EOF
-        cat >$out/dn42-roa6.conf <<EOF
-        route fec1::/64 max 64 as 64600;
-        route fec1:0:0:1::/64 max 64 as 64601;
-        EOF
-      '';
-    };
   };
 
 in
-pkgs.nixosTest rec {
+pkgs.testers.nixosTest rec {
   name = "extended-next-hop";
 
   nodes = {

checks/two-peers.nix

@@ -14,24 +14,10 @@ let
       Name = "dummy0";
     };
     environment.systemPackages = [ pkgs.jq ];
-    networking.dn42.roagen = {
-      enable = true;
-      outputDir = pkgs.runCommand "stub-roa" {} ''
-        mkdir $out
-        cat >$out/dn42-roa4.conf <<EOF
-        route 172.20.0.0/24 max 24 as 64600;
-        route 172.20.1.0/24 max 24 as 64601;
-        EOF
-        cat >$out/dn42-roa6.conf <<EOF
-        route fec1::/64 max 64 as 64600;
-        route fec1:0:0:1::/64 max 64 as 64601;
-        EOF
-      '';
-    };
   };
 
 in
-pkgs.nixosTest rec {
+pkgs.testers.nixosTest rec {
   name = "two-peers";
 
   nodes = {

flake.nix

@@ -20,7 +20,6 @@
       nixosModules = rec {
         dn42 = {
           imports = [ bird.nixosModules.bird ./modules ];
-          nixpkgs.overlays = [ self.overlays.default ];
         };
         default = dn42;
       };
@@ -40,25 +39,5 @@
           };
         })
         systems);
-
-      packages = builtins.listToAttrs (map
-        (system: {
-          name = system;
-          value = {
-            dn42-roagen = import ./pkgs/dn42-roagen {
-              pkgs = nixpkgs.legacyPackages.${system};
-            };
-          };
-        })
-        systems);
-
-      overlays = rec {
-        dn42 = _: prev: {
-          dn42-roagen = import ./pkgs/dn42-roagen {
-            pkgs = prev;
-          };
-        };
-        default = dn42;
-      };
     };
 }

modules/bird2.nix

@@ -3,7 +3,6 @@
 let
   cfg = config.networking.dn42;
   useVrf = cfg.vrf.name != null && cfg.vrf.table != null;
-  bird = if lib.versionAtLeast lib.version "25.05" then "bird" else "bird2";
 in
 {
   config = lib.mkIf cfg.enable {
@@ -22,7 +21,7 @@ in
         }) cfg.peers
       );
 
-    services.${bird} = {
+    services.bird = {
       enable = true;
       config = ''
         define OWNAS = ${toString cfg.as};
@@ -82,14 +81,6 @@ in
         '';
 
         static = {
-          static_roa_4 = lib.mkIf config.networking.dn42.roagen.enable ''
-            roa4 { table dnroa_4; };
-            include "${config.networking.dn42.roagen.outputDir}/dn42-roa4.conf";
-          '';
-          static_roa_6 = lib.mkIf config.networking.dn42.roagen.enable ''
-            roa6 { table dnroa_6; };
-            include "${config.networking.dn42.roagen.outputDir}/dn42-roa6.conf";
-          '';
           static_4 = ''
             ${lib.optionalString useVrf "vrf \"${cfg.vrf.name}\";"}
             ipv4 {

modules/default.nix

@@ -7,7 +7,6 @@ in
     ./firewall.nix
     ./bird2.nix
     ./stayrtr.nix
-    ./roagen.nix
   ];
 
   options.networking.dn42 = {

modules/stayrtr.nix

@@ -2,7 +2,6 @@
 
 let
   cfg = config.networking.dn42.stayrtr;
-  bird = if lib.versionAtLeast lib.version "25.05" then "bird" else "bird2";
 in
 {
   options.networking.dn42.stayrtr = with lib; {
@@ -15,7 +14,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    systemd.services.${bird} = {
+    systemd.services.bird = {
       after = [ "dn42-stayrtr.service" ];
       requires = [ "dn42-stayrtr.service" ];
     };