Unverified Commit af2f3c17 authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

Merge pull request #248652 from trofi/util-linux-update

util-linux: 2.39 -> 2.39.1
parents 3065bf40 6883e882
Loading
Loading
Loading
Loading
+3 −23
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
, capabilitiesSupport ? stdenv.isLinux
, libcap_ng
, libxcrypt
@@ -19,35 +19,15 @@

stdenv.mkDerivation rec {
  pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
  version = "2.39";
  version = "2.39.1";

  src = fetchurl {
    url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
    hash = "sha256-MrMKM2zakDGC7WH+s+m5CLdipeZv4U5D77iNNxYgdcs=";
    hash = "sha256-iQro/4ECR70Z4nTfdug3HSAs2gGtJ3aBsOqI7qoAKGs=";
  };

  patches = [
    ./rtcwake-search-PATH-for-shutdown.patch

    # FIXME: backport mount fixes for older kernels, remove in next release
    (fetchpatch {
      url = "https://github.com/util-linux/util-linux/commit/f94a7760ed7ce81389a6059f020238981627a70d.diff";
      hash = "sha256-UorqDeECK8pBePkmpo2x90p/jP3rCMshyPCyijSX1wo=";
    })
    (fetchpatch {
      url = "https://github.com/util-linux/util-linux/commit/1bd85b64632280d6bf0e86b4ff29da8b19321c5f.diff";
      hash = "sha256-dgu4de5ul/si7Vzwe8lr9NvsdI1CWfDQKuqvARaY6sE=";
    })

    # FIXME: backport bcache detection fixes, remove in next release
    (fetchpatch {
      url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff";
      hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME=";
    })
    (fetchpatch {
      url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff";
      hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8=";
    })
  ];

  # We separate some of the utilities into their own outputs. This