me
/
guix
Archived
1
0
Fork 0

gnu: inkscape: Rename variable to inkscape/stable and hide package.

This will allow introducing a new 'inkscape' package that can be more freely
upgraded on the main branch.

* gnu/packages/inkscape.scm (inkscape): Rename to...
(inkscape/stable): ... this, and make it a hidden package.
* gnu/packages/admin.scm (wpa-supplicant-gui)[native-inputs]: Rename inkscape
input accordingly.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/gnome-xyz.scm (arc-theme): Likewise.
* gnu/packages/python-xyz.scm (python-matplotlib-documentation): Likewise.
(python-nbconvert): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise.
master
Maxim Cournoyer 2022-07-12 15:54:59 -04:00
parent 73d7247aac
commit 023259c4bd
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
7 changed files with 203 additions and 200 deletions

View File

@ -2144,7 +2144,7 @@ command.")
(native-inputs (native-inputs
;; For icons. ;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant) (modify-inputs (package-native-inputs wpa-supplicant)
(prepend imagemagick inkscape))) (prepend imagemagick inkscape/stable)))
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir

View File

@ -506,7 +506,7 @@ the in DocBook SGML DTDs.")
texlive-generic-iftex))) texlive-generic-iftex)))
("imagemagick" ,imagemagick) ;for convert ("imagemagick" ,imagemagick) ;for convert
("inkscape" ,inkscape) ;for svg conversion ("inkscape" ,inkscape/stable) ;for svg conversion
("docbook" ,docbook-xml) ("docbook" ,docbook-xml)
("libxslt" ,libxslt))) ;for xsltproc ("libxslt" ,libxslt))) ;for xsltproc
(arguments (arguments

View File

@ -1109,7 +1109,7 @@ of windows.")
(list `(,glib "bin") ; for glib-compile-resources (list `(,glib "bin") ; for glib-compile-resources
gnome-shell gnome-shell
gtk+ gtk+
inkscape inkscape/stable
optipng optipng
pkg-config pkg-config
sassc/libsass-3.5)) sassc/libsass-3.5))

View File

@ -52,7 +52,10 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages pkg-config))
(define-public inkscape ;;; A variant of Inkscape intended to be bumped only on core-updates, to avoid
;;; rebuilding 2k+ packages through dblatex.
(define-public inkscape/stable
(hidden-package
(package (package
(name "inkscape") (name "inkscape")
(version "1.1.1") (version "1.1.1")
@ -233,4 +236,4 @@ endif()~%~%"
(description "Inkscape is a vector graphics editor. What sets Inkscape (description "Inkscape is a vector graphics editor. What sets Inkscape
apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
as the native format.") as the native format.")
(license license:gpl3+))) ;see the file COPYING (license license:gpl3+)))) ;see the file COPYING

View File

@ -6455,7 +6455,7 @@ toolkits.")
(string-append info "/matplotlib-figures")))))))) (string-append info "/matplotlib-figures"))))))))
(native-inputs (native-inputs
(list graphviz (list graphviz
inkscape inkscape/stable
python-colorspacious python-colorspacious
python-mpl-sphinx-theme python-mpl-sphinx-theme
python-scipy python-scipy
@ -13148,7 +13148,7 @@ time.")
"and not test_execute_widgets_from_nbconvert " "and not test_execute_widgets_from_nbconvert "
"and not test_execute_multiple_notebooks "))))))))) "and not test_execute_multiple_notebooks ")))))))))
(inputs (inputs
(list inkscape pandoc)) (list inkscape/stable pandoc))
(native-inputs (native-inputs
(list python-ipykernel (list python-ipykernel
;; Adding ipywidgets would create a cycle. ;; Adding ipywidgets would create a cycle.

View File

@ -862,11 +862,11 @@ on the screen.")
"backgrounds/xfce-verticals.png")) "backgrounds/xfce-verticals.png"))
#t))) #t)))
#:disallowed-references (,inkscape ,imagemagick))) #:disallowed-references (,inkscape/stable ,imagemagick)))
(native-inputs (native-inputs
(list pkg-config intltool (list pkg-config intltool
;; For our own prepare-background-image phase. ;; For our own prepare-background-image phase.
inkscape imagemagick)) inkscape/stable imagemagick))
(inputs (inputs
(list exo (list exo
garcon garcon

View File

@ -2206,7 +2206,7 @@ X server: @code{handhelds}, @code{redglass} and @code{whiteglass}.")
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke `("make" "install" ,@make-flags (apply invoke `("make" "install" ,@make-flags
"THEME_NAME=Hackneyed-Dark"))))))) "THEME_NAME=Hackneyed-Dark")))))))
(native-inputs (list imagemagick inkscape xcursorgen)) (native-inputs (list imagemagick inkscape/stable xcursorgen))
(home-page "https://gitlab.com/Enthymeme/hackneyed-x11-cursors") (home-page "https://gitlab.com/Enthymeme/hackneyed-x11-cursors")
(synopsis "Classic cursor theme for X11") (synopsis "Classic cursor theme for X11")
(description "Hackneyed is a scalable cursor theme mildly resembling old (description "Hackneyed is a scalable cursor theme mildly resembling old