6 commits

Author	SHA1	Message	Date
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
Robin Gloster	4e60b0efae	treewide: update globin's maintained drvs	2019-08-20 19:36:05 +02:00
WilliButz	dfb66de179	grafana-loki: 0.2.0 -> 0.3.0 (#66835)	2019-08-18 21:47:31 +02:00
volth	46420bbaa3	treewide: name -> pname (easy cases) (#66585) ... treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname	2019-08-15 13:41:18 +01:00
WilliButz	2d09016ed3	grafana-loki: 0.1.0 -> 0.2.0	2019-08-03 00:19:14 +02:00
WilliButz	25b2a5eba6	grafana-loki: init at 0.1.0	2019-06-04 01:50:34 +02:00