summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-17 13:01:30 +0000
committerGitHub <noreply@github.com>2017-12-17 13:01:30 +0000
commit4c3ccaf4187ec73187b81db77eae86a1ec2412a1 (patch)
treec1b853c427473b94bf72e3c2276ca704ceb4a060 /pkgs/tools
parent4844fbc2677344477c30f0c5fb8bbe4769a20006 (diff)
parent1b01ec13f6c8e52097dd21c3f205fd461429bcc8 (diff)
downloadnixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar.gz
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar.bz2
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar.lz
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar.xz
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.tar.zst
nixlib-4c3ccaf4187ec73187b81db77eae86a1ec2412a1.zip
Merge pull request #32753 from ikervagyok/btrfs-progs
btrfs-progs: 4.13.3 -> 4.14
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/btrfs-progs/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 4c8dc6218773..a37659aa8711 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
 }:
 
-let version = "4.13.3"; in
+let version = "4.14"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "10yp0b4pwrw5mcd81yn3d0d87fnqpp4si5d25dfhl6n2640dnnw0";
+    sha256 = "1bwirg6hz6gyfj5r3xkj4lfwadvl9pxlccf916fsmdn27fy5q289";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     attr acl zlib libuuid e2fsprogs lzo
-    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt zstd
   ];
 
   # gcc bug with -O1 on ARM with gcc 4.8