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

gnu: iso-codes: Rename to iso-codes/pinned.

Browse source 
* 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>
This commit is contained in:
Roman Scherer 2024-09-27 11:00:27 +02:00 committed by Ludovic Courtès
parent 73c5f1df05
commit 8e5c8303a4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
14 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/build.scm
View file

@ -1061,7 +1061,7 @@ (define exp
(bindtextdomain "guix-manual" (bindtextdomain "guix-manual"
#+(guix-manual-text-domain source)) #+(guix-manual-text-domain source))
(bindtextdomain "iso_639-3" ;language names (bindtextdomain "iso_639-3" ;language names
#+(file-append iso-codes #+(file-append iso-codes/pinned
"/share/locale")) "/share/locale"))
(setenv "LANGUAGE" ,language) (setenv "LANGUAGE" ,language)
(write (gettext ,str ,domain)))) (write (gettext ,str ,domain))))
@ -1080,7 +1080,7 @@ (define exp
(define %iso639-languages (define %iso639-languages
(vector->list (vector->list
(assoc-ref (call-with-input-file (assoc-ref (call-with-input-file
#+(file-append iso-codes #+(file-append iso-codes/pinned
"/share/iso-codes/json/iso_639-3.json") "/share/iso-codes/json/iso_639-3.json")
json->scm) json->scm)
"639-3"))) "639-3")))

12
gnu/installer.scm
View file

