This patch allows the Haskell daemons to locate Python libraries
installed to a non-standard pythondir.  It is necessary because Guix
does not use versionedsharedir (see related patch that disables it).

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,6 +83,7 @@ myexeclibdir = $(pkglibdir)
 bindir = $(versiondir)/$(BINDIR)
 sbindir = $(versiondir)$(SBINDIR)
 mandir = $(versionedsharedir)/root$(MANDIR)
+pythondir = $(versionedsharedir)
 pkgpythondir = $(versionedsharedir)/ganeti
 pkgpython_rpc_stubdir = $(versionedsharedir)/ganeti/rpc/stub
 gntpythondir = $(versionedsharedir)
@@ -2386,6 +2387,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
 	    -DPKGLIBDIR="$(libdir)/ganeti" \
 	    -DSHAREDIR="$(prefix)/share/ganeti" \
 	    -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
+	    -DPYTHONDIR="$(pythondir)" \
 	    -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
 	    -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
 	    -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \
diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in
--- a/src/AutoConf.hs.in
+++ b/src/AutoConf.hs.in
@@ -157,6 +157,9 @@ sharedir = "SHAREDIR"
 versionedsharedir :: String
 versionedsharedir = "VERSIONEDSHAREDIR"
 
+pythondir :: String
+pythondir = "PYTHONDIR"
+
 drbdBarriers :: String
 drbdBarriers = "DRBD_BARRIERS"
 
diff --git a/src/Ganeti/Path.hs b/src/Ganeti/Path.hs
--- a/src/Ganeti/Path.hs
+++ b/src/Ganeti/Path.hs
@@ -188,5 +188,5 @@ getInstReasonFilename instName = instanceReasonDir `pjoin` instName
 
 -- | The path to the Python executable for starting jobs.
 jqueueExecutorPy :: IO FilePath
-jqueueExecutorPy = return $ versionedsharedir
-                            </> "ganeti" </> "jqueue" </> "exec.py"
+jqueueExecutorPy = return $ pythondir
+                           </> "ganeti" </> "jqueue" </> "exec.py"
diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs
--- a/src/Ganeti/Query/Exec.hs
+++ b/src/Ganeti/Query/Exec.hs
@@ -99,12 +99,12 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $
   do
     use_debug <- isDebugMode
     env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0")
-            . M.insert "PYTHONPATH" AC.versionedsharedir
+            . M.insert "PYTHONPATH" AC.pythondir
             . M.fromList)
            `liftM` getEnvironment
     execPy <- P.jqueueExecutorPy
     logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy
-               ++ " with PYTHONPATH=" ++ AC.versionedsharedir
+               ++ " with PYTHONPATH=" ++ AC.pythondir
 
     (master, child) <- pipeClient connectConfig
     let (rh, wh) = clientToHandle child

</th></tr>
<tr><td><span title='2024-09-16 00:16:21 +0200'>2024-09-16</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=85556e1dab5040e9f570fd2606fef563bf0bbb83'>services: admin: Support rebooting after an unattended upgrade</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (unattended-upgrade-configuration): Add reboot?
field. When truthy, unattended upgrade will stop the shepherd root service,
triggering a reboot.
* doc/guix.texi (Unattended Upgrades): Document it.

Change-Id: I0af659b3c318421b1a7baa94dde3dadacc1fa10d
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Richard Sent</td></tr>
<tr><td><span title='2023-10-24 18:51:39 +0200'>2023-10-24</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=7e4324575c80cbe3c18c26b0507776b16ba3989e'>services: admin: Export rottlog-configuration accessors.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (&lt;rottlog-configuration&gt;): Rename accessors
rottlog-rottlog to rottlog-configuration-rottlog, rottlog-rc-file to
rottlog-configuration-rc-file, rottlog-rotations to
rottlog-configuration-rotations, rottlog-jobs to rottlog-configuration-jobs.
(rottlog-etc, rottlog-jobs-or-default, rottlog-service-type): Adjust
accordingly.
</span></span></td><td>Simon Tournier</td></tr>
<tr><td><span title='2023-08-22 11:17:53 +0200'>2023-08-22</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=2274d71f94e6973df1ebc312c88b876aaa19588a'>services: file-database: Clarify 'excluded-directories' description.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (file-database-configuration)[excluded-directories]:
Mention that these are regexps.
(%default-file-database-excluded-directories): Likewise.
* doc/guix.texi (File Search Services): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-22 11:17:53 +0200'>2023-08-22</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=6fc754c2d670d49f5a843d4b36729af95cf02d18'>services: file-database: Set 'PATH' for 'updatedb'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously 'updatedb' would fail to find 'sed', 'rm', etc.

* gnu/services/admin.scm (file-database-mcron-jobs): Set PATH before
invoking 'updatedb'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-07 15:11:45 +0200'>2023-08-07</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=b3a2b3e7238161ebd86c7609f68e8f1e9c1dd6b7'>services: Add 'package-database' service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (%default-package-database-update-schedule):
New variable.
(&lt;package-database-configuration&gt;): New record type.
(package-database-mcron-jobs): New procedure.
(package-database-service-type): New variable.
* doc/guix.texi (File Search Services): Document it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-07 15:11:44 +0200'>2023-08-07</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=e63c87020d10f90d5461cec2b7f83f5d20773603'>services: Add 'file-database' service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (%default-file-database-update-schedule)
(%default-file-database-excluded-directories): New variables.
(&lt;file-database-configuration&gt;): New record type.
(file-database-mcron-jobs): New procedure.
(file-database-service-type): New variable.
* doc/guix.texi (File Search Services): New node.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-01-10 11:49:14 +0100'>2023-01-10</span></td><td><a href='/guix/commit/gnu/services/admin.scm?id=5f63811032dab5c04c397e043cc7290cb3d51ee0'>services: unattended-upgrade: Add 'operating-system-expression' field.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/admin.scm (&lt;unattended-upgrade-configuration&gt;)
[operating-system-expression]: New field.
(unattended-upgrade-mcron-jobs): Honor it.
* doc/guix.texi (Unattended Upgrades): Document it.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>