summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/todo/use_ghc_8.0_custom_compile_errors.mdwn5
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
3 files changed, 9 insertions, 5 deletions
diff --git a/doc/todo/use_ghc_8.0_custom_compile_errors.mdwn b/doc/todo/use_ghc_8.0_custom_compile_errors.mdwn
index 7eed443a..95f86143 100644
--- a/doc/todo/use_ghc_8.0_custom_compile_errors.mdwn
+++ b/doc/todo/use_ghc_8.0_custom_compile_errors.mdwn
@@ -24,4 +24,9 @@ Custom errors need a type class to be used. So, could do something like this:
the `instance TypeError` can just be wrapped in an ifdef to make it only be
used by the new ghc.)
+> The new type-errors library builds a lot of stuff on top of this.
+> Its ability to detect "stuckness" seems like it may be able to catch
+> the very long type errors that we sometimes see when using propellor, and
+> whittle them down to a more useful error. --[[Joey]]
+
[[!tag user/joey]]
diff --git a/propellor.cabal b/propellor.cabal
index cde447e2..300313c0 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -38,8 +38,6 @@ Description:
Library
Default-Language: Haskell98
GHC-Options: -Wall -fno-warn-tabs -O0
- if impl(ghc >= 8.0)
- GHC-Options: -fno-warn-redundant-constraints
Default-Extensions: TypeOperators
Hs-Source-Dirs: src
Build-Depends:
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index faf242e0..8e3f1fbb 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -910,15 +910,16 @@ house user hosts ctx sshkey = propertyList "home automation" $ props
& Systemd.enabled setupservicename
`requires` setupserviceinstalled
`onChange` Systemd.started setupservicename
- & Systemd.enabled watchdogservicename
- `requires` watchdogserviceinstalled
- `onChange` Systemd.started watchdogservicename
& Systemd.enabled pollerservicename
`requires` pollerserviceinstalled
`onChange` Systemd.started pollerservicename
& Systemd.enabled controllerservicename
`requires` controllerserviceinstalled
`onChange` Systemd.started controllerservicename
+ & Systemd.enabled watchdogservicename
+ `requires` watchdogserviceinstalled
+ `onChange` Systemd.started watchdogservicename
+ & Apt.serviceInstalledRunning "watchdog"
& User.hasGroup user (Group "dialout")
& Group.exists (Group "gpio") Nothing
& User.hasGroup user (Group "gpio")