From 35f0ade5ea77d17544d253f970ef94dd1c7cd9f0 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Sun, 19 Apr 2020 16:50:36 -0700 Subject: Switch to niv for managing third party sources --- Hero/App.hs | 2 +- Hero/Prod.nix | 8 -------- Hero/Server.hs | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'Hero') diff --git a/Hero/App.hs b/Hero/App.hs index 39cfa03..a254d80 100644 --- a/Hero/App.hs +++ b/Hero/App.hs @@ -284,7 +284,7 @@ data ComicReaderState deriving (Show, Eq) findComic :: ComicId -> [Comic] -> Maybe Comic -findComic id = List.find . \c -> comicId c == id +findComic id = List.find (\c -> comicId c == id) -- | Main model for the app. -- diff --git a/Hero/Prod.nix b/Hero/Prod.nix index 10650ee..7da2f72 100644 --- a/Hero/Prod.nix +++ b/Hero/Prod.nix @@ -3,14 +3,6 @@ imports = [ ]; boot.loader.grub.device = "/dev/vda"; fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; }; - - services.herocomics = { - enable = true; - port = 3000; - server = pkgs.herocomics-server; - client = pkgs.herocomics-client; - }; - networking = { firewall.allowedTCPPorts = [ 22 80 443 ]; nameservers = [ diff --git a/Hero/Server.hs b/Hero/Server.hs index bf92f88..4dc80f5 100644 --- a/Hero/Server.hs +++ b/Hero/Server.hs @@ -77,7 +77,7 @@ main = bracket startup shutdown $ uncurry Warp.run Right c -> do db <- Database.dummy say "hero" - say $ "port: " ++ show $ heroPort c + say $ "port: " ++ show (heroPort c) say $ "client: " ++ heroClient c let waiapp = app db c return (heroPort c, waiapp) -- cgit v1.2.3