From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYlDv-0007xo-F7 for guix-patches@gnu.org; Thu, 06 Jun 2019 01:46:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYlDu-0007Wo-D0 for guix-patches@gnu.org; Thu, 06 Jun 2019 01:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYlDu-0007Wd-9H for guix-patches@gnu.org; Thu, 06 Jun 2019 01:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hYlDu-0003he-2m for guix-patches@gnu.org; Thu, 06 Jun 2019 01:46:02 -0400 Subject: [bug#36112] [PATCH] gnu: aspell.scm: Fix dictionaries with underscore/uppercase in name. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:51229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYlCt-0007q0-5h for guix-patches@gnu.org; Thu, 06 Jun 2019 01:45:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYlCr-0005l0-WF for guix-patches@gnu.org; Thu, 06 Jun 2019 01:44:59 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYlCr-0005j9-1g for guix-patches@gnu.org; Thu, 06 Jun 2019 01:44:57 -0400 From: Jens =?UTF-8?Q?M=C3=B8lgaard?= Date: Thu, 06 Jun 2019 17:44:46 +1200 Message-ID: <871s07jmi9.fsf@zete.tk> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36112@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Salut Guix! Since the same string is used to generate both the package names and source URLs of Aspell dictionaries, dictionaries pt-pt and pt-br have been producing invalid URLs. Their upstream names are pt_PT and pt_BR. This could be fixed by changing either the way package names or URLs are generated. Rather than adapting URLs to special cases, it seems more straightforward to let the dict-name string represent upstream name, and then downcase and replace underscores to produce a package name in accordance with the naming conventions. This was the simplest/easiest thing I could come up with. Do let me know if there is a smarter way! Kind regards, Jens M --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-aspell.scm-Fix-dictionaries-with-underscore-uppe.patch Content-Transfer-Encoding: quoted-printable From=202bc4b7b31004642fcf300fe49f7b27ebd0353774 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Jens=3D20M=3DC3=3DB8lgaard?=3D Date: Thu, 6 Jun 2019 17:06:56 +1200 Subject: [PATCH] gnu: aspell.scm: Fix dictionaries with underscore/uppercase in name. =2D-- gnu/packages/aspell.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 1bbe57a4ef..19b22c11eb 100644 =2D-- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -32,7 +32,8 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) =2D #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (ice-9 regex)) =20 (define-public aspell (package @@ -102,7 +103,12 @@ dictionaries, including personal ones.") (define* (aspell-dictionary dict-name full-name #:key version sha256 (prefix "aspell6-")) (package =2D (name (string-append "aspell-dict-" dict-name)) + (name (string-append + "aspell-dict-" + (regexp-substitute/global + ;; Downcase and replace underscore in package names=20 + ;; to follow Guix naming conventions. + #f "_" (string-downcase dict-name) 'pre "-" 'post))) (version version) (source (origin (method url-fetch) @@ -281,7 +287,7 @@ dictionaries, including personal ones.") "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rm= c"))) =20 (define-public aspell-dict-pt-br =2D (aspell-dictionary "pt-br" "Brazilian Portuguese" + (aspell-dictionary "pt_BR" "Brazilian Portuguese" #:version "20090702-0" #:prefix "aspell6-" #:sha256 @@ -289,7 +295,7 @@ dictionaries, including personal ones.") "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3= p"))) =20 (define-public aspell-dict-pt-pt =2D (aspell-dictionary "pt-pt" "Portuguese" + (aspell-dictionary "pt_PT" "Portuguese" #:version "20070510-0" #:prefix "aspell6-" #:sha256 =2D-=20 2.21.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE/VzWzPUn4Rzyui0RiZ866GcCScAFAlz4qE4ACgkQiZ866GcC ScC61w/+IX+zRPBrUAmKl18l3MtbL4ZEKfI534H2xQBMcLzFSAVlJZRrdvejzLJH NgG1EE3jPX8TushD4t2pd1dvo2vfUV+PoMaCKdAMZP1yRaXOTzGc5iuc3KwLtUxF g6W6wZfEMFHrUmgsQ7bKW4mfJowGz2dP/NVrj06UmHiCxtj9+NEJdDcwZ5Yn2RY0 i3ZokR7eVz0ZfGu+FPwkadOkKnGnT9WNzUXsNLLD8fmxIjowm9HWXzBND5xjnJHt lgZnf0OH4vuzsr1lA0roXL5+IrHSdQtzLbqGPfJ47lRs+oJXq76lA0AAAnX6h+Ww V7rJoSFEH/viinA0tmNbNiFNN9oPeAyNPJsWWz9FpCqLyxGNj6rGnChNlAEemFF1 PBPtCN9UQYHTKJsB3g+evQPJHk0nCfN0I2qUkSLi+Om36RYdhBWGY52gmUMaWef+ /7zP6PbcFWNSKvRrqLknfR8ZvgKewrXkHZoU5bA+6yVRtCyvaQi8TOR/Lk3wGyS0 2T6ZZ6iArS9pxm+sD0vzfEHGFNlVyXVed59PkyaFPTQ0mNmt3ckTcBmqA0TyCGMK v447pOIec833XTTflKUVbMID9346YdREgeOL8V1MHOLttRl3t7vHqOGCiLpaGZV0 Jw7SkVgJJZLpkmiSa1aSpNV+jG0LbdtI43AN1ajrTLM0sJyQg1Y= =p2Ie -----END PGP SIGNATURE----- --==-=-=--