summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-09-02 01:00:22 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-09-02 01:00:22 +0400
commit23b3495a253aa4e029cc48ea09629ab1243d9fa5 (patch)
tree6ff4fe80054a30f248db471aefbf06729bcad092 /pkgs/tools/filesystems
parent419031bcfce177ea6142286d555499b6cd54d141 (diff)
parent86d72b2c304c0a64f014476fadb50726e64e7399 (diff)
downloadnixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar.gz
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar.bz2
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar.lz
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar.xz
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.tar.zst
nixlib-23b3495a253aa4e029cc48ea09629ab1243d9fa5.zip
Merge pull request #3876 from wkennington/master.btrfsProgs
btrfsProgs: 3.14.2 -> 3.16.0
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/btrfsprogs/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 66152f9589b7..02f214ad430e 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.14.2"; in
+let version = "3.16"; 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 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh";
+    sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls";
   };
 
   buildInputs = [
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "prefix=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
     homepage = https://btrfs.wiki.kernel.org/;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin wkennington ];
+    platforms = platforms.linux;
   };
 }