From 72a7aaa39e7552970f466e712e1f7ef91aeb03c8 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 10 Jun 2021 08:14:16 -0400
Subject: 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.
---
 Biz/Cloud.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Biz/Cloud.nix')

diff --git a/Biz/Cloud.nix b/Biz/Cloud.nix
index 4730f1f..dc72fa9 100644
--- a/Biz/Cloud.nix
+++ b/Biz/Cloud.nix
@@ -3,10 +3,10 @@
 # Cloud infrastructure, always online. Mostly for messaging-related stuff.
 
 let
-  nixos-mailserver = let ver = "v2.3.0"; in builtins.fetchTarball {
-    url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${ver}/nixos-mailserver-${ver}.tar.gz";
-    sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919";
-  };
+  #nixos-mailserver = let ver = "v2.3.0"; in builtins.fetchTarball {
+  #  url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${ver}/nixos-mailserver-${ver}.tar.gz";
+  #  sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919";
+  #};
 in
 bild.os {
   imports = [
@@ -20,7 +20,7 @@ bild.os {
     ./Cloud/Networking.nix
     ./Cloud/Web.nix
     ./Cloud/Znc.nix
-    nixos-mailserver
+    "${bild.sources.nixos-mailserver}"
   ];
   networking.hostName = "simatime";
   networking.domain = "simatime.com";
-- 
cgit v1.2.3