Update from upstream repo nixOS/nixpkgs@master#10

Merged

eadwu merged 44 commits intoeadwu:masterfrom

Jun 20, 2018

Commits on Jun 11, 2018

nixos/mattermost: fix JoinsNamespaceOf config location
ryantm
committed

Commits on Jun 18, 2018

Commits on Jun 19, 2018

esh: init at 0.1.1
mnacamura
committed
wakatime: 10.1.0 -> 10.2.1
eadwu
committed
haskell generic-buider: nativeGhc should be a depsBuildBuild

pSub
authored and
Ericson2314
committed
haskell generic-builder: Only pass --extra-* for host deps
Ericson2314
committed
platformio: Fix building of overridden click package
Moredread
committed
platformio: 3.5.2 -> 3.5.3
Moredread
committed
git-secret: 0.2.3 -> 0.2.4
R. RyanTM
committed
fnotifystat: 0.02.00 -> 0.02.01
R. RyanTM
committed
clex: 4.6.patch6 -> 4.6.patch9
R. RyanTM
committed
debootstrap: 1.0.101 -> 1.0.102
R. RyanTM
committed
python.pkgs.cython: fix tests

FRidh
authored and
globin
committed
wesnoth: 1.14.2 -> 1.14.3 (#42195)

r-ryantm
authored and
fpletz
committed
adapta-gtk-theme: 3.93.1.18 -> 3.93.1.22
R. RyanTM
committed
brial: 1.2.3 -> 1.2.4
R. RyanTM
committed

Commits on Jun 20, 2018