diff --git a/.github/workflows/flake-check.yaml b/.github/workflows/flake-check.yaml
index 2344957..05c2593 100644
--- a/.github/workflows/flake-check.yaml
+++ b/.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
diff --git a/checks/extended-next-hop.nix b/checks/extended-next-hop.nix
index b1fb012..3e331ee 100644
--- a/checks/extended-next-hop.nix
+++ b/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 = {
diff --git a/checks/two-peers.nix b/checks/two-peers.nix
index 696a052..858615c 100644
--- a/checks/two-peers.nix
+++ b/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 = {
diff --git a/flake.lock b/flake.lock
index 537f8a9..477aa6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757884119,
-        "narHash": "sha256-RF0Em7PjDRaQ5cBFgc3fL22qgDVbv2HoVW1TDRaaSNo=",
+        "lastModified": 1759331986,
+        "narHash": "sha256-+d8xTY8agz72+ANMplTwP2IL6yk2fsgDLS0Di0dKo1U=",
         "owner": "NuschtOS",
         "repo": "bird.nix",
-        "rev": "f8d18c2c8eebd477987001a9c0af50a9ca7909e5",
+        "rev": "48e0bbf3c221444905f375a94f6a8802f0349c6b",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1766309749,
+        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index dc80741..c43bdf5 100644
--- a/flake.nix
+++ b/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;
-      };
     };
 }
