amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: util-linux: Update to 2.40.4.

Browse source 
* gnu/packages/linux.scm (util-linux)[source]<snippet>: Remove tailing #t.
[arguments]<#:phases>: Adjust pre-check phase.
[inputs]: Add sqlite.
[native-inputs]: Add pkg-config.
* gnu/packages/patches/util-linux-tests.patch: Adjust it.

Change-Id: I3c22d0b5b02a6dd0fee440f32e87279d7d4b1554
This commit is contained in:
Zheng Junjie 2025-02-27 00:53:12 +08:00 • committed by Andreas Enge
parent 52d06d2fb4
commit f94edace04
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/linux.scm
View file

@ -73,7 +73,7 @@
;;; Copyright © 2022, 2023 Demis Balbach <db@minikn.xyz>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023, 2025 Zheng Junjie <z572@z572.online>
;;; Copyright © 2023 dan <i@dan.games>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023, 2024 Wilko Meyer <w@wmeyer.eu>
@ -2742,7 +2742,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
(define-public util-linux
(package
(name "util-linux")
(version "2.37.4")
(version "2.40.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/"
@ -2750,7 +2750,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
"util-linux-" version ".tar.xz"))
(sha256
(base32
"10svcnsqmrsd660bzcm7k6dm8sa7hkknhr3bag1nccwimlb6jkk3"))
"0ygvflcr7v7x2rmr9h5mi07yx00i9368ggf3znd8bs847drsy7aw"))
(patches (search-patches "util-linux-tests.patch"))
(modules '((guix build utils)))
(snippet
@ -2760,8 +2760,7 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
(substitute* "configure"
(("build_nologin=yes") "build_nologin=no")
(("build_logger=yes") "build_logger=no")
(("build_kill=yes") "build_kill=no"))
#t))))
(("build_kill=yes") "build_kill=no"))))))
(build-system gnu-build-system)
(outputs '("out" ;6.4 MiB executables and documentation
"lib" ;8.8 MiB shared libraries, headers and locales
@ -2811,7 +2810,13 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
;; Change the test to refer to the right file.
(substitute* "tests/ts/misc/mcookie"
(("/etc/services")
services)))))
services))
(substitute* "tests/helpers/test_mkfds.c"
(("/etc/fstab")
(which "sh")))
(substitute* "tests/helpers/test_enosys.c"
(("/bin/false")
(which "false"))))))
(add-before 'check 'disable-setarch-test
(lambda _
;; The setarch tests are unreliable in QEMU's user-mode
@ -2861,10 +2866,12 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
(inputs
(list file ;for libmagic
ncurses
sqlite
zlib))
(native-inputs
(list net-base ;for tests
perl))
perl
pkg-config))
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
(synopsis "Collection of utilities for the Linux kernel")
(description "Util-linux is a diverse collection of Linux kernel