summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix2
-rw-r--r--bragi/thermoprint-server/thermoprint-server.hs2
m---------custom/thermoprint0
3 files changed, 2 insertions, 2 deletions
diff --git a/bragi.nix b/bragi.nix
index 2cb560d9..3a281263 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -34,7 +34,7 @@ in rec {
34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) 34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
35 Glob filelock; 35 Glob filelock;
36 inherit 36 inherit
37 (self.callPackage ./custom/thermoprint { inherit (self) Glob; inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) 37 (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
39 }; 39 };
40 }; 40 };
diff --git a/bragi/thermoprint-server/thermoprint-server.hs b/bragi/thermoprint-server/thermoprint-server.hs
index 5818ea4a..84d13ef1 100644
--- a/bragi/thermoprint-server/thermoprint-server.hs
+++ b/bragi/thermoprint-server/thermoprint-server.hs
@@ -20,7 +20,7 @@ import qualified Network.Wai.Handler.Warp as Warp
20type ServerM = ReaderT ConnectionPool (LoggingT IO) 20type ServerM = ReaderT ConnectionPool (LoggingT IO)
21 21
22main :: IO () 22main :: IO ()
23main = thermoprintServer True (Nat runDb) $ configure <$> def `withPrinters` printers' 23main = thermoprintServer True (NT runDb) $ configure <$> def `withPrinters` printers'
24 where 24 where
25 runDb :: ServerM a -> IO a 25 runDb :: ServerM a -> IO a
26 runDb = runStderrLoggingT . filterLogger (\_ lvl -> lvl >= LevelInfo) . withPostgresqlPool "" 5 . runReaderT 26 runDb = runStderrLoggingT . filterLogger (\_ lvl -> lvl >= LevelInfo) . withPostgresqlPool "" 5 . runReaderT
diff --git a/custom/thermoprint b/custom/thermoprint
Subproject 2ab4ee48a15da128536b27c77a224c08cd2e9b7 Subproject e8e0cb7f36641ffb7901178bc54fef98eba9215