commit bfa50e7ba6cd7ca539beb329d1196fe0a0fb3ece · pyrox.dev/nixpkgs

+9 -10

pkgs/tools/system/testdisk/default.nix

···

       8
       8
        
         pkg-config,

     

       9
       9
        
         libjpeg,

     

       10
       10
        
         zlib,

     

       11
       11
       -
         libewf,

     

       11
       11
       +
         libewf-legacy,

     

       12
       12
        
         enableNtfs ? !stdenv.hostPlatform.isDarwin,

     

       13
       13
        
         ntfs3g ? null,

     

       14
       14
        
         enableExtFs ? !stdenv.hostPlatform.isDarwin,

     
···

       27
       27
        
       

     

       28
       28
        
       (if enableQt then mkDerivation else stdenv.mkDerivation) rec {

     

       29
       29
        
         pname = "testdisk";

     

       30
       30
       -
         version = "7.1";

     

       30
       30
       +
         version = "7.2";

     

       31
       31
        
         src = fetchurl {

     

       32
       32
        
           url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2";

     

       33
       33
       -
           sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql";

     

       33
       33
       +
           hash = "sha256-+DQ74gy0ABxdkaLjvNkYOY8Arm2DEIlKWp8v64E8KD8=";

     

       34
       34
        
         };

     

       35
       35
       -
       

     

       36
       36
       -
         patches = [

     

       37
       37
       -
           ./gcc-14-fixes.diff

     

       38
       38
       -
         ];

     

       39
       35
        
       

     

       40
       36
        
         postPatch = ''

     

       41
       37
        
           substituteInPlace linux/qphotorec.desktop \

     
···

       49
       45
        
           libuuid

     

       50
       46
        
           libjpeg

     

       51
       47
        
           zlib

     

       52
       52
       -
           libewf

     

       48
       48
       +
           libewf-legacy

     

       53
       49
        
         ]

     

       54
       50
        
         ++ lib.optional enableNtfs ntfs3g

     

       55
       51
        
         ++ lib.optional enableExtFs e2fsprogs

     
···

       63
       59
        
       

     

       64
       60
        
         env.NIX_CFLAGS_COMPILE = "-Wno-unused";

     

       65
       61
        
       

     

       66
       66
       -
         meta = with lib; {

     

       62
       62
       +
         meta = {

     

       67
       63
        
           homepage = "https://www.cgsecurity.org/wiki/Main_Page";

     

       68
       64
        
           downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download";

     

       69
       65
        
           description = "Data recovery utilities";

     
···

       83
       79
        
           '';

     

       84
       80
        
           license = lib.licenses.gpl2Plus;

     

       85
       81
        
           platforms = lib.platforms.all;

     

       86
       86
       -
           maintainers = with maintainers; [ fgaz ];

     

       82
       82
       +
           maintainers = with lib.maintainers; [

     

       83
       83
       +
             fgaz

     

       84
       84
       +
             ryand56

     

       85
       85
       +
           ];

     

       87
       86
        
         };

     

       88
       87
        
       }

-15

pkgs/tools/system/testdisk/gcc-14-fixes.diff

···

       1
       1
       -
       diff --git a/src/ntfs_io.c b/src/ntfs_io.c

     

       2
       2
       -
       index 7f57edd..4b718bb 100644

     

       3
       3
       -
       --- a/src/ntfs_io.c

     

       4
       4
       -
       +++ b/src/ntfs_io.c

     

       5
       5
       -
       @@ -154,8 +154,8 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu

     

       6
       6
       -
        	return -1;

     

       7
       7
       -
        }

     

       8
       8
       -
        

     

       9
       9
       -
       -static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,

     

       10
       10
       -
       -		void *argp)

     

       11
       11
       -
       +static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev,

     

       12
       12
       -
       +                                         unsigned long request, void *argp)

     

       13
       13
       -
        {

     

       14
       14
       -
        	log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");

     

       15
       15
       -
        #ifdef ENOTSUP