diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dd9c3702b803..cbb15ac4f01e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -550,7 +550,6 @@ ./services/security/fail2ban.nix ./services/security/fprintd.nix ./services/security/fprot.nix - ./services/security/frandom.nix ./services/security/haka.nix ./services/security/haveged.nix ./services/security/hologram-server.nix diff --git a/nixos/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix deleted file mode 100644 index 2d43d12e541d..000000000000 --- a/nixos/modules/services/security/frandom.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, config, ...}: - -let kernel = config.boot.kernelPackages; -in - -{ - - ###### interface - - options = { - - services.frandom.enable = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - enable the /dev/frandom device (a very fast random number generator) - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.services.frandom.enable { - boot.kernelModules = [ "frandom" ]; - boot.extraModulePackages = [ kernel.frandom ]; - services.udev.packages = [ kernel.frandom ]; - }; - -} diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix deleted file mode 100644 index dfdc79c2005f..000000000000 --- a/pkgs/os-specific/linux/frandom/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, kernel }: - -let baseName = "frandom-1.1"; -in - -stdenv.mkDerivation rec { - name = "${baseName}-${kernel.version}"; - - src = fetchurl { - url = "mirror://sourceforge/frandom/${baseName}.tar.gz"; - sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls"; - }; - - hardeningDisable = [ "pic" ]; - - preBuild = '' - kernelVersion=${kernel.modDirVersion} - substituteInPlace Makefile \ - --replace "\$(shell uname -r)" "$kernelVersion" \ - --replace "/lib/modules" "${kernel.dev}/lib/modules" - ''; - - installPhase = '' - kernelVersion=${kernel.modDirVersion} - mkdir -p $out/lib/modules/$kernelVersion/misc - cp frandom.ko $out/lib/modules/$kernelVersion/misc - - mkdir -p $out/lib/udev/rules.d - tee $out/lib/udev/rules.d/10-frandom.rules <<-EOF - # - # These are the rules for the frandom devices. In theory, we could let - # udev's catch-all rule create the /dev node based upon the kernel name, - # which gives correct result, except that the default MODE set in - # 50-udev.rules (0600) is too restrictive. - # - KERNEL=="[ef]random", MODE="444", OPTIONS="last_rule" - EOF - ''; - - buildInputs = []; - - meta = { - description = "A very fast random number generator kernel module"; - homepage = http://frandom.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c4c33b87d92..aa96c677f3fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12248,8 +12248,6 @@ with pkgs; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; - frandom = callPackage ../os-specific/linux/frandom { }; - fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { }; lttng-modules = callPackage ../os-specific/linux/lttng-modules { };