Merge pull request #286832 from trofi/crda-removal-and-wireless-regdb-update (5ef42fcd) · Commits · nix / nixpkgs

nixos/modules/services/networking/hostapd.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -1197,8 +1197,6 @@ in {

		environment.systemPackages = [cfg.package];

		services.udev.packages = with pkgs; [crda];

		systemd.services.hostapd = {
		description = "IEEE 802.11 Host Access-Point Daemon";

pkgs/data/misc/wireless-regdb/default.nix

+4 −9

Original line number	Diff line number	Diff line
		{ lib, stdenvNoCC, fetchurl, directoryListingUpdater, crda }:
		{ lib, stdenvNoCC, fetchurl, directoryListingUpdater }:

		stdenvNoCC.mkDerivation rec {
		pname = "wireless-regdb";
		version = "2023.09.01";
		version = "2024.01.23";

		src = fetchurl {
		url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
		hash = "sha256-JtTCpyfMWSObhHNarYVrfH0LBOMKpcI1xPf0f18FNJE=";
		hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU=";
		};

		dontBuild = true;
		@@ -16,12 +16,7 @@ stdenvNoCC.mkDerivation rec {
		"PREFIX="
		];

		passthru = {
		tests = {
		inherit crda; # validate data base signature
		};
		updateScript = directoryListingUpdater { };
		};
		passthru.updateScript = directoryListingUpdater { };

		meta = with lib; {
		description = "Wireless regulatory database for CRDA";

pkgs/os-specific/linux/crda/default.nix

deleted100644 → 0

+0 −78

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }:

		stdenv.mkDerivation rec {
		pname = "crda";
		version = "4.14";

		src = fetchurl {
		url = "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-${version}.tar.gz";
		sha256 = "sha256-Wo81u4snR09Gaw511FG6kXQz2KqxiJZ4pk2cTnKouMI=";
		};

		patches = [
		# Fix python 3 build: except ImportError, e: SyntaxError: invalid syntax
		(fetchpatch {
		url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d234fddf451fab0f4fc412e2769f54e11f10d7d8/trunk/crda-4.14-python-3.patch";
		sha256 = "sha256-KEezEKrfizq9k4ZiE2mf3Nl4JiBayhXeVnFl7wYh28Y=";
		})

		(fetchpatch {
		url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d48ec843222b0d74c85bce86fa6f087c7dfdf952/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch";
		sha256 = "sha256-j93oydi209f22OF8aXZ/NczuUOnlhkdSeYvy2WRRvm0=";
		})
		];

		strictDeps = true;

		nativeBuildInputs = [
		pkg-config
		python3Packages.m2crypto # only used for a build time script
		];

		buildInputs = [
		libgcrypt
		libnl
		];

		postPatch = ''
		patchShebangs utils/
		substituteInPlace Makefile \
		--replace 'gzip' 'gzip -n' \
		--replace ldconfig true \
		--replace pkg-config $PKG_CONFIG
		sed -i crda.c \
		-e "/\/usr\/.*\/regulatory.bin/d" \
		-e "s\|/lib/crda\|${wireless-regdb}/lib/crda\|g"
		'';

		makeFlags = [
		"PREFIX=$(out)"
		"SBINDIR=$(out)/bin/"
		"UDEV_RULE_DIR=$(out)/lib/udev/rules.d/"
		"REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"
		];

		buildFlags = [ "all_noverify" ];
		enableParallelBuilding = true;

		doCheck = true;
		checkTarget = "verify";

		meta = with lib; {
		description = "Linux wireless Central Regulatory Domain Agent";
		longDescription = ''
		CRDA acts as the udev helper for communication between the kernel and
		userspace for regulatory compliance. It relies on nl80211 for communication.

		CRDA is intended to be run only through udev communication from the kernel.
		To use it under NixOS, add

		services.udev.packages = [ pkgs.crda ];

		to the system configuration.
		'';
		homepage = "https://wireless.wiki.kernel.org/en/developers/regulatory/crda";
		license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site
		platforms = platforms.linux;
		};
		}

pkgs/top-level/aliases.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ mapAliases ({
		concurrencykit = libck; # Added 2021-03
		connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08
		convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27
		crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06
		cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
		cvs_fast_export = cvs-fast-export; # Added 2021-06-10

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -27622,8 +27622,6 @@ with pkgs;

		cramfsswap = callPackage ../os-specific/linux/cramfsswap { };

		crda = callPackage ../os-specific/linux/crda { };

		cshatag = callPackage ../os-specific/linux/cshatag { };

		# Darwin package set