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, 27 insertions, 26 deletions

diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 9b62f7d..fd15d9e 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -5,11 +5,12 @@ let
       self.callCabal2nix name pkgs.sources.${name} {};
   buildCabalSubdir = self: {name, src ? pkgs.sources.${name}, subdir ? name}:
       self.callCabal2nix name (src + "/${subdir}") {};
+  ghc = "ghc884";
 in rec
 {
   haskell = pkgs.haskell // {
     packages = pkgs.haskell.packages // {
-      ghc865 = pkgs.haskell.packages.ghc865.override (old: {
+      "${ghc}" = pkgs.haskell.packages."${ghc}".override (old: {
         overrides = with pkgs.pkgs.haskell.lib; self: super:
           pkgs.overridePinnedDeps (buildCabal self) // {
           acid-state = dontCheck super.acid-state; # mac: "too many open files"
@@ -22,31 +23,31 @@ in rec
           wai-middleware-metrics = dontCheck super.wai-middleware-metrics;
         };
       });
-      ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
-        overrides = with pkgs.haskell.lib; self: super:
-          pkgs.overridePinnedDeps (buildCabal self) // {
-          Glob = dontCheck super.Glob;
-          QuickCheck = dontCheck super.QuickCheck;
-          aeson = dontCheck super.aeson;
-          base-compat-batteries = dontCheck super.base-compat-batteries;
-          clay = dontCheck super.clay;
-          comonad = dontCheck super.comonad;
-          ghcjs-base = dontCheck (buildCabal self "ghcjs-base");
-          jsaddle-warp = dontCheck (buildCabalSubdir self {
-            name = "jsaddle-warp";
-            src = pkgs.sources.jsaddle;
-          });
-          http-types = dontCheck super.http-types;
-          network-uri= dontCheck super.network-uri;
-          scientific = dontCheck super.scientific; # takes forever
-          servant = dontCheck super.servant;
-          servant-auth = buildCabalSubdir self "servant-auth";
-          tasty-quickcheck = dontCheck super.tasty-quickcheck;
-          temporary = dontCheck super.temporary;
-          time-compat = dontCheck super.time-compat;
-          vector = dontCheck super.vector;
-        };
-      });
+      #ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
+      #  overrides = with pkgs.haskell.lib; self: super:
+      #    pkgs.overridePinnedDeps (buildCabal self) // {
+      #    Glob = dontCheck super.Glob;
+      #    QuickCheck = dontCheck super.QuickCheck;
+      #    aeson = dontCheck super.aeson;
+      #    base-compat-batteries = dontCheck super.base-compat-batteries;
+      #    clay = dontCheck super.clay;
+      #    comonad = dontCheck super.comonad;
+      #    ghcjs-base = dontCheck (buildCabal self "ghcjs-base");
+      #    jsaddle-warp = dontCheck (buildCabalSubdir self {
+      #      name = "jsaddle-warp";
+      #      src = pkgs.sources.jsaddle;
+      #    });
+      #    http-types = dontCheck super.http-types;
+      #    network-uri= dontCheck super.network-uri;
+      #    scientific = dontCheck super.scientific; # takes forever
+      #    servant = dontCheck super.servant;
+      #    servant-auth = buildCabalSubdir self "servant-auth";
+      #    tasty-quickcheck = dontCheck super.tasty-quickcheck;
+      #    temporary = dontCheck super.temporary;
+      #    time-compat = dontCheck super.time-compat;
+      #    vector = dontCheck super.vector;
+      #  };
+      #});
     };
   };