From b531c198063c4e5a1d71616ced308ac167fd4cdc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 10 Mar 2019 03:53:25 -0500
Subject: [PATCH 1/2] e2fsprogs: 1.44.5 -> 1.45.0

Changes:
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.44.6.txt?h=v1.44.6
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.45.0.txt?h=v1.45.0

Also:
* remove 'hack' for installing pc files
* fixup location of `e2scrub_all_cron` to avoid reference cycle in
  outputs, promote to $bin/bin for now.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 80646949390..10b7344bc7a 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,12 @@
 { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.44.5";
+  pname = "e2fsprogs";
+  version = "1.45.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
@@ -36,10 +37,9 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails
 
-  # hacky way to make it install *.pc
   postInstall = ''
-    make install-libs
-    rm "$out"/lib/*.a
+    # avoid cycle between outputs
+    mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
   '';
 
   enableParallelBuilding = true;

From 8add9b7c2126c7be6736daf86bcc436821851112 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 10 Mar 2019 04:03:52 -0500
Subject: [PATCH 2/2] e2fsprogs: enable tests (previously explicitly disabled)

---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 10b7344bc7a..15346dcc30e 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ];
 
   checkInputs = [ perl ];
-  doCheck = false; # fails
+  doCheck = true;
 
   postInstall = ''
     # avoid cycle between outputs