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>
This commit is contained in:
Roman Scherer
Ludovic Courtès
parent
73c5f1df05
commit
8e5c8303a4
@ -1061,7 +1061,7 @@ (define exp
|
||||
(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 @@ (define exp
|
||||
(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")))
|
||||
|
||||
@ -146,10 +146,10 @@ (define (compiled-file-loader file name)
|
||||
|
||||
(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 @@ (define installer-builder
|
||||
;; (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"
|
||||
|
||||
@ -206,7 +206,7 @@ (define-public fcitx
|
||||
gtk+-2
|
||||
gtk+
|
||||
icu4c
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
json-c
|
||||
libxkbfile
|
||||
libxml2
|
||||
@ -245,7 +245,7 @@ (define-public fcitx-configtool
|
||||
("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
|
||||
|
||||
@ -111,7 +111,7 @@ (define-public fcitx5
|
||||
("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 @@ (define-public fcitx5-configtool
|
||||
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")
|
||||
|
||||
@ -1825,7 +1825,7 @@ (define-public libnma
|
||||
(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 @@ (define-public gnome-desktop
|
||||
(list gsettings-desktop-schemas
|
||||
gtk
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
libseccomp
|
||||
libx11
|
||||
xkeyboard-config))
|
||||
@ -4905,7 +4905,7 @@ (define-public libxklavier
|
||||
;; 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 @@ (define-public epiphany
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gstreamer
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
json-glib
|
||||
libadwaita
|
||||
libarchive
|
||||
@ -9178,7 +9178,7 @@ (define-public gdm
|
||||
gnome-session
|
||||
gnome-settings-daemon
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
libcanberra
|
||||
libgudev
|
||||
linux-pam
|
||||
@ -11502,7 +11502,7 @@ (define-public gspell
|
||||
(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 @@ (define-public sound-juicer
|
||||
gst-plugins-good
|
||||
gstreamer
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
libcanberra
|
||||
libdiscid
|
||||
libmusicbrainz
|
||||
@ -12784,7 +12784,7 @@ (define-public geary
|
||||
gspell
|
||||
gsound
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
json-glib
|
||||
libcanberra
|
||||
libgee
|
||||
@ -13248,7 +13248,7 @@ (define-public parlatype
|
||||
gst-plugins-good
|
||||
gstreamer
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
pocketsphinx
|
||||
pulseaudio
|
||||
sphinxbase))
|
||||
@ -13645,7 +13645,7 @@ (define-public libgda
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list intltool
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
`(,glib "bin")
|
||||
gnome-common
|
||||
gettext-minimal
|
||||
|
||||
@ -562,7 +562,7 @@ (define-public gst-plugins-base
|
||||
(list alsa-lib
|
||||
cdparanoia
|
||||
graphene
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
libjpeg-turbo
|
||||
libogg
|
||||
libpng
|
||||
|
||||
@ -1069,7 +1069,7 @@ (define-public gtk+
|
||||
cups
|
||||
graphene
|
||||
harfbuzz
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
json-glib-minimal
|
||||
libxml2
|
||||
rest))
|
||||
@ -1361,7 +1361,7 @@ (define-public gtk
|
||||
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
|
||||
|
||||
@ -195,7 +195,7 @@ (define-public ibus-minimal
|
||||
dconf
|
||||
glib
|
||||
gtk+
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
json-glib
|
||||
libnotify
|
||||
libx11
|
||||
|
||||
@ -68,7 +68,7 @@ (define-public iso-codes/official
|
||||
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
|
||||
|
||||
@ -1129,7 +1129,7 @@ (define-public ki18n
|
||||
(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 @@ (define-public ki18n-5
|
||||
(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 @@ (define-public kcontacts
|
||||
(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.
|
||||
|
||||
@ -2051,7 +2051,7 @@ (define-public plasma-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 @@ (define-public plasma-workspace
|
||||
dbus
|
||||
fontconfig
|
||||
icu4c
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
plasma-activities
|
||||
plasma-activities-stats
|
||||
karchive
|
||||
|
||||
@ -244,7 +244,7 @@ (define-public mate-desktop
|
||||
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 @@ (define-public pluma
|
||||
gtk+
|
||||
gtksourceview-4
|
||||
gdk-pixbuf
|
||||
iso-codes
|
||||
iso-codes/pinned
|
||||
libcanberra
|
||||
libx11
|
||||
libsm
|
||||
|
||||
@ -598,7 +598,7 @@ (define-public darktable
|
||||
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
|
||||
|
||||
@ -6155,7 +6155,7 @@ (define-public gaupol
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user