diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-05-22 00:31:46 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-05-22 00:31:57 +0200 |
| commit | b49bd8db30d945644f1b566ead4f9002eefd0d86 (patch) | |
| tree | 96b458803f27534fac9520aac7f2610c9f366e8f | |
| parent | a420acab1e197c0c4a2f2b960f3bf1e6b8043caa (diff) | |
| download | nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar.gz nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar.bz2 nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar.lz nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar.xz nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.tar.zst nixpkgs-b49bd8db30d945644f1b566ead4f9002eefd0d86.zip | |
batman-adv: 2021.0 -> 2021.1
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/version.nix | 8 |
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 7da14593410..354f4b1bff2 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, kernel }: +{ lib, stdenv, fetchurl, kernel }: let cfg = import ./version.nix; in @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - patches = [ - (fetchpatch { - # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1 - url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d"; - sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg"; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 3a6ec67519e..71c7863cfa8 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.0"; + version = "2021.1"; sha256 = { - batman-adv = "1898y0m8sgca0dmhyfkpmx2g6qc0b1xvh5nm7cvnhwl9h2jrp62s"; - alfred = "0jr4wbz81ijd03ssfxb9mqlj3zbx2k495lsl0np262hyla6w0qm0"; - batctl = "1r01a8zxivq4slwc81dgg9qknqsli8qw17csfj95321gjpqqpv4w"; + batman-adv = "1l1lk41h4chymrb41ihqrr3p80xdwhhp1kkksr157mzailyq8xxz"; + alfred = "122y92vqrpp3g6dbjfv8hkhwjlfa3skr91lbzicr0pw8mm6wzqll"; + batctl = "0xp1cqcw0g0irgw9yhkch01rbn39gzvfxv8b2yya32vbnkmqrcj4"; }; } |