diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6472f1ea09c..61066cec04d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchgit, fetchpatch, python3, docutils +{ lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc -, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz +, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, xxd, xz , colordiff , enableBloat ? false }: -python3.pkgs.buildPythonApplication rec { - pname = "diffoscope"; - name = "${pname}-${version}"; - version = "77"; +python3Packages.buildPythonApplication rec { + name = "diffoscope-${version}"; + version = "85"; src = fetchgit { - url = "git://anonscm.debian.org/reproducible/diffoscope.git"; - rev = "refs/tags/${version}"; - sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b"; + url = "git://anonscm.debian.org/reproducible/diffoscope.git"; + rev = "refs/tags/${version}"; + sha256 = "0kmcfhgva1fl6x5b07sc7k6ba9mqs3ma0lvspxm31w7nrrrqcvlr"; }; - patches = - [ # Ignore different link counts. - ./ignore_links.patch - ]; + patches = [ + # Ignore different link counts - doesn't work with 85 + # ./ignore_links.patch + ]; postPatch = '' # Upstream doesn't provide a PKG-INFO file @@ -28,10 +27,9 @@ python3.pkgs.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf # Also these libraries: python3-guestfs - # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - pythonPath = with python3.pkgs; + pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff + gzip libcaca poppler_utils sng sqlite squashfsTools unzip xxd xz colordiff ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root @@ -53,9 +51,9 @@ python3.pkgs.buildPythonApplication rec { diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". ''; - homepage = https://wiki.debian.org/ReproducibleBuilds; - license = licenses.gpl3Plus; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + homepage = https://wiki.debian.org/ReproducibleBuilds; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dezgeg ]; + platforms = platforms.linux; }; }