Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
This commit is contained in:
Vladimír Čunát
2015-12-31 09:53:02 +01:00
951 changed files with 117997 additions and 19014 deletions
+2 -2
View File
@@ -3,11 +3,11 @@
, libiconv, libpsl, openssl ? null }:
stdenv.mkDerivation rec {
name = "wget-1.17";
name = "wget-1.17.1";
src = fetchurl {
url = "mirror://gnu/wget/${name}.tar.xz";
sha256 = "11xvs919a8xr595hs6hk323rkk7yshyfdfyfdhlahagkrcxdcsdx";
sha256 = "1jcpvl5sxb2ag8yahpy370c5jlfb097a21k2mhsidh4wxdhrnmgy";
};
patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];