ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-06 23:16:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix: Remove unnecessary dependencies.

Browse source 
This reverts 0fda048652, 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 <janneke@gnu.org>
Change-Id: Ia9d05c699e3cc2f9a9235a67f8ec840c26b66a82
This commit is contained in:
Ludovic Courtès 2024-08-16 19:48:24 +02:00
parent 1003d62790
commit 9af235335e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/package-management.scm
View file

@ -493,10 +493,8 @@ (define code
("automake" ,automake) ("automake" ,automake)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("graphviz" ,graphviz) ;non-minimal for PDF support ("graphviz" ,graphviz-minimal)
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot' ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
("imagemagick" ,imagemagick) ;for 'make dist'
("perl" ,perl) ;for 'make dist'
("help2man" ,help2man) ("help2man" ,help2man)
("po4a" ,po4a-minimal))) ("po4a" ,po4a-minimal)))
(inputs (inputs

16
manifest.scm
View file

@ -24,11 +24,25 @@
;; ;;
;; guix shell --pure -m manifest.scm hello ... ;; guix shell --pure -m manifest.scm hello ...
(use-modules (guix packages))
(concatenate-manifests (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. ;; Extra packages used by unit tests.
(specifications->manifest (list "gnupg")) (specifications->manifest (list "gnupg"))
;; Packages needed for 'make dist' and 'make distcheck'.
(specifications->manifest
(list "imagemagick"
"perl"))
;; Useful extras for patches submission. ;; Useful extras for patches submission.
(specifications->manifest (specifications->manifest
(list "b4" (list "b4"