~ruther/guix-local: gnu: sphinx: Use 'imagemagick/stable' variant.

2090a563bdc9f707dcb985d3011c0cfc40255717 — Maxime Devos 5 years ago f9b0499

gnu: sphinx: Use 'imagemagick/stable' variant.

As the store item does not retain a reference to imagemagick,
it should be safe to use the 'imagemagick/stable' variant.

* gnu/packages/sphinx.scm (python-sphinx)
[arguments] Add #:disallowed-references to make sure no references to
imagemagick are retained.
[native-inputs]: Use 'imagemagick/stable' instead of 'imagemagick' and explain
why that's a safe thing to do.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I04bdc94e012f3fcb30c4ec113a0ae2e9d9373210

patch browse .tar.gz

1 files changed, 10 insertions(+), 2 deletions(-)

M gnu/packages/sphinx.scm

M gnu/packages/sphinx.scm => gnu/packages/sphinx.scm +10 -2

@@ 19,6 19,7 @@
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 75,7 76,10 @@
          "12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms"))))
     (build-system python-build-system)
     (arguments
-     '(#:phases
+     `(;; Make sure it is safe to use 'imagemagick' instead of
+       ;; 'imagemagick/stable' (see the comment for the "imagemagick" input).
+       #:disallowed-references (,imagemagick/stable)
+       #:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)


@@ 135,7 139,11 @@
            texlive-wrapfig
            texlive-xcolor))
     (native-inputs
-     (list imagemagick                  ;for "convert"
+     ;; imagemagick is added for "convert".  The store item does not retain a
+     ;; reference to imagemagick, so it should be safe to use
+     ;; 'imagemagick/stable' instead of 'imagemagick'.  This is enforced by
+     ;; the '#:disallowed-references' above.
+     (list imagemagick/stable
            python-cython
            python-html5lib
            python-pytest))