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

treewide: update globin's maintained drvs

2019-08-20 19:36:05 +02:00

qt.nix

treewide: name -> pname (easy cases) (#66585)

2019-08-15 13:41:18 +01:00