diffoscope: 29 -> 44

Relevant changes:
 - Python version switched to Python 3
 - ssdeep library got replaced with tlsh
 - the 'magic' Python package got replaced with a different one
 - Minor build system improvements == less work for us

2 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index e6c672d83441..f91cd143633c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -5,33 +5,30 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "diffoscope-${version}";
-  version = "29";
+  version = "44";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf";
+    sha256 = "1sisdmh1bl62b16yfjy9mxxdfzhskrabp0l3pl1kxn7db0c4vpac";
   };
 
   postPatch = ''
-    # Different pkg name in debian
-    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
-
     # Upstream doesn't provide a PKG-INFO file
-    sed -i setup.py -e "/'rpm',/d"
+    sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: ghc javap showttf sng
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++
+  # Still missing these tools: enjarify ghc img2txt javap otool(maybe OS X only) ppudump showttf sng
+  # Also these libraries: python3-guestfs
+  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
     [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
       gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 
   postInstall = ''
-    mv $out/bin/diffoscope.py $out/bin/diffoscope
     mkdir -p $out/share/man/man1
     ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c56422..03709f72803e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1285,7 +1285,10 @@ let
 
   di = callPackage ../tools/system/di { };
 
-  diffoscope = callPackage ../tools/misc/diffoscope { };
+  diffoscope = callPackage ../tools/misc/diffoscope {
+    pythonPackages = python3Packages;
+    rpm = rpm.override { python = python3; };
+  };
 
   diffstat = callPackage ../tools/text/diffstat { };