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

Merge branch 'master' into x-updates

Browse Source 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
This commit is contained in:
Vladimír Čunát
2013-04-24 06:29:09 +00:00
parent 6a29a56c12 50d66b945e
commit bde20f3e88
306 changed files with 6145 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
-1
View File
@@ -1804,7 +1804,6 @@ in
gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };