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

Merge master into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
This commit is contained in:
Vladimír Čunát
2014-01-12 12:29:24 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
-4
View File
@@ -1081,8 +1081,6 @@ let
acpi_call = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
atheros = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ati_drivers_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
aufs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
aufs_util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
bbswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
broadcom_sta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
cryptodev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1698,8 +1696,6 @@ let
v8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vacuum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala15 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vala16 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
valgrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };