diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
| commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
| tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/tools/filesystems/btrfs-progs | |
| parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
| parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
| download | nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixpkgs-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/tools/filesystems/btrfs-progs')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 32 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 4 |
2 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix deleted file mode 100644 index 5bbdbfba188..00000000000 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt -}: - -let version = "4.4.1"; 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 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # gcc bug with -O1 on ARM with gcc 4.8 - # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ nckx raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 87df30bba1c..77411e0cc26 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.13.1"; 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 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0"; }; nativeBuildInputs = [ pkgconfig ]; |