diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-16 21:43:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-16 21:43:26 +0200 |
| commit | 2a76b6ad698af623f110a183a4f0ce3f3f308273 (patch) | |
| tree | c025530a68cb5482538ec5d90e3e0e1495d79974 | |
| parent | f714dfbb1dc9d3df943edeaed3dc18d2ce0a579d (diff) | |
| parent | 286c36d7370763eb8222659ddd8f67773398c3c1 (diff) | |
| download | nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar.gz nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar.bz2 nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar.lz nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar.xz nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.tar.zst nixpkgs-2a76b6ad698af623f110a183a4f0ce3f3f308273.zip | |
Merge #26540: utillinux: fix "fstrim --all"
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 01bd8beea3d..79f63f8c27a 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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" ]; |