summaryrefslogtreecommitdiff
path: root/bragi.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-07 14:17:44 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-07 14:17:44 +0100
commit9ec4494121da0d1bc7485c516c428cad1c71722f (patch)
tree9071ebe608d7ff7c15044cbb41737b9ed5677b51 /bragi.nix
parent45cfb08af3e7c66a711dfd82d0c934075bd5c394 (diff)
downloadnixos-9ec4494121da0d1bc7485c516c428cad1c71722f.tar
nixos-9ec4494121da0d1bc7485c516c428cad1c71722f.tar.gz
nixos-9ec4494121da0d1bc7485c516c428cad1c71722f.tar.bz2
nixos-9ec4494121da0d1bc7485c516c428cad1c71722f.tar.xz
nixos-9ec4494121da0d1bc7485c516c428cad1c71722f.zip
Bump thermoprint
Diffstat (limited to 'bragi.nix')
-rw-r--r--bragi.nix4
1 files changed, 1 insertions, 3 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 };