2 files changed, 10 insertions, 11 deletions

diff --git a/bragi.nix b/bragi.nix
index f0817580..bb31a2c5 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -33,6 +33,7 @@ in rec {
             callPackage = pkgs.lib.callPackageWith ( pkgs // self );
           in {
             trivmix = callPackage ./custom/trivmix {};
+            inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
           };
         }
       );
@@ -41,9 +42,7 @@ in rec {
 
       mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-      inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint;
-
-      inherit (haskellPackages) trivmix;
+      inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
     };
 
   nixpkgs.config.allowUnfree = true;
diff --git a/bragi/bar/generated.nix b/bragi/bar/generated.nix
index 4243ad4d..8049f6fa 100644
--- a/bragi/bar/generated.nix
+++ b/bragi/bar/generated.nix
@@ -4,17 +4,17 @@
 , fetchgit, file-embed, hjsmin, http-conduit, lens, monad-control
 , monad-logger, mtl, persistent, persistent-postgresql
 , persistent-template, safe, shakespeare, stdenv, template-haskell
-, text, time, unordered-containers, vector, wai, wai-extra
-, wai-logger, warp, yaml, yesod, yesod-auth, yesod-core, yesod-form
-, yesod-static
+, text, thermoprint-client, time, unordered-containers, vector, wai
+, wai-extra, wai-logger, warp, yaml, yesod, yesod-auth, yesod-core
+, yesod-form, yesod-static
 }:
 mkDerivation {
   pname = "bar";
   version = "0.0.0";
   src = fetchgit {
     url = "git://git.yggdrasil.li/gkleen/pub/bar";
-    sha256 = "13h5hxwx4y79jr19l894zq4ynvkmhfds52xm8dlsdl5j69gg7laa";
-    rev = "53fcf55c02f9335518c28d26429913258fc28f87";
+    sha256 = "1chxdwya3vzflvvf8drxki5895i670c0wjssj3y8cx36z329mn22";
+    rev = "7bc954b779a9bc4e1c5e60f2648101c62ed22e72";
   };
   isLibrary = true;
   isExecutable = true;
@@ -24,9 +24,9 @@ mkDerivation {
     data-default directory fast-logger file-embed hjsmin http-conduit
     lens monad-control monad-logger mtl persistent
     persistent-postgresql persistent-template safe shakespeare
-    template-haskell text time unordered-containers vector wai
-    wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
-    yesod-form yesod-static
+    template-haskell text thermoprint-client time unordered-containers
+    vector wai wai-extra wai-logger warp yaml yesod yesod-auth
+    yesod-core yesod-form yesod-static
   ];
   executableHaskellDepends = [ base ];
   doHaddock = false;