From 2090a563bdc9f707dcb985d3011c0cfc40255717 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 29 Mar 2021 12:58:42 +0200 Subject: 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 Modified-by: Maxim Cournoyer Change-Id: I04bdc94e012f3fcb30c4ec113a0ae2e9d9373210 --- gnu/packages/sphinx.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index e280c06f2b..bd84a4134d 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2024 Troy Figiel +;;; Copyright © 2021 Maxime Devos ;;; ;;; 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)) -- cgit v1.2.3