From 7b4db5da18b6ed3e00b0433ddb46f724b63dfa63 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Oct 2017 01:40:00 +0300
Subject: utillinux: 2.30 -> 2.30.2

---
 pkgs/os-specific/linux/util-linux/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 8e16a3165f67..3d4309b7177a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -5,23 +5,18 @@ let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
   majorVersion = "2.30";
-  patchVersion = "";
+  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 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262";
+    sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv";
   };
 
   patches = [
     ./rtcwake-search-PATH-for-shutdown.patch
-    fstrimPatch
   ];
 
   outputs = [ "bin" "dev" "out" "man" ];
-- 
cgit 1.4.1