frr: 10.1 -> 10.2.1, libyang: 2.1.148 -> 3.4.2 (NixOS#365164)

mapperfr · Feb 13, 2025 · 757befc · 757befc
2 parents 56d5c42 + 9478b2f
commit 757befc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix
@@ -12,6 +12,10 @@ import ./make-test-python.nix (
     ifAddr = node: iface: (pkgs.lib.head node.networking.interfaces.${iface}.ipv4.addresses).address;
 
     ospfConf1 = ''
+      interface eth2
+        ip ospf hello-interval 1
+        ip ospf dead-interval 5
+      !
       router ospf
         network 192.168.0.0/16 area 0
     '';

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 
 # build time
 , autoreconfHook
@@ -77,23 +76,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "frr";
-  version = "10.1";
+  version = "10.2.1";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = finalAttrs.pname;
     rev = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-pmFdxL8QpyXvpX2YiSOZ+KIoNaj1OOH6/qnVAWZLE9s=";
+    hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-44070.patch";
-      url = "https://github.com/FRRouting/frr/commit/fea4ed5043b4a523921f970a39a565d2c1ca381f.patch";
-      hash = "sha256-X9FjQeOvo92+mL1z3u5W0LBhhePDAyhFAqh8sAtNNm8=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     bison

diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "2.1.148";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    hash = "sha256-uYZJo8lUv6tq0MRRJvbTS/8t1eZNGqcMb5k5sVCwMJM=";
+    hash = "sha256-pki4T6faY42UcnzOT6697FJWyPRNKNbUFEFZkkeWUx8=";
   };
 
   nativeBuildInputs = [