From 13d7c14bd06bf22558ca13e0c213cc231c98abdb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 13 Aug 2019 09:41:55 +0200
Subject: urlwatch: filter defaults to null

---
 krebs/3modules/urlwatch.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 61ee72e7..f82e6837 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -75,10 +75,7 @@ let
       ];
       apply = map (x: getAttr (typeOf x) {
         set = x;
-        string = {
-          url = x;
-          filter = null;
-        };
+        string.url = x;
       });
     };
     verbose = mkOption {
@@ -210,6 +207,7 @@ let
         type = types.str;
       };
       filter = mkOption {
+        default = null;
         type = with types; nullOr str; # TODO nullOr subtypes.filter
       };
     };
-- 
cgit v1.2.3


From b13d9d3149c349160e43e9ea1dbe654829b58ad9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 13 Aug 2019 09:42:14 +0200
Subject: urlwatch: add ignore_cached option

---
 krebs/3modules/urlwatch.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index f82e6837..79b45c62 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -210,6 +210,10 @@ let
         default = null;
         type = with types; nullOr str; # TODO nullOr subtypes.filter
       };
+      ignore_cached = mkOption {
+        default = null;
+        type = with types; nullOr bool;
+      };
     };
   };
 in out
-- 
cgit v1.2.3


From ccb7fb731c9118f86300b2b02c987b28b079c938 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 13 Aug 2019 09:44:26 +0200
Subject: urlwatch: use writeJSON

---
 krebs/3modules/urlwatch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 79b45c62..43535b08 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -93,7 +93,7 @@ let
 
   hooksFile = cfg.hooksFile;
 
-  configFile = pkgs.writeText "urlwatch.yaml" (toJSON {
+  configFile = pkgs.writeJSON "urlwatch.yaml" {
     display = {
       error = true;
       new = true;
@@ -129,7 +129,7 @@ let
         line_length = 75;
       };
     };
-  });
+  };
 
   imp = {
     systemd.timers.urlwatch = {
-- 
cgit v1.2.3