From aad26b59c48c3fcce94f7200f908f81503a1d3f9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 12 Apr 2018 15:13:13 +0200 Subject: thermoprint --- bragi.nix | 2 +- bragi/thermoprint-server/thermoprint-server.hs | 2 +- custom/thermoprint | 2 +- 3 files changed, 3 insertions(+), 3 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 { (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) Glob filelock; inherit - (self.callPackage ./custom/thermoprint { inherit (self) Glob; inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) + (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; }; }; 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 type ServerM = ReaderT ConnectionPool (LoggingT IO) main :: IO () -main = thermoprintServer True (Nat runDb) $ configure <$> def `withPrinters` printers' +main = thermoprintServer True (NT runDb) $ configure <$> def `withPrinters` printers' where runDb :: ServerM a -> IO a runDb = runStderrLoggingT . filterLogger (\_ lvl -> lvl >= LevelInfo) . withPostgresqlPool "" 5 . runReaderT diff --git a/custom/thermoprint b/custom/thermoprint index 2ab4ee48..e8e0cb7f 160000 --- a/custom/thermoprint +++ b/custom/thermoprint @@ -1 +1 @@ -Subproject commit 2ab4ee48a15da128536b27c77a224c08cd2e9b78 +Subproject commit e8e0cb7f36641ffb7901178bc54fef98eba9215c -- cgit v1.2.3