mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +00:00
Merge pull request #169124 from mweinelt/batman-adv
This commit is contained in:
commit
052ec23eac
@ -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"
|
||||
|
@ -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=";
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user