summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-07-25 16:53:28 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-07-25 17:29:21 +0300
commitdd248fad87ea99a5f2f9e209df662f74cfa662f5 (patch)
tree7381df1127073038015241f0eb18eddf7067d3e1
parentc1597af1f29be6eed8ae577c6bbd091b5f2131a2 (diff)
downloadnixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar.gz
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar.bz2
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar.lz
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar.xz
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.tar.zst
nixlib-dd248fad87ea99a5f2f9e209df662f74cfa662f5.zip
xfstests: 2017-03-26 -> 2017-07-16
-rw-r--r--pkgs/tools/misc/xfstests/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index f312f4770b54..5b1bee92b088 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
-, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
-  name = "xfstests-2017-03-26";
+  name = "xfstests-2017-07-16";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
-    rev = "7400c10e503fed20fe2d9f8b03b2157eba4ff3b8";
-    sha256 = "0m30mx8nv49ryijlkqffjmkw2g1xdxsrq868jh9crwh19055v7qp";
+    rev = "c3893c2dc623a07b1ace8e72ee4beb29f8bfae15";
+    sha256 = "1p42dakry4r2366hdgj4i1wcnjs4qk0bfmyr70r1n7s7ykvnvnrl";
   };
 
-  buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
+  nativeBuildInputs = [ autoconf automake libtool ];
+  buildInputs = [ acl attr gawk libaio libuuid libxfs openssl perl ];
 
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
@@ -55,6 +56,8 @@ stdenv.mkDerivation {
     export MAKE=$(type -P make)
     export SED=$(type -P sed)
     export SORT=$(type -P sort)
+
+    make configure
   '';
 
   postInstall = ''