From 9af235335e8f8baf7f434a76570a954999231879 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Aug 2024 19:48:24 +0200 Subject: gnu: guix: Remove unnecessary dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts 0fda0486523d67c2c464386c07a0c2800d8d8c20, instead moving the dependencies needed for ‘make dist’ to ‘manifest.scm’. Removing this extra dependencies make it simpler to build the ‘guix’ package in particular on less-capable systems like i586-gnu. * gnu/packages/package-management.scm (guix)[native-inputs]: Remove IMAGEMAGICK and PERL. Use GRAPHVIZ-MINIMAL instead of GRAPHVIZ. * manifest.scm: Use the full-blown ‘graphviz’ package; add ‘imagemagick’ and ‘perl’. Reported-by: Janneke Nieuwenhuizen Change-Id: Ia9d05c699e3cc2f9a9235a67f8ec840c26b66a82 --- manifest.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'manifest.scm') diff --git a/manifest.scm b/manifest.scm index 7e4d82c3a5..27e1d62566 100644 --- a/manifest.scm +++ b/manifest.scm @@ -24,11 +24,25 @@ ;; ;; guix shell --pure -m manifest.scm hello ... +(use-modules (guix packages)) + (concatenate-manifests - (list (package->development-manifest (specification->package "guix")) + (list (package->development-manifest + (let ((guix (specification->package "guix"))) + (package/inherit guix + ;; Replace with non-minimal Graphviz for PDF support. + (native-inputs (modify-inputs (package-native-inputs guix) + (replace "graphviz" + (specification->package "graphviz"))))))) + ;; Extra packages used by unit tests. (specifications->manifest (list "gnupg")) + ;; Packages needed for 'make dist' and 'make distcheck'. + (specifications->manifest + (list "imagemagick" + "perl")) + ;; Useful extras for patches submission. (specifications->manifest (list "b4" -- cgit v1.2.3