diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-07 18:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-07 18:00:58 +0000 |
| commit | 296d2f69915ddc4b8ce55fc49727c735d227d1f7 (patch) | |
| tree | 39f8d20b50a8766011c4fb5db540763da15f7175 /pkgs/os-specific | |
| parent | ff0149cc25a43a7e484ad2542adf5ab90508756e (diff) | |
| parent | cd5c10f69676a36ae44254b8cfd58f528a062f65 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/version.nix | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 5c4c14eeb0698..b825cfc0a9624 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -16,14 +16,6 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - patches = [ - # batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels - (fetchpatch2 { - url = "https://git.open-mesh.org/batman-adv.git/commitdiff_plain/be69e50e8c249ced085d41ddd308016c1c692174?hp=74d3c5e1c682a9efe31b75e8986668081a4b5341"; - sha256 = "sha256-yfEiU74wuMSKal/6mwzgdccqDMEv4P7CkAeiSAEwvjA="; - }) - ]; - 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 f78191489d0f9..545285a6cf422 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2023.3"; + version = "2024.0"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2023.3/$tool-2023.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.0/$tool-2024.0.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-rVrUFJ+uz351MCpXeqpnOxz8lAXSAksrSpFjuscMjk8="; - batctl = "sha256-mswxFwkwwXl8OHY7h73/iAVMNNHwEvu4EAaCc/7zEhI="; - batman-adv = "sha256-98bFPlk0PBYmQsubRPEBZ2XUv1E+A5ACvmEremweo2w="; + alfred = "sha256-0CmkNjirFnceX3HhNLyEPRcT10BBxlvNoYox0Y9VMb0="; + batctl = "sha256-doU+hyAa9jxBHbFS/QxiWnKalzMRWJfRMxYE4sWmfH0="; + batman-adv = "sha256-YREGl7V5n2RqKoKk3Pl/rtS7EqfMQ79Gg9LE3k9rQOc="; }; } |