From 7f5520bfbaaa194854fc3e02713240a8827f0a2a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 31 Mar 2012 14:51:36 +0000
Subject: [PATCH] Update btrfsProgs

svn path=/nixpkgs/trunk/; revision=33497
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 68139f416ebb..75f155fd0ddf 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -3,9 +3,9 @@ let
   fetchurl = a.fetchurl;
   fetchgit = a.fetchgit;
 
-  version = a.lib.attrByPath ["version"] "0.19" a;
+  version = a.lib.attrByPath ["version"] "0.19-20120328" a;
   buildInputs = with a; [
-    zlib libuuid acl attr
+    zlib libuuid acl attr e2fsprogs
   ];
 in
 
@@ -14,8 +14,8 @@ assert a.libuuid != null;
 rec {
   srcDrv = fetchgit {
     url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
-    sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
+    rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
+    sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
   };
 
   src = srcDrv + "/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 097479808186..f69eda91504c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -432,7 +432,7 @@ let
   bootchart = callPackage ../tools/system/bootchart { };
 
   btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit libuuid zlib acl attr fetchgit;
+    inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
   };
 
   catdoc = callPackage ../tools/text/catdoc { };