diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-18 21:10:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-18 21:10:46 +0000 |
| commit | 3d442ad185351acd900934baf1079a37a965ff54 (patch) | |
| tree | 7ac26b70403d844c8a11d28bf7894a1413fc457a /pkgs/build-support | |
| parent | 113fa71b8c81c27182cf06bd2819fad6a22b86ee (diff) | |
| download | nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar.gz nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar.bz2 nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar.lz nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar.xz nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.tar.zst nixpkgs-3d442ad185351acd900934baf1079a37a965ff54.zip | |
* Apply a patch that is apparently required to make the kernel work
properly on Amazon EC2. * Always apply the CIFS timeout patch. It's rather annoying to have to build a separate kernel for the VM tests. svn path=/nixpkgs/trunk/; revision=22630
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8322b689646..f4d34584d25 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -7,9 +7,7 @@ rec { # The 15 second CIFS timeout is too short if the host if heavily # loaded (e.g., in the Hydra build farm when it's running many jobs # in parallel). So apply a patch to increase the timeout to 120s. - kernel = pkgs.linux.override (orig: { - kernelPatches = orig.kernelPatches ++ [ kernelPatches.cifs_timeout ]; - }); + kernel = assert pkgs.linux.features.cifsTimeout; pkgs.linux; kvm = pkgs.qemu_kvm; |