aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/build.scm4
-rw-r--r--gnu/installer.scm12
-rw-r--r--gnu/packages/fcitx.scm4
-rw-r--r--gnu/packages/fcitx5.scm4
-rw-r--r--gnu/packages/gnome.scm20
-rw-r--r--gnu/packages/gstreamer.scm2
-rw-r--r--gnu/packages/gtk.scm4
-rw-r--r--gnu/packages/ibus.scm2
-rw-r--r--gnu/packages/iso-codes.scm2
-rw-r--r--gnu/packages/kde-frameworks.scm6
-rw-r--r--gnu/packages/kde-plasma.scm4
-rw-r--r--gnu/packages/mate.scm4
-rw-r--r--gnu/packages/photo.scm2
-rw-r--r--gnu/packages/video.scm2
14 files changed, 36 insertions, 36 deletions
diff --git a/doc/build.scm b/doc/build.scm
index 5d9fff9517..664766a1f5 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -1061,7 +1061,7 @@ must be the Guix top-level source directory, from which PO files are taken."
(bindtextdomain "guix-manual"
#+(guix-manual-text-domain source))
(bindtextdomain "iso_639-3" ;language names
- #+(file-append iso-codes
+ #+(file-append iso-codes/pinned
"/share/locale"))
(setenv "LANGUAGE" ,language)
(write (gettext ,str ,domain))))
@@ -1080,7 +1080,7 @@ must be the Guix top-level source directory, from which PO files are taken."
(define %iso639-languages
(vector->list
(assoc-ref (call-with-input-file
- #+(file-append iso-codes
+ #+(file-append iso-codes/pinned
"/share/iso-codes/json/iso_639-3.json")
json->scm)
"639-3")))
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 3792fc7e35..53af01261e 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -146,10 +146,10 @@ been performed at build time."
(let* ((supported-locales #~(supported-locales->locales
#+(glibc-supported-locales)))
- (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/"))
- (iso639-3 #~(string-append #$iso-codes "iso_639-3.json"))
- (iso639-5 #~(string-append #$iso-codes "iso_639-5.json"))
- (iso3166 #~(string-append #$iso-codes "iso_3166-1.json"))
+ (iso-codes #~(string-append #$iso-codes/pinned "/share/iso-codes/json/"))
+ (iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json"))
+ (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json"))
+ (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json"))
(locales-file (build-compiled-file
locales-name
#~`(quote ,#$supported-locales)))
@@ -437,9 +437,9 @@ purposes."
;; (e.g., "French" is always displayed as "français", but
;; "Belgium" could be translated to Dutch, French, or German.)
(bindtextdomain "iso_639-3" ;languages
- #+(file-append iso-codes "/share/locale"))
+ #+(file-append iso-codes/pinned "/share/locale"))
(bindtextdomain "iso_3166-1" ;territories
- #+(file-append iso-codes "/share/locale"))
+ #+(file-append iso-codes/pinned "/share/locale"))
;; Likewise for XKB keyboard layout names.
(bindtextdomain "xkeyboard-config"
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index b21b269926..11bf73610c 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -206,7 +206,7 @@ by the different predictive algorithms.")
gtk+-2
gtk+
icu4c
- iso-codes
+ iso-codes/pinned
json-c
libxkbfile
libxml2
@@ -245,7 +245,7 @@ built-in.")
("gettext" ,gettext-minimal)
("gtk2" ,gtk+-2)
("gtk3" ,gtk+)
- ("iso-codes" ,iso-codes)))
+ ("iso-codes" ,iso-codes/pinned)))
(home-page "https://fcitx-im.org/wiki/Configtool")
(synopsis "Graphic Fcitx configuration tool")
(description
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 4ad7fa98ca..c4c2b565db 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -111,7 +111,7 @@ client.")
("gdk-pixbuf" ,gdk-pixbuf)
("gettext" ,gettext-minimal)
("glib" ,glib)
- ("iso-codes" ,iso-codes)
+ ("iso-codes" ,iso-codes/pinned)
("json-c" ,json-c)
("libevent" ,libevent)
("libuuid" ,util-linux "lib")
@@ -469,7 +469,7 @@ including input methods previous bundled inside Fcitx 4:
xkeyboard-config
libxkbfile
gettext-minimal
- iso-codes))
+ iso-codes/pinned))
(native-inputs
(list extra-cmake-modules pkg-config))
(home-page "https://github.com/fcitx/fcitx5-configtool")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b9da31b1f1..892302f391 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1825,7 +1825,7 @@ client devices can handle.")
(inputs
(list gcr-3
(if (supported-package? gtk) gtk gtk+)
- iso-codes
+ iso-codes/pinned
mobile-broadband-provider-info
network-manager))
(synopsis "Network Manager's applet library")
@@ -2318,7 +2318,7 @@ offline sources, providing a centralized place for managing your contacts.")
(list gsettings-desktop-schemas
gtk
gtk+
- iso-codes
+ iso-codes/pinned
libseccomp
libx11
xkeyboard-config))
@@ -4905,7 +4905,7 @@ GLib and GObject, and integrates JSON with GLib data types.")
;; Required by libxklavier.pc.
(list glib libxml2))
(inputs
- (list iso-codes libxi libxkbfile xkbcomp xkeyboard-config))
+ (list iso-codes/pinned libxi libxkbfile xkbcomp xkeyboard-config))
(home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/")
(synopsis "High-level API for X Keyboard Extension")
(description
@@ -7322,7 +7322,7 @@ almost all of them.")
gst-plugins-base
gst-plugins-good
gstreamer
- iso-codes
+ iso-codes/pinned
json-glib
libadwaita
libarchive
@@ -9178,7 +9178,7 @@ logo='~a'~%" icon))))))
gnome-session
gnome-settings-daemon
gtk+
- iso-codes
+ iso-codes/pinned
libcanberra
libgudev
linux-pam
@@ -11502,7 +11502,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
(setenv "ASPELL_DICT_DIR"
(search-input-directory inputs "/lib/aspell")))))))
(inputs
- (list iso-codes))
+ (list iso-codes/pinned))
(native-inputs
(list `(,glib "bin")
gobject-introspection
@@ -11842,7 +11842,7 @@ and uncluttered interface for the management of password databases.")
gst-plugins-good
gstreamer
gtk+
- iso-codes
+ iso-codes/pinned
libcanberra
libdiscid
libmusicbrainz
@@ -12784,7 +12784,7 @@ non-privileged user.")
gspell
gsound
gtk+
- iso-codes
+ iso-codes/pinned
json-glib
libcanberra
libgee
@@ -13248,7 +13248,7 @@ provided there is a DBus service present:
gst-plugins-good
gstreamer
gtk+
- iso-codes
+ iso-codes/pinned
pocketsphinx
pulseaudio
sphinxbase))
@@ -13645,7 +13645,7 @@ developed with the aim of being used with the Librem 5 phone.")
(build-system meson-build-system)
(native-inputs
(list intltool
- iso-codes
+ iso-codes/pinned
`(,glib "bin")
gnome-common
gettext-minimal
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index c4791757a7..13c8734e68 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -562,7 +562,7 @@ This package provides the core library and elements.")
(list alsa-lib
cdparanoia
graphene
- iso-codes
+ iso-codes/pinned
libjpeg-turbo
libogg
libpng
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2c40d4468d..2742427008 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1069,7 +1069,7 @@ application suites.")
cups
graphene
harfbuzz
- iso-codes
+ iso-codes/pinned
json-glib-minimal
libxml2
rest))
@@ -1361,7 +1361,7 @@ application suites.")
gst-plugins-bad ;provides gstreamer-player
gst-plugins-base ;provides gstreamer-gl
harfbuzz
- iso-codes
+ iso-codes/pinned
json-glib
libcloudproviders ;for cloud-providers support
libgudev ;for gstreamer-gl
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 07f5b90f67..2f4211c385 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -195,7 +195,7 @@
dconf
glib
gtk+
- iso-codes
+ iso-codes/pinned
json-glib
libnotify
libx11
diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index d2bace6a3c..147cc9174b 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -68,7 +68,7 @@ changes in the ISO standard and will not work with outdated
information.")
(license license:gpl2+))) ; some bits use the lgpl2
-(define-public iso-codes
+(define-public iso-codes/pinned
;; This package should be used universally within Guix, e.g., as an input to
;; other Guix packages or in the Guix System installer's country selector.
(hidden-package
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 88f79615f0..974fd1c4dd 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1129,7 +1129,7 @@ other special events for a geographical region.")
(native-inputs
(list extra-cmake-modules python-minimal tzdata-for-tests))
(inputs
- (list qtbase qtdeclarative iso-codes))
+ (list qtbase qtdeclarative iso-codes/pinned))
(arguments
(list
#:phases
@@ -1173,7 +1173,7 @@ translation scripting.")
(native-inputs
(list extra-cmake-modules))
(inputs
- (list qtbase-5 qtdeclarative-5 qtscript iso-codes))))
+ (list qtbase-5 qtdeclarative-5 qtscript iso-codes/pinned))))
(define-public kidletime
(package
@@ -2359,7 +2359,7 @@ integrated it into your application's other widgets.")
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules
;; for test
- iso-codes))
+ iso-codes/pinned))
(inputs (list qtdeclarative))
(propagated-inputs
(list ;; As required by KF6ContactsConfig.cmake.
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 56213bed08..d36cfde21b 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2051,7 +2051,7 @@ the KDE Plasma 6 desktop.")
libxkbfile
libxcursor
libxkbcommon))
- (propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace))
+ (propagated-inputs (list iso-codes/pinned kirigami kcmutils plasma-workspace))
(arguments
(list #:qtbase qtbase
#:phases
@@ -2726,7 +2726,7 @@ sensors, process information and other system resources.")
dbus
fontconfig
icu4c
- iso-codes
+ iso-codes/pinned
plasma-activities
plasma-activities-stats
karchive
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index f83d26b26b..ca987cca7c 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -244,7 +244,7 @@ themes for both gtk+-2 and gtk+-3.")
yelp-tools
gtk-doc/stable))
(inputs
- (list gtk+ libxrandr iso-codes startup-notification))
+ (list gtk+ libxrandr iso-codes/pinned startup-notification))
(propagated-inputs
(list dconf)) ; mate-desktop-2.0.pc
(home-page "https://mate-desktop.org/")
@@ -1432,7 +1432,7 @@ can be used as backgrounds in the MATE Desktop environment.")
gtk+
gtksourceview-4
gdk-pixbuf
- iso-codes
+ iso-codes/pinned
libcanberra
libx11
libsm
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 96f5bbec50..ec32de2990 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -598,7 +598,7 @@ photographic equipment.")
gsettings-desktop-schemas
gtk+
imath
- iso-codes ;optional, for language names in the preferences
+ iso-codes/pinned ;optional, for language names in the preferences
json-glib
lcms
lensfun ;optional, for the lens distortion plugin
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 64ac69da46..1d2ab5fbeb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6155,7 +6155,7 @@ video from a Wayland session.")
python-pycairo ; Required or else clicking on a subtitle line fails.
python-chardet ; Optional: Character encoding detection.
gtkspell3 ; Optional: Inline spell-checking.
- iso-codes ; Optional: Translations.
+ iso-codes/pinned ; Optional: Translations.
gstreamer
gst-libav
gst-plugins-base
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-22 12:38:25 +0000