From 923c449e9bf554f0bd0aa2df4d1f857e144eeaf3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Oct 2019 08:06:25 +0200 Subject: [PATCH] nixos/blcr: remove --- nixos/modules/module-list.nix | 1 - nixos/modules/programs/blcr.nix | 27 --------------------------- nixos/modules/rename.nix | 3 +++ 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 nixos/modules/programs/blcr.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 775cc05aa0a9..862e62a4e259 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,7 +98,6 @@ ./programs/autojump.nix ./programs/bash/bash.nix ./programs/bcc.nix - ./programs/blcr.nix ./programs/browserpass.nix ./programs/captive-browser.nix ./programs/ccache.nix diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix deleted file mode 100644 index 804e1d01f12b..000000000000 --- a/nixos/modules/programs/blcr.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, ... }: - -let - inherit (lib) mkOption mkIf; - cfg = config.environment.blcr; - blcrPkg = config.boot.kernelPackages.blcr; -in - -{ - ###### interface - - options = { - environment.blcr.enable = mkOption { - default = false; - description = - "Whether to enable support for the BLCR checkpointing tool."; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - boot.kernelModules = [ "blcr" "blcr_imports" ]; - boot.extraModulePackages = [ blcrPkg ]; - environment.systemPackages = [ blcrPkg ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 802ffcdc94eb..564c53465e3a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -275,6 +275,9 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + # BLCR + (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed") + # Redis (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.") (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")