Unverified Commit 14fc87c2 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

jellyfin: 10.9.11 -> 10.10.0 (#351966)

parents 6eef3d72 bf8b641d

pkgs/by-name/je/jellyfin-web/package.nix

+18 −10
Original line number Diff line number Diff line
@@ -27,18 +27,26 @@ let 
in

buildNpmPackage' rec {

  pname = "jellyfin-web";

  version = "10.9.11";

  version = "10.10.0";



  src =

    assert version == jellyfin.version;

    fetchFromGitHub {

  src = fetchFromGitHub {

    owner = "jellyfin";

    repo = "jellyfin-web";

    rev = "v${version}";

      hash = "sha256-zt0Exx/4B5gqiN3fxvQuVh1MqRNNtJG6/G0/reqVHRc=";

    hash = "sha256-BuAvdDIvW2mQ+MzVBPGCFV73P6GxR/I3U24kCu+lXbc=";

  };



  npmDepsHash = "sha256-kQxfh8o8NBshKmmjQrLdxiOQK83LG+lxhZwzDkEJwEo=";

  postPatch = ''

    substituteInPlace webpack.common.js \

      --replace-fail "git describe --always --dirty" "echo ${src.rev}" \

  '';



  npmDepsHash = "sha256-EAZm4UTc9+gW7uPiNEp2vLSKA2vOmLKKZ4/DrnGrvYQ=";



  preBuild = ''

    # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

    rm -r node_modules/sass-embedded*

  '';



  npmBuildScript = [ "build:production" ];

pkgs/by-name/je/jellyfin/nuget-deps.nix

+50 −99

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/je/jellyfin/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


buildDotnetModule rec {

  pname = "jellyfin";

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

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



  src = fetchFromGitHub {

    owner = "jellyfin";

    repo = "jellyfin";

    rev = "v${version}";

    hash = "sha256-gZJIsNKXwhUUVgJh8vXuGSu9DEyrVY8NuIeyZHHQKN4=";

    hash = "sha256-XeMZEUorRrpS6GJ2qaXbyKUw0EaKCJF0PSoghUmOnrc=";

  };



  propagatedBuildInputs = [ sqlite ];

pkgs/development/libraries/jellyfin-ffmpeg/default.nix

+8 −16
Original line number Diff line number Diff line 
{ ffmpeg_6-full

{ ffmpeg_7-full

, fetchFromGitHub

, fetchpatch

, lib

}:



let

  version = "6.0.1-8";

  version = "7.0.2-5";

in



(ffmpeg_6-full.override {

(ffmpeg_7-full.override {

  inherit version; # Important! This sets the ABI.

  source = fetchFromGitHub {

    owner = "jellyfin";

    repo = "jellyfin-ffmpeg";

    rev = "v${version}";

    hash = "sha256-29g3BUdNcFEGjHkc/1qxOGazIfg0DLDIwoiDCI/aEKc=";

    hash = "sha256-cqyXQNx65eLEumOoSCucNpAqShMhiPqzsKc/GjKKQOA=";

  };

}).overrideAttrs (old: {

  pname = "jellyfin-ffmpeg";



  # Clobber upstream patches as they don't apply to the Jellyfin fork

  patches = [

    (fetchpatch {

      name = "fix_build_failure_due_to_libjxl_version_to_new";

      url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2";

      hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU=";

    })

  ];



  configureFlags = old.configureFlags ++ [

    "--extra-version=Jellyfin"

    "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
@@ -41,11 +32,12 @@ in 
    ${old.postPatch or ""}

  '';



  meta = with lib; {

  meta = {

    inherit (old.meta) license mainProgram;

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

    description = "${old.meta.description} (Jellyfin fork)";

    homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";

    license = licenses.gpl3;

    maintainers = with maintainers; [ justinas ];

    maintainers = with lib.maintainers; [ justinas ];

    pkgConfigModules = [ "libavutil" ];

  };

})