Unverified Commit ae012bdd authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents ddbc31ef e280fbc4

doc/release-notes/rl-2605.section.md

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,9 @@ 


- Added `lovr` package, a LUA-based game engine for VR and XR applications.



- Updated `wsjtx` from 2.7.0 to 3.0.0 for amateur radio hobbyists who use FT8 and other related digital modes.

  See the [release notes](https://wsjt.sourceforge.io/Release_Notes.txt) for the changelog.



- `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.

  Some existing OpenRGB plugins may be incompatible or require updates.

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -15011,6 +15011,12 @@ 
    githubId = 120277625;

    name = "LazilyStableProton";

  };

  lbeierlieb = {

    email = "lukasbrlb.lb@gmail.com";

    github = "lbeierlieb";

    githubId = 16045805;

    name = "Lukas Beierlieb";

  };

  lblasc = {

    email = "lblasc@znode.net";

    github = "lblasc";

pkgs/applications/emulators/libretro/cores/beetle-psx.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
}:

mkLibretroCore {

  core = "mednafen-psx" + lib.optionalString withHw "-hw";

  version = "0-unstable-2026-04-03";

  version = "0-unstable-2026-04-10";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "beetle-psx-libretro";

    rev = "f339f6363de238adcf7c259bff8b0771c9a46399";

    hash = "sha256-+JV/QQWiAK980ybM63jk6ljsJJWtdVszAFaIWGmzV/4=";

    rev = "4fdfd541e5dce6f08883883dd27289545825e0b4";

    hash = "sha256-DtZIi9BRrskfHFLt/UqfZBJp96QmgqGgroxyF7UTRLU=";

  };



  extraBuildInputs = lib.optionals withHw [

pkgs/applications/networking/instant-messengers/gajim/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ python3.pkgs.buildPythonApplication rec { 
      sqlalchemy

      emoji

      httpx

      httpx.optional-dependencies.socks

      h2

      truststore

    ]

pkgs/applications/video/jellyfin-mpv-shim/default.nix

+10 −8
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
  python,

  python-mpv-jsonipc,

  pywebview,

  setuptools,

  tkinter,

  wrapGAppsHook3,

}:
@@ -20,7 +21,7 @@ 
buildPythonApplication rec {

  pname = "jellyfin-mpv-shim";

  version = "2.9.0";

  format = "setuptools";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;
@@ -33,7 +34,9 @@ buildPythonApplication rec { 
    gobject-introspection

  ];



  propagatedBuildInputs = [

  build-system = [ setuptools ];



  dependencies = [

    jellyfin-apiclient-python

    mpv

    pillow
@@ -61,12 +64,12 @@ buildPythonApplication rec { 


  postPatch = ''

    substituteInPlace jellyfin_mpv_shim/conf.py \

      --replace "check_updates: bool = True" "check_updates: bool = False" \

      --replace "notify_updates: bool = True" "notify_updates: bool = False"

      --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 \

      --replace "python-mpv" "mpv" \

      --replace "mpv-jsonipc" "python_mpv_jsonipc"

      --replace-fail "python-mpv" "mpv" \

      --replace-fail "mpv-jsonipc" "python_mpv_jsonipc"

  '';



  # Install all the icons for the desktop item
@@ -84,8 +87,6 @@ buildPythonApplication rec { 
  '';

  dontWrapGApps = true;



  # no tests

  doCheck = false;

  pythonImportsCheck = [ "jellyfin_mpv_shim" ];



  desktopItems = [
@@ -113,6 +114,7 @@ buildPythonApplication rec { 
      to prevent needless transcoding of your media files on the server. The player also has

      advanced features, such as bulk subtitle updates and launching commands on events.

    '';

    changelog = "https://github.com/jellyfin/jellyfin-mpv-shim/releases/tag/v${version}";

    license = with lib.licenses; [

      # jellyfin-mpv-shim

      gpl3Only