From 9ec4494121da0d1bc7485c516c428cad1c71722f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 7 Mar 2017 14:17:44 +0100
Subject: Bump thermoprint

---
 bragi.nix          | 4 +---
 custom/thermoprint | 2 +-
 hel.nix            | 5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 493c2a18..d8664321 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -33,8 +33,6 @@ in rec {
             callPackage = pkgs.lib.callPackageWith ( pkgs // self );
           in {
             trivmix = callPackage ./custom/trivmix.nix {};
-            # filelock = callPackage ./custom/filelock.nix {};
-            cabal-test-quickcheck = super.lib.doJailbreak super.cabal-test-quickcheck;
           };
         }
       );
@@ -51,7 +49,7 @@ in rec {
         '';
       };
       
-      inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint;
+      inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint;
 
       inherit (haskellPackages) trivmix;
     };
diff --git a/custom/thermoprint b/custom/thermoprint
index 75d9fe61..7065a8cc 160000
--- a/custom/thermoprint
+++ b/custom/thermoprint
@@ -1 +1 @@
-Subproject commit 75d9fe614dca572aa1d7cfa53553e9c103eb2dd0
+Subproject commit 7065a8cc1b8b01cd32d4b1d5317b323fec5238bd
diff --git a/hel.nix b/hel.nix
index e6a50da2..e81627cb 100644
--- a/hel.nix
+++ b/hel.nix
@@ -425,7 +425,10 @@
   environment.etc."sane.d/dll.conf".text = "xerox_mfp";
   environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil";
 
-  environment.sessionVariables = { "SANE_CONFIG_DIR" = "/etc/sane.d"; };
+  environment.sessionVariables = {
+    "SANE_CONFIG_DIR" = "/etc/sane.d";
+    "TPRINT_BASEURL" = "http://bragi.asgard.yggdrasil/thermoprint/api";
+  };
 
   systemd.services."kill-user@" = {
     serviceConfig = {
-- 
cgit v1.2.3