diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index ff23b602c00d..b6b9c97afa58 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -8,7 +8,7 @@ pkg-config, libjpeg, zlib, - libewf, + libewf-legacy, enableNtfs ? !stdenv.hostPlatform.isDarwin, ntfs3g ? null, enableExtFs ? !stdenv.hostPlatform.isDarwin, @@ -27,16 +27,12 @@ assert enableQt -> qwt != null; (if enableQt then mkDerivation else stdenv.mkDerivation) rec { pname = "testdisk"; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; - sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql"; + hash = "sha256-+DQ74gy0ABxdkaLjvNkYOY8Arm2DEIlKWp8v64E8KD8="; }; - patches = [ - ./gcc-14-fixes.diff - ]; - postPatch = '' substituteInPlace linux/qphotorec.desktop \ --replace "/usr" "$out" @@ -49,7 +45,7 @@ assert enableQt -> qwt != null; libuuid libjpeg zlib - libewf + libewf-legacy ] ++ lib.optional enableNtfs ntfs3g ++ lib.optional enableExtFs e2fsprogs @@ -63,7 +59,7 @@ assert enableQt -> qwt != null; env.NIX_CFLAGS_COMPILE = "-Wno-unused"; - meta = with lib; { + meta = { homepage = "https://www.cgsecurity.org/wiki/Main_Page"; downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download"; description = "Data recovery utilities"; @@ -83,6 +79,9 @@ assert enableQt -> qwt != null; ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = with maintainers; [ fgaz ]; + maintainers = with lib.maintainers; [ + fgaz + ryand56 + ]; }; } diff --git a/pkgs/tools/system/testdisk/gcc-14-fixes.diff b/pkgs/tools/system/testdisk/gcc-14-fixes.diff deleted file mode 100644 index df4fc9140ead..000000000000 --- a/pkgs/tools/system/testdisk/gcc-14-fixes.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/ntfs_io.c b/src/ntfs_io.c -index 7f57edd..4b718bb 100644 ---- a/src/ntfs_io.c -+++ b/src/ntfs_io.c -@@ -154,8 +154,8 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu - return -1; - } - --static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request, -- void *argp) -+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, -+ unsigned long request, void *argp) - { - log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n"); - #ifdef ENOTSUP