Merge master into staging-next

2019-01-04 21:13:19 +01:00
parent 030f66400d 1a7d28e31f
commit 9618abe87c
99 changed files with 3758 additions and 2213 deletions
@@ -3,12 +3,12 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  version = "2.5.18";
+  version = "2.6.0";
  name = "dar-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "14002ai4xji0dczgiargxs3z8yylswj8z94higcsw09xk13izlkk";
+    sha256 = "0avaffkfrgj8vhvnpqi4s21bsrlxl0xafpyd3v9n3f9hs2gnm3wg";
  };

  buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]