diff --git a/flake.nix b/flake.nix index 206d80fd..0596362f 100644 --- a/flake.nix +++ b/flake.nix @@ -252,7 +252,6 @@ art-lotte art-lotte-bgs-nsfw art-lotte-bgs-sfw - kodi-pydes package-updater ; } diff --git a/packages/default.nix b/packages/default.nix index ba1bca8a..380af8dc 100644 --- a/packages/default.nix +++ b/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 { }; } diff --git a/packages/kodi/joyn/default.nix b/packages/kodi/joyn/default.nix index 5345d7f8..01b11c2f 100644 --- a/packages/kodi/joyn/default.nix +++ b/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 = '' - substituteInPlace --replace '2.26.0' '3.0.0' addon.xml + preFixup = '' + 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 = { diff --git a/packages/kodi/joyn/source.json b/packages/kodi/joyn/source.json index 44d3a57b..58d46064 100644 --- a/packages/kodi/joyn/source.json +++ b/packages/kodi/joyn/source.json @@ -1,10 +1,10 @@ { - "url": "https://github.com/knaerzche/plugin.video.joyn", - "rev": "0954c40d20fe4c956c45519993f0dfdc0debade2", - "date": "2020-09-04T17:17:52+02:00", - "path": "/nix/store/1c49y966arnakcna3nb55fpfik0rsysq-plugin.video.joyn", - "sha256": "1wkn03j0mwlbnnl0zzr74pw3z4z2r76130rana7jdmc79fqxld53", - "hash": "sha256-ozTasUuH1SaPsiqDEczJ4pM/+CUn/w+otYvyCuQAdvI=", + "url": "https://github.com/Maven85/plugin.video.joyn", + "rev": "a74a0901d55c47ca0269fd85dc2f267c41570e00", + "date": "2024-11-13T09:07:18+01:00", + "path": "/nix/store/q5x2msdzl377yribfa5a86vrdl1cbl4d-plugin.video.joyn", + "sha256": "00y4p9pqd1x67jc0356bm9ynkml9qnggqyylzm6mckk44i1ixqh1", + "hash": "sha256-AeIeQyRkTlZN/dR7/J7FidZpfarLlAGYPKaHhm+6xAM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/packages/kodi/joyn/updater.nix b/packages/kodi/joyn/updater.nix index bc1e40e0..2b44e2f5 100644 --- a/packages/kodi/joyn/updater.nix +++ b/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" '' diff --git a/packages/kodi/pydes/addon.xml b/packages/kodi/pydes/addon.xml deleted file mode 100644 index 045f98b7..00000000 --- a/packages/kodi/pydes/addon.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A pure python module which implements the DES and Triple-DES encryption algorithms. - http://twhiteman.netfirms.com/des.html - MIT - all - http://sourceforge.net/projects/pydes/ - - \ No newline at end of file diff --git a/packages/kodi/pydes/default.nix b/packages/kodi/pydes/default.nix deleted file mode 100644 index 970e7dd4..00000000 --- a/packages/kodi/pydes/default.nix +++ /dev/null @@ -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; -} diff --git a/packages/kodi/pydes/source.json b/packages/kodi/pydes/source.json deleted file mode 100644 index 6cd2f6ac..00000000 --- a/packages/kodi/pydes/source.json +++ /dev/null @@ -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 -} \ No newline at end of file diff --git a/packages/kodi/pydes/source.nix b/packages/kodi/pydes/source.nix deleted file mode 100644 index 21dda6d9..00000000 --- a/packages/kodi/pydes/source.nix +++ /dev/null @@ -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."; - }; -} diff --git a/packages/kodi/pydes/updater.nix b/packages/kodi/pydes/updater.nix deleted file mode 100644 index 41457bd0..00000000 --- a/packages/kodi/pydes/updater.nix +++ /dev/null @@ -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" -'' diff --git a/packages/kodi/updater.nix b/packages/kodi/updater.nix index e8273008..a69942fd 100644 --- a/packages/kodi/updater.nix +++ b/packages/kodi/updater.nix @@ -4,5 +4,4 @@ }: lib.concatMapStringsSep "\n" (f: callPackage "${f}/updater.nix" { }) [ ./joyn - ./pydes ]