Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'

Conflicts:
	nixpkgs/nixos/modules/misc/documentation.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
	nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
	nixpkgs/pkgs/servers/mail/mailman/web.nix
	nixpkgs/pkgs/top-level/aliases.nix
	nixpkgs/pkgs/top-level/all-packages.nix
	nixpkgs/pkgs/top-level/impure.nix

1 files changed, 65 insertions, 45 deletions

diff --git a/nixpkgs/pkgs/top-level/kodi-packages.nix b/nixpkgs/pkgs/top-level/kodi-packages.nix
index a0ff13248085..ed5799eab4f7 100644
--- a/nixpkgs/pkgs/top-level/kodi-packages.nix
+++ b/nixpkgs/pkgs/top-level/kodi-packages.nix
@@ -1,7 +1,11 @@
-{ lib, newScope, kodi }:
+{ lib, newScope, kodi, libretro }:
 
 with lib;
 
+let
+  inherit (libretro) genesis-plus-gx mgba snes9x;
+in
+
 let self = rec {
 
   addonDir = "/share/kodi/addons";
@@ -32,7 +36,7 @@ let self = rec {
 
   # package update scripts
 
-  addonUpdateScript = callPackage ../applications/video/kodi-packages/addon-update-script { };
+  addonUpdateScript = callPackage ../applications/video/kodi/addons/addon-update-script { };
 
   # package builders
 
@@ -42,96 +46,112 @@ let self = rec {
 
   # regular packages
 
-  kodi-platform = callPackage ../applications/video/kodi-packages/kodi-platform { };
+  kodi-platform = callPackage ../applications/video/kodi/addons/kodi-platform { };
 
   # addon packages
 
-  a4ksubtitles = callPackage ../applications/video/kodi-packages/a4ksubtitles { };
+  a4ksubtitles = callPackage ../applications/video/kodi/addons/a4ksubtitles { };
 
   controllers = {
-    default = callPackage ../applications/video/kodi-packages/controllers { controller = "default"; };
+    default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; };
 
-    dreamcast = callPackage ../applications/video/kodi-packages/controllers { controller = "dreamcast"; };
+    dreamcast = callPackage ../applications/video/kodi/addons/controllers { controller = "dreamcast"; };
 
-    gba = callPackage ../applications/video/kodi-packages/controllers { controller = "gba"; };
+    gba = callPackage ../applications/video/kodi/addons/controllers { controller = "gba"; };
 
-    genesis = callPackage ../applications/video/kodi-packages/controllers { controller = "genesis"; };
+    genesis = callPackage ../applications/video/kodi/addons/controllers { controller = "genesis"; };
 
-    mouse = callPackage ../applications/video/kodi-packages/controllers { controller = "mouse"; };
+    mouse = callPackage ../applications/video/kodi/addons/controllers { controller = "mouse"; };
 
-    n64 = callPackage ../applications/video/kodi-packages/controllers { controller = "n64"; };
+    n64 = callPackage ../applications/video/kodi/addons/controllers { controller = "n64"; };
 
-    nes = callPackage ../applications/video/kodi-packages/controllers { controller = "nes"; };
+    nes = callPackage ../applications/video/kodi/addons/controllers { controller = "nes"; };
 
-    ps = callPackage ../applications/video/kodi-packages/controllers { controller = "ps"; };
+    ps = callPackage ../applications/video/kodi/addons/controllers { controller = "ps"; };
 
-    snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; };
+    snes = callPackage ../applications/video/kodi/addons/controllers { controller = "snes"; };
   };
 
-  jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { };
+  iagl = callPackage ../applications/video/kodi/addons/iagl { };
+
+  libretro = callPackage ../applications/video/kodi/addons/libretro { };
+
+  libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; };
+
+  libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; };
+
+  libretro-snes9x = callPackage ../applications/video/kodi/addons/libretro-snes9x { inherit snes9x; };
 
-  joystick = callPackage ../applications/video/kodi-packages/joystick { };
+  jellyfin = callPackage ../applications/video/kodi/addons/jellyfin { };
 
-  netflix = callPackage ../applications/video/kodi-packages/netflix { };
+  joystick = callPackage ../applications/video/kodi/addons/joystick { };
 
-  svtplay = callPackage ../applications/video/kodi-packages/svtplay { };
+  keymap = callPackage ../applications/video/kodi/addons/keymap { };
 
-  steam-controller = callPackage ../applications/video/kodi-packages/steam-controller { };
+  netflix = callPackage ../applications/video/kodi/addons/netflix { };
 
-  steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { };
+  svtplay = callPackage ../applications/video/kodi/addons/svtplay { };
 
-  steam-library = callPackage ../applications/video/kodi-packages/steam-library { };
+  steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { };
 
-  pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { };
+  steam-launcher = callPackage ../applications/video/kodi/addons/steam-launcher { };
 
-  pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { };
+  steam-library = callPackage ../applications/video/kodi/addons/steam-library { };
 
-  pvr-hdhomerun = callPackage ../applications/video/kodi-packages/pvr-hdhomerun { };
+  pdfreader = callPackage ../applications/video/kodi/addons/pdfreader { };
 
-  pvr-iptvsimple = callPackage ../applications/video/kodi-packages/pvr-iptvsimple { };
+  pvr-hts = callPackage ../applications/video/kodi/addons/pvr-hts { };
 
-  osmc-skin = callPackage ../applications/video/kodi-packages/osmc-skin { };
+  pvr-hdhomerun = callPackage ../applications/video/kodi/addons/pvr-hdhomerun { };
 
-  vfs-sftp = callPackage ../applications/video/kodi-packages/vfs-sftp { };
+  pvr-iptvsimple = callPackage ../applications/video/kodi/addons/pvr-iptvsimple { };
 
-  vfs-libarchive = callPackage ../applications/video/kodi-packages/vfs-libarchive { };
+  osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { };
 
-  youtube = callPackage ../applications/video/kodi-packages/youtube { };
+  vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { };
+
+  vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { };
+
+  youtube = callPackage ../applications/video/kodi/addons/youtube { };
 
   # addon packages (dependencies)
 
-  certifi = callPackage ../applications/video/kodi-packages/certifi { };
+  archive_tool = callPackage ../applications/video/kodi/addons/archive_tool { };
+
+  certifi = callPackage ../applications/video/kodi/addons/certifi { };
+
+  chardet = callPackage ../applications/video/kodi/addons/chardet { };
 
-  chardet = callPackage ../applications/video/kodi-packages/chardet { };
+  dateutil = callPackage ../applications/video/kodi/addons/dateutil { };
 
-  dateutil = callPackage ../applications/video/kodi-packages/dateutil { };
+  defusedxml = callPackage ../applications/video/kodi/addons/defusedxml { };
 
-  idna = callPackage ../applications/video/kodi-packages/idna { };
+  idna = callPackage ../applications/video/kodi/addons/idna { };
 
-  inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };
+  inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { };
 
-  inputstream-ffmpegdirect = callPackage ../applications/video/kodi-packages/inputstream-ffmpegdirect { };
+  inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { };
 
-  inputstream-rtmp = callPackage ../applications/video/kodi-packages/inputstream-rtmp { };
+  inputstream-rtmp = callPackage ../applications/video/kodi/addons/inputstream-rtmp { };
 
-  inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { };
+  inputstreamhelper = callPackage ../applications/video/kodi/addons/inputstreamhelper { };
 
-  kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { };
+  kodi-six = callPackage ../applications/video/kodi/addons/kodi-six { };
 
-  myconnpy = callPackage ../applications/video/kodi-packages/myconnpy { };
+  myconnpy = callPackage ../applications/video/kodi/addons/myconnpy { };
 
-  requests = callPackage ../applications/video/kodi-packages/requests { };
+  requests = callPackage ../applications/video/kodi/addons/requests { };
 
-  requests-cache = callPackage ../applications/video/kodi-packages/requests-cache { };
+  requests-cache = callPackage ../applications/video/kodi/addons/requests-cache { };
 
-  routing = callPackage ../applications/video/kodi-packages/routing { };
+  routing = callPackage ../applications/video/kodi/addons/routing { };
 
-  signals = callPackage ../applications/video/kodi-packages/signals { };
+  signals = callPackage ../applications/video/kodi/addons/signals { };
 
-  six = callPackage ../applications/video/kodi-packages/six { };
+  six = callPackage ../applications/video/kodi/addons/six { };
 
-  urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { };
+  urllib3 = callPackage ../applications/video/kodi/addons/urllib3 { };
 
-  websocket = callPackage ../applications/video/kodi-packages/websocket { };
+  websocket = callPackage ../applications/video/kodi/addons/websocket { };
 
 }; in self