From ffba9cbb2b835c44cb474a1d5a6a8ff2986dcc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 5 Jul 2026 16:38:51 +0200 Subject: [PATCH 1/2] python3Packages.python-mpv-jsonipc: 1.2.1 -> 1.2.2 Diff: https://github.com/iwalton3/python-mpv-jsonipc/compare/v1.2.1...v1.2.2 --- .../python-mpv-jsonipc/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 4ddb70266c80..63b4be98a1d0 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -2,38 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - requests, - tqdm, - websocket-client, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-mpv-jsonipc"; - version = "1.2.1"; - format = "setuptools"; + version = "1.2.2"; + pyproject = true; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; - rev = "v${version}"; - hash = "sha256-ugdLUmo5w+IbtmL2b6+la1X01mWNmnXr9j6e99oPWpE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9QfGsJW08YqATP4+G3bADkjxHoauSF7BmcsIi56fBKI="; }; + build-system = [ setuptools ]; + # 'mpv-jsonipc' does not have any tests doCheck = false; - propagatedBuildInputs = [ - requests - tqdm - websocket-client - ]; - pythonImportsCheck = [ "python_mpv_jsonipc" ]; meta = { homepage = "https://github.com/iwalton3/python-mpv-jsonipc"; description = "Python API to MPV using JSON IPC"; - license = lib.licenses.gpl3; + license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 1260e09ca5af86099c31cb61670884100a8c5265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 30 Jun 2026 23:12:55 +0200 Subject: [PATCH 2/2] jellyfin-mpv-shim: 2.9.0 -> 2.10.0, minor cleanup Changelog: https://github.com/jellyfin/jellyfin-mpv-shim/releases/tag/v2.10.0 Diff: https://github.com/jellyfin/jellyfin-mpv-shim/compare/v2.9.0...v2.10.0 --- pkgs/by-name/je/jellyfin-mpv-shim/package.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-mpv-shim/package.nix b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix index 0f1334afafdb..09bc30ca7aa4 100644 --- a/pkgs/by-name/je/jellyfin-mpv-shim/package.nix +++ b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix @@ -10,12 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; + # contains shaderpacks src = fetchPypi { - inherit pname version; - hash = "sha256-YrwMvP66LAWKgx/yWBkWIkZtJ4a0YnhCiL7xB6fGm0E="; + pname = "jellyfin_mpv_shim"; + inherit version; + hash = "sha256-ZWmJQJAGAonStZyWww4P+034f2vGnTwLua7KUOqoBBE="; }; nativeBuildInputs = [ @@ -29,29 +31,23 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ jellyfin-apiclient-python mpv - pillow python-mpv-jsonipc + requests - # gui dependencies + # gui + mirror dependencies + pillow pystray tkinter - # display_mirror dependencies - jinja2 - pywebview - # discord rich presence dependency pypresence ]; - # override $HOME directory: - # error: [Errno 13] Permission denied: '/homeless-shelter' - # - # remove jellyfin_mpv_shim/win_utils.py: - # ModuleNotFoundError: No module named 'win32gui' preCheck = '' export HOME=$TMPDIR + # remove jellyfin_mpv_shim/win_utils.py: + # ModuleNotFoundError: No module named 'win32gui' rm jellyfin_mpv_shim/win_utils.py ''; @@ -60,7 +56,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "check_updates: bool = True" "check_updates: bool = False" \ --replace-fail "notify_updates: bool = True" "notify_updates: bool = False" # python-mpv renamed to mpv with 1.0.4 - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace-fail "python-mpv" "mpv" \ --replace-fail "mpv-jsonipc" "python_mpv_jsonipc" ''; @@ -70,7 +66,7 @@ python3Packages.buildPythonApplication rec { for s in 16 32 48 64 128 256; do mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps ln -s $out/${python3Packages.python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \ - $out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png + $out/share/icons/hicolor/''${s}x''${s}/apps/jellyfin-mpv-shim.png done ''; @@ -84,9 +80,9 @@ python3Packages.buildPythonApplication rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "jellyfin-mpv-shim"; + exec = "jellyfin-mpv-shim"; + icon = "jellyfin-mpv-shim"; desktopName = "Jellyfin MPV Shim"; categories = [ "Video" @@ -123,5 +119,6 @@ python3Packages.buildPythonApplication rec { ]; maintainers = with lib.maintainers; [ jojosch ]; mainProgram = "jellyfin-mpv-shim"; + platforms = lib.platforms.linux; }; }