Adjust to type change of TupE in Template Haskell 2.16.

diff --git a/src/Ganeti/THH/Types.hs b/src/Ganeti/THH/Types.hs
--- a/src/Ganeti/THH/Types.hs
+++ b/src/Ganeti/THH/Types.hs
@@ -123,4 +123,11 @@ curryN n = do
   f <- newName "f"
   ps <- replicateM n (newName "x")
   return $ LamE (VarP f : map VarP ps)
-             (AppE (VarE f) (TupE $ map VarE ps))
+             (AppE (VarE f) (nonUnaryTupE $ map VarE ps))
+  where
+    nonUnaryTupE :: [Exp] -> Exp
+    nonUnaryTupE es = TupE $
+#if MIN_VERSION_template_haskell(2,16,0)
+                            map Just
+#endif
+                            es
 name='id' value='770e326fdb006b2f689f55d5eb300d28ffd6a95b'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>refs</a><a class='active' href='/guix/log/nix/libutil/hash.hh'>log</a><a href='/guix/tree/nix/libutil/hash.hh?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>tree</a><a href='/guix/commit/nix/libutil/hash.hh?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>commit</a><a href='/guix/diff/nix/libutil/hash.hh?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libutil/hash.hh'>
<input type='hidden' name='id' value='770e326fdb006b2f689f55d5eb300d28ffd6a95b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>root</a>/<a href='/guix/log/nix?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>nix</a>/<a href='/guix/log/nix/libutil?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>libutil</a>/<a href='/guix/log/nix/libutil/hash.hh?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b'>hash.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libutil/hash.hh?id=770e326fdb006b2f689f55d5eb300d28ffd6a95b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/nix/libutil/hash.hh?id=8e6c1415d87272c0221ce328715fc0dd1dd3e032'>daemon: Recognize SHA3 and BLAKE2s.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/nix/libutil/hash.hh?id=3fb6b8f30444d41963ba5bdd441123a6d2df17bd'>daemon: Map directly to gcrypt hash functions.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>