Skip to content

Commit

Permalink
util-linux: 2.40.1 -> 2.39.4 (except 64-bit linux for now)
Browse files Browse the repository at this point in the history
We're running into multiple issues, so let's be conservative.
In particular, this commit should fix *-darwin builds.
/cc PR NixOS#309805 as this is kind-of reverting it (partially for now)
  • Loading branch information
vcunat committed May 20, 2024
1 parent 4edfd12 commit fa8ec67
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions pkgs/os-specific/linux/util-linux/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ]
Expand Down

0 comments on commit fa8ec67

Please sign in to comment.