f2fs-tools: 1.11.0 -> 1.13.0

+18 -16
+2 -2
pkgs/tools/filesystems/f2fs-tools/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "f2fs-tools"; 5 - version = "1.11.0"; 6 7 src = fetchgit { 8 url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; 9 rev = "refs/tags/v${version}"; 10 - sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; 11 }; 12 13 nativeBuildInputs = [ autoreconfHook pkgconfig ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "f2fs-tools"; 5 + version = "1.13.0"; 6 7 src = fetchgit { 8 url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; 9 rev = "refs/tags/v${version}"; 10 + sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j"; 11 }; 12 13 nativeBuildInputs = [ autoreconfHook pkgconfig ];
+16 -14
pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
··· 1 - --- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300 2 - +++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300 3 - @@ -20,14 +20,16 @@ 4 [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), 5 [Minor version for f2fs-tools]) 6 7 - -AC_CHECK_FILE(.git, 8 - AC_DEFINE([F2FS_TOOLS_DATE], 9 - "m4_bpatsubst(f2fs_tools_gitdate, 10 - [\([0-9-]*\)\(\w\|\W\)*], [\1])", 11 - - [f2fs-tools date based on Git commits]), 12 - AC_DEFINE([F2FS_TOOLS_DATE], 13 - "f2fs_tools_date", 14 - - [f2fs-tools date based on Source releases])) 15 - +dnl AC_CHECK_FILE(.git, 16 - +dnl AC_DEFINE([F2FS_TOOLS_DATE], 17 - +dnl "m4_bpatsubst(f2fs_tools_gitdate, 18 - +dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", 19 - +dnl [f2fs-tools date based on Git commits]), 20 - +dnl AC_DEFINE([F2FS_TOOLS_DATE], 21 - +dnl "f2fs_tools_date", 22 - +dnl [f2fs-tools date based on Source releases])) 23 + 24 +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) 25
··· 1 + diff --git a/configure.ac b/configure.ac 2 + index 9b0e872..0108219 100644 3 + --- a/configure.ac 4 + +++ b/configure.ac 5 + @@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, 6 [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), 7 [Minor version for f2fs-tools]) 8 9 + -AS_IF([test -d .git],[ 10 - AC_DEFINE([F2FS_TOOLS_DATE], 11 - "m4_bpatsubst(f2fs_tools_gitdate, 12 - [\([0-9-]*\)\(\w\|\W\)*], [\1])", 13 + - [f2fs-tools date based on Git commits])],[ 14 - AC_DEFINE([F2FS_TOOLS_DATE], 15 - "f2fs_tools_date", 16 + - [f2fs-tools date based on Source releases])]) 17 + +dnl AS_IF([test -d .git],[ 18 + +dnl AC_DEFINE([F2FS_TOOLS_DATE], 19 + +dnl "m4_bpatsubst(f2fs_tools_gitdate, 20 + +dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", 21 + +dnl [f2fs-tools date based on Git commits])],[ 22 + +dnl AC_DEFINE([F2FS_TOOLS_DATE], 23 + +dnl "f2fs_tools_date", 24 + +dnl [f2fs-tools date based on Source releases])]) 25 + 26 +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) 27