JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #26540: utillinux: fix "fstrim --all"

Browse Source
This commit is contained in:
Vladimír Čunát 2017-06-16 21:43:26 +02:00
commit 2a76b6ad69
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,28 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
stdenv.mkDerivation rec {
name = "util-linux-${version}";
let
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.29";
patchVersion = "2";
fstrimPatch = fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543";
sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh";
};
in stdenv.mkDerivation rec {
name = "util-linux-${version}";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc";
};
patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];
patches = [
./rtcwake-search-PATH-for-shutdown.patch
fstrimPatch
];
outputs = [ "bin" "dev" "out" "man" ];