diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-08-12 07:21:38 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-08-14 14:40:21 +0100 |
| commit | 6883e8826a2fcdc24975438813cf1a1c9ab76c79 (patch) | |
| tree | 526e61a24e88f870f2d1c50bd9cc70536a9ffbd4 /pkgs/os-specific/linux/util-linux | |
| parent | 7ad1b2d4e1eb8f7b127271f2540db60eee0c6be0 (diff) | |
| download | nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar.gz nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar.bz2 nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar.lz nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar.xz nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.tar.zst nixpkgs-6883e8826a2fcdc24975438813cf1a1c9ab76c79.zip | |
util-linux: 2.39 -> 2.39.1
Changes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/v2.39.1-ChangeLog
Diffstat (limited to 'pkgs/os-specific/linux/util-linux')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index e69ec1fb324..b9367a68728 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ 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 |