summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-08-20 21:39:22 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-08-20 21:39:22 +0000
commit202cd08724cffd79b9b6d08bf2fe150d86fe2876 (patch)
treef856324e33237b2a473959848fce17dcb131d9db /pkgs
parent44b5540bfdfc905ba432a51b84691c61bc8a4af0 (diff)
downloadnixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar.gz
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar.bz2
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar.lz
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar.xz
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.tar.zst
nixpkgs-202cd08724cffd79b9b6d08bf2fe150d86fe2876.zip
Looks like 2.6.35.2 commits a fix that breaks AUFS2
svn path=/nixpkgs/trunk/; revision=23295
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94b8a8f7b0a..dbdadaeb8d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -880,6 +880,8 @@ let
 
   netselect = callPackage ../tools/networking/netselect { };
 
+  nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
+
   nmap = callPackage ../tools/security/nmap {
     inherit (pythonPackages) pysqlite;
     inherit (gtkLibs) gtk;
@@ -4539,7 +4541,7 @@ let
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_35
         kernelPatches.sec_perm_2_6_24
-        kernelPatches.aufs2_2_6_35
+        # kernelPatches.aufs2_2_6_35
       ];
   };