6 files changed, 36 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 0a1c2c0..88b1866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 **/dist/
 **/.cabal-sandbox
 /thermoprint.sqlite
+**/.gup/
diff --git a/Gupfile b/Gupfile
new file mode 100644
index 0000000..f494843
--- /dev/null
+++ b/Gupfile
@@ -0,0 +1,4 @@
+gup/cabal2nix.sh:
+  !./default.nix
+  !./shell.nix
+  **/*.nix
\ No newline at end of file
diff --git a/all.gup b/all.gup
new file mode 100755
index 0000000..b1627cb
--- /dev/null
+++ b/all.gup
@@ -0,0 +1,16 @@
+#!/usr/bin/env zsh
+
+setopt EXTENDED_GLOB
+
+typeset -a nixFiles
+nixFiles=(**/(*~(default|shell)).nix(N))
+
+for f (${nixFiles}); do
+    [[ -e ${f:r}.cabal ]] && continue
+    nixFiles=("${(@)nixFiles:#${f}}")
+done
+
+print -l ${nixFiles} | gup --contents
+for f (${nixFiles}); do
+    gup -u ${f}
+done
diff --git a/default.nix b/default.nix
index 0aa8c9e..09e2b7b 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,12 @@
 }:
 
 rec {
-  haskellPackages = pkgs.haskell.packages."${compilerName}";
-  threepenny-gui = pkgs.haskell.lib.appendPatch haskellPackages.threepenny-gui ./threepenny.patch;
+  haskellPackages = pkgs.haskell.packages."${compilerName}".override {
+    overrides = self: super: with super; {
+      # threepenny-gui = pkgs.haskell.lib.appendPatch threepenny-gui ./threepenny.patch;
+      encoding = pkgs.haskell.lib.doJailbreak encoding;
+    };
+  };
   thermoprint-spec = haskellPackages.callPackage ./spec/thermoprint-spec.nix {};
   thermoprint-bbcode = haskellPackages.callPackage ./tp-bbcode/thermoprint-bbcode.nix {
     inherit bbcode thermoprint-spec;
@@ -19,7 +23,7 @@ rec {
     };
   };
   thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix {
-    inherit thermoprint-bbcode thermoprint-client threepenny-gui;
+    inherit thermoprint-bbcode thermoprint-client;
   };
   tprint = haskellPackages.callPackage ./tprint/tprint.nix {
     inherit thermoprint-bbcode thermoprint-client;
diff --git a/gup/cabal2nix.sh b/gup/cabal2nix.sh
new file mode 100755
index 0000000..ba23c4e
--- /dev/null
+++ b/gup/cabal2nix.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+gup -u ${2:r}.cabal
+
+cd ${2:h}
+cabal2nix ./. >! ${1}
diff --git a/shell.nix b/shell.nix
index f0a69b4..55efcc5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,13 +5,13 @@
 let
   thermoprintPackages = builtins.attrValues (import ./default.nix {});
   ghc = haskellPackages.ghcWithPackages
-    (ps: thermoprintPackages ++ utilities ps ++ testDeps ps);
+    (ps: utilities ps ++ testDeps ps);
   utilities = (ps: with ps; [ hlint cabal2nix ]);
   testDeps = (ps: with ps; [ temporary hspec ]);
 in
 pkgs.stdenv.mkDerivation rec {
   name = "thermoprint-env";
-  buildInputs = [ ghc ];
+  buildInputs = (with pkgs; [ gup ]) ++ [ ghc ];
   shellHook = ''
     eval $(egrep ^export ${ghc}/bin/ghc)
     export PROMPT_INFO="${name}"