Upgrade to nixos-21.05

Getting me closer to the latest GHC. This release also includes my own packages
that I submitted some time ago.

GHCJS is not present in 21.05 for some reason, but I think it's back in master,
so I might do another upgrade soon, but for now I just disabled my GHCJS
support. I'm not really using it anyway.

I also had to bring it string-quote, update nixos-mailserver, and a few other
things.

1 files changed, 38 insertions, 39 deletions

diff --git a/Biz/Bild.hs b/Biz/Bild.hs
index 9868ef0..b00be40 100644
--- a/Biz/Bild.hs
+++ b/Biz/Bild.hs
@@ -19,13 +19,11 @@
 --
 --    * only input is one or more a namespaces. no subcommands, no packages
 --
---    * no need to write specific build rules
+--    * no need to write specific build rules, one rule for hs, one for rs, one
+--    for scm, and so on
 --
---        * one rule for hs, one for rs, one for scm, and so on
---
---        * rules are written in Haskell as much as possible
---
---    * no need to distinguish between exe and lib, just have a single output
+--    * no need to distinguish between exe and lib, just have a single output,
+--    or figure it out automatically
 --
 --    * never concerned with deployment/packaging - leave that to another tool
 --      (scp? tar?)
@@ -226,7 +224,7 @@ data Target = Target
 
 -- | We can't build everything yet...
 isBuildableNs :: Namespace -> Bool
-isBuildableNs (Namespace _ Namespace.Hs) = True
+isBuildableNs (Namespace (x : _) Namespace.Hs) | x /= "Hero" = True
 isBuildableNs (Namespace _ Namespace.Scm) = True
 isBuildableNs ns
   | ns `elem` nixTargets = True
@@ -236,8 +234,7 @@ isBuildableNs ns
       [ Namespace ["Biz", "Pie"] Namespace.Nix,
         Namespace ["Biz", "Que", "Prod"] Namespace.Nix,
         Namespace ["Biz", "Cloud"] Namespace.Nix,
-        Namespace ["Biz", "Dev"] Namespace.Nix,
-        Namespace ["Hero", "Prod"] Namespace.Nix
+        Namespace ["Biz", "Dev"] Namespace.Nix
       ]
 
 -- | Emulate the *nix hierarchy in the cabdir.
@@ -407,38 +404,40 @@ build andTest loud Target {..} = do
         ]
     GhcjsExe -> do
       Log.info ["bild", "dev", "ghcjs-exe", nschunk namespace]
-      proc
-        loud
-        namespace
-        "ghcjs"
-        [ "-Werror",
-          "-i" <> root,
-          "-odir",
-          root </> intdir,
-          "-hidir",
-          root </> intdir,
-          "--make",
-          path,
-          "-main-is",
-          Namespace.toHaskellModule namespace,
-          "-o",
-          root </> vardir </> Maybe.fromJust out
-        ]
+      pure Exit.ExitSuccess
+    --proc
+    --  loud
+    --  namespace
+    --  "ghcjs"
+    --  [ "-Werror",
+    --    "-i" <> root,
+    --    "-odir",
+    --    root </> intdir,
+    --    "-hidir",
+    --    root </> intdir,
+    --    "--make",
+    --    path,
+    --    "-main-is",
+    --    Namespace.toHaskellModule namespace,
+    --    "-o",
+    --    root </> vardir </> Maybe.fromJust out
+    --  ]
     GhcjsLib -> do
       Log.info ["bild", "dev", "ghcjs-lib", nschunk namespace]
-      proc
-        loud
-        namespace
-        "ghcjs"
-        [ "-Werror",
-          "-i" <> root,
-          "-odir",
-          root </> intdir,
-          "-hidir",
-          root </> intdir,
-          "--make",
-          path
-        ]
+      pure Exit.ExitSuccess
+    --proc
+    --  loud
+    --  namespace
+    --  "ghcjs"
+    --  [ "-Werror",
+    --    "-i" <> root,
+    --    "-odir",
+    --    root </> intdir,
+    --    "-hidir",
+    --    root </> intdir,
+    --    "--make",
+    --    path
+    --  ]
     Guile -> do
       Log.info ["bild", "dev", "guile", nschunk namespace]
       proc