alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

docker: keep using btrfs-progs 4.4.1

Browse source 
Fixes https://hydra.nixos.org/build/33510211.
This commit is contained in:
Tobias Geerinckx-Rice 2016-03-21 16:15:21 +01:00
parent 4d305102e0
commit e2cbf68786
2 changed files with 35 additions and 1 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 Normal file
View file

@ -0,0 +1,31 @@
{ 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;
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -11935,7 +11935,10 @@ let
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
};
docker = callPackage ../applications/virtualization/docker { go = go_1_4; };
docker = callPackage ../applications/virtualization/docker {
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { };
go = go_1_4;
};
docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };