diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-27 21:54:10 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-27 21:54:10 -0400 |
| commit | 2807da5e37fe7f1ec285cdfe24abdaa032df122a (patch) | |
| tree | 34dc631482029ae4b9a65ca9e1f84fd34663faed /pkgs/tools/filesystems | |
| parent | 28a7e8fb753c82c579a6505053e2a683857c1a5c (diff) | |
| download | nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar.gz nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar.bz2 nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar.lz nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar.xz nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.tar.zst nixlib-2807da5e37fe7f1ec285cdfe24abdaa032df122a.zip | |
f2fs-tools: 1.11.0 -> 1.13.0
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/f2fs-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index d7fa971c9878..c5ec523e247d 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "f2fs-tools"; - version = "1.11.0"; + version = "1.13.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; + sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch index 1503732240c3..e01a97b0bc3c 100644 --- a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch +++ b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch @@ -1,25 +1,27 @@ ---- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300 -+++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300 -@@ -20,14 +20,16 @@ +diff --git a/configure.ac b/configure.ac +index 9b0e872..0108219 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), [Minor version for f2fs-tools]) --AC_CHECK_FILE(.git, +-AS_IF([test -d .git],[ - AC_DEFINE([F2FS_TOOLS_DATE], - "m4_bpatsubst(f2fs_tools_gitdate, - [\([0-9-]*\)\(\w\|\W\)*], [\1])", -- [f2fs-tools date based on Git commits]), +- [f2fs-tools date based on Git commits])],[ - AC_DEFINE([F2FS_TOOLS_DATE], - "f2fs_tools_date", -- [f2fs-tools date based on Source releases])) -+dnl AC_CHECK_FILE(.git, -+dnl AC_DEFINE([F2FS_TOOLS_DATE], -+dnl "m4_bpatsubst(f2fs_tools_gitdate, -+dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", -+dnl [f2fs-tools date based on Git commits]), -+dnl AC_DEFINE([F2FS_TOOLS_DATE], -+dnl "f2fs_tools_date", -+dnl [f2fs-tools date based on Source releases])) +- [f2fs-tools date based on Source releases])]) ++dnl AS_IF([test -d .git],[ ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "m4_bpatsubst(f2fs_tools_gitdate, ++dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", ++dnl [f2fs-tools date based on Git commits])],[ ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "f2fs_tools_date", ++dnl [f2fs-tools date based on Source releases])]) + +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) |