diff --git a/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch b/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch deleted file mode 100644 index ae221eff604..00000000000 --- a/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 620c3eb38f0dbea6e877e37e97508513e87a0732 Mon Sep 17 00:00:00 2001 -From: Jeremy Fleischman -Date: Sun, 27 Mar 2022 00:44:52 -0700 -Subject: [PATCH] Add new KODI_WEBSERVER_EXTRA_WHITELIST cmake var to allow - access to more directories - -(This is a backport of -https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 -to Kodi 19.4 Matrix) - -This is useful for NixOS, which often ends up creating a `KODI_HOME` -with symlinks to other files (including the chorus2 interface). Kodi's -webserver cautiously refuses to follow these symlinks, and you end up -getting 404s rather than the web page. - -See https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for a -discussion of this on the Kodi forum. ---- - CMakeLists.txt | 1 + - xbmc/CompileInfo.cpp.in | 5 +++++ - xbmc/CompileInfo.h | 1 + - xbmc/utils/FileUtils.cpp | 6 +++++- - 4 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d5369798df23..d5ef6d9390ef0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -243,6 +243,7 @@ add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp - -DAPP_BUILD_DATE=${APP_BUILD_DATE} - -DAPP_SHARED_LIBRARY_SUFFIX="${APP_SHARED_LIBRARY_SUFFIX}" - -Dprefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} -+ -DKODI_WEBSERVER_EXTRA_WHITELIST="${KODI_WEBSERVER_EXTRA_WHITELIST}" - -P ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake - DEPENDS ${CMAKE_SOURCE_DIR}/version.txt - export-files -diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in -index f81fe77902236..4f19203a89cde 100644 ---- a/xbmc/CompileInfo.cpp.in -+++ b/xbmc/CompileInfo.cpp.in -@@ -105,3 +105,8 @@ std::vector CCompileInfo::GetAvailableWindowSystems() - { - return StringUtils::Split("@CORE_PLATFORM_NAME_LC@", ' '); - } -+ -+const std::vector CCompileInfo::GetWebserverExtraWhitelist() -+{ -+ return StringUtils::Split("@KODI_WEBSERVER_EXTRA_WHITELIST@", ','); -+} -diff --git a/xbmc/CompileInfo.h b/xbmc/CompileInfo.h -index 553a0194ee77f..e2521324e6576 100644 ---- a/xbmc/CompileInfo.h -+++ b/xbmc/CompileInfo.h -@@ -32,4 +32,5 @@ class CCompileInfo - static const char* GetVersionCode(); - static std::vector GetAvailableWindowSystems(); - static std::vector LoadOfficialRepoInfos(); -+ static const std::vector GetWebserverExtraWhitelist(); - }; -diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp -index e51f3d631c256..fc717c9608098 100644 ---- a/xbmc/utils/FileUtils.cpp -+++ b/xbmc/utils/FileUtils.cpp -@@ -6,6 +6,7 @@ - * See LICENSES/README.md for more information. - */ - -+#include "CompileInfo.h" - #include "FileUtils.h" - #include "ServiceBroker.h" - #include "guilib/GUIKeyboardFactory.h" -@@ -261,12 +262,15 @@ bool CFileUtils::CheckFileAccessAllowed(const std::string &filePath) - "/.ssh/", - }; - // ALLOW kodi paths -- const std::vector whitelist = { -+ std::vector whitelist = { - CSpecialProtocol::TranslatePath("special://home"), - CSpecialProtocol::TranslatePath("special://xbmc"), - CSpecialProtocol::TranslatePath("special://musicartistsinfo") - }; - -+ auto kodiExtraWhitelist = CCompileInfo::GetWebserverExtraWhitelist(); -+ whitelist.insert(whitelist.end(), kodiExtraWhitelist.begin(), kodiExtraWhitelist.end()); -+ - // image urls come in the form of image://... sometimes with a / appended at the end - // and can be embedded in a music or video file image://music@... - // strip this off to get the real file path diff --git a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix index 17c1d45783f..abcdefaf02d 100644 --- a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix +++ b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix @@ -9,7 +9,7 @@ { attrPath }: let - url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz"; + url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz"; updateScript = writeShellScript "update.sh" '' set -ex diff --git a/pkgs/applications/video/kodi/addons/arrow/default.nix b/pkgs/applications/video/kodi/addons/arrow/default.nix index bca61e902eb..931667d8a58 100644 --- a/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "1.0.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l"; + url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; + sha256 = "sha256-dFCAHlWgslxsAVQAPP3aDM6Fw+I9PP0ITUVTKJY2QXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 1053ca11cb3..7d58625d2d7 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.1.8"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 7becbd2252d..0e0699752a9 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "2022.9.24"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix index fe482447cfa..0d20853412f 100644 --- a/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "4.0.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-sh1lMlB3+fkVr4yxzkRVHag+/GhySWFVk2iFVYsJTcs="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/dateutil/default.nix b/pkgs/applications/video/kodi/addons/dateutil/default.nix index 94ca38dd086..9adcf3303bb 100644 --- a/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "2.8.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 11738065ff6..12a9f82e3f6 100644 --- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.6.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index 0f2815fe5f9..30a1db9d6b2 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.18.2+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw="; }; diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index 44bda1278bb..d752cb93b01 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.4.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 1319f72f4e9..500a48532ca 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.5.10+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index 6c42bd78f45..a98b8d2d766 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.1.4"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 24404ef349e..638b7c3b500 100644 --- a/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.1.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix index 4e2a7001010..3d58ddd6430 100644 --- a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: buildKodiBinaryAddon rec { pname = "kodi-libretro-genplus"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.genplus"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q="; }; diff --git a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix index f669e24f8bd..231c769fa75 100644 --- a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: buildKodiBinaryAddon rec { pname = "kodi-libretro-mgba"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.mgba"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU="; }; diff --git a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix index 7994016b6cd..7b52988e80c 100644 --- a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }: +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, snes9x }: buildKodiBinaryAddon rec { pname = "kodi-libretro-snes9x"; @@ -8,7 +8,7 @@ buildKodiBinaryAddon rec { src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.snes9x"; - rev = "${version}-${rel}"; + rev = "${version}-Matrix"; sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38="; }; diff --git a/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/pkgs/applications/video/kodi/addons/myconnpy/default.nix index e39625545f6..5a649b70413 100644 --- a/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "8.0.18+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-E1S1EThukF3noU4LC6MDQseRQhSsZr/9qnPSxH/Do7M="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/pkgs/applications/video/kodi/addons/requests-cache/default.nix index de785ab9bb5..6800ecde832 100644 --- a/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.5.2+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix index 3361a03f5d2..7f505f5532e 100644 --- a/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/pkgs/applications/video/kodi/addons/requests/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "2.27.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/routing/default.nix b/pkgs/applications/video/kodi/addons/routing/default.nix index a75e786cf1f..a96c16b8629 100644 --- a/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/pkgs/applications/video/kodi/addons/routing/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.2.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/signals/default.nix b/pkgs/applications/video/kodi/addons/signals/default.nix index b66b1e99a8b..4d84bcafeee 100644 --- a/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/pkgs/applications/video/kodi/addons/signals/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "0.0.6+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE="; }; passthru= { diff --git a/pkgs/applications/video/kodi/addons/simplejson/default.nix b/pkgs/applications/video/kodi/addons/simplejson/default.nix index e9293d6258d..fad6efec158 100644 --- a/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "3.17.0+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-XLE4x0qr3CFwWqh1BfSg9q+w6pWgFBXG7TyVJWeGQIs="; }; diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 1742d1f6f04..5933c544735 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.15.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE="; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/pkgs/applications/video/kodi/addons/trakt-module/default.nix index ad7610e0f02..1c9680147cb 100644 --- a/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "4.4.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/trakt/default.nix b/pkgs/applications/video/kodi/addons/trakt/default.nix index f2a662616cc..64113cb0139 100644 --- a/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.5.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-OyU6S5r/y3vqW6Wg6OP0+Zn4YchBy8x1i++hzCQHyx0="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index 0fddddfb1b6..f1c203a2b95 100644 --- a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -5,8 +5,8 @@ buildKodiAddon rec { version = "3.7.4.3"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-GE9OfOIWtEKQcAmQZAK1uOFN4DQDiWU0YxUWICGDSFw="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 90900f30607..02d7fde864c 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "1.26.13+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index 423dfa73f34..9a15ab0a494 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "0.58.0+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7"; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-xyOlKAAvtucC/tTm027ifEgiry/9gQneAcIwOGxmTkg="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 8dab69bb56a..d256dad3934 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -6,8 +6,8 @@ buildKodiAddon rec { version = "6.8.24+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; + url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 05e594d80aa..1a3b8135e01 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -38,25 +38,27 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20221204"; - kodiVersion = "19.5"; - rel = "Matrix"; + kodiReleaseDate = "20230115"; + kodiVersion = "20.0"; + rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "sha256-vprhEPxYpY3/AsUgvPNnhBlh0Dl73ekALAblHaUKzd0="; + sha256 = "sha256-0BkbA1iovouwjQVtiKFw3+64i7sMWZNiCUfOQ0EsslY="; }; + # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies + ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION + version = "4.4.1"; src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-19.2"; - sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; + rev = "${version}-${rel}-Alpha1"; + sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; }; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . @@ -79,22 +81,22 @@ let libdvdcss = fetchFromGitHub { owner = "xbmc"; repo = "libdvdcss"; - rev = "1.4.2-Leia-Beta-5"; - sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; + rev = "1.4.3-Next-Nexus-Alpha2-2"; + sha256 = "sha256-CJMGH50mNAkovccNcol5ArF3zUnZKfbVB9EXyQgu5k4="; }; libdvdnav = fetchFromGitHub { owner = "xbmc"; repo = "libdvdnav"; - rev = "6.0.0-Leia-Alpha-3"; - sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; + rev = "6.1.1-Next-Nexus-Alpha2-2"; + sha256 = "sha256-m8SCjOokVbwJ7eVfYKHap1pQjVbI+BXaoxhGZQIg0+k="; }; libdvdread = fetchFromGitHub { owner = "xbmc"; repo = "libdvdread"; - rev = "6.0.0-Leia-Alpha-3"; - sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; + rev = "6.1.3-Next-Nexus-Alpha2-2"; + sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc="; }; kodi_platforms = lib.optional gbmSupport "gbm" @@ -107,22 +109,6 @@ in stdenv.mkDerivation { src = kodi_src; - patches = [ - # This is a backport of - # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 - # to Kodi 19.4 Matrix. - # This can be removed once a new major release of Kodi comes out and we upgrade - # to it. - ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch - - # A patch to fix build until the next major release of Kodi comes out and we upgrade - # https://github.com/xbmc/xbmc/pull/22291 - (fetchpatch { - url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; - sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; - }) - ]; - buildInputs = [ gnutls libidn libtasn1 nasm p11-kit libxml2 python3Packages.python @@ -196,6 +182,7 @@ in stdenv.mkDerivation { "-DGIT_VERSION=${kodiReleaseDate}" "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" + "-DENABLE_INTERNAL_RapidJSON=OFF" "-DENABLE_OPTICAL=ON" "-DLIRC_DEVICE=/run/lirc/lircd" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 7891669e0fc..3b948080c0e 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -9,7 +9,7 @@ in let self = rec { addonDir = "/share/kodi/addons"; - rel = "Matrix"; + rel = "Nexus"; callPackage = newScope self;