diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-18 01:16:39 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-18 13:53:44 +0200 |
| commit | a62be8ad084783d5cf87980c260c81069fc2e4af (patch) | |
| tree | 246c6c8429a3d860f7721bc9518778b526269b7d /pkgs/os-specific/linux/batman-adv | |
| parent | 247c8a676abf100c47e5448dd6dc967c15dcbee6 (diff) | |
batman-adv: 2021.4 -> 2022.0
https://www.open-mesh.org/news/107
Diffstat (limited to 'pkgs/os-specific/linux/batman-adv')
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/version.nix | 8 |
2 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 123c42e839712..79dc48a6ea9c9 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, kernel +}: let cfg = import ./version.nix; in @@ -11,6 +16,19 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + # batman-adv: make mc_forwarding atomic + (fetchpatch { + url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/c142c00f6b1a2ad5f5d74202fb1249e6a6575407..56db7c0540e733a1f063ccd6bab1b537a80857eb:/net/batman-adv/multicast.c"; + hash = "sha256-2zXg8mZ3/iK9E/kyn+wHSrlLq87HuK72xuXojQ9KjkI="; + }) + # batman-adv: compat: Add atomic mc_fowarding support for stable kernels + (fetchpatch { + url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/f07a0c37ab278fb6a9e95cad89429b1282f1ab59..350adcaec82fbaa358a2406343b6130ac8dad126:/net/batman-adv/multicast.c"; + hash = "sha256-r/Xp5bmDo9GVfAF6bn2Xq+cOq5ddQe+D5s/h37uI6bM="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 048318e3e33a1..12a7f26a336ef 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2021.4"; + version = "2022.0"; sha256 = { - batman-adv = "06zbyf8s7njn6wdm1fdq3kl8kx1vx4spxkgiy7dx0pq4c3qs5xyg"; - alfred = "15fbw80ix95zy8i4c6acm1631vxlz2hakjv4zv5wig74bp2bcyac"; - batctl = "1ryqz90av2p5pgmmpi1afmycd18zhpwz1i4f7r0s359jis86xndn"; + batman-adv = "sha256-STOHBbwgdwmshNdmaI5wJXEAnIJ8CjIHiOpR+4h3FKo="; + alfred = "sha256-q7odrGHsz81jKeczHQVV/syTd2D7NsbPVc5sHXUc/Zg="; + batctl = "sha256-iTlm+aLWpQch3hJM5i2l096cIOBVdspIK8VwTMWm9z0="; }; } |