public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Merge x-updates into master due to mesa bloat

Browse Source 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
This commit is contained in:
Vladimír Čunát
2013-05-09 14:03:35 +02:00
parent 84b0bf63b7
commit ec3965d8d0
135 changed files with 1595 additions and 2722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
+3
View File
@@ -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; };