This patch changes the default value of 'dict-dir' to correspond
to ~/.guix-profile/lib/aspell rather than $prefix/lib/aspell-X.Y.

This is not strictly necessary for the 'aspell' program itself since
one can simply set "ASPELL_CONF=dict-dir $HOME/.guix-profile/lib/aspell".
However it is necessary for applications that use libaspell since
'ASPELL_CONF' is not honored in this case.  See <https://bugs.gnu.org/25836>.

--- a/common/config.cpp
+++ b/common/config.cpp
@@ -651,7 +651,20 @@ namespace acommon {
 	  } else { // sep == '|'
 	    assert(replace[0] == '$');
 	    const char * env = getenv(replace.c_str()+1);
-	    final_str += env ? env : second;
+	    if (env) {
+	      final_str += env;
+	    } else if (second[0] == '$') {
+	      // Expand the right-hand side of '|', which starts with a
+	      // reference to an environment variable.
+	      auto slash = second.find('/');
+	      String variable = second.substr(1, slash - 1);
+	      const char * env = getenv(variable.c_str());
+	      String value = env ? String(env) : "";
+	      value += second.substr(slash, second.size() - slash);
+	      final_str += value;
+	    } else {
+	      final_str += second;
+	    }
 	  }
 	  replace = "";
 	  in_replace = false;
@@ -1349,6 +1349,9 @@ namespace acommon {
 #  define REPL     ".aspell.<lang>.prepl"
 #endif
 
+#undef DICT_DIR
+#define DICT_DIR "<$ASPELL_DICT_DIR|$HOME/.guix-profile/lib/aspell>"
+
   static const KeyInfo config_keys[] = {
     // the description should be under 50 chars
     {"actual-dict-dir", KeyInfoString, "<dict-dir^master>", 0}
t' action='/guix/log/gnu/packages/jupyter.scm'>
<input type='hidden' name='id' value='701d85c5a9b2dee3901ecd57c1a3f998a55ebae6'/><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=701d85c5a9b2dee3901ecd57c1a3f998a55ebae6'>root</a>/<a href='/guix/log/gnu?id=701d85c5a9b2dee3901ecd57c1a3f998a55ebae6'>gnu</a>/<a href='/guix/log/gnu/packages?id=701d85c5a9b2dee3901ecd57c1a3f998a55ebae6'>packages</a>/<a href='/guix/log/gnu/packages/jupyter.scm?id=701d85c5a9b2dee3901ecd57c1a3f998a55ebae6'>jupyter.scm</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/gnu/packages/jupyter.scm?id=701d85c5a9b2dee3901ecd57c1a3f998a55ebae6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-06-16 22:54:56 +0200'>2024-06-16</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=acb6cdc2990df2373707393d55da6827353862a8'>gnu: Add python-papermill.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2024-05-30 18:23:49 +0400'>2024-05-30</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=d6db4d16bd7ab7573dba1ea12cc0e894c51689a7'>gnu: Add python-comm.</a><span class='msg-avail'>...</span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2024-04-22 11:29:29 +0200'>2024-04-22</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=5ac831d81b884401b9d255804de422b9f81cfacd'>gnu: python-nbclient: Update to 0.6.6.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2024-02-06 22:48:50 +0000'>2024-02-06</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d'>gnu: python-ipydatawidgets: Fix build.</a><span class='msg-avail'>...</span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2023-10-25 16:58:40 +0200'>2023-10-25</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=617bca2ab0b4f57c65873cf3858c6387ea775ab1'>gnu: Add python-jupyterlite-sphinx.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2023-10-25 16:58:40 +0200'>2023-10-25</span></td><td><a href='/guix/commit/gnu/packages/jupyter.scm?id=1b9a0135fb54076f695178eae9f65a6567745898'>gnu: Add python-jupyterlite-core.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>