summaryrefslogtreecommitdiff
path: root/gnu/packages/bash.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/bash.scm')
-rw-r--r--gnu/packages/bash.scm37
1 files changed, 15 insertions, 22 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index ed2931fd972..8dfbd7834e5 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -6,6 +6,7 @@
6;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> 6;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
7;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> 7;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
8;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> 8;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
9;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
9;;; 10;;;
10;;; This file is part of GNU Guix. 11;;; This file is part of GNU Guix.
11;;; 12;;;
@@ -57,7 +58,7 @@
57 58
58(define (patch-url seqno) 59(define (patch-url seqno)
59 "Return the URL of Bash patch number SEQNO." 60 "Return the URL of Bash patch number SEQNO."
60 (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) 61 (format #f "mirror://gnu/bash/bash-5.1-patches/bash51-~3,'0d" seqno))
61 62
62(define (bash-patch seqno sha256-bv) 63(define (bash-patch seqno sha256-bv)
63 "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV." 64 "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV."
@@ -70,26 +71,18 @@
70 (list (bash-patch seqno (base32 hash)) 71 (list (bash-patch seqno (base32 hash))
71 ...)) 72 ...))
72 73
73(define %patch-series-5.0 74(define %patch-series-5.1
74 ;; This is the current patches series for 5.0, generated using 75 ;; This is the current patches series for 5.0, generated using
75 ;; 'download-patches' below. 76 ;; 'download-patches' below.
76 (patch-series 77 (patch-series
77 (1 "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") 78 (1 "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b")
78 (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") 79 (2 "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
79 (3 "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") 80 (3 "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
80 (4 "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") 81 (4 "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
81 (5 "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") 82 (5 "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc")
82 (6 "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") 83 (6 "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm")
83 (7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") 84 (7 "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c")
84 (8 "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") 85 (8 "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j")))
85 (9 "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d")
86 (10 "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn")
87 (11 "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c")
88 (12 "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9")
89 (13 "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm")
90 (14 "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx")
91 (15 "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
92 (16 "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")))
93 86
94(define (download-patches store count) 87(define (download-patches store count)
95 "Download COUNT Bash patches into store. Return a list of 88 "Download COUNT Bash patches into store. Return a list of
@@ -125,7 +118,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
125 " -Wl,-rpath -Wl," 118 " -Wl,-rpath -Wl,"
126 (assoc-ref %build-inputs "ncurses") 119 (assoc-ref %build-inputs "ncurses")
127 "/lib"))) 120 "/lib")))
128 (version "5.0")) 121 (version "5.1"))
129 (package 122 (package
130 (name "bash") 123 (name "bash")
131 (source (origin 124 (source (origin
@@ -134,11 +127,11 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
134 "mirror://gnu/bash/bash-" version ".tar.gz")) 127 "mirror://gnu/bash/bash-" version ".tar.gz"))
135 (sha256 128 (sha256
136 (base32 129 (base32
137 "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")) 130 "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"))
138 (patch-flags '("-p0")) 131 (patch-flags '("-p0"))
139 (patches (cons (search-patch "bash-linux-pgrp-pipe.patch") 132 (patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
140 %patch-series-5.0)))) 133 %patch-series-5.1))))
141 (version (string-append version "." (number->string (length %patch-series-5.0)))) 134 (version (string-append version "." (number->string (length %patch-series-5.1))))
142 (build-system gnu-build-system) 135 (build-system gnu-build-system)
143 136
144 (outputs '("out" 137 (outputs '("out"