diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/by-name/vi/visidata/package.nix similarity index 60% rename from pkgs/applications/misc/visidata/default.nix rename to pkgs/by-name/vi/visidata/package.nix index 0abc8a4d6cc7..ef923e097cd0 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/by-name/vi/visidata/package.nix @@ -1,55 +1,17 @@ { - 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,64 +23,69 @@ buildPythonApplication rec { hash = "sha256-kOg9OypWNGStNYFctPIwzVa1CsZBySY2IpA3eDrS7eY="; }; - propagatedBuildInputs = [ - # from visidata/requirements.txt - # packages not (yet) present in nixpkgs are commented - python-dateutil - pandas - requests - lxml - openpyxl - xlrd - xlwt - h5py - psycopg2 - boto3 - pyshp - #mapbox-vector-tile - pypng - #pyconll - msgpack - brotli - #fecfile - fonttools - #sas7bdat - #xport - #savReaderWriter - pyyaml - #namestand - #datapackage - pdfminer-six - #tabula - vobject - tabulate - wcwidth - zstandard - odfpy - urllib3 - pyarrow - seaborn - matplotlib - sh - psutil - numpy + propagatedBuildInputs = + with python3Packages; + [ + # from visidata/requirements.txt + # packages not (yet) present in nixpkgs are commented + python-dateutil + pandas + requests + lxml + openpyxl + xlrd + xlwt + h5py + psycopg2 + boto3 + pyshp + #mapbox-vector-tile + pypng + #pyconll + msgpack + brotli + #fecfile + fonttools + #sas7bdat + #xport + #savReaderWriter + pyyaml + #namestand + #datapackage + pdfminer-six + #tabula + vobject + tabulate + wcwidth + zstandard + odfpy + urllib3 + pyarrow + seaborn + matplotlib + sh + psutil + numpy - #requests_cache - beautifulsoup4 + #requests_cache + beautifulsoup4 - faker - praw - zulip - #pyairtable + faker + praw + zulip + #pyairtable - setuptools - importlib-metadata - ] - ++ lib.optionals withPcap [ - dpkt - dnslib - ] - ++ lib.optional withXclip xclip; + setuptools + importlib-metadata + ] + ++ lib.optionals withPcap ( + with python3Packages; + [ + dpkt + dnslib + ] + ) + ++ lib.optional withXclip xclip; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe5094154213..b61cf0936cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };