From 85d36c3cb2a28713edd9ea26f68bb87148112293 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 21 Jun 2021 20:38:16 -0400
Subject: [PATCH 01/12] kodi.packages.websocket: init at 0.58.0+matrix.2

---
 .../video/kodi-packages/websocket/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/kodi-packages.nix              |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/video/kodi-packages/websocket/default.nix

diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix
new file mode 100644
index 000000000000..3c83e1f9b000
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/websocket/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }:
+
+buildKodiAddon rec {
+  pname = "websocket";
+  namespace = "script.module.websocket";
+  version = "0.58.0+matrix.2";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  passthru.updateScript = addonUpdateScript {
+    attrPath = "kodi.packages.websocket";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/websocket-client/websocket-client";
+    description = "A WebSocket client for Python";
+    license = licenses.lgpl2Only;
+    maintainers = teams.kodi.members;
+  };
+}
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index f9bf8dc87061..b0e9e8c0a1e1 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -126,4 +126,6 @@ let self = rec {
 
   urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { };
 
+  websocket = callPackage ../applications/video/kodi-packages/websocket { };
+
 }; in self

From ade0431ba6ce03ad673554dbcb1f533f6425be42 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 22:41:51 -0400
Subject: [PATCH 02/12] kodi.packages.jellyfin: 0.7.1 -> 0.7.4

---
 .../video/kodi-packages/jellyfin/default.nix      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/pkgs/applications/video/kodi-packages/jellyfin/default.nix
index 03a037ce5387..b162ca11fa8c 100644
--- a/pkgs/applications/video/kodi-packages/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi-packages/jellyfin/default.nix
@@ -1,17 +1,17 @@
-{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals }:
+{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }:
 let
   python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]);
 in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "0.7.1";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "0fx20gmd5xlg59ks4433qh2b3jhbs5qrnc49zi4rkqqr4jr4nhnn";
