summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix4
m---------custom/thermoprint0
-rw-r--r--hel.nix5
3 files changed, 5 insertions, 4 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 {
33 callPackage = pkgs.lib.callPackageWith ( pkgs // self ); 33 callPackage = pkgs.lib.callPackageWith ( pkgs // self );
34 in { 34 in {
35 trivmix = callPackage ./custom/trivmix.nix {}; 35 trivmix = callPackage ./custom/trivmix.nix {};
36 # filelock = callPackage ./custom/filelock.nix {};
37 cabal-test-quickcheck = super.lib.doJailbreak super.cabal-test-quickcheck;
38 }; 36 };
39 } 37 }
40 ); 38 );
@@ -51,7 +49,7 @@ in rec {
51 ''; 49 '';
52 }; 50 };
53 51
54 inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint; 52 inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint;
55 53
56 inherit (haskellPackages) trivmix; 54 inherit (haskellPackages) trivmix;
57 }; 55 };
diff --git a/custom/thermoprint b/custom/thermoprint
Subproject 75d9fe614dca572aa1d7cfa53553e9c103eb2dd Subproject 7065a8cc1b8b01cd32d4b1d5317b323fec5238b
diff --git a/hel.nix b/hel.nix
index e6a50da2..e81627cb 100644
--- a/hel.nix
+++ b/hel.nix
@@ -425,7 +425,10 @@
425 environment.etc."sane.d/dll.conf".text = "xerox_mfp"; 425 environment.etc."sane.d/dll.conf".text = "xerox_mfp";
426 environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; 426 environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil";
427 427
428 environment.sessionVariables = { "SANE_CONFIG_DIR" = "/etc/sane.d"; }; 428 environment.sessionVariables = {
429 "SANE_CONFIG_DIR" = "/etc/sane.d";
430 "TPRINT_BASEURL" = "http://bragi.asgard.yggdrasil/thermoprint/api";
431 };
429 432
430 systemd.services."kill-user@" = { 433 systemd.services."kill-user@" = {
431 serviceConfig = { 434 serviceConfig = {