diff --git a/devices/nos/modules/jellyfin/packages.nix b/devices/nos/modules/jellyfin/packages.nix index 38541e4..91e728e 100644 --- a/devices/nos/modules/jellyfin/packages.nix +++ b/devices/nos/modules/jellyfin/packages.nix @@ -1,15 +1,13 @@ { config, - jellyfin-overlays, + jellyfin-flake, pkgs, ... }: let - overlays = jellyfin-overlays.legacyPackages.${pkgs.system}; - jellyPkgs = if config.nvidia.enableCUDA - then overlays.cudaPackages.pkgs - else overlays; + then jellyfin-flake.packages.${pkgs.system}.cudaPackages // {inherit (pkgs.cudaPackages.pkgs) jellyfin-ffmpeg;} + else jellyfin-flake.packages.${pkgs.system} // {inherit (pkgs) jellyfin-ffmpeg;}; jellyWeb = jellyPkgs.jellyfin-web.overrideAttrs (_: o: { # TODO: Inject skip intro button for 10.9.0 diff --git a/flake.lock b/flake.lock index 50e0692..1f8853a 100644 --- a/flake.lock +++ b/flake.lock @@ -762,16 +762,18 @@ }, "jellyfin-flake": { "inputs": { + "jellyfin-src": "jellyfin-src", + "jellyfin-web-src": "jellyfin-web-src", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1709785905, - "narHash": "sha256-RUI/to18Mx76ocQmmKAlrbRSN+/sewNt+fdp9iDYWGM=", + "lastModified": 1715565229, + "narHash": "sha256-WwdEBaANjwcnnSDuz/upMjMbwUfRUxz6uf9Tf5ZP4QI=", "owner": "matt1432", "repo": "nixos-jellyfin", - "rev": "50274dcec43e2179d6cbf1e045eea5354e6af606", + "rev": "e8b4b977bcd667d833b1d19dfe0df0d1993cedf9", "type": "github" }, "original": { @@ -780,19 +782,20 @@ "type": "github" } }, - "jellyfin-overlays": { + "jellyfin-src": { + "flake": false, "locked": { - "lastModified": 1715515598, - "narHash": "sha256-nYm7AZUBa9iE1uLto4EXroxXFdV1bNGRywHTih2fOtY=", - "owner": "minijackson", - "repo": "nixpkgs", - "rev": "22e41692a4e9991413b4cf562f52b0c676a9a0ee", + "lastModified": 1715559024, + "narHash": "sha256-ZvXz4gnpYE9bMvOHbmLhqJLUomPmk1K9ysw+Wlsyhr4=", + "owner": "jellyfin", + "repo": "jellyfin", + "rev": "717afcdc8237e12607b68d8a05c2438388e958bf", "type": "github" }, "original": { - "owner": "minijackson", - "ref": "jellyfin-10.9.0", - "repo": "nixpkgs", + "owner": "jellyfin", + "ref": "v10.9.1", + "repo": "jellyfin", "type": "github" } }, @@ -812,6 +815,23 @@ "type": "github" } }, + "jellyfin-web-src": { + "flake": false, + "locked": { + "lastModified": 1715559027, + "narHash": "sha256-KkPZ8OvGN/0gdoSVh9q0qEilae3tccgHRQQvrTsvycA=", + "owner": "jellyfin", + "repo": "jellyfin-web", + "rev": "ac8c2239ca7258e006f2acdb7acb02749a6ec824", + "type": "github" + }, + "original": { + "owner": "jellyfin", + "ref": "v10.9.1", + "repo": "jellyfin-web", + "type": "github" + } + }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_2", @@ -1734,7 +1754,6 @@ "hypridle": "hypridle", "hyprland": "hyprland", "jellyfin-flake": "jellyfin-flake", - "jellyfin-overlays": "jellyfin-overlays", "jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src", "libratbag-src": "libratbag-src", "modernx-src": "modernx-src", diff --git a/flake.nix b/flake.nix index 01e52d0..f0606de 100644 --- a/flake.nix +++ b/flake.nix @@ -241,14 +241,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # FIXME: remove this when it reaches nixpkgs - jellyfin-overlays = { - type = "github"; - owner = "minijackson"; - repo = "nixpkgs"; - ref = "jellyfin-10.9.0"; - }; - subsync = { type = "github"; owner = "matt1432";