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
..
ansible	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
elasticsearch	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
gandi	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
ibm	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
libvirt	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
data.nix	terraform-providers: bump versions (#66587)	2019-08-20 22:40:29 +00:00
default.nix
providers.txt	Update provider	2019-07-26 12:45:20 +02:00
update-all