diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 11 | ||||
| -rw-r--r-- | nixos/modules/misc/ids.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/emby.nix | 76 | ||||
| -rw-r--r-- | pkgs/servers/emby/default.nix | 52 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
7 files changed, 14 insertions, 133 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index b16297da7ce6..ead8f3abd8b2 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -91,6 +91,17 @@ the module for some time and so was removed as cleanup. </para> </listitem> + <listitem> + <para> + The <option>services.emby.enable</option> module has been removed, see + <option>services.jellyfin.enable</option> instead for a free software fork of Emby. + + See the Jellyfin documentation: + <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> + Migrating from Emby to Jellyfin + </link> + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e78673514e3b..cd6bb9019b18 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -266,7 +266,7 @@ caddy = 239; taskd = 240; factorio = 241; - emby = 242; + # emby = 242; # unusued, removed 2019-05-01 graylog = 243; sniproxy = 244; nzbget = 245; @@ -567,7 +567,7 @@ caddy = 239; taskd = 240; factorio = 241; - emby = 242; + # emby = 242; # unused, removed 2019-05-01 sniproxy = 244; nzbget = 245; mosquitto = 246; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 56c44a43c6e3..22efd028f7cf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -392,7 +392,6 @@ ./services/misc/dysnomia.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix - ./services/misc/emby.nix ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/exhibitor.nix diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix deleted file mode 100644 index 0ad4a3f7376f..000000000000 --- a/nixos/modules/services/misc/emby.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.emby; -in -{ - options = { - services.emby = { - enable = mkEnableOption "Emby Media Server"; - - user = mkOption { - type = types.str; - default = "emby"; - description = "User account under which Emby runs."; - }; - - group = mkOption { - type = types.str; - default = "emby"; - description = "Group under which emby runs."; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/lib/emby/ProgramData-Server"; - description = "Location where Emby stores its data."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.emby = { - description = "Emby Media Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - if [ -d ${cfg.dataDir} ] - then - for plugin in ${cfg.dataDir}/plugins/* - do - echo "Correcting permissions of plugin: $plugin" - chmod u+w $plugin - done - else - echo "Creating initial Emby data directory in ${cfg.dataDir}" - mkdir -p ${cfg.dataDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} - fi - ''; - - serviceConfig = { - Type = "simple"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = "true"; - ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}"; - Restart = "on-failure"; - }; - }; - - users.users = mkIf (cfg.user == "emby") { - emby = { - group = cfg.group; - uid = config.ids.uids.emby; - }; - }; - - users.groups = mkIf (cfg.group == "emby") { - emby = { - gid = config.ids.gids.emby; - }; - }; - }; -} diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix deleted file mode 100644 index 12b0dde0c9b4..000000000000 --- a/pkgs/servers/emby/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: - -stdenv.mkDerivation rec { - name = "emby-${version}"; - version = "3.5.3.0"; - - # We are fetching a binary here, however, a source build is possible. - # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43 - # Though in my attempt it failed with this error repeatedly - # The type 'Attribute' is defined in an assembly that is not referenced. You must add a reference to assembly 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. - # This may also need msbuild (instead of xbuild) which isn't in nixpkgs - # See -> https://github.com/NixOS/nixpkgs/issues/29817 - src = fetchurl { - url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip"; - sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj"; - }; - - buildInputs = [ - unzip - makeWrapper - ]; - - propagatedBuildInputs = [ - dotnet-sdk - sqlite - ]; - - preferLocalBuild = true; - - buildPhase = '' - rm -rf {electron,runtimes} - ''; - - installPhase = '' - install -dm 755 "$out/opt/emby-server" - cp -r * "$out/opt/emby-server" - - makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - sqlite - ]}" \ - --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" - ''; - - meta = with stdenv.lib; { - description = "MediaBrowser - Bring together your videos, music, photos, and live television"; - homepage = https://emby.media/; - license = licenses.gpl2; - maintainers = with maintainers; [ fadenb ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ada0de74be71..6d9d81c935a6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 + emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904fc2a01a7b..4ab18b0bfc54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1437,8 +1437,6 @@ in elm-github-install = callPackage ../tools/package-management/elm-github-install { }; - emby = callPackage ../servers/emby { }; - enca = callPackage ../tools/text/enca { }; ent = callPackage ../tools/misc/ent { }; |