diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-05-30 19:13:26 -0500 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-31 14:42:17 +0200 |
| commit | 215ce6259681b8696d42d2ff3f6e870d0355d41b (patch) | |
| tree | 3e2c64512033f44bcd2d2a54bb138d6cebcbfa07 /pkgs/tools/filesystems | |
| parent | 39bd9f8b1bbd9dc7fb2ce085a5fcb6bad16c8c45 (diff) | |
| download | nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar.gz nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar.bz2 nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar.lz nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar.xz nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.tar.zst nixlib-215ce6259681b8696d42d2ff3f6e870d0355d41b.zip | |
btrfsProgs: Update 3.14 -> 3.14.2 (close #2797)
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfsprogs/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a41b2f28d854..66152f9589b7 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }: +{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.14"; in +let version = "3.14.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1qjy4bc96nfzkdjp6hwb85aasqs87nkmgi8pl6qa6cpvml3627cq"; + sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh"; }; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo ]; + buildInputs = [ + attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; |