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}
guix/log/gnu/services/rsync.scm'>
<input type='hidden' name='id' value='a69ba18b1ffd4c9662742e1a2292298d01c3de2d'/><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=a69ba18b1ffd4c9662742e1a2292298d01c3de2d'>root</a>/<a href='/guix/log/gnu?id=a69ba18b1ffd4c9662742e1a2292298d01c3de2d'>gnu</a>/<a href='/guix/log/gnu/services?id=a69ba18b1ffd4c9662742e1a2292298d01c3de2d'>services</a>/<a href='/guix/log/gnu/services/rsync.scm?id=a69ba18b1ffd4c9662742e1a2292298d01c3de2d'>rsync.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/services/rsync.scm?id=a69ba18b1ffd4c9662742e1a2292298d01c3de2d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-11-26 23:34:48 +0100'>2023-11-26</span></td><td><a href='/guix/commit/gnu/services/rsync.scm?id=da2dc98185526796fbfb4bc63caf9d70aead9037'>services: rsync: Provide a prettier Shepherd inetd service name.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, a default name would be used for transient inetd services,
leading to names such as #{5rjnskb6011jgmfmpgp63jp9mh9nkl20-rsync-3274}#.

* gnu/services/rsync.scm (rsync-shepherd-service): Pass #:service-name-stem.

Change-Id: I4d0a4a01e122c6eeaa85f104b083cf7e8709eac3
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-05-18 23:11:19 -0400'>2023-05-18</span></td><td><a href='/guix/commit/gnu/services/rsync.scm?id=d43d8377c741c849ca89dccb07e7d87f82ae88d5'>services: rsync: Use least authority wrapper.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/rsync.scm (rsync-shepherd-service) Wrap rsync command in a
least-authority-wrapper.

Reviewed-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-05-18 23:10:56 -0400'>2023-05-18</span></td><td><a href='/guix/commit/gnu/services/rsync.scm?id=03e601da49e43ed0235144f32095ce5f58f16275'>services: rsync: Use make-inetd-constructor.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/rsync.scm (rsync-shepherd-service): Use make-inetd-constructor
if available in start slot.
* gnu/tests/rsync.scm (run-rsync-test): Delete "PID file" test.

Reviewed-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-04-21 16:16:37 +0200'>2023-04-21</span></td><td><a href='/guix/commit/gnu/services/rsync.scm?id=70677d882276ff44bc31d39e378749b976a9ca7d'>services: rsync: Add 'configuration' action.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/rsync.scm (rsync-shepherd-service): Add 'actions' field.
</span></span></td><td>Ludovic Courtès</td></tr>