diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
| commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
| tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/top-level/release-python.nix | |
| parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
| parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
Merge master into stdenv-updates
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/top-level/release-python.nix')
| -rw-r--r-- | pkgs/top-level/release-python.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index fdf8a28fbca4..f6da545c6736 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -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; }; |