Merge staging-next into master

2019-03-01 09:06:20 +01:00
parent 456ff62ff8 fc4a8f63c4
commit 2fcb11a244
682 changed files with 2751 additions and 1768 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }:
+{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }:

 stdenv.mkDerivation rec {
  version = "1.6.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
  };

-  buildInputs = [ libxml2 openssl zlib bzip2 fts ];
+  buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ];

  meta = {
    homepage    = https://mackyle.github.io/xar/;