Merge branch 'master' into x-updates

Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix

1 files changed, 0 insertions, 5 deletions

diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 6a4e5304049f..f08c8a8189ce 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -41,7 +41,6 @@ in
   acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  alienarena = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1592,7 +1591,6 @@ in
   sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  speed_dreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1690,7 +1688,6 @@ in
   udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  ufoai = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1712,7 +1709,6 @@ in
   valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  vdrift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1959,7 +1955,6 @@ in
   xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };