TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: util-linux: Update to 2.35.

Browse source 
* gnu/packages/linux.scm (util-linux): Update to 2.35.
[arguments]: Add substitution to fix test locale.
This commit is contained in:
Marius Bakke 2020-01-24 17:16:53 +01:00
parent 0830b2f4aa
commit f69a22accf
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/linux.scm
View file

@ -1096,7 +1096,7 @@ (define-public psmisc
(define-public util-linux (define-public util-linux
(package (package
(name "util-linux") (name "util-linux")
(version "2.34") (version "2.35")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/" (uri (string-append "mirror://kernel.org/linux/utils/"
@ -1104,7 +1104,7 @@ (define-public util-linux
"util-linux-" version ".tar.xz")) "util-linux-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1db2kydkwjmvgd1glkcba3adhidxw0f1x735dcjdpdjjf869sgvl")) "1jg2vywxi9m2h0f2pz0a7a9afvv1j5726dg0cwryrhb809b1n25k"))
(patches (search-patches "util-linux-tests.patch")) (patches (search-patches "util-linux-tests.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -1160,6 +1160,10 @@ (define-public util-linux
(substitute* "tests/ts/misc/mcookie" (substitute* "tests/ts/misc/mcookie"
(("/etc/services") (("/etc/services")
(string-append net "/etc/services"))) (string-append net "/etc/services")))
;; The C.UTF-8 locale does not exist in our libc.
(substitute* "tests/ts/column/invalid-multibyte"
(("C\\.UTF-8") "en_US.utf8"))
#t))) #t)))
(add-after 'install 'move-static-libraries (add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)