summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2019-09-30 16:39:40 +0200
committerGitHub <noreply@github.com>2019-09-30 16:39:40 +0200
commitc75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5 (patch)
tree5eb9195038a5556fb71ea1daa08a9877e63c8f84 /nixos
parent185778312847f3b0c50bd435800df8e02c34e1dc (diff)
parentb08b0bcbbec77046e5a7082177cedc12fbf1dc6c (diff)
downloadnixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar.gz
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar.bz2
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar.lz
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar.xz
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.tar.zst
nixpkgs-c75a18fea6f25dd5dfcc7d76c91cf49e3c53c6c5.zip
mkRemovedOptionModule: assert on removed options (#69419)
mkRemovedOptionModule: assert on removed options
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters/nginx.nix2
-rw-r--r--nixos/modules/tasks/network-interfaces.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 554377df37b..ba852fea433 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -49,6 +49,6 @@ in
     (mkRemovedOptionModule [ "insecure" ] ''
       This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
     '')
-    ({ options.warnings = options.warnings; })
+    ({ options.warnings = options.warnings; options.assertions = options.assertions; })
   ];
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 29310f6f24a..3038be6dbab 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -305,7 +305,7 @@ let
             optional (defined ipv6Address && defined ipv6PrefixLength)
             { address = ipv6Address; prefixLength = ipv6PrefixLength; }))
 
-        ({ options.warnings = options.warnings; })
+        ({ options.warnings = options.warnings; options.assertions = options.assertions; })
       ];
 
   };