summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2016-09-08 06:35:22 +0000
committerJoachim Fasting <joachifm@fastmail.fm>2016-09-08 16:04:46 +0200
commitf283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7 (patch)
tree02c83c7efa2e4bd9a677e954154f14c4e2c3dd8b /pkgs/servers
parent75baee8523f62b75a0cf350a8360ce8f3e3c3695 (diff)
downloadnixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar.gz
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar.bz2
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar.lz
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar.xz
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.tar.zst
nixpkgs-f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7.zip
plex: remove plexpass at the request of Plex
joachifm: throw error instead of silently ignoring user's
config.plex.pass setting.

Closes https://github.com/NixOS/nixpkgs/pull/18416
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/plex/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index f31971bf4c1..28d6295938a 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -4,11 +4,8 @@
 }:
 
 let
-  plexpkg = if enablePlexPass then {
-    version = "1.0.1.2396";
-    vsnHash = "c094d0d";
-    sha256 = "0bhbpaj88989zn1q590mkcqshcpir87yiac9x1dl0afzpxj09lcz";
-  } else {
+  plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
+  plexpkg = if enablePlexPass then plexPass else {
     version = "1.0.0.2261";
     vsnHash = "a17e99e";
     sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr";