Unverified Commit de485e72 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #205467 from prusnak/diffoscope 

diffoscope: 225 -> 228
parents 3705e7a9 9b52b756

pkgs/tools/misc/diffoscope/default.nix

+6 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles

, abootimg, acl, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc

, abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc

, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar

, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R

, gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R

, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd

, enableBloat ? false

# updater only
@@ -11,11 +11,11 @@ 
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!

python3Packages.buildPythonApplication rec {

  pname = "diffoscope";

  version = "225";

  version = "228";



  src = fetchurl {

    url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";

    sha256 = "sha256-nuQmvYpCSzw2kUj/UdcBpn6jabaVMYT47MDblzpb/o0=";

    sha256 = "sha256-fzIjuQEYOQPscQeVCV5gj6PmaVZcrjiOai/UA4279p4=";

  };



  outputs = [ "out" "man" ];
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { 
  pythonPath = [

      binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils

      e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip

      libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd

      html2text libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd

      xz zip zstd

    ]

    ++ (with python3Packages; [
@@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { 
    ])

    ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ]

    ++ lib.optionals enableBloat ([

      abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric

      abootimg apksigcopier apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric

      hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans

    ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ]));