Commit 5cf0c470 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

diffoscope: apply nixfmt

parent adbceb5f

pkgs/tools/misc/diffoscope/default.nix

+213 −204
Original line number Diff line number Diff line 
{ lib

, stdenv

, abootimg

, acl

, apksigcopier

, apksigner

, apktool

, binutils-unwrapped-all-targets

, bzip2

, cbfstool

, cdrkit

, colord

, colordiff

, coreutils

, cpio

, db

, diffutils

, docutils

, dtc

, e2fsprogs

, enableBloat ? true

, enjarify

, fetchurl

, file

, findutils

, fontforge-fonttools

, ffmpeg

, fpc

, gettext

, ghc

, ghostscriptX

, giflib

, gnumeric

, gnupg

, gnutar

, gzip

, hdf5

, help2man

, html2text

, imagemagick

, installShellFiles

, jdk

, libarchive

, libcaca

, libxmlb

, llvm

, lz4

, lzip

, mono

, ocaml

, odt2txt

, oggvideotools

, openssh

, openssl

, pdftk

, pgpdump

, poppler_utils

, procyon

, python3

, qemu

, R

, sng

, sqlite

, squashfsTools

, tcpdump

, ubootTools

, unzip

, wabt

, xmlbeans

, xxd

, xz

, zip

, zstd

{

  lib,

  stdenv,

  abootimg,

  acl,

  apksigcopier,

  apksigner,

  apktool,

  binutils-unwrapped-all-targets,

  bzip2,

  cbfstool,

  cdrkit,

  colord,

  colordiff,

  coreutils,

  cpio,

  db,

  diffutils,

  docutils,

  dtc,

  e2fsprogs,

  enableBloat ? true,

  enjarify,

  fetchurl,

  file,

  findutils,

  fontforge-fonttools,

  ffmpeg,

  fpc,

  gettext,

  ghc,

  ghostscriptX,

  giflib,

  gnumeric,

  gnupg,

  gnutar,

  gzip,

  hdf5,

  help2man,

  html2text,

  imagemagick,

  installShellFiles,

  jdk,

  libarchive,

  libcaca,

  libxmlb,

  llvm,

  lz4,

  lzip,

  mono,

  ocaml,

  odt2txt,

  oggvideotools,

  openssh,

  openssl,

  pdftk,

  pgpdump,

  poppler_utils,

  procyon,

  python3,

  qemu,

  R,

  sng,

  sqlite,

  squashfsTools,

  tcpdump,

  ubootTools,

  unzip,

  wabt,

  xmlbeans,

  xxd,

  xz,

  zip,

  zstd,

  # updater only

, writeScript

  writeScript,

}:



let
@@ -80,15 +81,19 @@ let 
    packageOverrides = final: prev: {

      # version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled

      # ValueError: argument TNULL is not a TLSH hex string

      tlsh = prev.tlsh.overridePythonAttrs ({ src, ... }: let

      tlsh = prev.tlsh.overridePythonAttrs (

        { src, ... }:

        let

          version = "3.19.1";

      in {

        in

        {

          inherit version;

          src = src.override {

            rev = version;

            hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U=";

          };

      });

        }

      );

    };

  };

in
@@ -108,9 +113,7 @@ python.pkgs.buildPythonApplication rec { 
    "man"

  ];



  patches = [

    ./ignore_links.patch

  ];

  patches = [ ./ignore_links.patch ];



  postPatch = ''

    # Upstream doesn't provide a PKG-INFO file
@@ -148,7 +151,8 @@ python.pkgs.buildPythonApplication rec { 
  #

  # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).

  # Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it.

  pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([

  pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (

    [

      acl

      binutils-unwrapped-all-targets

      bzip2
@@ -243,11 +247,10 @@ python.pkgs.buildPythonApplication rec { 
      ++ lib.optionals stdenv.isLinux [ oggvideotools ]

      # This doesn't work on aarch64-darwin

      ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ]

  ));

    )

  );



  nativeCheckInputs = with python.pkgs; [

    pytestCheckHook

  ] ++ pythonPath;

  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ] ++ pythonPath;



  pytestFlagsArray = [

    # Always show more information when tests fail
@@ -259,7 +262,8 @@ python.pkgs.buildPythonApplication rec { 
    installManPage doc/diffoscope.1

  '';



  disabledTests = [

  disabledTests =

    [

      "test_sbin_added_to_path"

      "test_diff_meta"

      "test_diff_meta2"
@@ -268,7 +272,8 @@ python.pkgs.buildPythonApplication rec { 
      "test_item3_deflate_llvm_bitcode"

      # Fails ever since an update to imagemagick

      "test_has_visuals"

  ] ++ lib.optionals stdenv.isDarwin [

    ]

    ++ lib.optionals stdenv.isDarwin [

      # Disable flaky tests on Darwin

      "test_non_unicode_filename"

      "test_listing"
@@ -320,7 +325,11 @@ python.pkgs.buildPythonApplication rec { 
    homepage = "https://diffoscope.org/";

    changelog = "https://diffoscope.org/news/diffoscope-${version}-released/";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ dezgeg danielfullmer raitobezarius ];

    maintainers = with maintainers; [

      dezgeg

      danielfullmer

      raitobezarius

    ];

    platforms = platforms.unix;

    mainProgram = "diffoscope";

  };