bug#40029: Preventing automatic python2 transformation of some packages

["Ludovic Courtès" <ludo@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

Hi!

Marius Bakke <mbakke@fastmail.com> skribis:

> 'python2-sphinx' is obsolete and increasingly a maintenance burden,
> because we need to keep special versions around just to make it build.
>
> The only reason we have this package is because it gets pulled in
> automatically when using (package-with-python2 ...) on a Python 3
> package that has 'python-sphinx' in inputs.

What about this evil hack?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 582 bytes --]

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 323d5b4457..66306e97fc 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -99,7 +99,7 @@
 for Python projects or other documents consisting of multiple reStructuredText
 sources.")
     (license license:bsd-2)
-    (properties `((python2-variant . ,(delay python2-sphinx))))))
+    (properties `((python2-variant . ,(delay python-sphinx))))))
 
 ;; Sphinx 2 does not support Python 2, so we stick with this older version here.
 ;; Remove this package once python2-pbcore no longer requires it.

[-- Attachment #3: Type: text/plain, Size: 144 bytes --]


The effect should be that ‘package-with-python2’ always keeps
‘python-sphinx’ unchanged.  (It’s a double-edge sword.)

Ludo’.