Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 401e07d41981
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 06159c66daee
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 13, 2020

  1. jellyfin: 10.5.3 -> 10.5.4

    @minijackson
    minijackson committed Apr 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dff99df View commit details

Commits on Apr 14, 2020

  1. jellyfin: add link to nixos test

    @minijackson
    minijackson committed Apr 14, 2020
    Copy the full SHA
    01d3516 View commit details

  2. Merge pull request #85140 from minijackson/jellyfin-10.5.4 

    jellyfin: 10.5.3 -> 10.5.4, add link to nixos test
    @worldofpeace
    worldofpeace authored Apr 14, 2020
    Copy the full SHA
    06159c6 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/servers/jellyfin/default.nix
10 changes: 7 additions & 3 deletions pkgs/servers/jellyfin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,
fontconfig, freetype }:
fontconfig, freetype, nixosTests }:

let
os = if stdenv.isDarwin then "osx" else "linux";
@@ -18,12 +18,12 @@ let

in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.5.3";
version = "10.5.4";

# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
sha256 = "04fq3g6yddyqiixgk45x3c90zjdhkm7glahlb71fyx8ivf1qkcvs";
sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y";
};

buildInputs = [
@@ -49,6 +49,10 @@ in stdenv.mkDerivation rec {
--add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
'';

passthru.tests = {
smoke-test = nixosTests.jellyfin;
};

meta = with stdenv.lib; {
description = "The Free Software Media System";
homepage = "https://jellyfin.github.io/";