Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-04-07 21:52:26 +00:00
198 changed files with 32102 additions and 27617 deletions
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
description = "A caching proxy specialized for linux distribution files";
homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.makefu ];
};
}