Update from upstream repo nixOS/nixpkgs@master#7

Merged

eadwu merged 51 commits intoeadwu:masterfrom

Jun 19, 2018

Commits on Jun 13, 2018

asc-key-to-qr-code-gif: init at 20180613
asymmetric
committed

Commits on Jun 18, 2018

nix-pin: 0.3.1 -> 0.3.4
timbertson
committed
haskell generic-builder: Always use separate pkg db for custom setup
Ericson2314
committed
haskell: Add setup depends for Cabal

kirelagin
authored and
Ericson2314
committed
Merge pull request #41893 from asymmetric/asymmetric/asc-qr
xeji
authored
tesseract: make tessdata a fix output derivation (#41227)

symphorien
authored and
xeji
committed
c-blosc: 1.11.3 -> 1.14.3 (#42036)

r-ryantm
authored and
xeji
committed
balsa: 2.5.5 -> 2.5.6 (#42054)

r-ryantm
authored and
xeji
committed
inkscape: work around ARGMAX limit
matthewbauer
committed
docs: minor rewording for easier reading.
ariutta
committed
range-v3: 0.3.5 -> 0.3.6
dtzWill
committed

Commits on Jun 19, 2018