diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-05-06 18:22:07 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-05-06 18:23:07 +0200 |
| commit | 11a8c3e409f30099704d74fa349ccde948ec497a (patch) | |
| tree | b61b6af97246f915ddf3ad342e7d5cd815796081 /pkgs/os-specific/linux | |
| parent | 900a20ebc01d0a277d6a32be8a127d56ca741ddc (diff) | |
| download | nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar.gz nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar.bz2 nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar.lz nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar.xz nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.tar.zst nixpkgs-11a8c3e409f30099704d74fa349ccde948ec497a.zip | |
batman-adv: 2022.0 -> 2022.1
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/version.nix | 8 |
2 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 79dc48a6ea9..3d22720b962 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -16,19 +16,6 @@ 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 12a7f26a336..dd222787450 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2022.0"; + version = "2022.1"; sha256 = { - batman-adv = "sha256-STOHBbwgdwmshNdmaI5wJXEAnIJ8CjIHiOpR+4h3FKo="; - alfred = "sha256-q7odrGHsz81jKeczHQVV/syTd2D7NsbPVc5sHXUc/Zg="; - batctl = "sha256-iTlm+aLWpQch3hJM5i2l096cIOBVdspIK8VwTMWm9z0="; + batman-adv = "sha256-bQQdNTCr1LJJq/Wpb8Ki4kFDG/lEO1R/2yWi2P0ymkA="; + alfred = "sha256-OgrCuybgyz8nMtSHNmmgoi6YJej5qOerrJhjY/J1CX8="; + batctl = "sha256-h+iak4lxuGJCJoG7NBBOmytLZRLR0WXelTYw3zjWGmg="; }; } |