From 13d1089f5a9a9e35489d0e7d58ccf2e052e304a6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 09:07:35 -0600 Subject: [PATCH 1/3] jellyfin: 10.10.0 -> 10.10.1 --- pkgs/by-name/je/jellyfin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 429d1311b226..c65949d634e3 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.0"; # ensure that jellyfin-web has matching version + version = "10.10.1"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-XeMZEUorRrpS6GJ2qaXbyKUw0EaKCJF0PSoghUmOnrc="; + hash = "sha256-jDiJ1tnCR3cZvNmvZ47Vvoqow1sC+xciHsO546yoIKY="; }; propagatedBuildInputs = [ sqlite ]; From b6ea4f466c46a4b1b6e629a48730f263eabd0164 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 09:10:17 -0600 Subject: [PATCH 2/3] jellyfin-web: 10.10.0 -> 10.10.1 --- pkgs/by-name/je/jellyfin-web/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 965a2903ce1a..b678ce2614cf 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, buildNpmPackage, - jellyfin, nix-update-script, pkg-config, xcbuild, @@ -14,13 +13,13 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.0"; + version = "10.10.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-BuAvdDIvW2mQ+MzVBPGCFV73P6GxR/I3U24kCu+lXbc="; + hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; }; postPatch = '' @@ -28,7 +27,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-EAZm4UTc9+gW7uPiNEp2vLSKA2vOmLKKZ4/DrnGrvYQ="; + npmDepsHash = "sha256-kL57KmBHmBwJEhsUciPaj826qdoSQxZXxtFNGkddGZk="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From 8285855799ac9d44c3da020c14a13dc2a6c2e457 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 5 Nov 2024 15:30:37 -0600 Subject: [PATCH 3/3] jellyfin-web: assert matching jellyfin version --- pkgs/by-name/je/jellyfin-web/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index b678ce2614cf..6cfa106b603c 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -10,17 +10,20 @@ giflib, apple-sdk_11, darwinMinVersionHook, + jellyfin, }: buildNpmPackage rec { pname = "jellyfin-web"; version = "10.10.1"; - src = fetchFromGitHub { - owner = "jellyfin"; - repo = "jellyfin-web"; - rev = "v${version}"; - hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; - }; + src = + assert version == jellyfin.version; + fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-web"; + rev = "v${version}"; + hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; + }; postPatch = '' substituteInPlace webpack.common.js \