git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120520 from minijackson/jellyfin-remove-10.5

jellyfin_10_5: remove unmaintained version

commite22d76fe3460716ae48d3647d780422ce43e7d01 authorRobert Schütz <dev@schuetz-co.de> dateMon 26 Apr 2021, 17:16 (6 years ago) parent9d1141f2ad8aa7
4 files changed+2−68
nixos/modules/services/misc/jellyfin.nix+1−5 pkgs/servers/jellyfin/10.5.x.nix−61 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
nixos/modules/services/misc/jellyfin.nix+1−5
@@ -18,6 +18,7 @@ in
1818
1919 package = mkOption {
2020 type = types.package;
21+ default = pkgs.jellyfin;
2122 example = literalExample "pkgs.jellyfin";
2223 description = ''
2324 Jellyfin package to use.
@@ -98,11 +99,6 @@ in
9899 };
99100 };
100101
101− services.jellyfin.package = mkDefault (
102− if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin
103− else pkgs.jellyfin_10_5
104− );
105−
106102 users.users = mkIf (cfg.user == "jellyfin") {
107103 jellyfin = {
108104 group = cfg.group;
pkgs/servers/jellyfin/10.5.x.nixdeleted−61
@@ -1,61 +0,0 @@
1−{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,
2− fontconfig, freetype, nixosTests }:
3−
4−let
5− os = if stdenv.isDarwin then "osx" else "linux";
6− arch =
7− with stdenv.hostPlatform;
8− if isx86_32 then "x86"
9− else if isx86_64 then "x64"
10− else if isAarch32 then "arm"
11− else if isAarch64 then "arm64"
12− else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown";
13− musl = lib.optionalString stdenv.hostPlatform.isMusl
14− (if (arch != "x64")
15− then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-"
16− else "musl-");
17− runtimeDir = "${os}-${musl}${arch}";
18−
19−in stdenv.mkDerivation rec {
20− pname = "jellyfin";
21− version = "10.5.5";
22−
23− # Impossible to build anything offline with dotnet
24− src = fetchurl {
25− url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
26− sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
27− };
28−
29− nativeBuildInputs = [ unzip ];
30− buildInputs = [
31− makeWrapper
32− ];
33−
34− propagatedBuildInputs = [
35− dotnetCorePackages.aspnetcore_3_1
36− sqlite
37− ];
38−
39− preferLocalBuild = true;
40−
41− installPhase = ''
42− install -dm 755 "$out/opt/jellyfin"
43− cp -r * "$out/opt/jellyfin"
44− makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
45− --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
46− sqlite fontconfig freetype stdenv.cc.cc.lib
47− ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \
48− --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
49− '';
50−
51− passthru.tests = {
52− smoke-test = nixosTests.jellyfin;
53− };
54−
55− meta = with lib; {
56− description = "The Free Software Media System";
57− homepage = "https://jellyfin.org/";
58− license = licenses.gpl2;
59− maintainers = with maintainers; [ nyanloutre minijackson ];
60− };
61−}
pkgs/top-level/aliases.nix+1
@@ -336,6 +336,7 @@ mapAliases ({
336336 kodiGBM = kodi-gbm;
337337 kodiPlain = kodi;
338338 kodiPlainWayland = kodi-wayland;
339+ jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26
339340 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
340341 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
341342 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
pkgs/top-level/all-packages.nix−2
@@ -2697,8 +2697,6 @@ in
26972697
26982698 jellyfin = callPackage ../servers/jellyfin { };
26992699
2700− jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { };
2701−
27022700 jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {
27032701 inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
27042702 };