diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 03:31:25 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 04:04:20 +0200 |
| commit | c559e96445412e25db8d9b26e4c7237da15fb9e6 (patch) | |
| tree | fbdc63266102e503a74d43c4a48b24fcb415aecf /pkgs | |
| parent | 0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e (diff) | |
| download | nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar.gz nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar.bz2 nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar.lz nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar.xz nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.tar.zst nixlib-c559e96445412e25db8d9b26e4c7237da15fb9e6.zip | |
btrfs-progs_4_4_1: remove, snapper works with latest
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 1 insertions, 36 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 afafa4ec1743..000000000000 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9efda627134..c34d03f32692 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |