summary refs log tree commit diff
path: root/pkgs/top-level/release-python.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-05-09 13:58:08 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-05-09 14:03:35 +0200
commitec3965d8d0b5594a9db11e6c9cd1c28d36e91cde (patch)
tree9bb0bc5ac4f3c6aaa170a9df5562f10e30ade47f /pkgs/top-level/release-python.nix
parent84b0bf63b7f07dc1d9d19458dcbba6d02b4e2811 (diff)
downloadnixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.gz
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.bz2
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.lz
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.xz
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.zst
nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.zip
Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
Diffstat (limited to 'pkgs/top-level/release-python.nix')
-rw-r--r--pkgs/top-level/release-python.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index f08c8a8189ce..ba9b20c99de7 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -372,6 +372,7 @@ in
   gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1031,6 +1032,7 @@ in
   libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1933,6 +1935,7 @@ in
     xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+    xorgserver_1_13_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };