(address . guix-patches@gnu.org)
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
From 2bc4b7b31004642fcf300fe49f7b27ebd0353774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20M=C3=B8lgaard?= <jens@zete.tk>
Date: Thu, 6 Jun 2019 17:06:56 +1200
Subject: [PATCH] gnu: aspell.scm: Fix dictionaries with underscore/uppercase
in name.
---
gnu/packages/aspell.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
Toggle diff (48 lines)
diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 1bbe57a4ef..19b22c11eb 100644
--- 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)
- #:use-module (gnu packages perl))
+ #:use-module (gnu packages perl)
+ #:use-module (ice-9 regex))
(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
- (name (string-append "aspell-dict-" dict-name))
+ (name (string-append
+ "aspell-dict-"
+ (regexp-substitute/global
+ ;; Downcase and replace underscore in package names
+ ;; 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.")
"0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc")))
(define-public aspell-dict-pt-br
- (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.")
"1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p")))
(define-public aspell-dict-pt-pt
- (aspell-dictionary "pt-pt" "Portuguese"
+ (aspell-dictionary "pt_PT" "Portuguese"
#:version "20070510-0"
#:prefix "aspell6-"
#:sha256
--
2.21.0
-----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-----