diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-18 09:41:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-18 09:44:13 +0200 |
| commit | 0aa9f35a99f0edac6c6b8f405ead51eb700a444f (patch) | |
| tree | 2e17cc239013f5fccc6e56596a3f4d3ec5ad8faa /nixos/modules/misc | |
| parent | 7adbdd97588674706cb5a277d5dc63480425bc6b (diff) | |
| parent | 03acdd20beddc0f1a6a16037959ba84d56a0e403 (diff) | |
| download | nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.gz nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.bz2 nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.lz nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.xz nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.zst nixlib-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1525828
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/nixops-autoluks.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/misc/version.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/misc/nixops-autoluks.nix b/nixos/modules/misc/nixops-autoluks.nix index 2153c6f975ad..20c143286afa 100644 --- a/nixos/modules/misc/nixops-autoluks.nix +++ b/nixos/modules/misc/nixops-autoluks.nix @@ -1,7 +1,6 @@ { config, options, lib, ... }: let path = [ "deployment" "autoLuks" ]; - hasAutoLuksOption = lib.hasAttrByPath path options; hasAutoLuksConfig = lib.hasAttrByPath path config && (lib.attrByPath path {} config) != {}; inherit (config.nixops) enableDeprecatedAutoLuks; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index c9b374b6d7b1..3ae60cb79160 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,4 +1,4 @@ -{ options, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; |