From unknown Sat Jun 21 10:38:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#73081 <73081@debbugs.gnu.org> To: bug#73081 <73081@debbugs.gnu.org> Subject: Status: installer crash: iso-codes is too old Reply-To: bug#73081 <73081@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:38:54 +0000 retitle 73081 installer crash: iso-codes is too old reassign 73081 guix submitter 73081 Ricardo Wurmus severity 73081 important thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 14:44:12 2024 Received: (at submit) by debbugs.gnu.org; 6 Sep 2024 18:44:12 +0000 Received: from localhost ([127.0.0.1]:54190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smdwK-0000Ci-Cd for submit@debbugs.gnu.org; Fri, 06 Sep 2024 14:44:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:38282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smdwG-0000CI-R6 for submit@debbugs.gnu.org; Fri, 06 Sep 2024 14:44:11 -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 1smdhT-0002Nj-Qi for bug-guix@gnu.org; Fri, 06 Sep 2024 14:28:51 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smdhS-0007A9-2j for bug-guix@gnu.org; Fri, 06 Sep 2024 14:28:51 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1725647324; cv=none; d=zohomail.com; s=zohoarc; b=XXoireWtZm/RYSOMXE9krCx5Q2ReyKkljrbXzBZb4A4yUC12edB/+KXcpbKVDazNmllq9G5XWcr3ZKIcDhtuEVOYWCyGV8lZakM+BaAqKU3Lghl+7D/6PBMMeQLMyIC/GPkmaxak8BqBI3SOmFc/jAH7M2XmUzQxYOC4avYbtr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725647324; h=Content-Type:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IrxSTBd6fsL+pNKV6ozIbQsU9kC07duT4oP62jFxp/A=; b=ZtADdbwfRkUEYdQAXbXcaDDtRghbT+r1WDdmXjQ1xKezqTOTX0DiaFLvV/lqi7R9fzcsZ5oR5RWp0AERxPiEiH3qUw6Hkb75Zr/neLImFvYQSFvK+7GDM+XI9uT9CIpk4HI9qRgrqLc8AjKhxOh0t9+5JZcz52CF8UIge32B1ds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1725647324; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To:Cc; bh=IrxSTBd6fsL+pNKV6ozIbQsU9kC07duT4oP62jFxp/A=; b=EAmWqMg/tZnGv1GL8zniXC+/PRM59UD8NJ6P29S4jc7E/NiMTcPe2Q9QAkVcdKBg PdekRCWVUNL3gq5ET8smfUhXAdMVHPRkYLvG7qta0ygtRkc5Tn4li1MjKEh9g69d+NE j0eMfTHNuniGmGzeNYUR1k/kYImnx6z/+PSWh6vs= Received: by mx.zohomail.com with SMTPS id 1725647323954631.6644305470218; Fri, 6 Sep 2024 11:28:43 -0700 (PDT) From: Ricardo Wurmus To: bug-guix@gnu.org Subject: installer crash: iso-codes is too old Date: Fri, 06 Sep 2024 20:28:40 +0200 Message-ID: <875xr8myav.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.51; envelope-from=rekado@elephly.net; helo=sender4-of-o51.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The installer crashes because the "tok" language is not included in our old version of the iso-codes package. Upgrading it to 4.16.0 should fix it, but it is unclear whether this would result in mass rebuilds. There is iso-codes/official and a derived iso-codes. GTK+ uses iso-codes/official with a note to switch to iso-codes on "core-updates". So this change would likely cause mass rebuilds via the gtk+ package. -- Ricardo From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 18:02:43 2024 Received: (at 73081) by debbugs.gnu.org; 6 Sep 2024 22:02:43 +0000 Received: from localhost ([127.0.0.1]:54317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smh2Q-0002sQ-VN for submit@debbugs.gnu.org; Fri, 06 Sep 2024 18:02:43 -0400 Received: from sender4-of-o52.zoho.com ([136.143.188.52]:21269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smh2O-0002sI-WA for 73081@debbugs.gnu.org; Fri, 06 Sep 2024 18:02:41 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1725660157; cv=none; d=zohomail.com; s=zohoarc; b=fDnyYbm1syIzncTq3HciQzPB6dSVSXAFH1S1oNberbYuyju4NTBYpA87z/nesO8429HRpQYyAvG3E0FqmjaSHSj1uRGnfx1zOpRG3lbXAjmaWEIDY1c41bRFg0AeHtmre+uBUMIYPTF40Aln+vH6zD23mzr9CnGNHU9QZzBPD0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725660157; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=HV0keeIkqvAjT0kBqpJOuZl2f1FihrVwrQobPdQpOKM=; b=O5fZU0IFsJ9KYNSTZkKnfKYUWetmM7wFi9nEiDLfy73+N18cQQX3ZfmHcGdvl7AIdOh480/zbFnghsUvUnj198PQse+l4Bdco11/RG+ehJzPeAOR+IkanKyJv9OKXOztdCtdS9YHTEUvzM9HSzhHXevWsVo2BN6QGnH8UyLl0fE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1725660157; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=HV0keeIkqvAjT0kBqpJOuZl2f1FihrVwrQobPdQpOKM=; b=DbSxf7sglJaPSriTufqiL6s3LuKnTyIPN4ALk+KPu/eednCC/4YOcGUkfDLt3Ozj hzRmRsMbOh4wvJfiiHl2I/RevHvmjew1FZhiNjQKsh/HHl/I1vWllJjcqTKxwc+Hvbz sOKj1O5OvkT5hjH7rqaSPCYyXSL0lS3pBRijOnZI= Received: by mx.zohomail.com with SMTPS id 1725660156514896.7308176252626; Fri, 6 Sep 2024 15:02:36 -0700 (PDT) From: Ricardo Wurmus To: 73081@debbugs.gnu.org Subject: [PATCH] gnu: Add iso-codes/installer. Date: Sat, 7 Sep 2024 00:01:17 +0200 Message-ID: <71c632b0e965df14ca7bf7994d43b2f97cad3d15.1725660077.git.rekado@elephly.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Josselin Poiret , Ludovic Courtès , Mathieu Othacehe Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73081 Cc: Ricardo Wurmus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/iso-codes.scm (iso-codes/installer): New variable. * gnu/installer.scm (compute-locale-step): Use it. Fixes . Change-Id: Ibc37b3972f6eda14886543b30a72d3b890455d07 Change-Id: Ia06b776e861742fb108a41317ed6df13afec9b6f --- gnu/installer.scm | 6 +++--- gnu/packages/iso-codes.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 3792fc7e35..41ac07ab9e 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -146,7 +146,7 @@ (define* (compute-locale-step #:key (let* ((supported-locales #~(supported-locales->locales #+(glibc-supported-locales))) - (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/")) + (iso-codes #~(string-append #$iso-codes/installer "/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")) @@ -437,9 +437,9 @@ (define (installer-program) ;; (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/installer "/share/locale")) (bindtextdomain "iso_3166-1" ;territories - #+(file-append iso-codes "/share/locale")) + #+(file-append iso-codes/installer "/share/locale")) ;; Likewise for XKB keyboard layout names. (bindtextdomain "xkeyboard-config" diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm index d2bace6a3c..17f093ab78 100644 --- a/gnu/packages/iso-codes.scm +++ b/gnu/packages/iso-codes.scm @@ -87,6 +87,32 @@ (define-public iso-codes (("(Taiwan), [^\"]*" _ name) name)))))) (synopsis "Various ISO standards as used by GNU@tie{}Guix")))) +(define-public iso-codes/installer + (hidden-package + (package + (inherit iso-codes/official) + (name "iso-codes") + (version "4.16.0") + (home-page "https://salsa.debian.org/iso-codes-team/iso-codes") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rh2hiivd2hl864zar3pr3yxpkizj4jj4g6c9zjflls35jk4my3a")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "." "\\.po$") + (("#.*Name for TWN,.*") "") + (("^msgid \"Taiwan, .*") "# Guix doesn't use ")) + (substitute* "data/iso_3166-1.json" + (("(Taiwan), [^\"]*" _ name) name)))))) + (synopsis "Various ISO standards as used by GNU@tie{}Guix")))) + (define-public python-iso639 (package (name "python-iso639") base-commit: 18d02443e1ec37779ee3cf63f9aaff1746bfdd8e prerequisite-patch-id: 4ffb617d91dd5b9402dbbc4b283a10ddb2e346fa prerequisite-patch-id: 71683bcfadbcfa4015533d7a9f350cc56ee0bcc9 prerequisite-patch-id: 791a04c394d72d0ebc43e256f36b87a328730021 prerequisite-patch-id: 0304eeb68533b569a1e97db280f9c3056fdbd18e prerequisite-patch-id: 62bc2f225dc341e92ccd57e6e85e820781276325 prerequisite-patch-id: 80dddd088995777720d8bd9bfbbdc624bb73558e prerequisite-patch-id: 17c1e3549ad480aa4898c41345f9fc42a31e36f8 prerequisite-patch-id: 101787b1a916da58bebc25c93c5119933dd5b342 prerequisite-patch-id: a17f97af2833018ba63ec532841ec365b88819d2 prerequisite-patch-id: d24e2e49818c64a7196123123f3799e2d6d68df6 prerequisite-patch-id: d77d6b930b595ddcf65f87eaa0017377009df33e prerequisite-patch-id: a0e9a69a85d2ba39893ce272a4154d78fd70d436 prerequisite-patch-id: 6e95fccb5adca3aa9c525205dbf8a504d9fc3011 prerequisite-patch-id: 6fc64e51903b7dc549a57a2e476f04cba38064ca prerequisite-patch-id: fc76be9d9a7c50b3c0929f1540cce53f6310ff3f prerequisite-patch-id: 3645ebc0f7c660c7f9f4484aa5cc836a32dca88b prerequisite-patch-id: 8f3115f73547fbda4c7ab8758d57093d89f5556f prerequisite-patch-id: 2945b1975128021fa547990b34444d5425bd05b0 prerequisite-patch-id: efe0e637a1b92bca3438f8f322597f55e483e3cd prerequisite-patch-id: 9a3cc330e771344f3d04bd1f8fd1b1f6e5092485 prerequisite-patch-id: 1d4b7f915798aaaa33ff1698c787a964d0520b6d prerequisite-patch-id: 79674edf84a571c3fd9f5a3d86953690e1c9bc0e prerequisite-patch-id: 14e78aa57aecec4f767a148df724589ff2e7fb47 prerequisite-patch-id: 7907c8d13571d434dcaf46d1236cba23ea9a3759 prerequisite-patch-id: 93e2ae209447710f140c0931a5bbd76e71639cea prerequisite-patch-id: f3e23be6a18c939bb8f498438f025adf101d232e prerequisite-patch-id: 07690aa820c880cd58808246e0968de89a085c67 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 14:35:58 2024 Received: (at 73081) by debbugs.gnu.org; 9 Sep 2024 18:35:58 +0000 Received: from localhost ([127.0.0.1]:34154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snjF0-0005eU-EY for submit@debbugs.gnu.org; Mon, 09 Sep 2024 14:35:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snjEy-0005eF-MT for 73081@debbugs.gnu.org; Mon, 09 Sep 2024 14:35:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snjEp-0004l4-DY; Mon, 09 Sep 2024 14:35:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=IKkStzDvKuxFypX1nQaL/TTbenHLVUI7yLMk7MCEOjQ=; b=SrYtktSmFP2q8uUvzij7 kzHBa7GtZ1L/Qcwx4wsiaOaubzb7Q74mbIWKD1PSsY4RNt/ALqm4kcE1AIhBasmLF4D8ctyECoYpY w6l0zuHFsqtHlgCXaMqoPJMSP9w7bclACEUPAvllX5XVrll2HVdcGV/EDZEMP0A4AbI+tvF9R2zvP 0tU4jZOnm39fq80pT079evR/Da8uho7hYlbUeUojg4GN/Cfq3YJwPy8hNvrkvUBtvfmyIjnXixuPj uRpAVMw8iZeIQV+viw68tnLWixEihOXDSaoQglI+lSSwb89iErAItw9GYKMnCX2Zr1BzGEPGYZYit W9/C62s4zpZhtQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Ricardo Wurmus Subject: Re: bug#73081: installer crash: iso-codes is too old In-Reply-To: <71c632b0e965df14ca7bf7994d43b2f97cad3d15.1725660077.git.rekado@elephly.net> (Ricardo Wurmus's message of "Sat, 7 Sep 2024 00:01:17 +0200") References: <875xr8myav.fsf@elephly.net> <71c632b0e965df14ca7bf7994d43b2f97cad3d15.1725660077.git.rekado@elephly.net> Date: Mon, 09 Sep 2024 20:35:43 +0200 Message-ID: <87o74wad4w.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73081 Cc: Mathieu Othacehe , Josselin Poiret , 73081@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ricardo Wurmus skribis: > * gnu/packages/iso-codes.scm (iso-codes/installer): New variable. > * gnu/installer.scm (compute-locale-step): Use it. > > Fixes . > Change-Id: Ibc37b3972f6eda14886543b30a72d3b890455d07 > > Change-Id: Ia06b776e861742fb108a41317ed6df13afec9b6f [...] > +(define-public iso-codes/installer > + (hidden-package > + (package > + (inherit iso-codes/official) Maybe rename =E2=80=98iso-codes=E2=80=99 to =E2=80=98iso-codes/pinned=E2=80= =99, rename users, and have: (define-public iso-codes (package (inherit iso-codes/pinned) =E2=80=A6)) ? > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url home-page) > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0rh2hiivd2hl864zar3pr3yxpkizj4jj4g6c9zjflls35jk4my3a")) > + (modules '((guix build utils))) > + (snippet > + '(begin > + (substitute* (find-files "." "\\.po$") > + (("#.*Name for TWN,.*") "") > + (("^msgid \"Taiwan, .*") "# Guix doesn't use ")) > + (substitute* "data/iso_3166-1.json" > + (("(Taiwan), [^\"]*" _ name) name)))))) Maybe (origin (inherit (package-source iso-codes/pinned)) =E2=80=A6) to avo= id duplicating the snippet? Apart from that, it LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 14:37:21 2024 Received: (at control) by debbugs.gnu.org; 9 Sep 2024 18:37:21 +0000 Received: from localhost ([127.0.0.1]:34159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snjGK-0005gv-VI for submit@debbugs.gnu.org; Mon, 09 Sep 2024 14:37:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snjGJ-0005gj-RM for control@debbugs.gnu.org; Mon, 09 Sep 2024 14:37:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snjG9-0004uw-LF for control@debbugs.gnu.org; Mon, 09 Sep 2024 14:37:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=VEqk9PxiKcfW0ACdfJMJsxJlnqUvjl7DE2CZpV31Vz8=; b=DBpGm3KZ7p17wB xahH8GvWbEhwfHscplZHIQFotdtLpX0lj7QqHg3KSAbqZLj4oNWDjWvkETS0lFDJ1VLCJ1Oe959di DFcFncYjgNR4OarUu2V3okNxoMeZ3zLM6II1ujVvim/pWLljgIkso5hxuYclU/t2hGMHBH3ekwS5q 2x5gsCZIikLg9P4MscRUr7HfK4wqCljvjEGOJsKS8htGTOB2z1ySVcxtYgpzomo78w/W6Prs5lBhK Pev2MtiUjhFDEkfFxGX0B0vnAnElR5Vjr7SU4IEnFi3HrzL/V1kQYn9Y1Z+iKsKn475HvLLZw7XT8 POgz2MXEB+IUcGFU440w==; Date: Mon, 09 Sep 2024 20:36:50 +0200 Message-Id: <87mskgad31.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #73081 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) severity 73081 important quit From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 08:05:33 2024 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 To: 73081@debbugs.gnu.org Subject: bug#73081: installer crash: iso-codes is too old 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73081 Cc: rekado@elephly.net, ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= 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----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 28 06:38:59 2024 Received: (at control) by debbugs.gnu.org; 28 Sep 2024 10:38:59 +0000 Received: from localhost ([127.0.0.1]:51962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suUqp-0003MU-Ab for submit@debbugs.gnu.org; Sat, 28 Sep 2024 06:38:59 -0400 Received: from tobias.gr ([80.241.217.52]:36440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suUqo-0003MN-1N for control@debbugs.gnu.org; Sat, 28 Sep 2024 06:38:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=24pieCL0wS0Vw Xj5mABUF9oZOsKQ7/H94LgCR+cx4h4=; h=references:in-reply-to:subject:to: from:date; d=tobias.gr; b=XW8ZJJDV5fLN2ApsVwy8Re5iLt9F0l9Rhyxxl1sPSXO/ RAXWllYoaI+jMkJwc24BIkak2rS3whY+Vuf3sCihlBny/j0squlDvMoEfZEC/qM/OwkGBD aqvB2wvdxW7moqZz0B5UZX/66/qvRYSpjsWG909MxjO9fIhmwmjDmjNJf7n/Fz9C3pZ6pp JXDemkKGbzR0nttgemJG+DGoZ855iqg/WlM+bGv2uaeVOCtVJSxs4A+SsKzQexyKusz7yv I4H0WwAvph2fZSbzvTrkIBxmIg0YpKy6KNqbLU+/81d9fwvBhgivFFrWXFyoQrjn+W5ST+ 5ov7wVa/6fBe/Rzv5w== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 3bf56691 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 28 Sep 2024 10:38:25 +0000 (UTC) Date: Sat, 28 Sep 2024 10:38:26 +0000 From: Tobias Geerinckx-Rice To: control@debbugs.gnu.org Subject: Re: bug#73519: Generated installation image fails to launch In-Reply-To: References: <0D8CC372-EC6D-478C-8960-C50EB819EF6B@tobias.gr> Message-ID: <3A8917E2-D8DD-4541-B22C-09DD08E9B893@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) severity 73519 important merge 73519 73081 thanks pedantic bugger From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 28 09:48:21 2024 Received: (at 73081-done) by debbugs.gnu.org; 28 Sep 2024 13:48:21 +0000 Received: from localhost ([127.0.0.1]:58335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suXo5-0007r0-33 for submit@debbugs.gnu.org; Sat, 28 Sep 2024 09:48:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suXo2-0007qd-9p for 73081-done@debbugs.gnu.org; Sat, 28 Sep 2024 09:48:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suXnS-0004sn-8O; Sat, 28 Sep 2024 09:47:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=/pLbWh64RUiywFZTdh+rsf0tVuUy5Sm5TYd24sE4LHI=; b=E5U2aJWU4NbTj5mlY2I0 OHBk/Yeck/CX7hXXug1/Fvh/32Lnv9luYG3/kVxm0QaNlG4e7YZw46wY2va3erqBXW9lSevwRk/Hd J2tkr9LP3gtiVE59l3pQk6DwUl2W18MdzlqP72p46pn0JD9mxWWwlO9DiuEbH9xiFwE9tOvuZm/xk pZeYfub4cO0l5gdnq8bfzPbno+0LF/0XkL2wrleKtcE15kKNBFCQ55gxKMNf7nDrFhzXbVUTxIaYs M4HotSmOLDBz/xmcR26IR3EcC7ZoQwoeL3rrfK5Twt3vvNWj1LRQGXgkcmSSGA9iz36H/ADeuczpb 9kTBUOujnOGWoA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Roman Scherer Subject: Re: bug#73081: installer crash: iso-codes is too old In-Reply-To: <87msjt482i.fsf@burningswell.com> (Roman Scherer's message of "Fri, 27 Sep 2024 14:03:49 +0200") References: <875xr8myav.fsf@elephly.net> <87msjt482i.fsf@burningswell.com> Date: Sat, 28 Sep 2024 15:47:34 +0200 Message-ID: <87a5frkhzd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73081-done Cc: rekado@elephly.net, 73081-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Roman, Roman Scherer skribis: > 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? Pushed: e076b8b884 installer: Use the latest =E2=80=98iso-codes=E2=80=99. 2ae666c471 gnu: Add iso-codes. 8e5c8303a4 gnu: iso-codes: Rename to iso-codes/pinned. I tweaked the commit logs and added a comment in =E2=80=98installer.scm=E2= =80=99 about the choice of the =E2=80=98iso-codes=E2=80=99 version. Thank you! Ludo=E2=80=99. From unknown Sat Jun 21 10:38:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 27 Oct 2024 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator