JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs-progs_4_4_1: remove, snapper works with latest

Browse Source
This commit is contained in:
Franz Pletz 2017-10-07 03:31:25 +02:00
parent 0a9825a7f5
commit c559e96445
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/tools/filesystems/btrfs-progs/4.4.1.nix
View File

@ -1,31 +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";
};
buildInputs = [
pkgconfig 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;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -781,7 +781,6 @@ with pkgs;
bsod = callPackage ../misc/emulators/bsod { };
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { };
btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
@ -16472,10 +16471,7 @@ with pkgs;
smartdeblur = callPackage ../applications/graphics/smartdeblur { };
snapper = callPackage ../tools/misc/snapper {
btrfs-progs = btrfs-progs_4_4_1;
stdenv = overrideCC stdenv gcc5;
};
snapper = callPackage ../tools/misc/snapper { };
snd = callPackage ../applications/audio/snd { };