ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 20:48:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #314775 from Nanotwerp/jellyfin-up

Browse Source 
jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3
This commit is contained in:
Doron Behar 2024-05-28 09:06:01 +03:00 committed by GitHub
commit 22a5fc0518
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/servers/jellyfin/default.nix
View File

@ -1,30 +1,29 @@
{ 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;
};

19
pkgs/servers/jellyfin/web.nix
View File

@ -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 {
owner = "jellyfin";
repo = "jellyfin-web";
rev = "v${version}";
hash = "sha256-0MBVcMajRk+CR0nZ8Dtd3Mg4tKdLiHGs3AhI8BEqZyE=";
};
src =
assert version == jellyfin.version;
fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-web";
rev = "v${version}";
hash = "sha256-duq2tilUDEzj7o3Nq3Ku5qVJm4XDqVmqkQQIK/dlTpE=";
};
npmDepsHash = "sha256-aN+EXHRXez26oS4Ad1d9HSBkwVKnvYQMJvJVypDCk+0=";
npmDepsHash = "sha256-nKA/mR1ug1yq4+jJGhWGtAL9Zsx3KjDPqt5rkCE4LFU=";
npmBuildScript = [ "build:production" ];