diff options
| author | WilliButz <WilliButz@users.noreply.github.com> | 2019-09-13 18:12:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 18:12:10 +0200 |
| commit | e64239dca3663d322f2613a383be873cd33aad59 (patch) | |
| tree | dd97b33629f862129c3e25670a5c38501c9e1cd4 | |
| parent | 889485bd7d5242404712b3986d7e850106ab09c4 (diff) | |
| parent | 08dab35cd470c45ba03ff2e7f2ea31be293eb3d2 (diff) | |
| download | nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar.gz nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar.bz2 nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar.lz nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar.xz nixlib-e64239dca3663d322f2613a383be873cd33aad59.tar.zst nixlib-e64239dca3663d322f2613a383be873cd33aad59.zip | |
Merge pull request #68674 from JohnAZoidberg/xfstests-sep-2019
xfstests: 2018-04-11 -> 2019-09-08
| -rw-r--r-- | pkgs/tools/misc/xfstests/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 3be931a362be..204059913318 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -4,12 +4,12 @@ , time, utillinux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { - name = "xfstests-2018-04-11"; + name = "xfstests-2019-09-08"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "fdf6d4bc862bb3269c95986fdaf1c59271762ad6"; - sha256 = "16j1kcmj0xq6s2qw4hll5r5cz7q4vbbsy2nh1g5aaq7xsl3h8mhb"; + rev = "0837e907988a5f410cae0ae714f42f9c4242e072"; + sha256 = "1f5cv0vwc1g9difzp69k49rc5nfd08y72vdg318j25nv3rwv7wc9"; }; nativeBuildInputs = [ @@ -23,6 +23,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; patchPhase = '' + substituteInPlace Makefile \ + --replace "cp include/install-sh ." "cp -f include/install-sh ." + # Patch the destination directory sed -i include/builddefs.in -e "s|^PKG_LIB_DIR\s*=.*|PKG_LIB_DIR=$out/lib/xfstests|" |