From cb66411484eeb7b8423c31336275c5a70e4f57a8 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 29 Mar 2021 12:58:42 +0200 Subject: [PATCH 04/10] 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]<#:phases>: Suggest using #:disallowed-references to make sure no references to imagemagick are retained, but don't do that yet to avoid rebuilds. [native-inputs]: Use 'imagemagick/stable' instead of 'imagemagick' and explain why that's a safe thing to do. --- gnu/packages/sphinx.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index e85e4a0f7e..b3c5384f30 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Eric Bavier +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,7 +63,13 @@ "0023vc2i29pjxmvdqbz1wdbi7gbj56y1br1b2z8h8wa44li5k38y")))) (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). + ;; + ;; TODO: uncomment this line on the next package update. + ;; #:disallowed-references (,imagemagick/stable) + #:phases (modify-phases %standard-phases (replace 'check (lambda _ @@ -92,7 +99,11 @@ ,python-sphinxcontrib-serializinghtml))) (native-inputs `(("graphviz" ,graphviz) - ("imagemagick" ,imagemagick) ;for "convert" + ;; 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. + ("imagemagick" ,imagemagick/stable) ("python-html5lib" ,python-html5lib) ("python-mock" ,python-mock) ("python-nose" ,python-nose) -- 2.31.1