nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 02:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255250 from thillux/frr-9.0.1

Browse Source 
frr: 8.5.2 -> 9.0.1
This commit is contained in:
Martin Weinelt 2023-09-15 16:36:37 +02:00 committed by GitHub
commit 1fc088bce0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/networking/frr.nix
View File

@ -23,6 +23,7 @@ let
"pbr"
"bfd"
"fabric"
"mgmt"
];
allServices = services ++ [ "zebra" ];

9
pkgs/servers/frr/default.nix
View File

@ -25,6 +25,7 @@
, python3
, readline
, rtrlib
, protobufc
# tests
, nettools
@ -47,6 +48,7 @@
, rtadvSupport ? true
, irdpSupport ? true
, routeReplacementSupport ? true
, mgmtdSupport ? true
# routing daemon options
, bgpdSupport ? true
@ -83,13 +85,13 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform))
stdenv.mkDerivation rec {
pname = "frr";
version = "8.5.2";
version = "9.0.1";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-xJCaVh/PlV6WRv/JRHO/vzF72E6Ap8/RaqLnkYTnk14=";
hash = "sha256-o0AVx7sDRowQz6NpKPQThC8NcGA3QN8xFzfE0k4AIVg=";
};
nativeBuildInputs = [
@ -114,6 +116,7 @@ stdenv.mkDerivation rec {
python3
readline
rtrlib
protobufc
] ++ lib.optionals stdenv.isLinux [
libcap
] ++ lib.optionals snmpSupport [
@ -149,6 +152,8 @@ stdenv.mkDerivation rec {
(lib.strings.enableFeature rtadvSupport "rtadv")
(lib.strings.enableFeature irdpSupport "irdp")
(lib.strings.enableFeature routeReplacementSupport "rr-semantics")
(lib.strings.enableFeature mgmtdSupport "mgmtd")
# routing protocols
(lib.strings.enableFeature bgpdSupport "bgpd")
(lib.strings.enableFeature ripdSupport "ripd")