Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
parent 72f8f89849 dbc771f2e1
commit ff101946a8
220 changed files with 6008 additions and 2679 deletions
@@ -3,12 +3,12 @@
 with stdenv.lib;

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

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

  buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]