Unverified Commit 8bb4e100 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

visidata: migrate to by-name (#437592)

parents 007d3f0e 34b9180a
Loading
Loading
Loading
Loading
+63 −96
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  buildPythonApplication,
  python3Packages,
  fetchFromGitHub,
  # python requirements
  beautifulsoup4,
  boto3,
  faker,
  fonttools,
  h5py,
  importlib-metadata,
  lxml,
  matplotlib,
  numpy,
  odfpy,
  openpyxl,
  pandas,
  pdfminer-six,
  praw,
  psutil,
  psycopg2,
  pyarrow,
  pyshp,
  pypng,
  msgpack,
  brotli,
  python-dateutil,
  pyyaml,
  requests,
  seaborn,
  setuptools,
  sh,
  tabulate,
  urllib3,
  vobject,
  wcwidth,
  xlrd,
  xlwt,
  zstandard,
  zulip,
  # other
  gitMinimal,
  withPcap ? true,
  dpkt,
  dnslib,
  withXclip ? stdenv.hostPlatform.isLinux,
  xclip,
  testers,
  visidata,
  stdenv,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
  pname = "visidata";
  version = "3.2";
  format = "setuptools";
@@ -61,7 +23,9 @@ buildPythonApplication rec {
    hash = "sha256-kOg9OypWNGStNYFctPIwzVa1CsZBySY2IpA3eDrS7eY=";
  };

  propagatedBuildInputs = [
  propagatedBuildInputs =
    with python3Packages;
    [
      # from visidata/requirements.txt
      # packages not (yet) present in nixpkgs are commented
      python-dateutil
@@ -114,10 +78,13 @@ buildPythonApplication rec {
      setuptools
      importlib-metadata
    ]
  ++ lib.optionals withPcap [
    ++ lib.optionals withPcap (
      with python3Packages;
      [
        dpkt
        dnslib
      ]
    )
    ++ lib.optional withXclip xclip;

  nativeCheckInputs = [
+0 −2
Original line number Diff line number Diff line
@@ -4387,8 +4387,6 @@ with pkgs;

  vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { };

  visidata = python3Packages.callPackage ../applications/misc/visidata { };

  vkbasalt = callPackage ../tools/graphics/vkbasalt {
    vkbasalt32 = pkgsi686Linux.vkbasalt;
  };