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
ame='id' value='f814d33cbd3bd6f4a6c330ed0e93a214b887f401'/><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=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>refs</a><a class='active' href='/guix/log/tests/keys/rsa.pub'>log</a><a href='/guix/tree/tests/keys/rsa.pub?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>tree</a><a href='/guix/commit/tests/keys/rsa.pub?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>commit</a><a href='/guix/diff/tests/keys/rsa.pub?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/keys/rsa.pub'>
<input type='hidden' name='id' value='f814d33cbd3bd6f4a6c330ed0e93a214b887f401'/><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=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>root</a>/<a href='/guix/log/tests?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>tests</a>/<a href='/guix/log/tests/keys?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>keys</a>/<a href='/guix/log/tests/keys/rsa.pub?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401'>rsa.pub</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/tests/keys/rsa.pub?id=f814d33cbd3bd6f4a6c330ed0e93a214b887f401&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/tests/keys/rsa.pub?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...<span class='msg-tooltip'>The third key will be used in an upcoming commit.

Rename public keys to .pub.

* guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable.
(%ed25519-3-secret-key-file): New variable.
(%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file.
(%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file.
* tests/keys/ed25519-3.key: New file.
* tests/keys/ed25519-3.sec: New file.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Attila Lendvai</td></tr>