pyrox.dev
Merge #309805: util-linux: 2.39.3 -> 2.40.1
...into staging
+6
-4
pkgs/os-specific/linux/util-linux/default.nix
+6
-4
pkgs/os-specific/linux/util-linux/default.nix
···
2
2
, capabilitiesSupport ? stdenv.isLinux
3
3
, libcap_ng
4
4
, libxcrypt
5
+
, sqlite
5
6
, ncursesSupport ? true
6
7
, ncurses
7
8
, pamSupport ? true
···
20
21
21
22
stdenv.mkDerivation rec {
22
23
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
23
-
version = "2.39.3";
24
+
version = "2.40.1";
24
25
25
26
src = fetchurl {
26
27
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
27
-
hash = "sha256-e2YF5I0aSfQ8xLTPxZ8xPQ3VQC+kC5aBC9Vy4Wff7Q8=";
28
+
hash = "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=";
28
29
};
29
30
30
31
patches = [
···
40
41
separateDebugInfo = true;
41
42
42
43
postPatch = ''
43
-
patchShebangs tests/run.sh
44
+
patchShebangs tests/run.sh tools/all_syscalls
44
45
45
46
substituteInPlace sys-utils/eject.c \
46
47
--replace "/bin/umount" "$bin/bin/umount"
···
59
60
"--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
60
61
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
61
62
"--disable-su" # provided by shadow
63
+
"--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
62
64
(lib.enableFeature writeSupport "write")
63
65
(lib.enableFeature nlsSupport "nls")
64
66
(lib.withFeature ncursesSupport "ncursesw")
···
80
82
nativeBuildInputs = [ pkg-config installShellFiles ]
81
83
++ lib.optionals translateManpages [ po4a ];
82
84
83
-
buildInputs = [ zlib libxcrypt ]
85
+
buildInputs = [ zlib libxcrypt sqlite ]
84
86
++ lib.optionals pamSupport [ pam ]
85
87
++ lib.optionals capabilitiesSupport [ libcap_ng ]
86
88
++ lib.optionals ncursesSupport [ ncurses ]