summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Scherer <roman@burningswell.com>2024-09-27 11:00:27 +0200
committerLudovic Courtès <ludo@gnu.org>2024-09-28 12:55:54 +0200
commit8e5c8303a414719c19a597247674be87fd500d45 (patch)
tree74fb47877a73e88cd47a1f0072963de8d764fac1
parent73c5f1df053f34a3f0eb2bbdbe0279cd3dd9743f (diff)
gnu: iso-codes: Rename to iso-codes/pinned.
* gnu/packages/iso-codes.scm (iso-codes): Rename to… (iso-codes/pinned): … this. * doc/build.scm, gnu/installer.scm, gnu/packages/fcitx.scm, gnu/packages/fcitx5.scm, gnu/packages/gnome.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/ibus.scm, gnu/packages/kde-frameworks.scm, gnu/packages/kde-plasma.scm, gnu/packages/mate.scm, gnu/packages/photo.scm, gnu/packages/video.scm: Adjust accordingly. Change-Id: Ia98fee15a27009583fee822cf411512727b1aa27 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-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 5d9fff95179..664766a1f50 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."
1061 (bindtextdomain "guix-manual" 1061 (bindtextdomain "guix-manual"
1062 #+(guix-manual-text-domain source)) 1062 #+(guix-manual-text-domain source))
1063 (bindtextdomain "iso_639-3" ;language names 1063 (bindtextdomain "iso_639-3" ;language names
1064 #+(file-append iso-codes 1064 #+(file-append iso-codes/pinned
1065 "/share/locale")) 1065 "/share/locale"))
1066 (setenv "LANGUAGE" ,language) 1066 (setenv "LANGUAGE" ,language)
1067 (write (gettext ,str ,domain)))) 1067 (write (gettext ,str ,domain))))
@@ -1080,7 +1080,7 @@ must be the Guix top-level source directory, from which PO files are taken."
1080 (define %iso639-languages 1080 (define %iso639-languages
1081 (vector->list 1081 (vector->list
1082 (assoc-ref (call-with-input-file 1082 (assoc-ref (call-with-input-file
1083 #+(file-append iso-codes 1083 #+(file-append iso-codes/pinned
1084 "/share/iso-codes/json/iso_639-3.json") 1084 "/share/iso-codes/json/iso_639-3.json")
1085 json->scm) 1085 json->scm)
1086 "639-3"))) 1086 "639-3")))
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 3792fc7e350..53af01261eb 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -146,10 +146,10 @@ been performed at build time."
146 146
147 (let* ((supported-locales #~(supported-locales->locales 147 (let* ((supported-locales #~(supported-locales->locales
148 #+(glibc-supported-locales))) 148 #+(glibc-supported-locales)))
149 (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/")) 149 (iso-codes #~(string-append #$iso-codes/pinned "/share/iso-codes/json/"))
150 (iso639-3 #~(string-append #$iso-codes "iso_639-3.json")) 150 (iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json"))
151 (iso639-5 #~(string-append #$iso-codes "iso_639-5.json")) 151 (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json"))
152 (iso3166 #~(string-append #$iso-codes "iso_3166-1.json")) 152 (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json"))
153 (locales-file (build-compiled-file 153 (locales-file (build-compiled-file
154 locales-name 154 locales-name
155 #~`(quote ,#$supported-locales))) 155 #~`(quote ,#$supported-locales)))
@@ -437,9 +437,9 @@ purposes."
437 ;; (e.g., "French" is always displayed as "français", but 437 ;; (e.g., "French" is always displayed as "français", but
438 ;; "Belgium" could be translated to Dutch, French, or German.) 438 ;; "Belgium" could be translated to Dutch, French, or German.)
439 (bindtextdomain "iso_639-3" ;languages 439 (bindtextdomain "iso_639-3" ;languages
440 #+(file-append iso-codes "/share/locale")) 440 #+(file-append iso-codes/pinned "/share/locale"))
441 (bindtextdomain "iso_3166-1" ;territories 441 (bindtextdomain "iso_3166-1" ;territories
442 #+(file-append iso-codes "/share/locale")) 442 #+(file-append iso-codes/pinned "/share/locale"))
443 443
444 ;; Likewise for XKB keyboard layout names. 444 ;; Likewise for XKB keyboard layout names.
445 (bindtextdomain "xkeyboard-config" 445 (bindtextdomain "xkeyboard-config"
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index b21b2699265..11bf73610c0 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -206,7 +206,7 @@ by the different predictive algorithms.")
206 gtk+-2 206 gtk+-2
207 gtk+ 207 gtk+
208 icu4c 208 icu4c
209 iso-codes 209 iso-codes/pinned
210 json-c 210 json-c
211 libxkbfile 211 libxkbfile
212 libxml2 212 libxml2
@@ -245,7 +245,7 @@ built-in.")
245 ("gettext" ,gettext-minimal) 245 ("gettext" ,gettext-minimal)
246 ("gtk2" ,gtk+-2) 246 ("gtk2" ,gtk+-2)
247 ("gtk3" ,gtk+) 247 ("gtk3" ,gtk+)
248 ("iso-codes" ,iso-codes))) 248 ("iso-codes" ,iso-codes/pinned)))
249 (home-page "https://fcitx-im.org/wiki/Configtool") 249 (home-page "https://fcitx-im.org/wiki/Configtool")
250 (synopsis "Graphic Fcitx configuration tool") 250 (synopsis "Graphic Fcitx configuration tool")
251 (description 251 (description
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 4ad7fa98caa..c4c2b565db7 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -111,7 +111,7 @@ client.")
111 ("gdk-pixbuf" ,gdk-pixbuf) 111 ("gdk-pixbuf" ,gdk-pixbuf)
112 ("gettext" ,gettext-minimal) 112 ("gettext" ,gettext-minimal)
113 ("glib" ,glib) 113 ("glib" ,glib)
114 ("iso-codes" ,iso-codes) 114 ("iso-codes" ,iso-codes/pinned)
115 ("json-c" ,json-c) 115 ("json-c" ,json-c)
116 ("libevent" ,libevent) 116 ("libevent" ,libevent)
117 ("libuuid" ,util-linux "lib") 117 ("libuuid" ,util-linux "lib")
@@ -469,7 +469,7 @@ including input methods previous bundled inside Fcitx 4:
469 xkeyboard-config 469 xkeyboard-config
470 libxkbfile 470 libxkbfile
471 gettext-minimal 471 gettext-minimal
472 iso-codes)) 472 iso-codes/pinned))
473 (native-inputs 473 (native-inputs
474 (list extra-cmake-modules pkg-config)) 474 (list extra-cmake-modules pkg-config))
475 (home-page "https://github.com/fcitx/fcitx5-configtool") 475 (home-page "https://github.com/fcitx/fcitx5-configtool")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b9da31b1f19..892302f391b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1825,7 +1825,7 @@ client devices can handle.")
1825 (inputs 1825 (inputs
1826 (list gcr-3 1826 (list gcr-3
1827 (if (supported-package? gtk) gtk gtk+) 1827 (if (supported-package? gtk) gtk gtk+)
1828 iso-codes 1828 iso-codes/pinned
1829 mobile-broadband-provider-info 1829 mobile-broadband-provider-info
1830 network-manager)) 1830 network-manager))
1831 (synopsis "Network Manager's applet library") 1831 (synopsis "Network Manager's applet library")
@@ -2318,7 +2318,7 @@ offline sources, providing a centralized place for managing your contacts.")
2318 (list gsettings-desktop-schemas 2318 (list gsettings-desktop-schemas
2319 gtk 2319 gtk
2320 gtk+ 2320 gtk+
2321 iso-codes 2321 iso-codes/pinned
2322 libseccomp 2322 libseccomp
2323 libx11 2323 libx11
2324 xkeyboard-config)) 2324 xkeyboard-config))
@@ -4905,7 +4905,7 @@ GLib and GObject, and integrates JSON with GLib data types.")
4905 ;; Required by libxklavier.pc. 4905 ;; Required by libxklavier.pc.
4906 (list glib libxml2)) 4906 (list glib libxml2))
4907 (inputs 4907 (inputs
4908 (list iso-codes libxi libxkbfile xkbcomp xkeyboard-config)) 4908 (list iso-codes/pinned libxi libxkbfile xkbcomp xkeyboard-config))
4909 (home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/") 4909 (home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/")
4910 (synopsis "High-level API for X Keyboard Extension") 4910 (synopsis "High-level API for X Keyboard Extension")
4911 (description 4911 (description
@@ -7322,7 +7322,7 @@ almost all of them.")
7322 gst-plugins-base 7322 gst-plugins-base
7323 gst-plugins-good 7323 gst-plugins-good
7324 gstreamer 7324 gstreamer
7325 iso-codes 7325 iso-codes/pinned
7326 json-glib 7326 json-glib
7327 libadwaita 7327 libadwaita
7328 libarchive 7328 libarchive
@@ -9178,7 +9178,7 @@ logo='~a'~%" icon))))))
9178 gnome-session 9178 gnome-session
9179 gnome-settings-daemon 9179 gnome-settings-daemon
9180 gtk+ 9180 gtk+
9181 iso-codes 9181 iso-codes/pinned
9182 libcanberra 9182 libcanberra
9183 libgudev 9183 libgudev
9184 linux-pam 9184 linux-pam
@@ -11502,7 +11502,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
11502 (setenv "ASPELL_DICT_DIR" 11502 (setenv "ASPELL_DICT_DIR"
11503 (search-input-directory inputs "/lib/aspell"))))))) 11503 (search-input-directory inputs "/lib/aspell")))))))
11504 (inputs 11504 (inputs
11505 (list iso-codes)) 11505 (list iso-codes/pinned))
11506 (native-inputs 11506 (native-inputs
11507 (list `(,glib "bin") 11507 (list `(,glib "bin")
11508 gobject-introspection 11508 gobject-introspection
@@ -11842,7 +11842,7 @@ and uncluttered interface for the management of password databases.")
11842 gst-plugins-good 11842 gst-plugins-good
11843 gstreamer 11843 gstreamer
11844 gtk+ 11844 gtk+
11845 iso-codes 11845 iso-codes/pinned
11846 libcanberra 11846 libcanberra
11847 libdiscid 11847 libdiscid
11848 libmusicbrainz 11848 libmusicbrainz
@@ -12784,7 +12784,7 @@ non-privileged user.")
12784 gspell 12784 gspell
12785 gsound 12785 gsound
12786 gtk+ 12786 gtk+
12787 iso-codes 12787 iso-codes/pinned
12788 json-glib 12788 json-glib
12789 libcanberra 12789 libcanberra
12790 libgee 12790 libgee
@@ -13248,7 +13248,7 @@ provided there is a DBus service present:
13248 gst-plugins-good 13248 gst-plugins-good
13249 gstreamer 13249 gstreamer
13250 gtk+ 13250 gtk+
13251 iso-codes 13251 iso-codes/pinned
13252 pocketsphinx 13252 pocketsphinx
13253 pulseaudio 13253 pulseaudio
13254 sphinxbase)) 13254 sphinxbase))
@@ -13645,7 +13645,7 @@ developed with the aim of being used with the Librem 5 phone.")
13645 (build-system meson-build-system) 13645 (build-system meson-build-system)
13646 (native-inputs 13646 (native-inputs
13647 (list intltool 13647 (list intltool
13648 iso-codes 13648 iso-codes/pinned
13649 `(,glib "bin") 13649 `(,glib "bin")
13650 gnome-common 13650 gnome-common
13651 gettext-minimal 13651 gettext-minimal
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index c4791757a72..13c8734e68a 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -562,7 +562,7 @@ This package provides the core library and elements.")
562 (list alsa-lib 562 (list alsa-lib
563 cdparanoia 563 cdparanoia
564 graphene 564 graphene
565 iso-codes 565 iso-codes/pinned
566 libjpeg-turbo 566 libjpeg-turbo
567 libogg 567 libogg
568 libpng 568 libpng
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2c40d4468dc..2742427008c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1069,7 +1069,7 @@ application suites.")
1069 cups 1069 cups
1070 graphene 1070 graphene
1071 harfbuzz 1071 harfbuzz
1072 iso-codes 1072 iso-codes/pinned
1073 json-glib-minimal 1073 json-glib-minimal
1074 libxml2 1074 libxml2
1075 rest)) 1075 rest))
@@ -1361,7 +1361,7 @@ application suites.")
1361 gst-plugins-bad ;provides gstreamer-player 1361 gst-plugins-bad ;provides gstreamer-player
1362 gst-plugins-base ;provides gstreamer-gl 1362 gst-plugins-base ;provides gstreamer-gl
1363 harfbuzz 1363 harfbuzz
1364 iso-codes 1364 iso-codes/pinned
1365 json-glib 1365 json-glib
1366 libcloudproviders ;for cloud-providers support 1366 libcloudproviders ;for cloud-providers support
1367 libgudev ;for gstreamer-gl 1367 libgudev ;for gstreamer-gl
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 07f5b90f678..2f4211c385b 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -195,7 +195,7 @@
195 dconf 195 dconf
196 glib 196 glib
197 gtk+ 197 gtk+
198 iso-codes 198 iso-codes/pinned
199 json-glib 199 json-glib
200 libnotify 200 libnotify
201 libx11 201 libx11
diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index d2bace6a3c7..147cc9174b3 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
68information.") 68information.")
69 (license license:gpl2+))) ; some bits use the lgpl2 69 (license license:gpl2+))) ; some bits use the lgpl2
70 70
71(define-public iso-codes 71(define-public iso-codes/pinned
72 ;; This package should be used universally within Guix, e.g., as an input to 72 ;; This package should be used universally within Guix, e.g., as an input to
73 ;; other Guix packages or in the Guix System installer's country selector. 73 ;; other Guix packages or in the Guix System installer's country selector.
74 (hidden-package 74 (hidden-package
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 88f79615f09..974fd1c4ddd 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1129,7 +1129,7 @@ other special events for a geographical region.")
1129 (native-inputs 1129 (native-inputs
1130 (list extra-cmake-modules python-minimal tzdata-for-tests)) 1130 (list extra-cmake-modules python-minimal tzdata-for-tests))
1131 (inputs 1131 (inputs
1132 (list qtbase qtdeclarative iso-codes)) 1132 (list qtbase qtdeclarative iso-codes/pinned))
1133 (arguments 1133 (arguments
1134 (list 1134 (list
1135 #:phases 1135 #:phases
@@ -1173,7 +1173,7 @@ translation scripting.")
1173 (native-inputs 1173 (native-inputs
1174 (list extra-cmake-modules)) 1174 (list extra-cmake-modules))
1175 (inputs 1175 (inputs
1176 (list qtbase-5 qtdeclarative-5 qtscript iso-codes)))) 1176 (list qtbase-5 qtdeclarative-5 qtscript iso-codes/pinned))))
1177 1177
1178(define-public kidletime 1178(define-public kidletime
1179 (package 1179 (package
@@ -2359,7 +2359,7 @@ integrated it into your application's other widgets.")
2359 (build-system qt-build-system) 2359 (build-system qt-build-system)
2360 (native-inputs (list extra-cmake-modules 2360 (native-inputs (list extra-cmake-modules
2361 ;; for test 2361 ;; for test
2362 iso-codes)) 2362 iso-codes/pinned))
2363 (inputs (list qtdeclarative)) 2363 (inputs (list qtdeclarative))
2364 (propagated-inputs 2364 (propagated-inputs
2365 (list ;; As required by KF6ContactsConfig.cmake. 2365 (list ;; As required by KF6ContactsConfig.cmake.
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 56213bed08b..d36cfde21b0 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2051,7 +2051,7 @@ the KDE Plasma 6 desktop.")
2051 libxkbfile 2051 libxkbfile
2052 libxcursor 2052 libxcursor
2053 libxkbcommon)) 2053 libxkbcommon))
2054 (propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace)) 2054 (propagated-inputs (list iso-codes/pinned kirigami kcmutils plasma-workspace))
2055 (arguments 2055 (arguments
2056 (list #:qtbase qtbase 2056 (list #:qtbase qtbase
2057 #:phases 2057 #:phases
@@ -2726,7 +2726,7 @@ sensors, process information and other system resources.")
2726 dbus 2726 dbus
2727 fontconfig 2727 fontconfig
2728 icu4c 2728 icu4c
2729 iso-codes 2729 iso-codes/pinned
2730 plasma-activities 2730 plasma-activities
2731 plasma-activities-stats 2731 plasma-activities-stats
2732 karchive 2732 karchive
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index f83d26b26bf..ca987cca7c1 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -244,7 +244,7 @@ themes for both gtk+-2 and gtk+-3.")
244 yelp-tools 244 yelp-tools
245 gtk-doc/stable)) 245 gtk-doc/stable))
246 (inputs 246 (inputs
247 (list gtk+ libxrandr iso-codes startup-notification)) 247 (list gtk+ libxrandr iso-codes/pinned startup-notification))
248 (propagated-inputs 248 (propagated-inputs
249 (list dconf)) ; mate-desktop-2.0.pc 249 (list dconf)) ; mate-desktop-2.0.pc
250 (home-page "https://mate-desktop.org/") 250 (home-page "https://mate-desktop.org/")
@@ -1432,7 +1432,7 @@ can be used as backgrounds in the MATE Desktop environment.")
1432 gtk+ 1432 gtk+
1433 gtksourceview-4 1433 gtksourceview-4
1434 gdk-pixbuf 1434 gdk-pixbuf
1435 iso-codes 1435 iso-codes/pinned
1436 libcanberra 1436 libcanberra
1437 libx11 1437 libx11
1438 libsm 1438 libsm
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 96f5bbec50d..ec32de29902 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -598,7 +598,7 @@ photographic equipment.")
598 gsettings-desktop-schemas 598 gsettings-desktop-schemas
599 gtk+ 599 gtk+
600 imath 600 imath
601 iso-codes ;optional, for language names in the preferences 601 iso-codes/pinned ;optional, for language names in the preferences
602 json-glib 602 json-glib
603 lcms 603 lcms
604 lensfun ;optional, for the lens distortion plugin 604 lensfun ;optional, for the lens distortion plugin
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 64ac69da469..1d2ab5fbeb7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6155,7 +6155,7 @@ video from a Wayland session.")
6155 python-pycairo ; Required or else clicking on a subtitle line fails. 6155 python-pycairo ; Required or else clicking on a subtitle line fails.
6156 python-chardet ; Optional: Character encoding detection. 6156 python-chardet ; Optional: Character encoding detection.
6157 gtkspell3 ; Optional: Inline spell-checking. 6157 gtkspell3 ; Optional: Inline spell-checking.
6158 iso-codes ; Optional: Translations. 6158 iso-codes/pinned ; Optional: Translations.
6159 gstreamer 6159 gstreamer
6160 gst-libav 6160 gst-libav
6161 gst-plugins-base 6161 gst-plugins-base