apteryx pushed a commit to branch elogind-updates
in repository guix.
commit 1b389da95f0ce7c9819a53c2aa2624620c9cd101
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Mar 24 00:17:11 2025 +0900
gnu: inkscape/stable: Rename variable to inkscape/pinned.
This is to match recently established conventions.
Automated via:
git grep -l inkscape/stable |
xargs sed -i 's,inkscape/stable,inkscape/pinned,'
Change-Id: If74bf91b1da0d2ca8cf25c6038b4c2100262873e
---
gnu/packages/admin.scm | 2 +-
gnu/packages/docbook.scm | 2 +-
gnu/packages/gnome-xyz.scm | 2 +-
gnu/packages/inkscape.scm | 16 ++++++++--------
gnu/packages/python-xyz.scm | 4 ++--
gnu/packages/xfce.scm | 4 ++--
gnu/packages/xorg.scm | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 584298f31b..46d01eed93 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2593,7 +2593,7 @@ command.")
;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant)
(prepend imagemagick/stable
- inkscape/stable)))
+ inkscape/pinned)))
(build-system qt-build-system)
(arguments
(list
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 990e0a38fd..f68bf639cf 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -797,7 +797,7 @@ DB2LaTeX.")
(package/inherit dblatex
(inputs (modify-inputs (package-inputs dblatex)
(replace "imagemagick" imagemagick/stable)
- (replace "inkscape" inkscape/stable))))))
+ (replace "inkscape" inkscape/pinned))))))
(define-public docbook-utils
(package
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index ebd9bcf45c..1fe79b7a9f 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -1336,7 +1336,7 @@ bar of the GNOME Shell.")
(list `(,glib "bin") ; for glib-compile-resources
gnome-shell
gtk+
- inkscape/stable
+ inkscape/pinned
optipng
pkg-config
python
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 13e1652f87..3354aaaab5 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -62,7 +62,7 @@
;;; A variant of Inkscape intended to be bumped only on core-updates, to avoid
;;; rebuilding 2k+ packages through dblatex. It should only be used as a
;;; native-input since it might not receive timely security updates.
-(define-public inkscape/stable
+(define-public inkscape/pinned
(hidden-package
(package
(name "inkscape")
@@ -336,12 +336,12 @@ as the native format.")
(define-public inkscape
(package
- (inherit inkscape/stable)
+ (inherit inkscape/pinned)
(name "inkscape")
(version "1.3.2")
(source
(origin
- (inherit (package-source inkscape/stable))
+ (inherit (package-source inkscape/pinned))
(method url-fetch)
(uri (string-append "https://media.inkscape.org/dl/";
"resources/file/"
@@ -350,7 +350,7 @@ as the native format.")
(base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv"))))
(build-system cmake-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments inkscape/stable)
+ (substitute-keyword-arguments (package-arguments inkscape/pinned)
((#:configure-flags flags ''())
;; Enable ImageMagick support.
#~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags))
@@ -359,7 +359,7 @@ as the native format.")
#$@(if (target-x86-32?)
#~() ;XXX: there are remaining failures on i686
#~((replace 'check
- ;; Re-instate the tests disabled in inkscape/stable,
now that
+ ;; Re-instate the tests disabled in inkscape/pinned,
now that
;; their ImageMagick requirement is satisfied.
(assoc-ref %standard-phases 'check))))
@@ -373,10 +373,10 @@ as the native format.")
;; its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
- (inputs (modify-inputs (package-inputs inkscape/stable)
+ (inputs (modify-inputs (package-inputs inkscape/pinned)
(append imagemagick))) ;for libMagickCore and libMagickWand
(native-inputs
- (modify-inputs (package-native-inputs inkscape/stable)
+ (modify-inputs (package-native-inputs inkscape/pinned)
;; Only use 1 imagemagick across the package build.
(replace "imagemagick" imagemagick)))
- (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
+ (properties (alist-delete 'hidden? (package-properties inkscape/pinned)))))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index dd5648a9d5..030268c8f7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10885,7 +10885,7 @@ toolkits.")
(string-append info "/matplotlib-figures"))))))))
(native-inputs
(list graphviz
- inkscape/stable
+ inkscape/pinned
python-colorspacious
python-ipython
python-ipywidgets
@@ -19242,7 +19242,7 @@ time.")
;; Tests need a writable HOME.
(setenv "HOME" "/tmp"))))))
(inputs
- (list inkscape/stable pandoc))
+ (list inkscape/pinned pandoc))
(native-inputs
(list python-flaky
python-hatchling
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7e17f2497b..85ab03ae75 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1158,11 +1158,11 @@ window manager.")
"backgrounds/xfce-verticals.svg"))
#t)))
- #:disallowed-references (,inkscape/stable ,imagemagick)))
+ #:disallowed-references (,inkscape/pinned ,imagemagick)))
(native-inputs
(list xfce4-dev-tools
;; For our own ‘prepare-background-image’ phase.
- inkscape/stable imagemagick))
+ inkscape/pinned imagemagick))
(inputs
(list exo
garcon
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c7c60e738f..0f03055309 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2345,7 +2345,7 @@ X server: @code{handhelds}, @code{redglass} and
@code{whiteglass}.")
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke `("make" "install" ,@make-flags
"THEME_NAME=Hackneyed-Dark")))))))
- (native-inputs (list imagemagick inkscape/stable xcursorgen))
+ (native-inputs (list imagemagick inkscape/pinned xcursorgen))
(home-page "https://gitlab.com/Enthymeme/hackneyed-x11-cursors";)
(synopsis "Classic cursor theme for X11")
(description "Hackneyed is a scalable cursor theme mildly resembling old