diff --git a/modules/bird2.nix b/modules/bird2.nix
index 2d281a3..5da30e8 100644
--- a/modules/bird2.nix
+++ b/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 {
diff --git a/modules/default.nix b/modules/default.nix
index 23dcca4..20503e6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,7 +7,6 @@ in
     ./firewall.nix
     ./bird2.nix
     ./stayrtr.nix
-    ./roagen.nix
   ];
 
   options.networking.dn42 = {
diff --git a/modules/roagen.nix b/modules/roagen.nix
deleted file mode 100644
index ad79f6f..0000000
--- a/modules/roagen.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.networking.dn42.roagen;
-  bird = if lib.versionAtLeast lib.version "25.05" then "bird" else "bird2";
-in
-{
-  options.networking.dn42.roagen = with lib; {
-    enable = mkEnableOption "dn42-roagen";
-
-    outputDir = mkOption {
-      type = types.path;
-      default = "/var/lib/dn42-roa";
-      description = ''
-        This directory will be created with files:
-        - dn42-roa4.conf
-        - dn42-roa6.conf
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.timers.dn42-roagen = {
-      wantedBy = [ "timers.target" ];
-      timerConfig.OnCalendar = "hourly";
-    };
-
-    services.${bird}.preCheckConfig = ''
-      rm ${bird}.conf
-      cp $out ${bird}.conf
-      substituteInPlace ${bird}.conf \
-        --replace-fail '${cfg.outputDir}' '/tmp'
-      touch /tmp/dn42-roa{4,6}.conf
-    '';
-
-    systemd.services.dn42-roagen = {
-      after = [ "systemd-tmpfiles-setup.service" ];
-      before = [ "bird2.service" ];
-      wantedBy = [ "bird2.service" ];
-      script = ''
-        set -e
-
-        cd /tmp
-        if [ ! -e registry ]; then
-          ${lib.getExe pkgs.gitMinimal} clone --depth=1 https://git.dn42.dev/dn42/registry.git
-          cd registry
-        else
-          cd registry
-          ${lib.getExe pkgs.gitMinimal} pull --depth=1
-        fi
-
-        mkdir -p '${cfg.outputDir}'
-        ${lib.getExe pkgs.dn42-roagen} /tmp/registry '${cfg.outputDir}'
-
-        /run/current-system/sw/bin/systemctl reload bird2
-      '';
-      serviceConfig = {
-        PrivateTmp = true;
-        Type = "oneshot";
-        User = "bird2";
-        Group = "bird2";
-      };
-    };
-
-    systemd.tmpfiles.rules = [ "d ${cfg.outputDir} 755 bird2 bird2 -" ];
-  };
-}
diff --git a/modules/stayrtr.nix b/modules/stayrtr.nix
index 56a8452..14ca5d2 100644
--- a/modules/stayrtr.nix
+++ b/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" ];
     };
diff --git a/pkgs/dn42-roagen/0001-Update-dependencies.patch b/pkgs/dn42-roagen/0001-Update-dependencies.patch
deleted file mode 100644
index dd03f75..0000000
--- a/pkgs/dn42-roagen/0001-Update-dependencies.patch
+++ /dev/null
@@ -1,456 +0,0 @@
-From b9bf06679414c87b79aa07c0322c3c96f86a95ff Mon Sep 17 00:00:00 2001
-From: Astro <astro@spaceboyz.net>
-Date: Wed, 10 Apr 2024 02:04:42 +0200
-Subject: [PATCH 2/2] Update dependencies
-
----
- Cargo.lock  | 305 +++++++++++++++++++++++++++++++++++++++++++---------
- Cargo.toml  |   4 +-
- src/main.rs |   2 +-
- 3 files changed, 259 insertions(+), 52 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 9bcbec8..6b2bb33 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1,10 +1,27 @@
- # This file is automatically @generated by Cargo.
- # It is not intended for manual editing.
-+version = 3
-+
-+[[package]]
-+name = "android-tzdata"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-+
-+[[package]]
-+name = "android_system_properties"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-+dependencies = [
-+ "libc",
-+]
-+
- [[package]]
- name = "ansi_term"
--version = "0.11.0"
-+version = "0.12.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
- dependencies = [
-  "winapi",
- ]
-@@ -22,48 +39,59 @@ dependencies = [
- 
- [[package]]
- name = "autocfg"
--version = "1.0.0"
-+version = "1.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
- 
- [[package]]
- name = "bitflags"
--version = "1.2.1"
-+version = "1.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
--name = "bitstring"
--version = "0.1.1"
-+name = "bumpalo"
-+version = "3.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d"
-+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
-+
-+[[package]]
-+name = "cfg-if"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- 
- [[package]]
- name = "chrono"
--version = "0.4.11"
-+version = "0.4.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
-+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
- dependencies = [
-- "num-integer",
-+ "android-tzdata",
-+ "iana-time-zone",
-+ "js-sys",
-  "num-traits",
-- "time",
-+ "wasm-bindgen",
-+ "windows-targets",
- ]
- 
- [[package]]
- name = "cidr"
--version = "0.1.0"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01"
--dependencies = [
-- "bitstring",
-- "serde",
--]
-+checksum = "8d18b093eba54c9aaa1e3784d4361eb2ba944cf7d0a932a830132238f483e8d8"
- 
- [[package]]
- name = "clap"
--version = "2.33.1"
-+version = "2.34.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
-+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
- dependencies = [
-  "ansi_term",
-  "atty",
-@@ -74,9 +102,15 @@ dependencies = [
-  "vec_map",
- ]
- 
-+[[package]]
-+name = "core-foundation-sys"
-+version = "0.8.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-+
- [[package]]
- name = "dn42-roagen"
--version = "0.2.1"
-+version = "0.2.2"
- dependencies = [
-  "chrono",
-  "cidr",
-@@ -85,43 +119,89 @@ dependencies = [
- 
- [[package]]
- name = "hermit-abi"
--version = "0.1.12"
-+version = "0.1.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
-+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
- dependencies = [
-  "libc",
- ]
- 
-+[[package]]
-+name = "iana-time-zone"
-+version = "0.1.60"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-+dependencies = [
-+ "android_system_properties",
-+ "core-foundation-sys",
-+ "iana-time-zone-haiku",
-+ "js-sys",
-+ "wasm-bindgen",
-+ "windows-core",
-+]
-+
-+[[package]]
-+name = "iana-time-zone-haiku"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-+dependencies = [
-+ "cc",
-+]
-+
-+[[package]]
-+name = "js-sys"
-+version = "0.3.69"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-+dependencies = [
-+ "wasm-bindgen",
-+]
-+
- [[package]]
- name = "libc"
--version = "0.2.70"
-+version = "0.2.153"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
-+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
- 
- [[package]]
--name = "num-integer"
--version = "0.1.42"
-+name = "log"
-+version = "0.4.21"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
--dependencies = [
-- "autocfg",
-- "num-traits",
--]
-+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
- 
- [[package]]
- name = "num-traits"
--version = "0.2.11"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
- dependencies = [
-  "autocfg",
- ]
- 
- [[package]]
--name = "serde"
--version = "1.0.110"
-+name = "once_cell"
-+version = "1.19.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c"
-+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.79"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
-+dependencies = [
-+ "unicode-ident",
-+]
-+
-+[[package]]
-+name = "quote"
-+version = "1.0.35"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-+dependencies = [
-+ "proc-macro2",
-+]
- 
- [[package]]
- name = "strsim"
-@@ -129,6 +209,17 @@ version = "0.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
- 
-+[[package]]
-+name = "syn"
-+version = "2.0.58"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "unicode-ident",
-+]
-+
- [[package]]
- name = "textwrap"
- version = "0.11.0"
-@@ -139,20 +230,16 @@ dependencies = [
- ]
- 
- [[package]]
--name = "time"
--version = "0.1.43"
-+name = "unicode-ident"
-+version = "1.0.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
--dependencies = [
-- "libc",
-- "winapi",
--]
-+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
- 
- [[package]]
- name = "unicode-width"
--version = "0.1.7"
-+version = "0.1.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
- 
- [[package]]
- name = "vec_map"
-@@ -160,11 +247,65 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
- 
-+[[package]]
-+name = "wasm-bindgen"
-+version = "0.2.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-+dependencies = [
-+ "cfg-if",
-+ "wasm-bindgen-macro",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-backend"
-+version = "0.2.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-+dependencies = [
-+ "bumpalo",
-+ "log",
-+ "once_cell",
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+ "wasm-bindgen-shared",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-macro"
-+version = "0.2.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-+dependencies = [
-+ "quote",
-+ "wasm-bindgen-macro-support",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-macro-support"
-+version = "0.2.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+ "wasm-bindgen-backend",
-+ "wasm-bindgen-shared",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-shared"
-+version = "0.2.92"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-+
- [[package]]
- name = "winapi"
--version = "0.3.8"
-+version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
- dependencies = [
-  "winapi-i686-pc-windows-gnu",
-  "winapi-x86_64-pc-windows-gnu",
-@@ -181,3 +322,69 @@ name = "winapi-x86_64-pc-windows-gnu"
- version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+
-+[[package]]
-+name = "windows-core"
-+version = "0.52.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-+dependencies = [
-+ "windows-targets",
-+]
-+
-+[[package]]
-+name = "windows-targets"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
-+dependencies = [
-+ "windows_aarch64_gnullvm",
-+ "windows_aarch64_msvc",
-+ "windows_i686_gnu",
-+ "windows_i686_msvc",
-+ "windows_x86_64_gnu",
-+ "windows_x86_64_gnullvm",
-+ "windows_x86_64_msvc",
-+]
-+
-+[[package]]
-+name = "windows_aarch64_gnullvm"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-+
-+[[package]]
-+name = "windows_aarch64_msvc"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-+
-+[[package]]
-+name = "windows_i686_gnu"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
-+
-+[[package]]
-+name = "windows_i686_msvc"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-+
-+[[package]]
-+name = "windows_x86_64_gnu"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-+
-+[[package]]
-+name = "windows_x86_64_gnullvm"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
-+
-+[[package]]
-+name = "windows_x86_64_msvc"
-+version = "0.52.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
-diff --git a/Cargo.toml b/Cargo.toml
-index 87b7254..e3153fc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,6 +24,6 @@ A simple roa file generator.
- """
- 
- [dependencies]
--clap = "2.33"
--cidr = "0.1"
-+clap = "2"
-+cidr = "0.2"
- chrono = "0.4"
-diff --git a/src/main.rs b/src/main.rs
-index 0f8fd29..5e0d656 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -1,5 +1,5 @@
- use chrono::prelude::*;
--use cidr::{Cidr, IpCidr};
-+use cidr::IpCidr;
- use std::convert::TryFrom;
- use std::fmt;
- use std::fs::{self, File};
--- 
-2.42.0
-
diff --git a/pkgs/dn42-roagen/Cargo.lock b/pkgs/dn42-roagen/Cargo.lock
deleted file mode 100644
index 6b2bb33..0000000
--- a/pkgs/dn42-roagen/Cargo.lock
+++ /dev/null
@@ -1,390 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "cc"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets",
-]
-
-[[package]]
-name = "cidr"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d18b093eba54c9aaa1e3784d4361eb2ba944cf7d0a932a830132238f483e8d8"
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "dn42-roagen"
-version = "0.2.2"
-dependencies = [
- "chrono",
- "cidr",
- "clap",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "syn"
-version = "2.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
diff --git a/pkgs/dn42-roagen/default.nix b/pkgs/dn42-roagen/default.nix
deleted file mode 100644
index 1138e56..0000000
--- a/pkgs/dn42-roagen/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs }:
-
-pkgs.rustPlatform.buildRustPackage {
-  pname = "dn42-roagen";
-  version = "0.2.2";
-
-  src = pkgs.fetchFromGitLab {
-    owner = "bauen1";
-    repo = "dn42-roagen";
-    rev = "2862b6e48865412648fb93e09517edb6320f02b0";
-    hash = "sha256-+YrvwL845qkr4v5ad897034rgI8H4rIWi4HnoSKGgFs=";
-  };
-
-  patches = [
-    ./0001-Update-dependencies.patch
-  ];
-
-  cargoLock.lockFile = ./Cargo.lock;
-
-  meta.mainProgram = "dn42-roagen";
-}