crda: 3.18 -> 4.14

Artturin 48a4db63 015a305a

+18 -18
+18 -18
pkgs/os-specific/linux/crda/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "crda"; 5 - version = "3.18"; 5 + version = "4.14"; 6 6 7 7 src = fetchurl { 8 - sha256 = "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23"; 9 - url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz"; 8 + url = "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-${version}.tar.gz"; 9 + sha256 = "sha256-Wo81u4snR09Gaw511FG6kXQz2KqxiJZ4pk2cTnKouMI="; 10 10 }; 11 11 12 12 patches = [ 13 - # Switch to Python 3 14 - # https://lore.kernel.org/linux-wireless/1437542484-23409-1-git-send-email-ahmed.taahir@gmail.com/ 13 + # Fix python 3 build: except ImportError, e: SyntaxError: invalid syntax 15 14 (fetchpatch { 16 - url = "https://lore.kernel.org/linux-wireless/1437542484-23409-2-git-send-email-ahmed.taahir@gmail.com/raw"; 17 - sha256 = "0s2n340cgaasvg1k8g9v8xjrbh4y2mcgrhdmv97ja2fs8xjcjbf1"; 15 + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d234fddf451fab0f4fc412e2769f54e11f10d7d8/trunk/crda-4.14-python-3.patch"; 16 + sha256 = "sha256-KEezEKrfizq9k4ZiE2mf3Nl4JiBayhXeVnFl7wYh28Y="; 18 17 }) 18 + 19 19 (fetchpatch { 20 - url = "https://lore.kernel.org/linux-wireless/1437542484-23409-3-git-send-email-ahmed.taahir@gmail.com/raw"; 21 - sha256 = "01dlfw7kqhyx025jxq2l75950b181p9r7i9zkflcwvbzzdmx59md"; 20 + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d48ec843222b0d74c85bce86fa6f087c7dfdf952/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch"; 21 + sha256 = "sha256-j93oydi209f22OF8aXZ/NczuUOnlhkdSeYvy2WRRvm0="; 22 22 }) 23 23 ]; 24 24 25 - buildInputs = [ libgcrypt libnl ]; 25 + strictDeps = true; 26 + 26 27 nativeBuildInputs = [ 27 28 pkg-config 28 - python3Packages.pycrypto 29 + python3Packages.m2crypto # only used for a build time script 30 + ]; 31 + 32 + buildInputs = [ 33 + libgcrypt 34 + libnl 29 35 ]; 30 36 31 37 postPatch = '' 32 38 patchShebangs utils/ 33 39 substituteInPlace Makefile \ 40 + --replace 'gzip' 'gzip -n' \ 34 41 --replace ldconfig true \ 35 42 --replace pkg-config $PKG_CONFIG 36 43 sed -i crda.c \ ··· 45 52 "REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin" 46 53 ]; 47 54 48 - NIX_CFLAGS_COMPILE = "-Wno-error=unused-const-variable"; 49 - 50 55 buildFlags = [ "all_noverify" ]; 51 56 enableParallelBuilding = true; 52 57 53 58 doCheck = true; 54 59 checkTarget = "verify"; 55 - 56 - postInstall = '' 57 - # The patch installs build header 58 - rm $out/include/reglib/keys-gcrypt.h 59 - ''; 60 60 61 61 meta = with lib; { 62 62 description = "Linux wireless Central Regulatory Domain Agent";