Merge pull request #90343 from flokli/hardware-u2f-remove

hardware/u2f: remove module
This commit is contained in:
Florian Klink 2020-06-15 17:53:47 +02:00 committed by GitHub
commit af3c1000a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 28 deletions

View file

@ -560,6 +560,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<link xlink:href="https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v7-0">in the Grafana documentation</link>.
</para>
</listitem>
<listitem>
<para>
The <literal>hardware.u2f</literal> module, which was installing udev rules
was removed, as udev gained native support to handle FIDO security tokens.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -362,7 +362,6 @@
./services/hardware/throttled.nix
./services/hardware/trezord.nix
./services/hardware/triggerhappy.nix
./services/hardware/u2f.nix
./services/hardware/udev.nix
./services/hardware/udisks2.nix
./services/hardware/upower.nix

View file

@ -55,6 +55,12 @@ with lib;
prey-bash-client is deprecated upstream
'')
(mkRemovedOptionModule ["hardware" "u2f" ] ''
The U2F modules module was removed, as all it did was adding the
udev rules from libu2f-host to the system. Udev gained native support
to handle FIDO security tokens, so this isn't necessary anymore.
'')
# Do NOT add any option renames here, see top of the file
];
}

View file

@ -1,23 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.hardware.u2f;
in {
options = {
hardware.u2f = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable U2F hardware support.
'';
};
};
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.libu2f-host ];
};
}

View file

@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
install -D -t $out/lib/udev/rules.d 70-u2f.rules
'';
meta = with stdenv.lib; {
homepage = "https://developers.yubico.com/libu2f-host";
description = "A C library and command-line tool that implements the host-side of the U2F protocol";