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
..
default.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
dont-create-sysconfdir-1.patch	bird, bird6: 1.6.3 -> 1.6.6	2019-03-07 11:37:24 +01:00
dont-create-sysconfdir-2.patch	bird2: 2.0.2 -> 2.0.4	2019-03-07 11:30:30 +01:00