Merge #309805: util-linux: 2.39.3 -> 2.40.1

...into staging

Changed files
+6 -4
pkgs
os-specific
linux
util-linux
+6 -4
pkgs/os-specific/linux/util-linux/default.nix
···
, capabilitiesSupport ? stdenv.isLinux
, libcap_ng
, libxcrypt
+
, sqlite
, ncursesSupport ? true
, ncurses
, pamSupport ? true
···
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
-
version = "2.39.3";
+
version = "2.40.1";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
-
hash = "sha256-e2YF5I0aSfQ8xLTPxZ8xPQ3VQC+kC5aBC9Vy4Wff7Q8=";
+
hash = "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=";
};
patches = [
···
separateDebugInfo = true;
postPatch = ''
-
patchShebangs tests/run.sh
+
patchShebangs tests/run.sh tools/all_syscalls
substituteInPlace sys-utils/eject.c \
--replace "/bin/umount" "$bin/bin/umount"
···
"--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
"--disable-su" # provided by shadow
+
"--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
(lib.enableFeature writeSupport "write")
(lib.enableFeature nlsSupport "nls")
(lib.withFeature ncursesSupport "ncursesw")
···
nativeBuildInputs = [ pkg-config installShellFiles ]
++ lib.optionals translateManpages [ po4a ];
-
buildInputs = [ zlib libxcrypt ]
+
buildInputs = [ zlib libxcrypt sqlite ]
++ lib.optionals pamSupport [ pam ]
++ lib.optionals capabilitiesSupport [ libcap_ng ]
++ lib.optionals ncursesSupport [ ncurses ]