Merge pull request #25958 from Mic92/iwd

iwd: init at unstable-2017-04-21
This commit is contained in:
Arseniy Seroka 2017-05-22 20:04:04 +03:00 committed by GitHub
commit c734781158
4 changed files with 73 additions and 0 deletions

View File

@ -431,6 +431,7 @@
./services/networking/i2p.nix
./services/networking/iodine.nix
./services/networking/ircd-hybrid/default.nix
./services/networking/iwd.nix
./services/networking/keepalived/default.nix
./services/networking/keybase.nix
./services/networking/kippo.nix

View File

@ -0,0 +1,34 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.networking.wireless.iwd;
in {
options.networking.wireless.iwd.enable = mkEnableOption "iwd";
config = mkIf cfg.enable {
assertions = [{
assertion = !config.networking.wireless.enable;
message = ''
Only one wireless daemon is allowed at the time: networking.wireless.enable and networking.wireless.iwd.enable are mutually exclusive.
'';
}];
# for iwctl
environment.systemPackages = [ pkgs.iwd ];
services.dbus.packages = [ pkgs.iwd ];
systemd.services.iwd = {
description = "Wireless daemon";
before = [ "network.target" ];
wants = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd";
};
};
meta.maintainers = with lib.maintainers; [ mic92 ];
}

View File

@ -0,0 +1,36 @@
{ stdenv, fetchgit, autoreconfHook, readline }:
let
ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
rev = "58e873d7463f3a7f91e02260585bfa50cbc77668";
sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh";
};
in stdenv.mkDerivation rec {
name = "iwd-unstable-2017-04-21";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = "f64dea81b8490e5e09888be645a4325419bb269c";
sha256 = "0maqhx5264ykgmwaf90s2806i1kx2028if34ph2axlirxrhdd3lg";
};
configureFlags = [
"--with-dbusconfdir=$(out)/etc/"
];
postUnpack = ''
ln -s ${ell} ell
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ readline ];
meta = with stdenv.lib; {
homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
description = "Wireless daemon for Linux";
platforms = platforms.linux;
maintainers = [ maintainers.mic92 ];
};
}

View File

@ -11718,6 +11718,8 @@ with pkgs;
iw = callPackage ../os-specific/linux/iw { };
iwd = callPackage ../os-specific/linux/iwd { };
jfbview = callPackage ../os-specific/linux/jfbview { };
jfbpdf = callPackage ../os-specific/linux/jfbview {
imageSupport = false;