@ -146,10 +146,10 @@ (define (compiled-file-loader file name)
(let* ((supported-locales #~(supported-locales->locales (let* ((supported-locales #~(supported-locales->locales
#+(glibc-supported-locales))) #+(glibc-supported-locales)))
(iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/")) (iso-codes #~(string-append #$iso-codes/pinned "/share/iso-codes/json/"))
(iso639-3 #~(string-append #$iso-codes "iso_639-3.json")) (iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json"))
(iso639-5 #~(string-append #$iso-codes "iso_639-5.json")) (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json"))
(iso3166 #~(string-append #$iso-codes "iso_3166-1.json")) (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json"))
(locales-file (build-compiled-file (locales-file (build-compiled-file
locales-name locales-name
#~`(quote ,#$supported-locales))) #~`(quote ,#$supported-locales)))
@ -437,9 +437,9 @@ (define installer-builder
;; (e.g., "French" is always displayed as "français", but ;; (e.g., "French" is always displayed as "français", but
;; "Belgium" could be translated to Dutch, French, or German.) ;; "Belgium" could be translated to Dutch, French, or German.)
(bindtextdomain "iso_639-3" ;languages (bindtextdomain "iso_639-3" ;languages
#+(file-append iso-codes "/share/locale")) #+(file-append iso-codes/pinned "/share/locale"))
(bindtextdomain "iso_3166-1" ;territories (bindtextdomain "iso_3166-1" ;territories
#+(file-append iso-codes "/share/locale")) #+(file-append iso-codes/pinned "/share/locale"))
;; Likewise for XKB keyboard layout names. ;; Likewise for XKB keyboard layout names.
(bindtextdomain "xkeyboard-config" (bindtextdomain "xkeyboard-config"

4
gnu/packages/fcitx.scm
View file

@ -206,7 +206,7 @@ (define-public fcitx
gtk+-2 gtk+-2
gtk+ gtk+
icu4c icu4c
iso-codes iso-codes/pinned
json-c json-c
libxkbfile libxkbfile
libxml2 libxml2
@ -245,7 +245,7 @@ (define-public fcitx-configtool
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("gtk2" ,gtk+-2) ("gtk2" ,gtk+-2)
("gtk3" ,gtk+) ("gtk3" ,gtk+)
("iso-codes" ,iso-codes))) ("iso-codes" ,iso-codes/pinned)))
(home-page "https://fcitx-im.org/wiki/Configtool") (home-page "https://fcitx-im.org/wiki/Configtool")
(synopsis "Graphic Fcitx configuration tool") (synopsis "Graphic Fcitx configuration tool")
(description (description

4
gnu/packages/fcitx5.scm
View file

@ -111,7 +111,7 @@ (define-public fcitx5
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib" ,glib) ("glib" ,glib)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes/pinned)
("json-c" ,json-c) ("json-c" ,json-c)
("libevent" ,libevent) ("libevent" ,libevent)
("libuuid" ,util-linux "lib") ("libuuid" ,util-linux "lib")
@ -469,7 +469,7 @@ (define-public fcitx5-configtool
xkeyboard-config xkeyboard-config
libxkbfile libxkbfile
gettext-minimal gettext-minimal
iso-codes)) iso-codes/pinned))
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config)) (list extra-cmake-modules pkg-config))
(home-page "https://github.com/fcitx/fcitx5-configtool") (home-page "https://github.com/fcitx/fcitx5-configtool")

20
gnu/packages/gnome.scm
View file

@ -1825,7 +1825,7 @@ (define-public libnma
(inputs (inputs
(list gcr-3 (list gcr-3
(if (supported-package? gtk) gtk gtk+) (if (supported-package? gtk) gtk gtk+)
iso-codes iso-codes/pinned
mobile-broadband-provider-info mobile-broadband-provider-info
network-manager)) network-manager))
(synopsis "Network Manager's applet library") (synopsis "Network Manager's applet library")
@ -2318,7 +2318,7 @@ (define-public gnome-desktop
(list gsettings-desktop-schemas (list gsettings-desktop-schemas
gtk gtk
gtk+ gtk+
iso-codes iso-codes/pinned
libseccomp libseccomp
libx11 libx11
xkeyboard-config)) xkeyboard-config))
@ -4905,7 +4905,7 @@ (define-public libxklavier
;; Required by libxklavier.pc. ;; Required by libxklavier.pc.
(list glib libxml2)) (list glib libxml2))
(inputs (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/") (home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/")
(synopsis "High-level API for X Keyboard Extension") (synopsis "High-level API for X Keyboard Extension")
(description (description
@ -7322,7 +7322,7 @@ (define-public epiphany
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good
gstreamer gstreamer
iso-codes iso-codes/pinned
json-glib json-glib
libadwaita libadwaita
libarchive libarchive
@ -9178,7 +9178,7 @@ (define-public gdm
gnome-session gnome-session
gnome-settings-daemon gnome-settings-daemon
gtk+ gtk+
iso-codes iso-codes/pinned
libcanberra libcanberra
libgudev libgudev
linux-pam linux-pam
@ -11502,7 +11502,7 @@ (define-public gspell
(setenv "ASPELL_DICT_DIR" (setenv "ASPELL_DICT_DIR"
(search-input-directory inputs "/lib/aspell"))))))) (search-input-directory inputs "/lib/aspell")))))))
(inputs (inputs
(list iso-codes)) (list iso-codes/pinned))
(native-inputs (native-inputs
(list `(,glib "bin") (list `(,glib "bin")
gobject-introspection gobject-introspection
@ -11842,7 +11842,7 @@ (define-public sound-juicer
gst-plugins-good gst-plugins-good
gstreamer gstreamer
gtk+ gtk+
iso-codes iso-codes/pinned
libcanberra libcanberra
libdiscid libdiscid
libmusicbrainz libmusicbrainz
@ -12784,7 +12784,7 @@ (define-public geary
gspell gspell
gsound gsound
gtk+ gtk+
iso-codes iso-codes/pinned
json-glib json-glib
libcanberra libcanberra
libgee libgee
@ -13248,7 +13248,7 @@ (define-public parlatype
gst-plugins-good gst-plugins-good
gstreamer gstreamer
gtk+ gtk+
iso-codes iso-codes/pinned
pocketsphinx pocketsphinx
pulseaudio pulseaudio
sphinxbase)) sphinxbase))
@ -13645,7 +13645,7 @@ (define-public libgda
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list intltool (list intltool
iso-codes iso-codes/pinned
`(,glib "bin") `(,glib "bin")
gnome-common gnome-common
gettext-minimal gettext-minimal

2
gnu/packages/gstreamer.scm
View file

@ -562,7 +562,7 @@ (define-public gst-plugins-base
(list alsa-lib (list alsa-lib
cdparanoia cdparanoia
graphene graphene
iso-codes iso-codes/pinned
libjpeg-turbo libjpeg-turbo
libogg libogg
libpng libpng

4
gnu/packages/gtk.scm
View file

@ -1069,7 +1069,7 @@ (define-public gtk+
cups cups
graphene graphene
harfbuzz harfbuzz
iso-codes iso-codes/pinned
json-glib-minimal json-glib-minimal
libxml2 libxml2
rest)) rest))
@ -1361,7 +1361,7 @@ (define-public gtk
gst-plugins-bad ;provides gstreamer-player gst-plugins-bad ;provides gstreamer-player
gst-plugins-base ;provides gstreamer-gl gst-plugins-base ;provides gstreamer-gl
harfbuzz harfbuzz
iso-codes iso-codes/pinned
json-glib json-glib
libcloudproviders ;for cloud-providers support libcloudproviders ;for cloud-providers support
libgudev ;for gstreamer-gl libgudev ;for gstreamer-gl

2
gnu/packages/ibus.scm
View file

@ -195,7 +195,7 @@ (define-public ibus-minimal
dconf dconf
glib glib
gtk+ gtk+
iso-codes iso-codes/pinned
json-glib json-glib
libnotify libnotify
libx11 libx11

2
gnu/packages/iso-codes.scm
View file

@ -68,7 +68,7 @@ (define-public iso-codes/official
information.") information.")
(license license:gpl2+))) ; some bits use the lgpl2 (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 ;; 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. ;; other Guix packages or in the Guix System installer's country selector.
(hidden-package (hidden-package

6
gnu/packages/kde-frameworks.scm
View file

@ -1129,7 +1129,7 @@ (define-public ki18n
(native-inputs (native-inputs
(list extra-cmake-modules python-minimal tzdata-for-tests)) (list extra-cmake-modules python-minimal tzdata-for-tests))
(inputs (inputs
(list qtbase qtdeclarative iso-codes)) (list qtbase qtdeclarative iso-codes/pinned))
(arguments (arguments
(list (list
#:phases #:phases
@ -1173,7 +1173,7 @@ (define-public ki18n-5
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
(inputs (inputs
(list qtbase-5 qtdeclarative-5 qtscript iso-codes)))) (list qtbase-5 qtdeclarative-5 qtscript iso-codes/pinned))))
(define-public kidletime (define-public kidletime
(package (package
@ -2359,7 +2359,7 @@ (define-public kcontacts
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (list extra-cmake-modules (native-inputs (list extra-cmake-modules
;; for test ;; for test
iso-codes)) iso-codes/pinned))
(inputs (list qtdeclarative)) (inputs (list qtdeclarative))
(propagated-inputs (propagated-inputs
(list ;; As required by KF6ContactsConfig.cmake. (list ;; As required by KF6ContactsConfig.cmake.

4
gnu/packages/kde-plasma.scm
View file

@ -2051,7 +2051,7 @@ (define-public plasma-desktop
libxkbfile libxkbfile
libxcursor libxcursor
libxkbcommon)) libxkbcommon))
(propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace)) (propagated-inputs (list iso-codes/pinned kirigami kcmutils plasma-workspace))
(arguments (arguments
(list #:qtbase qtbase (list #:qtbase qtbase
#:phases #:phases
@ -2726,7 +2726,7 @@ (define-public plasma-workspace
dbus dbus
fontconfig fontconfig
icu4c icu4c
iso-codes iso-codes/pinned
plasma-activities plasma-activities
plasma-activities-stats plasma-activities-stats
karchive karchive

4
gnu/packages/mate.scm
View file

@ -244,7 +244,7 @@ (define-public mate-desktop
yelp-tools yelp-tools
gtk-doc/stable)) gtk-doc/stable))
(inputs (inputs
(list gtk+ libxrandr iso-codes startup-notification)) (list gtk+ libxrandr iso-codes/pinned startup-notification))
(propagated-inputs (propagated-inputs
(list dconf)) ; mate-desktop-2.0.pc (list dconf)) ; mate-desktop-2.0.pc
(home-page "https://mate-desktop.org/") (home-page "https://mate-desktop.org/")
@ -1432,7 +1432,7 @@ (define-public pluma
gtk+ gtk+
gtksourceview-4 gtksourceview-4
gdk-pixbuf gdk-pixbuf
iso-codes iso-codes/pinned
libcanberra libcanberra
libx11 libx11
libsm libsm

2
gnu/packages/photo.scm
View file

@ -598,7 +598,7 @@ (define-public darktable
gsettings-desktop-schemas gsettings-desktop-schemas
gtk+ gtk+
imath imath
iso-codes ;optional, for language names in the preferences iso-codes/pinned ;optional, for language names in the preferences
json-glib json-glib
lcms lcms
lensfun ;optional, for the lens distortion plugin lensfun ;optional, for the lens distortion plugin

2
gnu/packages/video.scm
View file

@ -6155,7 +6155,7 @@ (define-public gaupol
python-pycairo ; Required or else clicking on a subtitle line fails. python-pycairo ; Required or else clicking on a subtitle line fails.
python-chardet ; Optional: Character encoding detection. python-chardet ; Optional: Character encoding detection.
gtkspell3 ; Optional: Inline spell-checking. gtkspell3 ; Optional: Inline spell-checking.
iso-codes ; Optional: Translations. iso-codes/pinned ; Optional: Translations.
gstreamer gstreamer
gst-libav gst-libav
gst-plugins-base gst-plugins-base