* 'master' of https://github.com/NixOS/nixpkgs: (554 commits)
  generators: make toPretty handle floats correctly
  haskell-yesod-core: disable broken test suite
  git-annex: update sha256 hash for the new 6.20181011 version
  cabal2nix: update overrides for latest yaml version
  hackage-packages.nix: automatic Haskell package set update
  hackage2nix: disable failing Hydra builds
  LTS Haskell 12.13
  saga: add mpickering as a co-maintainer after NixOS#39125
  python3Packages.cmd2: 0.9.4 -> 0.9.6
  ghc: add new 8.4.4 version
  apvlv: add .desktop file
  staruml: fix download URL
  spectmorph: init at 0.4.1
  termdown: 1.11.0 -> 1.14.1 (NixOS#48443)
  gotop: 1.2.9 -> 1.5.0 (NixOS#48407)
  emacs-mac: use generic builder
  dolphin-emu: fix metadata (GPLv2 -> GPLv2+, http -> https)
  tests/prometheus-exporters: add new Tor exporter
  dbeaver: 5.2.1 -> 5.2.2
  nixos/hardened: add myself to maintainers
  ...

* 'master' of https://github.com/NixOS/nixpkgs: (104 commits)
  python3.pkgs.pyls: 0.2.1 -> 0.3.0
  chromium: fix aarch64 build (NixOS#48586)
  pythonPackages.cligj: 0.4.0 -> 0.5.0 (NixOS#48584)
  Flexget: 2.15.1 -> 2.16.2 (NixOS#48583)
  gitolite 3.6.7 -> 3.6.10 (NixOS#48562)
  oh-my-zsh: 2018-09-03 -> 2018-09-14
  julia_10: update to 1.0.1
  signal-desktop: 1.16.2 -> 1.16.3
  Revert "Merge pull request NixOS#48122 from zimbatm/pkg-nixos-rebuild"
  terraform-providers.libvirt: fix plugin output (NixOS#48577)
  libssh: 0.7.5 -> 0.7.6
  googler: 3.7 -> 3.7.1 (NixOS#48508)
  chromium plugins: add meta.platforms (NixOS#48495)
  varnish6: 6.0.1 -> 6.1.0 (NixOS#48487)
  erlangR21: 21.0 -> 21.1.1 (NixOS#47371)
  varnish4: 4.1.9 -> 4.1.10 (NixOS#48488)
  tmux: 2.7 -> 2.8
  nixpart0.blivet: fix reference to selinux python modules
  blivet: fix reference to selinux python modules
  magit-filenotify: Fix missing dependency on git
  ...

* 'master' of https://github.com/NixOS/nixpkgs: (4438 commits)
  terraform-providers: add terraform-provider-secret
  terraform-providers: update
  x2goclient: 4.1.2.1 -> unstable-2018-11-30, fix build
  pythonPackages.flake8-future-import: fix build on Python 3.7
  chromium: 70.0.3538.110 -> 71.0.3578.80
  linux: 4.19.6 -> 4.19.7
  linux: 4.14.85 -> 4.14.86
  linux: 4.9.142 -> 4.9.143
  firefox-beta-bin: 64.0b10 -> 64.0b14
  firefox-devedition-bin: 64.0b10 -> 65.0b1
  opensans-ttf: change source to salsa, rename to open-sans
  all-cabal-hashes: update to Hackage at 2018-12-05T19:25:40Z
  haskell-json-autotype: disable the test suite to fix the build
  haskell-brick: update override for the new version
  hackage-packages.nix: automatic Haskell package set update
  gimp: fix on darwin
  stdenv/darwin: fix portable libsystem hook
  nextcloud: 14.0.3 -> 14.0.4
  pythonPackages.parsimonious: 0.7.0 -> 0.8.1
  nginx: 1.14.1 -> 1.14.2
  ...