get the joyn plugin to work

flake.nix

@@ -252,7 +252,6 @@
                   art-lotte
                   art-lotte-bgs-nsfw
                   art-lotte-bgs-sfw
-                  kodi-pydes
                   package-updater
                   ;
               }

packages/default.nix

@@ -3,6 +3,5 @@ self: super: {
   art-lotte-bgs-nsfw = self.callPackage ./art/lotte/bgs-nsfw.nix { };
   art-lotte-bgs-sfw = self.callPackage ./art/lotte/bgs-sfw.nix { };
   kodi-joyn = self.kodiPackages.callPackage ./kodi/joyn { };
-  kodi-pydes = self.kodiPackages.callPackage ./kodi/pydes { };
   package-updater = self.callPackage ./updater.nix { };
 }

packages/kodi/joyn/default.nix

@@ -3,7 +3,6 @@
   fetchFromGitHub,
   inputstream-adaptive,
   inputstreamhelper,
-  kodi-pydes,
   lib,
   simplejson,
 }:
@@ -15,17 +14,16 @@ buildKodiAddon {
   namespace = "plugin.video.joyn";
   version = "2.3.1.10";
   src = fetchFromGitHub {
-    owner = "knaerzche";
+    owner = "Maven85";
     repo = "plugin.video.joyn";
     inherit (srcInfo) rev sha256;
   };
-  postPatch = ''
+  preFixup = ''
-    substituteInPlace --replace '2.26.0' '3.0.0' addon.xml
+    substituteInPlace $out/share/kodi/addons/plugin.video.joyn/addon.xml --replace-fail '2.26.0' '3.0.0' 
   '';
   propagatedBuildInputs = [
     inputstream-adaptive
     inputstreamhelper
-    kodi-pydes
     simplejson
   ];
   meta = {

packages/kodi/joyn/source.json

@@ -1,10 +1,10 @@
 {
-    "url": "https://github.com/knaerzche/plugin.video.joyn",
+    "url": "https://github.com/Maven85/plugin.video.joyn",
-    "rev": "0954c40d20fe4c956c45519993f0dfdc0debade2",
+    "rev": "a74a0901d55c47ca0269fd85dc2f267c41570e00",
-    "date": "2020-09-04T17:17:52+02:00",
+    "date": "2024-11-13T09:07:18+01:00",
-    "path": "/nix/store/1c49y966arnakcna3nb55fpfik0rsysq-plugin.video.joyn",
+    "path": "/nix/store/q5x2msdzl377yribfa5a86vrdl1cbl4d-plugin.video.joyn",
-    "sha256": "1wkn03j0mwlbnnl0zzr74pw3z4z2r76130rana7jdmc79fqxld53",
+    "sha256": "00y4p9pqd1x67jc0356bm9ynkml9qnggqyylzm6mckk44i1ixqh1",
-    "hash": "sha256-ozTasUuH1SaPsiqDEczJ4pM/+CUn/w+otYvyCuQAdvI=",
+    "hash": "sha256-AeIeQyRkTlZN/dR7/J7FidZpfarLlAGYPKaHhm+6xAM=",
     "fetchLFS": false,
     "fetchSubmodules": false,
     "deepClone": false,

packages/kodi/joyn/updater.nix

@@ -9,11 +9,11 @@ let
 in
 ''
   echo "kodi-joyn: Checking for updates"
-  CURRENT_COMMIT=$(${curl}/bin/curl https://api.github.com/repos/knaerzche/plugin.video.joyn/commits | ${jq}/bin/jq -r '.[0].sha')
+  CURRENT_COMMIT=$(${curl}/bin/curl https://api.github.com/repos/Maven85/plugin.video.joyn/commits | ${jq}/bin/jq -r '.[0].sha')
   KNOWN_COMMIT=${srcInfo.rev}
   if [ $CURRENT_COMMIT != $KNOWN_COMMIT ]; then
     echo "kodi-joyn: Updating from $KNOWN_COMMIT to $CURRENT_COMMIT"
-    ${nix-prefetch-git}/bin/nix-prefetch-git https://github.com/knaerzche/plugin.video.joyn | ${jq}/bin/jq > packages/kodi/joyn/source.json
+    ${nix-prefetch-git}/bin/nix-prefetch-git https://github.com/Maven85/plugin.video.joyn | ${jq}/bin/jq > packages/kodi/joyn/source.json
   fi
   echo "kodi-joyn: Done"
 ''

packages/kodi/pydes/addon.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.pydes" name="pyDes" version="2.0.1" provider-name="Todd Whiteman">
-  <requires>
-    <import addon="xbmc.python" version="3.0.0"/>
-  </requires>
-  <extension point="xbmc.python.module"
-             library="lib" />
-  <extension point="xbmc.addon.metadata">
-    <summary lang="en">A pure python module which implements the DES and Triple-DES encryption algorithms.</summary>
-    <website>http://twhiteman.netfirms.com/des.html</website> 
-    <license>MIT</license> 
-    <platform>all</platform> 
-    <source>http://sourceforge.net/projects/pydes/</source> 
-  </extension>
-</addon>

packages/kodi/pydes/default.nix

@@ -1,11 +0,0 @@
-{ callPackage, buildKodiAddon }:
-let
-  src = callPackage ./source.nix { };
-in
-buildKodiAddon {
-  pname = "pyDes";
-  namespace = "script.module.pydes";
-  version = "2.0.1";
-  inherit src;
-  inherit (src) meta;
-}

packages/kodi/pydes/source.json

@@ -1,12 +0,0 @@
-{
-    "url": "https://github.com/twhiteman/pyDes",
-    "rev": "e988a5ffc9abb8010fc75dba54904d1c5dbe83db",
-    "date": "2019-01-07T17:12:32-08:00",
-    "path": "/nix/store/avhx558pnxzlzl4ww1xrzkl08qcp19pm-pyDes",
-    "sha256": "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww",
-    "hash": "sha256-nI9gQjkM+8Jitmmzf4VGnGFHTWLrm0oaWV+V6RdHLGo=",
-    "fetchLFS": false,
-    "fetchSubmodules": false,
-    "deepClone": false,
-    "leaveDotGit": false
-}

packages/kodi/pydes/source.nix

@@ -1,29 +0,0 @@
-{
-  stdenvNoCC,
-  fetchFromGitHub,
-  lib,
-}:
-let
-  srcInfo = lib.importJSON ./source.json;
-  src = fetchFromGitHub {
-    owner = "twhiteman";
-    repo = "pyDes";
-    inherit (srcInfo) rev sha256;
-  };
-in
-stdenvNoCC.mkDerivation {
-  pname = "kodi-pydes";
-  version = srcInfo.date;
-  inherit src;
-  dontUnpack = true;
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/lib
-    cp $src/pyDes.py $out/lib
-    cp ${./addon.xml} $out/addon.xml
-  '';
-  meta = {
-    license = lib.licenses.mit;
-    description = "A pure python module which implements the DES and Triple-DES encryption algorithms.";
-  };
-}

packages/kodi/pydes/updater.nix

@@ -1,19 +0,0 @@
-{
-  nix-prefetch-git,
-  curl,
-  jq,
-  lib,
-}:
-let
-  srcInfo = lib.importJSON ./source.json;
-in
-''
-  echo "kodi-pydes: Checking for updates"
-  CURRENT_COMMIT=$(${curl}/bin/curl https://api.github.com/repos/twhiteman/pyDes/commits | ${jq}/bin/jq -r '.[0].sha')
-  KNOWN_COMMIT=${srcInfo.rev}
-  if [ $CURRENT_COMMIT != $KNOWN_COMMIT ]; then
-    echo "kodi-pydes: Updating from $KNOWN_COMMIT to $CURRENT_COMMIT"
-    ${nix-prefetch-git}/bin/nix-prefetch-git https://github.com/twhiteman/pyDes | ${jq}/bin/jq > packages/kodi/pydes/source.json
-  fi
-  echo "kodi-pydes: Done"
-''

packages/kodi/updater.nix

@@ -4,5 +4,4 @@
 }:
 lib.concatMapStringsSep "\n" (f: callPackage "${f}/updater.nix" { }) [
   ./joyn
-  ./pydes
 ]