summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2018-10-23 19:55:08 -0400
committerTim Steinbach <tim@nequissimus.com>2018-10-23 19:55:08 -0400
commit5de85172926ef93060086b204270bfa263b4895c (patch)
tree6423bec752bf5eea59ef3167210e34bfb1e41e95 /pkgs/tools/filesystems
parent7deafa339ee9084b7eedc629f71f3ed21583df6a (diff)
downloadnixlib-5de85172926ef93060086b204270bfa263b4895c.tar
nixlib-5de85172926ef93060086b204270bfa263b4895c.tar.gz
nixlib-5de85172926ef93060086b204270bfa263b4895c.tar.bz2
nixlib-5de85172926ef93060086b204270bfa263b4895c.tar.lz
nixlib-5de85172926ef93060086b204270bfa263b4895c.tar.xz
nixlib-5de85172926ef93060086b204270bfa263b4895c.tar.zst
nixlib-5de85172926ef93060086b204270bfa263b4895c.zip
btrfs-progs: 4.15.1 -> 4.17.1
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/btrfs-progs/default.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index e84260052a41..42f27e69f38e 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,26 +1,18 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages
 }:
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
-  version = "4.15.1";
+  version = "4.17.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
+    sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz";
   };
 
-  patches = [
-    # Fix build with e2fsprogs 1.44.0
-    (fetchpatch {
-      url = "https://patchwork.kernel.org/patch/10281327/raw/";
-      sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
-    })
-  ];
-
   nativeBuildInputs = [
-    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools
   ];
 
   buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];