diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index d7a7c4d9f75f..4790d433647e 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonApplication , fetchFromGitHub -, fetchpatch # python requirements , beautifulsoup4 , boto3 @@ -23,6 +22,8 @@ , pyarrow , pyshp , pypng +, msgpack +, brotli , python-dateutil , pyyaml , requests @@ -46,29 +47,15 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s="; + hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0="; }; - patches = [ - # Drop when next release is out - (fetchpatch { - name = "drop-support-for-python-37.patch"; - url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch"; - hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY="; - }) - (fetchpatch { - name = "update-tests-for-python-312.patch"; - url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch"; - hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E="; - }) - ]; - propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented @@ -86,6 +73,9 @@ buildPythonApplication rec { #mapbox-vector-tile pypng #pyconll + msgpack + brotli + #fecfile fonttools #sas7bdat #xport @@ -139,6 +129,7 @@ buildPythonApplication rec { # tests to disable because we don't have a package to load such files rm -f tests/load-conllu.vdj # no 'pyconll' rm -f tests/load-sav.vd # no 'savReaderWriter' + rm -f tests/load-fec.vdj # no 'fecfile' # tests use git to compare outputs to references git init -b "test-reference" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d1e21622b7e..0760f5a8bd5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13330,8 +13330,7 @@ with pkgs; vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; - visidata = (newScope python3Packages) ../applications/misc/visidata { - }; + visidata = python3Packages.callPackage ../applications/misc/visidata { }; vit = callPackage ../applications/misc/vit { };