+    sha256 = "1ykgz1l2gmpdlsp3fbm31q8757879i9dd13svslqykvxadg69x03";
   };
 
   nativeBuildInputs = [
@@ -19,13 +19,13 @@ buildKodiAddon rec {
   ];
 
   prePatch = ''
-    substituteInPlace .config/generate_xml.py \
-      --replace "'jellyfin-kodi/release.yaml'" "'release.yaml'" \
-      --replace "'jellyfin-kodi/addon.xml'" "'addon.xml'"
+    # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097
+    substituteInPlace build.py \
+      --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:"
   '';
 
   buildPhase = ''
-    ${python}/bin/python3 .config/generate_xml.py py3
+    ${python}/bin/python3 build.py --version=py3
   '';
 
   postInstall = ''
@@ -38,6 +38,7 @@ buildKodiAddon rec {
     six
     kodi-six
     signals
+    websocket
   ];
 
   meta = with lib; {

From f01fdf8357f135a9896ec1a9e256b8d24df7dbe1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 22:44:34 -0400
Subject: [PATCH 03/12] kodi.packages.a4ksubtitles: 2.3.0 -> 2.6.0

---
 .../applications/video/kodi-packages/a4ksubtitles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
index 5d714cf17993..8b91b5e5fa58 100644
--- a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
+++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
@@ -3,13 +3,13 @@
 buildKodiAddon rec {
   pname = "a4ksubtitles";
   namespace = "service.subtitles.a4ksubtitles";
-  version = "2.3.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "a4k-openproject";
     repo = "a4kSubtitles";
     rev = "${namespace}/${namespace}-${version}";
-    sha256 = "0hxvxkbihfyvixmlxf5n4ccn70w0244hhw3hr44rqvx00a0bg1lh";
+    sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881";
   };
 
   propagatedBuildInputs = [

From 790830ea4914922a4eb2d9d9d71554432e846288 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 22:46:52 -0400
Subject: [PATCH 04/12] kodi.packages.netflix: 1.15.1 -> 1.16.0

---
 pkgs/applications/video/kodi-packages/netflix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix
index 1aac5f8e9b27..20317b26828c 100644
--- a/pkgs/applications/video/kodi-packages/netflix/default.nix
+++ b/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -3,13 +3,13 @@
 buildKodiAddon rec {
   pname = "netflix";
   namespace = "plugin.video.netflix";
-  version = "1.15.1";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "CastagnaIT";
     repo = namespace;
     rev = "v${version}";
-    sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v";
+    sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k";
   };
 
   propagatedBuildInputs = [

From 52fc17064d75c0230e8be9eb2ba23144cfec5cfd Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 22:57:04 -0400
Subject: [PATCH 05/12] kodi.packages.youtube: 6.8.10 -> 6.8.14

---
 pkgs/applications/video/kodi-packages/youtube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix
index c108aa36f925..65613658e0f0 100644
--- a/pkgs/applications/video/kodi-packages/youtube/default.nix
+++ b/pkgs/applications/video/kodi-packages/youtube/default.nix
@@ -3,11 +3,11 @@
 buildKodiAddon rec {
   pname = "youtube";
   namespace = "plugin.video.youtube";
-  version = "6.8.10+matrix.1";
+  version = "6.8.14+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "18z9zh6yqihnmfwd6cc4kpy2frzbarvhg8qpyc3w851ad053q7v0";
+    sha256 = "1a18whh3fisprwipwhxf26kc958sxhwpvs8pxwq2sq96vr7b4xq7";
   };
 
   propagatedBuildInputs = [

From 38a2180238ac44386fb2fd5d9369cfbb12eaf0e9 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:01:04 -0400
Subject: [PATCH 06/12] kodi.packages.certifi: 2019.11.28 -> 2020.12.05

---
 pkgs/applications/video/kodi-packages/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix
index d122cacc878f..b99a64f3eec3 100644
--- a/pkgs/applications/video/kodi-packages/certifi/default.nix
+++ b/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "certifi";
   namespace = "script.module.certifi";
-  version = "2019.11.28+matrix.1";
+  version = "2020.12.05+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "0vsd68izv1ix0hb1gm74qq3zff0sxmhfhjyh7y9005zzp2gpi62v";
+    sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy";
   };
 
   passthru.updateScript = addonUpdateScript {

From ca0f03fc9180f5202abcdca9bb81b2d54360a97e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:01:57 -0400
Subject: [PATCH 07/12] kodi.packages.chardet: 3.0.4 -> 4.0.0

---
 pkgs/applications/video/kodi-packages/chardet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix
index 7c069592c673..cfe3d501cbd4 100644
--- a/pkgs/applications/video/kodi-packages/chardet/default.nix
+++ b/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "chardet";
   namespace = "script.module.chardet";
-  version = "3.0.4+matrix.3";
+  version = "4.0.0+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "05928dj4fsj2zg8ajdial3sdf8izddq64sr0al3zy1gqw91jp80f";
+    sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj";
   };
 
   passthru.updateScript = addonUpdateScript {

From 6bf3af4045dba925641858640b42d7c0acf67398 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:02:44 -0400
Subject: [PATCH 08/12] kodi.packages.idna: 2.8.1 -> 2.10.0

---
 pkgs/applications/video/kodi-packages/idna/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix
index 662a45188ecc..c90f52ffdc94 100644
--- a/pkgs/applications/video/kodi-packages/idna/default.nix
+++ b/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "idna";
   namespace = "script.module.idna";
-  version = "2.8.1+matrix.1";
+  version = "2.10.0+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "02s75fhfmbs3a38wvxba51aj3lv5bidshjdkl6yjfji6waxpr9xh";
+    sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7";
   };
 
   passthru.updateScript = addonUpdateScript {

From 382ab79dff4a30952d0f568d39551e4dfc338f24 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:03:47 -0400
Subject: [PATCH 09/12] kodi.packages.inputstreamhelper: 0.5.2 -> 0.5.5

---
 .../video/kodi-packages/inputstreamhelper/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
index b42c32fed109..4ca45f8b7b90 100644
--- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
+++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "inputstreamhelper";
   namespace = "script.module.inputstreamhelper";
-  version = "0.5.2+matrix.1";
+  version = "0.5.5+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "18lkksljfa57w69yklbldf7dgyykrm84pd10mdjdqdm88fdiiijk";
+    sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4";
   };
 
   passthru.updateScript = addonUpdateScript {

From 52109273d1eb0c75853d42e22043f8fea62e18fd Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:04:18 -0400
Subject: [PATCH 10/12] kodi.packages.requests: 2.22.0 -> 2.25.1

---
 pkgs/applications/video/kodi-packages/requests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix
index 7d79abd0872e..0f2d5044f04c 100644
--- a/pkgs/applications/video/kodi-packages/requests/default.nix
+++ b/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "requests";
   namespace = "script.module.requests";
-  version = "2.22.0+matrix.1";
+  version = "2.25.1+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "09576galkyzhw8fhy2h4aablm5rm2v08g0mdmg9nn55dlxhkkljq";
+    sha256 = "00qhykizvspzfwgl7qz9cyxrazs54jgin40g49v5nzmjq3qf62hb";
   };
 
   propagatedBuildInputs = [

From 4002abc72ff8b8de4eb0cbbdfec50359b692cacc Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:05:13 -0400
Subject: [PATCH 11/12] kodi.packages.six: 1.14.0 -> 1.15.0

---
 pkgs/applications/video/kodi-packages/six/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/six/default.nix b/pkgs/applications/video/kodi-packages/six/default.nix
index 8d7b8f936f3a..1742d1f6f049 100644
--- a/pkgs/applications/video/kodi-packages/six/default.nix
+++ b/pkgs/applications/video/kodi-packages/six/default.nix
@@ -3,11 +3,11 @@
 buildKodiAddon rec {
   pname = "six";
   namespace = "script.module.six";
-  version = "1.14.0+matrix.2";
+  version = "1.15.0+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "1f9g43j4y5x7b1bgbwqqfj0p2bkqjpycj17dj7a9j271mcr5zhwb";
+    sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf";
   };
 
   passthru.updateScript = addonUpdateScript {

From 2a23771c38907892aeca3fe7e2b6fe79fe8351cb Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 16 Jun 2021 23:06:06 -0400
Subject: [PATCH 12/12] kodi.packages.urllib3: 1.25.8 -> 1.26.4

---
 pkgs/applications/video/kodi-packages/urllib3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix
index e3127a8d1188..12d8e60d67be 100644
--- a/pkgs/applications/video/kodi-packages/urllib3/default.nix
+++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -2,11 +2,11 @@
 buildKodiAddon rec {
   pname = "urllib3";
   namespace = "script.module.urllib3";
-  version = "1.25.8+matrix.1";
+  version = "1.26.4+matrix.1";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
-    sha256 = "080yq8ns0sag6rmdag1hjwi0whcmp35wzqjp3by92m81cpszs75q";
+    sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf";
   };
 
   passthru.updateScript = addonUpdateScript {