From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EKYtMKCf9mY8xAAA62LTzQ:P1 (envelope-from ) for ; Fri, 27 Sep 2024 12:05:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EKYtMKCf9mY8xAAA62LTzQ (envelope-from ) for ; Fri, 27 Sep 2024 14:05:52 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="XyWH/XWK"; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20230601.gappssmtp.com header.s=20230601 header.b=zoOVDLjs; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727438752; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=YClXbof2lJdyLjjhJGeulgcdyG1xyX/JcHecQ2p7pmc=; b=Y1BcPIAEbf110UsMjroqP/6ZhfWzaJpWF9PIlwYtWjl+iU6UCVaPh7F0sOb2USC34Hpjb0 S0ScKpCAn8agkfBmwGMHHwWfAaWe3lqFphW5mqK64HASMmUXnftvy4tcLjST0tllTt0VKF I7YmaRGoVtfXWudox6n+jL0OSOx/Qhh4CZp7bi3FdErJikWqiTdszjNbrQqKPqoeWRMnOa 7MTFs12cSIygwbA8/ehSk3PNWcwnJv/I2wUAPkgEpjaBweN6sSJUeSYyhRyWDuuKx9NI7e ss9yZV0R3uwq17XZwWwjah+Sk9r3VKHL029YSc6thOTIu4yl7p2zW235qdwboA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727438752; a=rsa-sha256; cv=none; b=tMtYtWyl35j9ZeLqrzXtVKKIoKpK5NEZxhznM4bp70SLM5yMkh+nZ/WvJgHs5cXeBYFdOj KSal4a4lg7DATHyjFHv4hem5V1v2x5pX5G8avwrvJj9K9hIkMyUwsMZO9uotRDj36UsjCj Tje5Ud/xR2MzCttGD7rLrmHQ3ConLY7sLpaoLAQwU53yjUrrZ3qc2keKUMUxbGPQbiZL+E 94R5Fy+VWay8kyE6B7wIVNOlXJou7aSltEXl3ycEzZ+ZdMgwpN4yAHUYmx0dk8WN/YwXWe i9OBNevZfuzIf6IbOc7J4CpNk9Lr4PEZZlW/TjiuTkZyU55FPMHQCM8AkZYYHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="XyWH/XWK"; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20230601.gappssmtp.com header.s=20230601 header.b=zoOVDLjs; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 426EB693E7 for ; Fri, 27 Sep 2024 14:05:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1su9j7-0002iy-JD; Fri, 27 Sep 2024 08:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1su9j4-0002iW-U0 for bug-guix@gnu.org; Fri, 27 Sep 2024 08:05:35 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1su9j4-0000lj-4q for bug-guix@gnu.org; Fri, 27 Sep 2024 08:05:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=YClXbof2lJdyLjjhJGeulgcdyG1xyX/JcHecQ2p7pmc=; b=XyWH/XWKShDaORqHqJZHN3JBudlJ3MADL00qw4QZwf9n4b+GKGbr0eioK7PU5k74uMPZKUT9KLvqxsHrceIhSTNuuuO79Sk+TcxtJGJeca4U8LXB5mKAo89itpxjPJEm/UPDA+W/yxsgHmmFHvL9e5922fqYd4LBV6aF/fqkB6FK0kicto24tM/Rj/dnGa7QQWqfMd9e4EnafCGA3aq3AARJqnIlAxhksvU92ECLrj2Un1Lb83+1LpETN8VvxNRiX9+sb5YYzN4p76VA8JfZ2dutGrzKjCdqst886Bw3g7z7hNXPY2uHasylGpWi/2PvYaRlNCML4jQpeIM/mqG/Tg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1su9jW-0005SL-B6 for bug-guix@gnu.org; Fri, 27 Sep 2024 08:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#73081: installer crash: iso-codes is too old References: <875xr8myav.fsf@elephly.net> In-Reply-To: <875xr8myav.fsf@elephly.net> Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 27 Sep 2024 12:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73081 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 73081@debbugs.gnu.org Cc: rekado@elephly.net, ludo@gnu.org Received: via spool by 73081-submit@debbugs.gnu.org id=B73081.172743873320449 (code B ref 73081); Fri, 27 Sep 2024 12:06:02 +0000 Received: (at 73081) by debbugs.gnu.org; 27 Sep 2024 12:05:33 +0000 Received: from localhost ([127.0.0.1]:56110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1su9j1-0005JE-Rb for submit@debbugs.gnu.org; Fri, 27 Sep 2024 08:05:32 -0400 Received: from mail-ed1-f51.google.com ([209.85.208.51]:60682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1su9iy-0005Io-Gh for 73081@debbugs.gnu.org; Fri, 27 Sep 2024 08:05:30 -0400 Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5c5bca59416so2163633a12.1 for <73081@debbugs.gnu.org>; Fri, 27 Sep 2024 05:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1727438634; x=1728043434; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=YClXbof2lJdyLjjhJGeulgcdyG1xyX/JcHecQ2p7pmc=; b=zoOVDLjsSq3WPsucjh4Dxw/YIAIF2T6alFCg7MDRIS1AmTxGcsHPU/3tLaoAUdzNri Y0snNJ4U5/95epz2t1+L4CEGdgNUKTYeJfieX6qgD3NQZqTnh5Zpc3Z2fosx2gUu9oqq 6DZLoqXSZ3Kz9XkwEfHw4hy8OtnTrJFDK4WVAgOW7HPUbKWuxadjh26JtMjVGO3XmXri Vsf6pSfjQq05PWGwZ3qP5OhwKSxrc30ENzUloiiVcgpX7RyEojff7pG6cyVGiCFdIJ+t ATJxMkypWDdtPeDRS+AoIOFcyBKun0tTXpwaIklN29IoJ586+xn4mVDIXBxAlYUbv5RY 0/VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727438634; x=1728043434; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=YClXbof2lJdyLjjhJGeulgcdyG1xyX/JcHecQ2p7pmc=; b=T2ddPFonXiUhlA/N9O2Bmd+Ux6h1BIwW2TR93W1l4nMVKaxlcbqsw0qzQX3q7VNqdv k6fl27+kBkE4Qyp+5DSxhwhipPjEzVT2Iph2AjRMbOhWUSYT2jGzslb8VYcQdPJrk0eV vA4N4NjQ5DwD/Y5LiG4g7zbV37k5HxxgKls1vlwgS1OvU3pmNRZiS99N26PEVp1Z3kHR jeNlynwli0+YQPEuMhbbfuJ+WdvQXDP6EE0xXzFpERV7iGJexxI8pDuB4T6vaLw+khh5 3UtUVxbJOYipdwO2DMtMHz0BWB9xnXCBP8aRP0pMOa7dG1ChvftNv5a0LtaAr4aDIC9y q2yw== X-Gm-Message-State: AOJu0YxlM6F3/SsB3P+TAj4nrka3tu1pReJHqSu54nMNoKRDGbQ1g6/o NV24bI50uJ+X62epLh+lJ050wROt1q+69HL/fXHdwbM/pGihKwHs8bdpUrcIx/IWcZA8JB/m2xa W X-Google-Smtp-Source: AGHT+IGCJe42GJX6Jpxna7ZMoKbDdq0pl9HQx7uzwrKQQNRffz1q3aJKbeotBTd0uIecCpsRROGwMQ== X-Received: by 2002:a05:6402:390a:b0:5c7:1f16:7f77 with SMTP id 4fb4d7f45d1cf-5c882602d68mr1973578a12.27.1727438633426; Fri, 27 Sep 2024 05:03:53 -0700 (PDT) Received: from precision (tmo-087-65.customers.d1-online.com. [80.187.87.65]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c8831c9055sm953191a12.31.2024.09.27.05.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 05:03:52 -0700 (PDT) From: Roman Scherer Date: Fri, 27 Sep 2024 14:03:49 +0200 Message-ID: <87msjt482i.fsf@burningswell.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.71 X-Spam-Score: -6.71 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: 426EB693E7 X-TUID: 5wtvSVDKRu8v --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi Ricardo and Ludo, I tried to address the comments mentioned by Ludo and tested them by booting into the installer. It seems to work now. I don't see it crashing anymore. Please find the patches attached to this mail. Could you please review them, and if ok merge them? Thanks, Roman. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-iso-codes-Rename-to-iso-codes-pinned.patch Content-Transfer-Encoding: quoted-printable From=207fefef83a062a97d7c41e3e0d145abd9d5b1101b Mon Sep 17 00:00:00 2001 Message-ID: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman@= burningswell.com> From: Roman Scherer Date: Fri, 27 Sep 2024 11:00:27 +0200 Subject: [PATCH 1/3] gnu: iso-codes: Rename to iso-codes/pinned. * 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/iso-codes.scm * gnu/packages/kde-frameworks.scm * gnu/packages/kde-plasma.scm * gnu/packages/mate.scm * gnu/packages/photo.scm * gnu/packages/video.scm Change-Id: Ia98fee15a27009583fee822cf411512727b1aa27 =2D-- doc/build.scm | 4 ++-- gnu/installer.scm | 12 ++++++------ gnu/packages/fcitx.scm | 4 ++-- gnu/packages/fcitx5.scm | 4 ++-- gnu/packages/gnome.scm | 20 ++++++++++---------- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 4 ++-- gnu/packages/ibus.scm | 2 +- gnu/packages/iso-codes.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-plasma.scm | 4 ++-- gnu/packages/mate.scm | 4 ++-- gnu/packages/photo.scm | 2 +- gnu/packages/video.scm | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 5d9fff9517..664766a1f5 100644 =2D-- a/doc/build.scm +++ b/doc/build.scm @@ -1061,7 +1061,7 @@ (define* (localization-helper-module source (bindtextdomain "guix-manual" #+(guix-manual-text-domain source)) (bindtextdomain "iso_639-3" ;language names =2D #+(file-append iso-codes + #+(file-append iso-codes/pinned "/share/locale")) (setenv "LANGUAGE" ,language) (write (gettext ,str ,domain)))) @@ -1080,7 +1080,7 @@ (define* (localization-helper-module source (define %iso639-languages (vector->list (assoc-ref (call-with-input-file =2D #+(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 =2D-- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -146,10 +146,10 @@ (define* (compute-locale-step #:key =20 (let* ((supported-locales #~(supported-locales->locales #+(glibc-supported-locales))) =2D (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/= ")) =2D (iso639-3 #~(string-append #$iso-codes "iso_639-3.json")) =2D (iso639-5 #~(string-append #$iso-codes "iso_639-5.json")) =2D (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-program) ;; (e.g., "French" is always displayed as "fran=C3=A7ais", but ;; "Belgium" could be translated to Dutch, French, or German.) (bindtextdomain "iso_639-3" ;languages =2D #+(file-append iso-codes "/share/locale")) + #+(file-append iso-codes/pinned "/share/locale= ")) (bindtextdomain "iso_3166-1" ;territories =2D #+(file-append iso-codes "/share/locale")) + #+(file-append iso-codes/pinned "/share/locale= ")) =20 ;; 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 =2D-- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -206,7 +206,7 @@ (define-public fcitx gtk+-2 gtk+ icu4c =2D 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+) =2D ("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 =2D-- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -111,7 +111,7 @@ (define-public fcitx5 ("gdk-pixbuf" ,gdk-pixbuf) ("gettext" ,gettext-minimal) ("glib" ,glib) =2D ("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 =2D 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 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1825,7 +1825,7 @@ (define-public libnma (inputs (list gcr-3 (if (supported-package? gtk) gtk gtk+) =2D 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+ =2D iso-codes + iso-codes/pinned libseccomp libx11 xkeyboard-config)) @@ -4905,7 +4905,7 @@ (define-public libxklavier ;; Required by libxklavier.pc. (list glib libxml2)) (inputs =2D (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 =2D iso-codes + iso-codes/pinned json-glib libadwaita libarchive @@ -9178,7 +9178,7 @@ (define-public gdm gnome-session gnome-settings-daemon gtk+ =2D 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 =2D (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+ =2D iso-codes + iso-codes/pinned libcanberra libdiscid libmusicbrainz @@ -12784,7 +12784,7 @@ (define-public geary gspell gsound gtk+ =2D iso-codes + iso-codes/pinned json-glib libcanberra libgee @@ -13248,7 +13248,7 @@ (define-public parlatype gst-plugins-good gstreamer gtk+ =2D iso-codes + iso-codes/pinned pocketsphinx pulseaudio sphinxbase)) @@ -13645,7 +13645,7 @@ (define-public libgda (build-system meson-build-system) (native-inputs (list intltool =2D 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 =2D-- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -562,7 +562,7 @@ (define-public gst-plugins-base (list alsa-lib cdparanoia graphene =2D 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 =2D-- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1069,7 +1069,7 @@ (define-public gtk+ cups graphene harfbuzz =2D 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 =2D 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 =2D-- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -195,7 +195,7 @@ (define-public ibus-minimal dconf glib gtk+ =2D 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 =2D-- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -68,7 +68,7 @@ (define-public iso-codes/official information.") (license license:gpl2+))) ; some bits use the lgpl2 =20 =2D(define-public iso-codes +(define-public iso-codes/pinned ;; This package should be used universally within Guix, e.g., as an inpu= t to ;; other Guix packages or in the Guix System installer's country selecto= r. (hidden-package diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.= scm index 88f79615f0..974fd1c4dd 100644 =2D-- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1129,7 +1129,7 @@ (define-public ki18n (native-inputs (list extra-cmake-modules python-minimal tzdata-for-tests)) (inputs =2D (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 =2D (list qtbase-5 qtdeclarative-5 qtscript iso-codes)))) + (list qtbase-5 qtdeclarative-5 qtscript iso-codes/pinned)))) =20 (define-public kidletime (package @@ -2359,7 +2359,7 @@ (define-public kcontacts (build-system qt-build-system) (native-inputs (list extra-cmake-modules ;; for test =2D 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 =2D-- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -2051,7 +2051,7 @@ (define-public plasma-desktop libxkbfile libxcursor libxkbcommon)) =2D (propagated-inputs (list iso-codes kirigami kcmutils plasma-workspac= e)) + (propagated-inputs (list iso-codes/pinned kirigami kcmutils plasma-wor= kspace)) (arguments (list #:qtbase qtbase #:phases @@ -2726,7 +2726,7 @@ (define-public plasma-workspace dbus fontconfig icu4c =2D 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 =2D-- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -244,7 +244,7 @@ (define-public mate-desktop yelp-tools gtk-doc/stable)) (inputs =2D (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 =2D iso-codes + iso-codes/pinned libcanberra libx11 libsm diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 96f5bbec50..ec32de2990 100644 =2D-- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -598,7 +598,7 @@ (define-public darktable gsettings-desktop-schemas gtk+ imath =2D iso-codes ;optional, for language names in the prefe= rences + iso-codes/pinned ;optional, for language names in the = preferences json-glib lcms lensfun ;optional, for the lens distortion pl= ugin diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 64ac69da46..1d2ab5fbeb 100644 =2D-- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6155,7 +6155,7 @@ (define-public gaupol python-pycairo ; Required or else clicking on a subtitle line f= ails. python-chardet ; Optional: Character encoding detection. gtkspell3 ; Optional: Inline spell-checking. =2D iso-codes ; Optional: Translations. + iso-codes/pinned ; Optional: Translations. gstreamer gst-libav gst-plugins-base base-commit: e6a771c7baf9662b4c9832045ad86c8b92b46bb3 =2D-=20 2.46.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-Add-iso-codes.patch Content-Transfer-Encoding: quoted-printable From=206c651fbaef76daa87b01c37a3a119b7bbfbb3917 Mon Sep 17 00:00:00 2001 Message-ID: <6c651fbaef76daa87b01c37a3a119b7bbfbb3917.1727437710.git.roman@= burningswell.com> In-Reply-To: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman= @burningswell.com> References: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman@= burningswell.com> From: Roman Scherer Date: Fri, 27 Sep 2024 11:14:02 +0200 Subject: [PATCH 2/3] gnu: Add iso-codes. * gnu/packages/iso-codes.scm (iso-codes): New variable. Change-Id: I2d945a2daf98d111c04a3c30f0779e39644a5e2e =2D-- gnu/packages/iso-codes.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm index 147cc9174b..8c51777dda 100644 =2D-- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -87,6 +87,20 @@ (define-public iso-codes/pinned (("(Taiwan), [^\"]*" _ name) name)))))) (synopsis "Various ISO standards as used by GNU@tie{}Guix")))) =20 +(define-public iso-codes + (package + (inherit iso-codes/pinned) + (version "4.17.0") + (source (origin + (inherit (package-source iso-codes/pinned)) + (uri (git-reference + (url (package-home-page iso-codes/pinned)) + (commit (string-append "v" version)))) + (file-name (git-file-name (package-name iso-codes/pinned) ve= rsion)) + (sha256 + (base32 + "0a77b9aid68vakhsa3l3lx2jav5q9fp7vn50mwmzkr2lkr2l4k41"))))= )) + (define-public python-iso639 (package (name "python-iso639") =2D-=20 2.46.0 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-installer-Use-iso-codes.patch Content-Transfer-Encoding: quoted-printable From=20ba1046d61eecd9d88483e5730bec4c0e23e96bc9 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman= @burningswell.com> References: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman@= burningswell.com> From: Roman Scherer Date: Fri, 27 Sep 2024 11:14:44 +0200 Subject: [PATCH 3/3] gnu: installer: Use iso-codes. * gnu/installer.scm (compute-locale-step): Use Use iso-codes. Change-Id: I9a69f7accee965cf5deb2c1b23ce3fda579d465a =2D-- gnu/installer.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 53af01261e..3792fc7e35 100644 =2D-- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -146,10 +146,10 @@ (define* (compute-locale-step #:key =20 (let* ((supported-locales #~(supported-locales->locales #+(glibc-supported-locales))) =2D (iso-codes #~(string-append #$iso-codes/pinned "/share/iso-code= s/json/")) =2D (iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json")) =2D (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json")) =2D (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json")) + (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")) (locales-file (build-compiled-file locales-name #~`(quote ,#$supported-locales))) @@ -437,9 +437,9 @@ (define (installer-program) ;; (e.g., "French" is always displayed as "fran=C3=A7ais", but ;; "Belgium" could be translated to Dutch, French, or German.) (bindtextdomain "iso_639-3" ;languages =2D #+(file-append iso-codes/pinned "/share/loca= le")) + #+(file-append iso-codes "/share/locale")) (bindtextdomain "iso_3166-1" ;territories =2D #+(file-append iso-codes/pinned "/share/loca= le")) + #+(file-append iso-codes "/share/locale")) =20 ;; Likewise for XKB keyboard layout names. (bindtextdomain "xkeyboard-config" =2D-=20 2.46.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFTBAEBCAA9FiEE0iajOdjfRIFd3gygPdpSUn0qwZkFAmb2nyUfHHJvbWFuLnNj aGVyZXJAYnVybmluZ3N3ZWxsLmNvbQAKCRA92lJSfSrBma7ECADP+5r25U+RjDa1 uDa5clOR3lV649lrKDMyBZQgZbEZjC71M7Yrl05CEUrNicTzi/kpPIMDEow0fsAf JBfqdjXiwTbQ8PKik87kO4DakEBg2mLsthLwXnu2gfwu6lKoS//hvbO3Hv5hvwFX jqdtUva2G1p0ldMEVJHB3tsaF4XUU3DZy0n1ryvPPsPrZe2h7UVsKo/N4+mm7C70 5NJd9mx+bnqeMKERLgN/aKVBcmXh251JMwpV9q9bNU7ZUr5oMHjhUD1jmEmXf5Kv uLHnAsoZcOFqN3a6WnnyfBuPb0BW/Bga4Vqn/YCFhuS7FEAxuG2GJK4ojnBJC92O nZsDVqJZ =gvmP -----END PGP SIGNATURE----- --==-=-=--