From fa8ec6702a3ee117c98d5519b6b054b0f75c6e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 May 2024 08:35:34 +0200 Subject: [PATCH] util-linux: 2.40.1 -> 2.39.4 (except 64-bit linux for now) We're running into multiple issues, so let's be conservative. In particular, this commit should fix *-darwin builds. /cc PR #309805 as this is kind-of reverting it (partially for now) --- pkgs/os-specific/linux/util-linux/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 4f957dfcc1675..41b022496273c 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -26,28 +26,17 @@ let in stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.40.1"; + version = if avoidRebuild then "2.40.1" else "2.39.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8="; + hash = if avoidRebuild + then "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=" + else "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4="; }; 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 @@ -98,7 +87,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config installShellFiles ] - ++ lib.optionals (!avoidRebuild) [ autoreconfHook gtk-doc ] ++ lib.optionals translateManpages [ po4a ]; buildInputs = [ zlib libxcrypt sqlite ]