Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III
2015-08-05 16:24:57 -07:00
68 changed files with 1942 additions and 1078 deletions

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yaws-${version}";
version = "1.99";
version = "2.0";
src = fetchurl {
url = "http://yaws.hyber.org/download/${name}.tar.gz";
sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6";
};
# The tarball includes a symlink yaws -> yaws-1.95, which seems to be