nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "util-linux: 2.40.1 -> 2.39.4 (except 64-bit linux for now)"

Browse Source 
This reverts commit fa8ec6702a.

Too many issues with 2.40 for now — we're reverting to 2.39.
This commit is contained in:
Alyssa Ross
2024-05-22 18:28:56 +02:00
parent d2b0bf5658
commit 125b5dcfb5
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/os-specific/linux/util-linux/default.nix
View File

@@ -26,17 +26,28 @@ let
in
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
version = if avoidRebuild then "2.40.1" else "2.39.4";
version = "2.40.1";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
hash = if avoidRebuild
then "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8="
else "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4=";
hash = "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=";
};
patches = [
./rtcwake-search-PATH-for-shutdown.patch
] ++ lib.optionals (!avoidRebuild) [
# Backports of patches that hopefully fix an intermittent parallel
# build failure.
(fetchpatch {
name = "pam_lastlog2:-drop-duplicate-assignment-pam_lastlog2_la_LDFLAGS.patch";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=290748729dc3edf9ea1c680c8954441a5e367a44";
hash = "sha256-Hi+SrT8UovZyCWf6Jc7s3dc6YLyfOfgqohOEnc7aJq4=";
})
(fetchpatch {
name = "libuuid:-drop-duplicate-assignment-liuuid_la_LDFLAGS";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=597e8b246ae31366514ead6cca240a09fe5e1528";
hash = "sha256-QCx3MD/57x2tV1SlJ79EYyxafhaEH4UC+Dt24DA6P8I=";
})
];
# We separate some of the utilities into their own outputs. This
@@ -87,6 +98,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config installShellFiles ]
++ lib.optionals (!avoidRebuild) [ autoreconfHook gtk-doc ]
++ lib.optionals translateManpages [ po4a ];
buildInputs = [ zlib libxcrypt sqlite ]