From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cJvjFTB822YRWgAA62LTzQ:P1 (envelope-from ) for ; Fri, 06 Sep 2024 22:03:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cJvjFTB822YRWgAA62LTzQ (envelope-from ) for ; Sat, 07 Sep 2024 00:03:28 +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=g5754Cav; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=DbSxf7sg; 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"; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725660207; 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: content-transfer-encoding:content-transfer-encoding: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=HV0keeIkqvAjT0kBqpJOuZl2f1FihrVwrQobPdQpOKM=; b=hD/6GENsfuv3LUGeCTysR3Dl4WqZcDXu9prAaxuCN0HC8foUVag/CNESj9AlSO8n3Os+c8 umrSWn+iC9hgQp+rVuKg08PE9qoOwLZqDuEn0PKua9q5ntKWgEKOo+em+vEJTuKeFyvu3f a9qxF/GHCavQu2E3JRvAZtF4g8o3pIdVuv/FrbS6UfUTiR60EWnqqNrrVEk9UjfWwLm6y0 pzOxd9r7MHqz0NBv1YV4KLLhtCZAI9tJ7VlWke3BpU6orcbR35BuYcXxHsWzCOtAJfaXHv 6MOSqD6hIdLjFZSw+eURkkfeCVl1BGdXoLo4tI83HozpM+vXKLafIzp4Buj1VA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g5754Cav; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=DbSxf7sg; 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"; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Seal: i=2; s=key1; d=yhetil.org; t=1725660207; a=rsa-sha256; cv=fail; b=uQz6qlRTlvqCcjVSKM+vckIdS8vxQu/uaERLa9jZUGMs4UQx5mLmjzabF9/2PCvP5+IJWp 2Ubyx6PqzRV3yB4K86q68DUCZYQHzR99AKAHGEiJNz/ziIlfkJxcfHiGWuii+qSsCecthi FLzHsmzO60yw4aj3xBCXFtx9qMxjMJ9d4nPgxJ4bRqdftt1e8+yyM05eiDz/KLrZZIcDmQ 7rAcjNVb7LW6XH71sWihESS3mRvNFbYCGiCU5gKHDZF+4QLa5q/PVLs5ogqQSoRsqT3EL2 LQOogzRd4SPUaZO3JjlBqiDdKPG+Ne8eBmKsueB9lNaZKm4OWuylt/+OyzkSrQ== 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 DD8DD537C for ; Sat, 07 Sep 2024 00:03:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smh2o-0000Xs-CO; Fri, 06 Sep 2024 18:03:06 -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 1smh2l-0000XP-Iv for bug-guix@gnu.org; Fri, 06 Sep 2024 18:03:03 -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 1smh2k-0000gi-E7; Fri, 06 Sep 2024 18:03:02 -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=HV0keeIkqvAjT0kBqpJOuZl2f1FihrVwrQobPdQpOKM=; b=g5754CavSOOaYQTgeEfgqdHZOnZ8flvA4lBEUsViV+EDSJ5odOhpiHs8D+29HxeZkiScRB07oRQOaG5jagsXBWKNCiMn/I4j+HqvVAYYfApKyLsHoZc1SxdjKAhBBTYT0HN+6BiTTSEsd+VKcWgEKA26rluaQLuzIOEg0ANfb0n7KW1wPfmd3Mdey7bqstR5FX86kXjKRswBEc1FYGokf8uvZhKfO73I3vzMVBuZe3DKIgpsy3KcaC3mt+5egCYTsDwidNIuP1s2HPxXOiWA0hLIkTsAFX0JVhHuKddxLt53ec3uUzv16TObCeIdWH5coNuCsOj1gFAJf6M1AhBTYg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smh2k-0002tI-9E; Fri, 06 Sep 2024 18:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#73081: [PATCH] gnu: Add iso-codes/installer. References: <875xr8myav.fsf@elephly.net> In-Reply-To: <875xr8myav.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, bug-guix@gnu.org Resent-Date: Fri, 06 Sep 2024 22:03: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: Ricardo Wurmus , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 73081-submit@debbugs.gnu.org id=B73081.172566016311067 (code B ref 73081); Fri, 06 Sep 2024 22:03:02 +0000 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 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External 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-Spam-Score: -8.52 X-Migadu-Queue-Id: DD8DD537C X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -8.52 X-TUID: uyTGoAP027A6 * 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