From 65dc12ea22599727459e121b7a0741be3a2392e8 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Sat, 19 Oct 2024 16:30:38 +0200
Subject: [PATCH 1/2] visidata: 3.0.2 -> 3.1.1

Changelog: https://github.com/saulpw/visidata/releases/tag/v3.1.1

The now obsolete patches have been removed.
New dependencies for the msgpack loader have been registered here.
The test for the fecfile loader is disabled because we do not have
the required dependency in nixpkgs.
---
 pkgs/applications/misc/visidata/default.nix | 25 +++++++--------------
 1 file changed, 8 insertions(+), 17 deletions(-)

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"

From 8c64772d13ce2b36997412dc421f634e9af5a827 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Sat, 19 Oct 2024 16:34:15 +0200
Subject: [PATCH 2/2] visidata: newScope -> python3Packages.callPackage

---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85dc76a96bfc..4a1c405259bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13339,8 +13339,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 { };