Merge recent master into staging

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

1 files changed, 18 insertions, 0 deletions

diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
new file mode 100644
index 000000000000..73bc987908d7
--- /dev/null
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "lbzip2-2.5";
+
+  src = fetchurl {
+    url = "http://archive.lbzip2.org/${name}.tar.gz";
+    sha256 = "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://lbzip2.org/;
+    description = "parallel bzip2 compression utility";
+    license = licenses.gpl3;
+    maintainers = maintainers.abbradar;
+    platforms = platforms.unix;
+  };
+}