Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
0001-Fix-build-with-unbound-1.6.1.patch
default.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
pfixtools.nix	treewide: name -> pname	2019-08-17 10:54:38 +00:00
pflogsumm.nix	buildPerlPackage: name -> (pname, version)	2019-06-20 15:56:50 +00:00
post-install-script.patch
postfix-3.0-no-warnings.patch
postfix-script-shell.patch
relative-symlinks.patch