about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-08-29 20:01:25 -0400
committerTim Steinbach <tim@nequissimus.com>2017-08-29 20:01:25 -0400
commitae742fa4952a2ab799317b810e04bcac8846c56d (patch)
tree57d04e9fc834d0070c458acc1a473169147155db
parent03b08fca66850dc01f988146d8c807d059f9c4af (diff)
downloadnixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar.gz
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar.bz2
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar.lz
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar.xz
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.tar.zst
nixlib-ae742fa4952a2ab799317b810e04bcac8846c56d.zip
frandom: Remove
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/security/frandom.nix31
-rw-r--r--pkgs/os-specific/linux/frandom/default.nix48
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 0 insertions, 82 deletions
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 041bd7dd2688..a3f8dfa73b1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12250,8 +12250,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 { };