22/94: gnu: readline: Add a version parameter to patch procedures.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit f7511ff1109868d215f5668d8e07e539ef77bd7b
Author: Marius Bakke <address@hidden>
Date:   Sat Nov 30 03:33:56 2019 +0100

    gnu: readline: Add a version parameter to patch procedures.
    
    * gnu/packages/readline.scm (patch-url, readline-patch, patch-series): Add
    VERSION parameter.
    (%patch-series-7.0): Pass "7.0" to PATCH-SERIES.
---
 gnu/packages/readline.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 57d550d..1304bb8 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -30,22 +30,24 @@
   #:use-module (guix utils)
   #:use-module (ice-9 format))
 
-(define (patch-url seqno)
-  (format #f "mirror://gnu/readline/readline-7.0-patches/readline70-~3,'0d" 
seqno))
+(define (patch-url version seqno)
+  (format #f "mirror://gnu/readline/readline-~a-patches/readline~a-~3,'0d"
+          version (string-join (string-split version #\.) "") seqno))
 
-(define (readline-patch seqno sha256)
+(define (readline-patch version seqno sha256)
   "Return the origin of Readline patch SEQNO, with expected hash SHA256"
   (origin
     (method url-fetch)
-    (uri (patch-url seqno))
+    (uri (patch-url version seqno))
     (sha256 sha256)))
 
-(define-syntax-rule (patch-series (seqno hash) ...)
-  (list (readline-patch seqno (base32 hash))
+(define-syntax-rule (patch-series version (seqno hash) ...)
+  (list (readline-patch version seqno (base32 hash))
         ...))
 
 (define %patch-series-7.0
   (patch-series
+   "7.0"
    (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
    (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
    (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")