Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:57:58 +01:00
1276 changed files with 78548 additions and 29166 deletions

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.2";
name = "libssh-0.7.3";
src = fetchurl {
url = "https://red.libssh.org/attachments/download/177/${name}.tar.xz";
sha256 = "0qmfxgx88dbzcbyvh40gddn0fcg9adyyskg8pnsclha1cywlab53";
url = "https://red.libssh.org/attachments/download/195/${name}.tar.xz";
sha256 = "165g49i4kmm3bfsjm0n8hm21kadv79g9yjqyq09138jxanz4dvr6";
};
postPatch = ''