Update btrfsProgs
svn path=/nixpkgs/trunk/; revision=33497
This commit is contained in:
parent
45b546c83d
commit
7f5520bfba
@ -3,9 +3,9 @@ let
|
|||||||
fetchurl = a.fetchurl;
|
fetchurl = a.fetchurl;
|
||||||
fetchgit = a.fetchgit;
|
fetchgit = a.fetchgit;
|
||||||
|
|
||||||
version = a.lib.attrByPath ["version"] "0.19" a;
|
version = a.lib.attrByPath ["version"] "0.19-20120328" a;
|
||||||
buildInputs = with a; [
|
buildInputs = with a; [
|
||||||
zlib libuuid acl attr
|
zlib libuuid acl attr e2fsprogs
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -14,8 +14,8 @@ assert a.libuuid != null;
|
|||||||
rec {
|
rec {
|
||||||
srcDrv = fetchgit {
|
srcDrv = fetchgit {
|
||||||
url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
|
url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
|
||||||
rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
|
rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
|
||||||
sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
|
sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
|
||||||
};
|
};
|
||||||
|
|
||||||
src = srcDrv + "/";
|
src = srcDrv + "/";
|
||||||
|
@ -432,7 +432,7 @@ let
|
|||||||
bootchart = callPackage ../tools/system/bootchart { };
|
bootchart = callPackage ../tools/system/bootchart { };
|
||||||
|
|
||||||
btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
|
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 { };
|
catdoc = callPackage ../tools/text/catdoc { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user