nixpkgs/pkgs
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
..
applications Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
build-support Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
common-updater
data Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
desktops Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
development Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
games Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
misc Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
os-specific Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
servers Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
shells Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
stdenv Merge pull request #66657 from danbst/pgpackages-fixes 2019-08-18 17:30:56 +03:00
test
tools Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
top-level Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00