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

svn merge ^/nixpkgs/trunk

Browse Source 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
This commit is contained in:
Yury G. Kudryashov
2012-02-23 20:06:21 +00:00
parent 79232c5f54 65e7aeda65
commit 38e3d7bc86
49 changed files with 761 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/patches.nix
+14
View File
@@ -252,6 +252,20 @@ rec {
features.aufs3 = true;
};
aufs3_2 = rec {
name = "aufs3.2";
version = "3.2";
utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f";
utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033";
sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =