diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 691c8581d6f..8acf68ac3af 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -97,6 +97,18 @@ with lib.maintainers; {
scope = "Maintain Jitsi.";
};
+ kodi = {
+ members = [
+ aanderse
+ cpages
+ edwtjo
+ minijackson
+ peterhoeg
+ sephalon
+ ];
+ scope = "Maintain Kodi and related packages.";
+ };
+
matrix = {
members = [
ma27
diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix
index bfce47b7b2c..d122cacc878 100644
--- a/pkgs/applications/video/kodi-packages/certifi/default.nix
+++ b/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://certifi.io";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.mpl20;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix
index 1e37f6b46e2..7c069592c67 100644
--- a/pkgs/applications/video/kodi-packages/chardet/default.nix
+++ b/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://github.com/Freso/script.module.chardet";
description = "Universal encoding detector";
license = licenses.lgpl2Only;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/controllers/default.nix b/pkgs/applications/video/kodi-packages/controllers/default.nix
index bd29b7c0f7c..825ad5d53fc 100644
--- a/pkgs/applications/video/kodi-packages/controllers/default.nix
+++ b/pkgs/applications/video/kodi-packages/controllers/default.nix
@@ -16,6 +16,7 @@ buildKodiAddon rec {
meta = with lib; {
description = "Add support for different gaming controllers.";
platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
+ license = licenses.odbl;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix
index abe5635e828..662a45188ec 100644
--- a/pkgs/applications/video/kodi-packages/idna/default.nix
+++ b/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://github.com/Freso/script.module.idna";
description = "Internationalized Domain Names for Python";
license = licenses.bsd3;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
index cd4c5aca117..136efe8a243 100644
--- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
+++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -23,6 +23,7 @@ buildKodiBinaryAddon rec {
homepage = "https://github.com/peak3d/inputstream.adaptive";
description = "Kodi inputstream addon for several manifest types";
platforms = platforms.all;
- maintainers = with maintainers; [ sephalon ];
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
index 2bbcc6d9d2c..b42c32fed10 100644
--- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
+++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper";
description = "A simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback";
license = licenses.mit;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/joystick/default.nix b/pkgs/applications/video/kodi-packages/joystick/default.nix
index 321ddce905f..a1b9c3eeeef 100644
--- a/pkgs/applications/video/kodi-packages/joystick/default.nix
+++ b/pkgs/applications/video/kodi-packages/joystick/default.nix
@@ -11,11 +11,12 @@ buildKodiBinaryAddon rec {
sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
};
+ extraBuildInputs = [ tinyxml udev ];
+
meta = with lib; {
description = "Binary addon for raw joystick input.";
platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
-
- extraBuildInputs = [ tinyxml udev ];
}
diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
index a1b25576524..bd0c98137a5 100644
--- a/pkgs/applications/video/kodi-packages/myconnpy/default.nix
+++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "http://dev.mysql.com/doc/connector-python/en/index.html";
description = "MySQL Connector/Python";
license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix
index 20440153f76..80308bb1eb1 100644
--- a/pkgs/applications/video/kodi-packages/netflix/default.nix
+++ b/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -22,5 +22,6 @@ buildKodiAddon rec {
homepage = "https://github.com/CastagnaIT/plugin.video.netflix";
description = "Netflix VOD Services Add-on";
license = licenses.mit;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
index 430b9be3fd4..8896a94c9c3 100644
--- a/pkgs/applications/video/kodi-packages/pdfreader/default.nix
+++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
@@ -14,6 +14,7 @@ buildKodiAddon rec {
meta = with lib; {
homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
description = "A comic book reader";
- maintainers = with maintainers; [ edwtjo ];
+ license = licenses.gpl2Plus;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
index 3920120b90a..ba1a0241ffe 100644
--- a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
+++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
@@ -11,12 +11,13 @@ buildKodiBinaryAddon rec {
sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
};
+ extraBuildInputs = [ jsoncpp libhdhomerun ];
+
meta = with lib; {
homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
description = "Kodi's HDHomeRun PVR client addon";
platforms = platforms.all;
- maintainers = with maintainers; [ titanous ];
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
-
- extraBuildInputs = [ jsoncpp libhdhomerun ];
}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
index 935238758a6..5c55873e819 100644
--- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
+++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -15,7 +15,7 @@ buildKodiBinaryAddon rec {
homepage = "https://github.com/kodi-pvr/pvr.hts";
description = "Kodi's Tvheadend HTSP client addon";
platforms = platforms.all;
- maintainers = with maintainers; [ cpages ];
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
-
}
diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
index b508eae8c7e..9f160b4fa61 100644
--- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
+++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
@@ -11,12 +11,13 @@ buildKodiBinaryAddon rec {
sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
};
+ extraBuildInputs = [ zlib pugixml ];
+
meta = with lib; {
homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
description = "Kodi's IPTV Simple client addon";
platforms = platforms.all;
license = licenses.gpl2Plus;
+ maintainers = teams.kodi.members;
};
-
- extraBuildInputs = [ zlib pugixml ];
}
diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix
index 05288b74b6c..7d79abd0872 100644
--- a/pkgs/applications/video/kodi-packages/requests/default.nix
+++ b/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -24,5 +24,6 @@ buildKodiAddon rec {
homepage = "http://python-requests.org";
description = "Python HTTP for Humans";
license = licenses.asl20;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix
index 9d49e632721..bba7b112e9f 100644
--- a/pkgs/applications/video/kodi-packages/signals/default.nix
+++ b/pkgs/applications/video/kodi-packages/signals/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://github.com/ruuk/script.module.addon.signals";
description = "Provides signal/slot mechanism for inter-addon communication";
license = licenses.lgpl21Only;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
index 5eee0eff941..d2b79029f7c 100644
--- a/pkgs/applications/video/kodi-packages/steam-controller/default.nix
+++ b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
@@ -16,7 +16,6 @@ buildKodiBinaryAddon rec {
meta = with lib; {
description = "Binary addon for steam controller.";
platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
+ maintainers = teams.kodi.members;
};
-
}
diff --git a/pkgs/applications/video/kodi-packages/steam-launcher/default.nix b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
index cb140b4fb4d..c4a695b8f81 100644
--- a/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
+++ b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
@@ -23,6 +23,7 @@ buildKodiAddon {
restart/maximise. Running pre/post Steam scripts can be
configured via the addon.
'';
- maintainers = with maintainers; [ edwtjo ];
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/svtplay/default.nix b/pkgs/applications/video/kodi-packages/svtplay/default.nix
index cc7d350fa31..db4fbb642c0 100644
--- a/pkgs/applications/video/kodi-packages/svtplay/default.nix
+++ b/pkgs/applications/video/kodi-packages/svtplay/default.nix
@@ -21,6 +21,7 @@ buildKodiAddon rec {
is the preferred video format by the plugin.
'';
platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
+ license = licenses.gpl3Plus;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix
index e8146987913..e3127a8d118 100644
--- a/pkgs/applications/video/kodi-packages/urllib3/default.nix
+++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -17,5 +17,6 @@ buildKodiAddon rec {
homepage = "https://urllib3.readthedocs.io/en/latest/";
description = "HTTP library with thread-safe connection pooling, file post, and more";
license = licenses.mit;
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
index 13100b0dd35..6819f7bfdcb 100644
--- a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
+++ b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
@@ -11,12 +11,12 @@ buildKodiBinaryAddon rec {
sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
};
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+
meta = with lib; {
description = "LibArchive Virtual Filesystem add-on for Kodi";
license = licenses.gpl2Plus;
platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
+ maintainers = teams.kodi.members;
};
-
- extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
}
diff --git a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
index 7910ab640e9..e41f008281a 100644
--- a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
+++ b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
@@ -11,12 +11,12 @@ buildKodiBinaryAddon rec {
sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
};
+ extraBuildInputs = [ openssl libssh zlib ];
+
meta = with lib; {
description = "SFTP Virtual Filesystem add-on for Kodi";
license = licenses.gpl2Plus;
platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
+ maintainers = teams.kodi.members;
};
-
- extraBuildInputs = [ openssl libssh zlib ];
}
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 2a713324c3f..1b665418f3f 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -237,6 +237,6 @@ in stdenv.mkDerivation {
homepage = "https://kodi.tv/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];
+ maintainers = teams.kodi.members;
};
}