diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2022-11-27 14:31:11 +0100 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2022-11-27 14:31:11 +0100 |
| commit | a7e1d5114d278a5fdd5cb90f477fb8d611dcca91 (patch) | |
| tree | dc03281f998d58e97914362205776ec254b04f7a | |
| parent | 537b31017dc6ed38ceeca0b89a576e95edca8919 (diff) | |
| download | nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar.gz nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar.bz2 nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar.lz nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar.xz nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.tar.zst nixpkgs-a7e1d5114d278a5fdd5cb90f477fb8d611dcca91.zip | |
frr: 8.3.1 -> 8.4.1
https://github.com/FRRouting/frr/releases/tag/frr-8.4.1 https://github.com/FRRouting/frr/releases/tag/frr-8.4.0 This upgrade allows to cleanup the patches since the fix is available in 8.4.0.
| -rw-r--r-- | pkgs/servers/frr/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 1215fbd3409..88648fa1e13 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch # build time , autoreconfHook @@ -33,23 +32,15 @@ stdenv.mkDerivation rec { pname = "frr"; - version = "8.3.1"; + version = "8.4.1"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0="; + hash = "sha256-SJKDIs6bL8NroSieNeSYBv+8JTGgFdhP4WYKUWYhpbk="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-37032.patch"; - url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch"; - sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag="; - }) - ]; - nativeBuildInputs = [ autoreconfHook bison |