Unverified Commit 1c9af90d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #315272 from NixOS/backport-314775-to-release-24.05 

[Backport release-24.05] jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3
parents 6e318d1c 62f30688

pkgs/servers/jellyfin/default.nix

+21 −17
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, nixosTests

, stdenv

, dotnetCorePackages

, buildDotnetModule

, ffmpeg

, fontconfig

, freetype

, jellyfin-web

, sqlite

{

  lib,

  fetchFromGitHub,

  nixosTests,

  stdenv,

  dotnetCorePackages,

  buildDotnetModule,

  ffmpeg,

  fontconfig,

  freetype,

  jellyfin-web,

  sqlite,

}:



buildDotnetModule rec {

  pname = "jellyfin";

  version = "10.9.1"; # ensure that jellyfin-web has matching version

  version = "10.9.3"; # ensure that jellyfin-web has matching version



  src = fetchFromGitHub {

    owner = "jellyfin";

    repo = "jellyfin";

    rev = "v${version}";

    sha256 = "sha256-ZvXz4gnpYE9bMvOHbmLhqJLUomPmk1K9ysw+Wlsyhr4=";

    sha256 = "sha256-gJMz2LfxC0JXqGYNKNz1zRbWZOH1UxbcoGtmdymZ/Oo=";

  };



  propagatedBuildInputs = [

    sqlite

  ];

  propagatedBuildInputs = [ sqlite ];



  projectFile = "Jellyfin.Server/Jellyfin.Server.csproj";

  executables = [ "jellyfin" ];
@@ -56,7 +55,12 @@ buildDotnetModule rec { 
    homepage = "https://jellyfin.org/";

    # https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ nyanloutre minijackson purcell jojosch ];

    maintainers = with maintainers; [

      nyanloutre

      minijackson

      purcell

      jojosch

    ];

    mainProgram = "jellyfin";

    platforms = dotnet-runtime.meta.platforms;

  };

pkgs/servers/jellyfin/web.nix

+11 −8
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  overrideSDK,

  fetchFromGitHub,

  buildNpmPackage,

  jellyfin,

  nix-update-script,

  pkg-config,

  xcbuild,
@@ -26,16 +27,18 @@ let 
in

buildNpmPackage' rec {

  pname = "jellyfin-web";

  version = "10.9.2";

  version = "10.9.3";



  src = fetchFromGitHub {

  src =

    assert version == jellyfin.version;

    fetchFromGitHub {

      owner = "jellyfin";

      repo = "jellyfin-web";

      rev = "v${version}";

    hash = "sha256-0MBVcMajRk+CR0nZ8Dtd3Mg4tKdLiHGs3AhI8BEqZyE=";

      hash = "sha256-duq2tilUDEzj7o3Nq3Ku5qVJm4XDqVmqkQQIK/dlTpE=";

    };



  npmDepsHash = "sha256-aN+EXHRXez26oS4Ad1d9HSBkwVKnvYQMJvJVypDCk+0=";

  npmDepsHash = "sha256-nKA/mR1ug1yq4+jJGhWGtAL9Zsx3KjDPqt5rkCE4LFU=";



  npmBuildScript = [ "build:production" ];