From cc902bf73ce225e2ac51f624ac47e1f7a10b04ce Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 27 Feb 2019 18:28:17 +0100 Subject: [PATCH 1/3] maintainers: add minijackson --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a44660ebef5..d1f9eb6747c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5282,4 +5282,9 @@ github = "shmish111"; name = "David Smith"; }; + minijackson = { + email = "minijackson@riseup.net"; + github = "minijackson"; + name = "RĂ©mi Nicole"; + }; } From b4dbc56dbf7608cf0b1e57ff2aadd997fb8219b1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 27 Feb 2019 18:31:53 +0100 Subject: [PATCH 2/3] kodiPlugins.vfs-sftp: init at 1.0.1 --- pkgs/applications/video/kodi/plugins.nix | 24 +++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 29fbf79c662..6822d4c3d83 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,7 +1,8 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip , cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib -, python2Packages, expat, glib, nspr, nss }: +, python2Packages, expat, glib, nspr, nss, openssl +, libssh }: with stdenv.lib; @@ -506,4 +507,25 @@ let self = rec { }; }; + vfs-sftp = mkKodiABIPlugin rec { + namespace = "vfs.sftp"; + version = "1.0.1"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v"; + }; + + meta = with stdenv.lib; { + description = "SFTP Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ openssl libssh zlib ]; + }; }; in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb678f9dee..6b51a59119f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20143,6 +20143,7 @@ in ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive + ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp ); }; From 7ca5c6b3c34bdb4a4e124000072e179946691960 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 27 Feb 2019 18:35:02 +0100 Subject: [PATCH 3/3] kodiPlugins.vfs-libarchive: init at 1.0.5 --- pkgs/applications/video/kodi/plugins.nix | 24 +++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6822d4c3d83..f1bd5b299de 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -2,7 +2,7 @@ , cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib , python2Packages, expat, glib, nspr, nss, openssl -, libssh }: +, libssh, libarchive, lzma, bzip2, lz4, lzo }: with stdenv.lib; @@ -528,4 +528,26 @@ let self = rec { extraBuildInputs = [ openssl libssh zlib ]; }; + + vfs-libarchive = mkKodiABIPlugin rec { + namespace = "vfs.libarchive"; + version = "1.0.5"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8"; + }; + + meta = with stdenv.lib; { + description = "LibArchive Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + }; }; in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b51a59119f..dcfb90e130f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20144,6 +20144,7 @@ in ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp + ++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive ); };