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

ReRevert Merge x-updates into master

Browse Source 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Vladimír Čunát
2013-05-29 23:24:20 +02:00
parent 971337a119
commit b770365574
135 changed files with 2718 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/release-python.nix
View File

@@ -372,7 +372,6 @@ 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; };
@@ -1032,7 +1031,6 @@ 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,7 +1931,6 @@ 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; };