HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: util-linux: Disable tests when building on i586-gnu.
[jackhill/guix/guix.git]
/
gnu
/
packages
/
linux.scm
diff --git
a/gnu/packages/linux.scm
b/gnu/packages/linux.scm
index
f22b421
..
1ea9d80
100644
(file)
--- a/
gnu/packages/linux.scm
+++ b/
gnu/packages/linux.scm
@@
-354,7
+354,7
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
-(define-public linux-libre-5.11-version "5.11.1
1
")
+(define-public linux-libre-5.11-version "5.11.1
5
")
(define deblob-scripts-5.11
(linux-libre-deblob-scripts
linux-libre-5.11-version
(define deblob-scripts-5.11
(linux-libre-deblob-scripts
linux-libre-5.11-version
@@
-362,7
+362,7
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n")))
(define-public linux-libre-5.11-pristine-source
(let ((version linux-libre-5.11-version)
(base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n")))
(define-public linux-libre-5.11-pristine-source
(let ((version linux-libre-5.11-version)
- (hash (base32 "
1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a
")))
+ (hash (base32 "
0jn4fy70lma5c6kn443hmi8vccl8kbh60k0bwnavcmngax9q99yn
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.11)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.11)))
@@
-370,7
+370,7
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-5.10-version "5.10.
27
")
+(define-public linux-libre-5.10-version "5.10.
31
")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
@@
-378,12
+378,12
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
- (hash (base32 "
1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr
")))
+ (hash (base32 "
03ai5fd543mhqfl0yl11z86xkif2ffn2iq3m2cl849cssajg3vjl
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
-(define-public linux-libre-5.4-version "5.4.1
08
")
+(define-public linux-libre-5.4-version "5.4.1
13
")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@@
-391,12
+391,12
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
- (hash (base32 "0
wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj
")))
+ (hash (base32 "0
iysc8k2k7s6qm25as90xhrbnvfxf12nb5xikrgvfx64ccjfkk9h
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
-(define-public linux-libre-4.19-version "4.19.18
3
")
+(define-public linux-libre-4.19-version "4.19.18
8
")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@@
-404,12
+404,12
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
- (hash (base32 "
1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs
")))
+ (hash (base32 "
0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
-(define-public linux-libre-4.14-version "4.14.2
27
")
+(define-public linux-libre-4.14-version "4.14.2
31
")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@@
-417,12
+417,12
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
- (hash (base32 "1
iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7
")))
+ (hash (base32 "1
0k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
-(define-public linux-libre-4.9-version "4.9.26
3
")
+(define-public linux-libre-4.9-version "4.9.26
7
")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
@@
-430,12
+430,12
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
- (hash (base32 "
1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz
")))
+ (hash (base32 "
0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
-(define-public linux-libre-4.4-version "4.4.26
3
")
+(define-public linux-libre-4.4-version "4.4.26
7
")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
@@
-443,7
+443,7
@@
corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
- (hash (base32 "1q
qh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2
")))
+ (hash (base32 "1q
k629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4
")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@@
-1600,6
+1600,12
@@
providing the system administrator with some help in common tasks.")
(string-append "--with-bashcompletiondir="
(assoc-ref %outputs "out")
"/etc/bash_completion.d"))
(string-append "--with-bashcompletiondir="
(assoc-ref %outputs "out")
"/etc/bash_completion.d"))
+
+ ;; FIXME: For now we cannot reliably run tests on GNU/Hurd:
+ ;; <https://bugs.gnu.org/47791>.
+ #:tests? ,(and (not (%current-target-system))
+ (not (string-suffix? "-gnu" (%current-system))))
+
#:phases (modify-phases %standard-phases
(add-before 'configure 'patch-build-scripts
(lambda* (#:key outputs #:allow-other-keys)
#:phases (modify-phases %standard-phases
(add-before 'configure 'patch-build-scripts
(lambda* (#:key outputs #:allow-other-keys)
@@
-3907,7
+3913,7
@@
compliance.")
(define-public wireless-regdb
(package
(name "wireless-regdb")
(define-public wireless-regdb
(package
(name "wireless-regdb")
- (version "2020.
04.29
")
+ (version "2020.
11.20
")
(source (origin
(method url-fetch)
(uri (string-append
(source (origin
(method url-fetch)
(uri (string-append
@@
-3915,7
+3921,7
@@
compliance.")
"wireless-regdb-" version ".tar.xz"))
(sha256
(base32
"wireless-regdb-" version ".tar.xz"))
(sha256
(base32
- "0
yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9
"))
+ "0
liagyi6ppf5w474qk9j4jz5gbvvn8mc8al1dq4b1xrgv28485ml
"))
;; We're building 'regulatory.bin' by ourselves.
(snippet '(begin
;; We're building 'regulatory.bin' by ourselves.
(snippet '(begin
@@
-3969,8
+3975,8
@@
compliance.")
"https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb")
(synopsis "Wireless regulatory database")
(description
"https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb")
(synopsis "Wireless regulatory database")
(description
- "This package contains the wireless regulatory database Central
-Regulatory Database Agent (CRDA)
daemon
. The database contains information on
+ "This package contains the wireless regulatory database
for the
Central
+Regulatory Database Agent (CRDA). The database contains information on
country-specific regulations for the wireless spectrum.")
(license license:isc)))
country-specific regulations for the wireless spectrum.")
(license license:isc)))
@@
-5058,7
+5064,7
@@
and copy/paste text in the console and in xterm.")
(define-public btrfs-progs
(package
(name "btrfs-progs")
(define-public btrfs-progs
(package
(name "btrfs-progs")
- (version "5.11")
+ (version "5.11
.1
")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/"
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/"
@@
-5066,7
+5072,7
@@
and copy/paste text in the console and in xterm.")
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
- "
0dq1ryji9hmq10zbyk083lp9r212524a3naai47whq11m6q626fl
"))))
+ "
1zpbpmq8qndwls40yg2c9xj9ca6mcxdziadj5i8fbi3ffp2crap3
"))))
(build-system gnu-build-system)
(outputs '("out"
"static")) ; static versions of the binaries in "out"
(build-system gnu-build-system)
(outputs '("out"
"static")) ; static versions of the binaries in "out"
@@
-7126,7
+7132,7
@@
privileges.")
(define-public psm2
(package
(name "psm2")
(define-public psm2
(package
(name "psm2")
- (version "11.2.
86
")
+ (version "11.2.
185
")
(source (origin
(method git-fetch)
(uri (git-reference
(source (origin
(method git-fetch)
(uri (git-reference
@@
-7135,7
+7141,7
@@
privileges.")
(file-name (git-file-name name version))
(sha256
(base32
(file-name (git-file-name name version))
(sha256
(base32
- "
1hiqzcmc97lzhaqjva82vf8irgg038cciypsv2brw90ak09n6vwf
"))))
+ "
062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg
"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
(build-system gnu-build-system)
(arguments
'(#:make-flags
@@
-8026,8
+8032,8
@@
kernel side implementation.")
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/")
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/")
- (synopsis "User-space tools for EROFS filesystem")
+ (synopsis "User-space tools for EROFS file
system")
(description "EROFS (Enhanced Read-Only File System) is a compressed,
(description "EROFS (Enhanced Read-Only File System) is a compressed,
-read-only filesystem optimized for resource-scarce devices. This package
-provides user-space tools for creating EROFS filesystems.")
+read-only file
system optimized for resource-scarce devices. This package
+provides user-space tools for creating EROFS file
systems.")
(license license:gpl2+)))
(license license:gpl2+)))