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
disable-failed-test.patch	umockdev: disable failed test (#66909)	2019-08-19 16:57:04 +03:00
fix-test-paths.patch	umockdev: 0.12.1 -> 0.13.1	2019-08-18 21:17:32 +03:00