Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ab8bcd05f6fa970f7364a1fe3c51a74bdb5d225f
      
https://github.com/NixOS/nixpkgs/commit/ab8bcd05f6fa970f7364a1fe3c51a74bdb5d225f
  Author: Johannes Bornhold <johan...@bornhold.name>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pytestcov: 2.3.1 -> 2.4.0


  Commit: 3c65b4ac9a727d22bdf1f49221ad738005a1113a
      
https://github.com/NixOS/nixpkgs/commit/3c65b4ac9a727d22bdf1f49221ad738005a1113a
  Author: Johannes Bornhold <johan...@bornhold.name>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  freezegun: 0.3.5 -> 0.3.8


  Commit: a189f8cc0fb1d676c8e5de9b81c2b1feb189b726
      
https://github.com/NixOS/nixpkgs/commit/a189f8cc0fb1d676c8e5de9b81c2b1feb189b726
  Author: Johannes Bornhold <johan...@bornhold.name>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pytest_xdist: 1.8 -> 1.14


  Commit: e9adf383e685bdb9812111fa8ec50450b16cfb11
      
https://github.com/NixOS/nixpkgs/commit/e9adf383e685bdb9812111fa8ec50450b16cfb11
  Author: Orivej Desh <ori...@gmx.fr>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/build-support/cc-wrapper/utils.sh

  Log Message:
  -----------
  Fix parsing @args.rsp compiler arguments


  Commit: 34436df0d0e57caafb6b0ed5911f71861b10a6eb
      
https://github.com/NixOS/nixpkgs/commit/34436df0d0e57caafb6b0ed5911f71861b10a6eb
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/clang/default.nix

  Log Message:
  -----------
  clang: Use cmake from buildPackages


  Commit: 3eee6ea7c17aea50b8a1e04b95e9ee226591e38f
      
https://github.com/NixOS/nixpkgs/commit/3eee6ea7c17aea50b8a1e04b95e9ee226591e38f
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/tools/text/groff/default.nix

  Log Message:
  -----------
  groff: use buildPackages to fix cross compile


  Commit: 12bbc630247f85f4fa84c100d856a712b6d7cf4d
      
https://github.com/NixOS/nixpkgs/commit/12bbc630247f85f4fa84c100d856a712b6d7cf4d
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/llvm.nix

  Log Message:
  -----------
  llvm-3.9: Fix cross compilation

It's now possible to cross compile llvm:

`nix-build -E '(import ./. { crossSystem = import ./platform.nix; }).pkgs.llvm'`


  Commit: fea424fea33b7b71dfc43b3297ad2d1d2da36f5a
      
https://github.com/NixOS/nixpkgs/commit/fea424fea33b7b71dfc43b3297ad2d1d2da36f5a
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/llvm.nix

  Log Message:
  -----------
  LLVM-3.9: Fix RPATH in cross compile builds

This error was cause by multiple-outputs.sh not setting
NIX_CROSS_LDFLAGS


  Commit: bad5ca052553aefb724e32bed1ea547b911cbb4b
      
https://github.com/NixOS/nixpkgs/commit/bad5ca052553aefb724e32bed1ea547b911cbb4b
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/clang/default.nix
    M pkgs/development/compilers/llvm/3.9/llvm.nix

  Log Message:
  -----------
  LLVM-3.9: Use nativeBuildInputs instead of buildPackages


  Commit: 7b7ffc4999ba4b38f8090aab48a78ace0eb3424a
      
https://github.com/NixOS/nixpkgs/commit/7b7ffc4999ba4b38f8090aab48a78ace0eb3424a
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-29 (Sat, 29 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/llvm.nix

  Log Message:
  -----------
  LLVM-3.9: disable shared libraries in cross builds

The current cc-wrapper script seems to have trouble setting the rpath
correctly. Hopefully #25047 will fix this.


  Commit: ad778a64d7c887405e37a2ddc375dc01350dfe10
      
https://github.com/NixOS/nixpkgs/commit/ad778a64d7c887405e37a2ddc375dc01350dfe10
  Author: Joe Hermaszewski <g...@monoid.al>
  Date:   2017-04-29 (Sat, 29 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/llvm.nix

  Log Message:
  -----------
  LLVM-3.9: formatting


  Commit: 66f7398e4a6dd9d8ee4016712bc6cb3ca7579b1d
      
https://github.com/NixOS/nixpkgs/commit/66f7398e4a6dd9d8ee4016712bc6cb3ca7579b1d
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-04-30 (Sun, 30 Apr 2017)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Python 3 is now an alias of 3.6 instead of 3.5


  Commit: f3b45f83b55b6c5847967dfeaeae521e83af2225
      
https://github.com/NixOS/nixpkgs/commit/f3b45f83b55b6c5847967dfeaeae521e83af2225
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pkgs/build-support/cc-wrapper/utils.sh

  Log Message:
  -----------
  Merge pull request #25205 from orivej/rsp

Fix parsing @args.rsp compiler arguments


  Commit: 2dd351114635c19e5ba6a62a7b201dee0d35e0f9
      
https://github.com/NixOS/nixpkgs/commit/2dd351114635c19e5ba6a62a7b201dee0d35e0f9
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #24827 from johbo/trytond-dependencies

Trytond dependencies updates


  Commit: 1bcd56b6e659f22c89ac6ec0411c9dd30866f68f
      
https://github.com/NixOS/nixpkgs/commit/1bcd56b6e659f22c89ac6ec0411c9dd30866f68f
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M doc/languages-frameworks/haskell.md
    M lib/customisation.nix
    M lib/filesystem.nix
    M lib/licenses.nix
    M lib/maintainers.nix
    M lib/meta.nix
    M lib/systems/platforms.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/config/i18n.nix
    M nixos/modules/installer/tools/nixos-prepare-root.sh
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/profiles/hardened.nix
    A nixos/modules/programs/browserpass.nix
    M nixos/modules/programs/environment.nix
    A nixos/modules/programs/qt5ct.nix
    M nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
    M nixos/modules/security/lock-kernel-modules.nix
    M nixos/modules/services/backup/tarsnap.nix
    M nixos/modules/services/backup/znapzend.nix
    A nixos/modules/services/databases/clickhouse.nix
    M nixos/modules/services/misc/gogs.nix
    M nixos/modules/services/monitoring/cadvisor.nix
    M nixos/modules/services/monitoring/longview.nix
    M nixos/modules/services/monitoring/munin.nix
    M nixos/modules/services/monitoring/ups.nix
    M nixos/modules/services/networking/radicale.nix
    A nixos/modules/services/networking/xrdp.nix
    A nixos/modules/services/security/sshguard.nix
    M nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
    M nixos/modules/services/x11/desktop-managers/plasma5.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/tests/hardened.nix
    A nixos/tests/radicale.nix
    A nixos/tests/xrdp.nix
    M pkgs/applications/audio/abcde/default.nix
    A pkgs/applications/audio/google-play-music-desktop-player/default.nix
    M pkgs/applications/display-managers/sddm/default.nix
    M pkgs/applications/editors/emacs-modes/elpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/jetbrains/default.nix
    A pkgs/applications/graphics/displaycal/default.nix
    M pkgs/applications/graphics/ocrad/default.nix
    M pkgs/applications/misc/albert/default.nix
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/deepin-terminal/default.nix
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/jekyll/Gemfile
    M pkgs/applications/misc/jekyll/Gemfile.lock
    M pkgs/applications/misc/jekyll/default.nix
    M pkgs/applications/misc/jekyll/gemset.nix
    M pkgs/applications/misc/osmctools/default.nix
    M pkgs/applications/misc/robomongo/default.nix
    A pkgs/applications/misc/termdown/default.nix
    A pkgs/applications/misc/toot/default.nix
    M pkgs/applications/networking/browsers/vivaldi/default.nix
    M pkgs/applications/networking/cluster/openshift/default.nix
    M pkgs/applications/networking/flexget/default.nix
    M pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/mumble/default.nix
    M pkgs/applications/networking/owncloud-client/default.nix
    M pkgs/applications/networking/p2p/qbittorrent/default.nix
    A pkgs/applications/networking/remote/xrdp/default.nix
    M pkgs/applications/office/planner/default.nix
    M pkgs/applications/science/biology/ants/default.nix
    M pkgs/applications/science/biology/ncbi-tools/default.nix
    M pkgs/applications/science/logic/abc/default.nix
    A pkgs/applications/science/logic/cubicle/default.nix
    M pkgs/applications/science/math/csdp/default.nix
    M pkgs/applications/version-management/git-and-tools/qgit/default.nix
    M pkgs/applications/version-management/smartgithg/default.nix
    M pkgs/applications/video/makemkv/default.nix
    M pkgs/applications/video/mkvtoolnix/default.nix
    M pkgs/applications/video/mpv/default.nix
    M pkgs/applications/window-managers/dwm/default.nix
    M pkgs/build-support/docker/default.nix
    M pkgs/build-support/emacs/buffer.nix
    M pkgs/build-support/kde/wrapper.nix
    M pkgs/build-support/release/ant-build.nix
    M pkgs/build-support/vm/windows/default.nix
    M pkgs/desktops/enlightenment/efl.nix
    M pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
    A pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
    A pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
    M pkgs/desktops/plasma-5/default.nix
    M pkgs/desktops/plasma-5/kwin/default.nix
    R pkgs/desktops/plasma-5/libkscreen.nix
    A pkgs/desktops/plasma-5/libkscreen/default.nix
    A pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
    A pkgs/desktops/plasma-5/libkscreen/series
    M pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
    M pkgs/development/compilers/mono/4.6.nix
    A pkgs/development/compilers/reason/default.nix
    M pkgs/development/compilers/swift/default.nix
    M pkgs/development/go-modules/generic/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-nix.nix
    M pkgs/development/haskell-modules/make-package-set.nix
    M pkgs/development/interpreters/love/0.10.nix
    M pkgs/development/interpreters/love/0.9.nix
    R pkgs/development/interpreters/lua-5/expat.nix
    R pkgs/development/interpreters/lua-5/sec.nix
    M pkgs/development/interpreters/luajit/default.nix
    M pkgs/development/interpreters/php/default.nix
    A pkgs/development/libraries/audio/libgme/default.nix
    R pkgs/development/libraries/cimg/builder.sh
    M pkgs/development/libraries/cimg/default.nix
    A pkgs/development/libraries/eccodes/default.nix
    M pkgs/development/libraries/farbfeld/default.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    R pkgs/development/libraries/ffmpeg/3.1.nix
    R pkgs/development/libraries/ffmpeg/3.2.nix
    A pkgs/development/libraries/ffmpeg/3.3.nix
    M pkgs/development/libraries/ffmpeg/generic.nix
    R pkgs/development/libraries/ffmpeg/sdk_detection.patch
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/glfw/3.x.nix
    M pkgs/development/libraries/gstreamer/bad/default.nix
    M pkgs/development/libraries/imlib2/default.nix
    M pkgs/development/libraries/json-c/default.nix
    R pkgs/development/libraries/json-c/unused-variable.patch
    M pkgs/development/libraries/kde-frameworks/default.nix
    M pkgs/development/libraries/kde-frameworks/kinit/default.nix
    A pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
    M pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
    M pkgs/development/libraries/kde-frameworks/kinit/series
    R pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
    A pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
    A 
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
    A pkgs/development/libraries/kde-frameworks/kwindowsystem/series
    M pkgs/development/libraries/libidn2/default.nix
    M pkgs/development/libraries/libmatroska/default.nix
    M pkgs/development/libraries/libmicrohttpd/default.nix
    M pkgs/development/libraries/libplist/default.nix
    R pkgs/development/libraries/libplist/swig.patch
    M pkgs/development/libraries/physics/rivet/default.nix
    M pkgs/development/libraries/physics/yoda/default.nix
    R 
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/series
    R pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
    R pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
    R 
pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
    A 
pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch
    A pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/series
    M pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
    M pkgs/development/libraries/qt-5/make-qt-wrapper.sh
    A pkgs/development/libraries/qtinstaller/default.nix
    M pkgs/development/libraries/science/math/blas/default.nix
    M pkgs/development/libraries/vulkan-loader/default.nix
    R pkgs/development/libraries/wxGTK-2.8/default.nix
    R pkgs/development/libraries/wxGTK-2.9/default.nix
    R pkgs/development/libraries/wxGTK-3.0/default.nix
    R pkgs/development/libraries/wxmac/default.nix
    A pkgs/development/libraries/wxwidgets/2.8/default.nix
    A pkgs/development/libraries/wxwidgets/2.9/default.nix
    A pkgs/development/libraries/wxwidgets/3.0/default.nix
    A pkgs/development/libraries/wxwidgets/3.0/mac.nix
    M pkgs/development/ocaml-modules/lambda-term/default.nix
    M pkgs/development/ocaml-modules/lwt/default.nix
    A pkgs/development/ocaml-modules/merlin_extend/default.nix
    M pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
    A pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
    A pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch
    A pkgs/development/python-modules/APScheduler/default.nix
    A pkgs/development/python-modules/Wand/default.nix
    A pkgs/development/python-modules/Wand/libraries.patch
    A pkgs/development/python-modules/asgi_ipc/default.nix
    A pkgs/development/python-modules/asgi_redis/default.nix
    A pkgs/development/python-modules/asgiref/default.nix
    A pkgs/development/python-modules/autobahn/default.nix
    A pkgs/development/python-modules/automat/default.nix
    M pkgs/development/python-modules/bcrypt.nix
    A pkgs/development/python-modules/cffi/default.nix
    M pkgs/development/python-modules/channels/default.nix
    A pkgs/development/python-modules/constantly/default.nix
    M pkgs/development/python-modules/daphne/default.nix
    A pkgs/development/python-modules/django-compat/default.nix
    A pkgs/development/python-modules/django/1_11.nix
    M pkgs/development/python-modules/django_guardian.nix
    A pkgs/development/python-modules/dkimpy/default.nix
    A pkgs/development/python-modules/dogpile.cache/default.nix
    A pkgs/development/python-modules/flask-restplus/0.8.nix
    A pkgs/development/python-modules/guessit/default.nix
    A pkgs/development/python-modules/ipython/5.nix
    M pkgs/development/python-modules/ipython/default.nix
    M pkgs/development/python-modules/keras/default.nix
    A pkgs/development/python-modules/m2r/default.nix
    A pkgs/development/python-modules/pbr/default.nix
    A pkgs/development/python-modules/plumbum/default.nix
    A pkgs/development/python-modules/pytest-asyncio/default.nix
    A pkgs/development/python-modules/tqdm/default.nix
    A pkgs/development/python-modules/twisted/default.nix
    A pkgs/development/python-modules/txaio/default.nix
    M pkgs/development/python-modules/vcrpy/default.nix
    A pkgs/development/python-modules/zxcvbn-python/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/backblaze-b2/default.nix
    M pkgs/development/tools/boomerang/default.nix
    A pkgs/development/tools/boomerang/fix-install.patch
    A pkgs/development/tools/boomerang/fix-output.patch
    A pkgs/development/tools/build-managers/doit/default.nix
    M pkgs/development/tools/misc/hydra/default.nix
    A pkgs/development/tools/misc/premake/5.nix
    M pkgs/development/tools/ocaml/utop/default.nix
    M pkgs/development/tools/parsing/byacc/default.nix
    M pkgs/development/tools/rust/bindgen/default.nix
    M pkgs/games/minetest/default.nix
    M pkgs/misc/emulators/desmume/default.nix
    M pkgs/misc/emulators/dolphin-emu/default.nix
    M pkgs/misc/screensavers/xlockmore/default.nix
    M pkgs/misc/themes/adapta/default.nix
    M pkgs/misc/themes/e17gtk/default.nix
    M pkgs/misc/uboot/default.nix
    M pkgs/os-specific/linux/atop/default.nix
    M pkgs/os-specific/linux/bluez/bluez5.nix
    M pkgs/os-specific/linux/guvcview/default.nix
    A pkgs/os-specific/linux/ioport/default.nix
    A pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.10.patch
    A pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch
    R pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.6.patch
    R pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.7.patch
    A pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch
    A pkgs/os-specific/linux/kernel/linux-4.11.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-mptcp.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    A pkgs/os-specific/linux/upstart/check-config.nix
    M pkgs/os-specific/linux/upstart/default.nix
    M pkgs/os-specific/linux/wpa_supplicant/gui.nix
    R pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
    A pkgs/servers/clickhouse/default.nix
    A pkgs/servers/clickhouse/prefix.patch
    A pkgs/servers/clickhouse/termcap.patch
    M pkgs/servers/dns/knot-resolver/default.nix
    M pkgs/servers/http/nginx/modules.nix
    M pkgs/servers/monitoring/longview/default.nix
    M pkgs/servers/nosql/eventstore/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/servers/tvheadend/default.nix
    M pkgs/servers/unifi/default.nix
    M pkgs/servers/xmpp/pyIRCt/default.nix
    M pkgs/servers/xmpp/pyMAILt/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/tools/X11/xpra/default.nix
    M pkgs/tools/admin/simp_le/default.nix
    M pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
    M pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
    M pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
    M pkgs/tools/misc/fzf/default.nix
    M pkgs/tools/misc/fzf/deps.nix
    M pkgs/tools/misc/qt5ct/default.nix
    M pkgs/tools/misc/rockbox-utility/default.nix
    M pkgs/tools/networking/cmst/default.nix
    M pkgs/tools/networking/connman/default.nix
    A pkgs/tools/networking/networkmanager_dmenu/default.nix
    M pkgs/tools/networking/nzbget/default.nix
    M pkgs/tools/networking/offlineimap/default.nix
    M pkgs/tools/networking/wrk/default.nix
    A pkgs/tools/package-management/nix-update-source/default.nix
    A pkgs/tools/security/browserpass/default.nix
    A pkgs/tools/security/masscan/default.nix
    A 
pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
    A pkgs/tools/security/sshguard/default.nix
    M pkgs/tools/system/efibootmgr/default.nix
    M pkgs/tools/text/platinum-searcher/default.nix
    M pkgs/tools/text/platinum-searcher/deps.nix
    A pkgs/tools/text/rst2html5/default.nix
    A pkgs/tools/virtualization/linode-cli/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

There's been a very large rebuild on master, unfortunately.
pytestcov conflict: I'm not really sure what should be propagated.


  Commit: 7527355840b6398e63fa5104088a0c13da0ab33f
      
https://github.com/NixOS/nixpkgs/commit/7527355840b6398e63fa5104088a0c13da0ab33f
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/development/compilers/llvm/3.9/clang/default.nix
    M pkgs/development/compilers/llvm/3.9/llvm.nix
    M pkgs/tools/text/groff/default.nix

  Log Message:
  -----------
  Merge pull request #25218 from expipiplus1/cross-llvm

Fix cross compilation of LLVM-3.9


  Commit: c520e79842c91b432ffc8535cbecc90878392bea
      
https://github.com/NixOS/nixpkgs/commit/c520e79842c91b432ffc8535cbecc90878392bea
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/module-list.nix
    M nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/continuous-integration/buildbot/worker.nix
    A nixos/modules/services/security/shibboleth-sp.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/tests/buildbot.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/editors/neovim/neovim-remote.nix
    M pkgs/applications/editors/neovim/qt.nix
    M pkgs/applications/editors/rstudio/default.nix
    M pkgs/applications/kde/kgpg.nix
    M pkgs/applications/misc/urh/default.nix
    M pkgs/applications/networking/browsers/google-chrome/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/feedreaders/rawdog/default.nix
    M pkgs/applications/networking/irc/qweechat/default.nix
    M pkgs/build-support/emacs/wrapper.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/libidn2/fix-error-darwin.patch
    M pkgs/development/libraries/qtinstaller/default.nix
    A pkgs/development/python-modules/certifi/default.nix
    M pkgs/development/python-modules/line_profiler/default.nix
    M pkgs/development/python-modules/magic-wormhole/default.nix
    A pkgs/development/python-modules/pydot/default.nix
    M pkgs/development/python-modules/pyroute2/default.nix
    A pkgs/development/python-modules/stevedore/default.nix
    M pkgs/development/r-modules/README.md
    A pkgs/development/r-modules/wrapper-rstudio.nix
    M pkgs/development/r-modules/wrapper.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    M pkgs/development/tools/build-managers/buildbot/plugins.nix
    M pkgs/development/tools/build-managers/buildbot/worker.nix
    M pkgs/os-specific/linux/mwprocapture/default.nix
    A pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch
    M pkgs/os-specific/linux/tomb/default.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/tools/networking/fakeroute/default.nix
    M pkgs/tools/networking/mosh/default.nix
    M pkgs/tools/security/encryptr/default.nix
    M pkgs/tools/system/efivar/default.nix
    M pkgs/tools/text/grin/default.nix
    M pkgs/tools/text/xml/jing-trang/default.nix
    M pkgs/tools/text/xsv/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into HEAD


  Commit: 33962a4420cc908af5f64083a6bfe843dc0c7ecb
      
https://github.com/NixOS/nixpkgs/commit/33962a4420cc908af5f64083a6bfe843dc0c7ecb
  Author: Linus Heckemann <g...@sphalerite.org>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M pkgs/build-support/setup-hooks/multiple-outputs.sh

  Log Message:
  -----------
  stdenv: fix "grep: invalid range"


  Commit: 5fa8a5c760eaadfb5973333624ac781758e35f2e
      
https://github.com/NixOS/nixpkgs/commit/5fa8a5c760eaadfb5973333624ac781758e35f2e
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M pkgs/build-support/setup-hooks/multiple-outputs.sh

  Log Message:
  -----------
  Merge pull request #25501 from lheckemann/stdenv-grep-range

stdenv: fix "grep: invalid range"


  Commit: 3b8f8951db5e657651732d776aa3ea7adb5e9041
      
https://github.com/NixOS/nixpkgs/commit/3b8f8951db5e657651732d776aa3ea7adb5e9041
  Author: Eelco Dolstra <edols...@gmail.com>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    R nixos/modules/services/monitoring/dd-agent.nix
    A nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
    A nixos/modules/services/monitoring/dd-agent/dd-agent.nix
    A nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
    M pkgs/applications/editors/emacs-modes/elpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/networking/cluster/helm/default.nix
    M pkgs/applications/science/math/R/default.nix
    A pkgs/applications/science/math/R/fix-sweave-exit-code.patch
    M pkgs/applications/window-managers/stalonetray/default.nix
    M pkgs/data/documentation/man-pages/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    R pkgs/development/libraries/capnproto/clang4.patch
    M pkgs/development/libraries/capnproto/default.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/libseccomp/default.nix
    M pkgs/development/python-modules/autobahn/default.nix
    A pkgs/development/python-modules/branca/default.nix
    A pkgs/development/python-modules/folium/default.nix
    A pkgs/development/python-modules/os-testr/default.nix
    A pkgs/development/python-modules/pyproj/default.nix
    M pkgs/development/python-modules/pytest-asyncio/default.nix
    A pkgs/development/python-modules/sqlalchemy-migrate/default.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    A 
pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch
    M pkgs/development/tools/database/sqlitebrowser/default.nix
    A pkgs/development/tools/haskell/intero-nix-shim/default.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/ocaml/camlp5/default.nix
    M pkgs/development/tools/ocaml/utop/default.nix
    M pkgs/os-specific/linux/kernel/linux-4.10.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/servers/http/nginx/modules.nix
    M pkgs/tools/networking/dd-agent/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into staging


  Commit: 94d164dd7f20c785a543d1fb1d5bd359fb38bd25
      
https://github.com/NixOS/nixpkgs/commit/94d164dd7f20c785a543d1fb1d5bd359fb38bd25
  Author: Eelco Dolstra <edols...@gmail.com>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    A pkgs/build-support/setup-hooks/audit-tmpdir.sh
    M pkgs/stdenv/generic/default.nix
    M pkgs/stdenv/generic/setup.sh

  Log Message:
  -----------
  Add a setup hook for detecting $TMPDIR references in RPATHs and wrapper 
scripts


  Commit: 1823113f8792fc67b11b35dfffe72c88d69dd791
      
https://github.com/NixOS/nixpkgs/commit/1823113f8792fc67b11b35dfffe72c88d69dd791
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/extra.list
    M pkgs/servers/x11/xorg/tarballs-7.7.list

  Log Message:
  -----------
  xorg: misc updates


  Commit: 572550596752fe6f69b2c07f5a928889df223fe7
      
https://github.com/NixOS/nixpkgs/commit/572550596752fe6f69b2c07f5a928889df223fe7
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/development/libraries/mesa/default.nix

  Log Message:
  -----------
  mesa: maintenance 17.0.4 -> 17.0.5


  Commit: 24f0fa56a65b0f6e31894413864014413fe06cfa
      
https://github.com/NixOS/nixpkgs/commit/24f0fa56a65b0f6e31894413864014413fe06cfa
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  mesa: no more grsecurity support by default

Nixpkgs discontinued grsecurity support: #25277.


  Commit: 24ec5f07bc41ce1c976e7ed1b689440d8696b988
      
https://github.com/NixOS/nixpkgs/commit/24ec5f07bc41ce1c976e7ed1b689440d8696b988
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  mesa: LLVM dependency 3.9 -> 4


  Commit: 7830ce47cb931f748f8a08ddbb29caf430befe1c
      
https://github.com/NixOS/nixpkgs/commit/7830ce47cb931f748f8a08ddbb29caf430befe1c
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list

  Log Message:
  -----------
  xf86-video-nouveau: maintenance 1.0.14 -> 1.0.15


  Commit: ef5844be6cf7da93f4c2bee9242da3bddf083ad8
      
https://github.com/NixOS/nixpkgs/commit/ef5844be6cf7da93f4c2bee9242da3bddf083ad8
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/stdenv/generic/default.nix

  Log Message:
  -----------
  stdenv: disable audit-tmpdir on non-Linux for now

Without changing any hashes.


  Commit: fa5d543770970b16da8585b5f1c4125c4bc5b5f3
      
https://github.com/NixOS/nixpkgs/commit/fa5d543770970b16da8585b5f1c4125c4bc5b5f3
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M .github/ISSUE_TEMPLATE.md
    M lib/maintainers.nix
    M lib/tests.nix
    M lib/trivial.nix
    M nixos/modules/hardware/all-firmware.nix
    M nixos/modules/programs/environment.nix
    M nixos/modules/services/networking/xrdp.nix
    M pkgs/applications/editors/vscode/default.nix
    M pkgs/applications/graphics/gimp/plugins/default.nix
    A pkgs/applications/graphics/imagej/default.nix
    M pkgs/applications/graphics/mozjpeg/default.nix
    M pkgs/applications/misc/calibre/default.nix
    M pkgs/applications/networking/browsers/firefox/common.nix
    M pkgs/applications/networking/browsers/firefox/wrapper.nix
    M pkgs/applications/networking/cluster/openshift/default.nix
    M pkgs/applications/networking/corebird/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/remote/freerdp/default.nix
    R pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
    A pkgs/applications/office/watson/default.nix
    M pkgs/applications/science/electronics/kicad/default.nix
    A pkgs/applications/science/misc/openmvg/default.nix
    M pkgs/applications/version-management/git-and-tools/gitflow/default.nix
    M pkgs/applications/version-management/gitkraken/default.nix
    M pkgs/applications/video/obs-studio/default.nix
    A pkgs/applications/video/obs-studio/find-xcb.patch
    M pkgs/applications/video/smplayer/default.nix
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/haskell-modules/with-packages-wrapper.nix
    A pkgs/development/libraries/c-blosc/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    A pkgs/development/libraries/libsmi/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    M pkgs/development/libraries/rdkafka/default.nix
    A pkgs/development/python-modules/PyLD/default.nix
    M pkgs/development/python-modules/aenum/default.nix
    A pkgs/development/python-modules/agate-dbf/default.nix
    A pkgs/development/python-modules/agate-excel/default.nix
    A pkgs/development/python-modules/agate-sql/default.nix
    A pkgs/development/python-modules/agate/default.nix
    A pkgs/development/python-modules/bibtexparser/default.nix
    A pkgs/development/python-modules/csvkit/default.nix
    A pkgs/development/python-modules/dbf/default.nix
    A pkgs/development/python-modules/dbfread/default.nix
    A pkgs/development/python-modules/httpserver/default.nix
    A pkgs/development/python-modules/mplleaflet/default.nix
    A pkgs/development/python-modules/phpserialize/default.nix
    A pkgs/development/python-modules/plotly/default.nix
    A pkgs/development/python-modules/pytest-datafiles/default.nix
    A pkgs/development/python-modules/pytest-flake8/default.nix
    A pkgs/development/python-modules/python-slugify/default.nix
    A pkgs/development/python-modules/pytimeparse/default.nix
    M pkgs/development/python-modules/tables/default.nix
    M pkgs/development/tools/rust/bindgen/default.nix
    A pkgs/misc/tw-rs/default.nix
    A pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
    A pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
    M pkgs/os-specific/linux/spl/default.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/servers/emby/default.nix
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    M pkgs/tools/misc/openopc/default.nix
    A pkgs/tools/networking/connman-gtk/default.nix
    M pkgs/tools/package-management/nix/default.nix
    A pkgs/tools/text/mb2md/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: e68633cd7270b01c6a02196054335090d6c13455
      
https://github.com/NixOS/nixpkgs/commit/e68633cd7270b01c6a02196054335090d6c13455
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M lib/maintainers.nix
    M lib/systems/doubles.nix
    M lib/systems/parse.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/release-cross.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

The missing maintainer entry is blocking evaluation on Hydra.


  Commit: 0a897b2a33dd920456b058de9f835aa890a67cd9
      
https://github.com/NixOS/nixpkgs/commit/0a897b2a33dd920456b058de9f835aa890a67cd9
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-06 (Sat, 06 May 2017)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  mesa: use older LLVM on aarch64 for now


  Commit: d4dde073fd9d59f104d295df32f60ad8d56889ea
      
https://github.com/NixOS/nixpkgs/commit/d4dde073fd9d59f104d295df32f60ad8d56889ea
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-05-07 (Sun, 07 May 2017)

  Changed paths:
    M pkgs/top-level/release.nix

  Log Message:
  -----------
  Python release: do not build all Python packages

as we agreed not to. Maybe in the future we will again. Do build a
couple of packages that take a longer time to build.


  Commit: 7a61788bc1d535213608a6f8d6b195f9a5519820
      
https://github.com/NixOS/nixpkgs/commit/7a61788bc1d535213608a6f8d6b195f9a5519820
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-05-07 (Sun, 07 May 2017)

  Changed paths:
    M doc/languages-frameworks/python.md
    M lib/maintainers.nix
    M nixos/modules/module-list.nix
    A nixos/modules/services/desktops/gnome3/gnome-disks.nix
    M nixos/modules/services/misc/taskserver/default.nix
    M nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    M pkgs/applications/audio/mopidy-gmusic/default.nix
    M pkgs/applications/audio/mopidy/default.nix
    M pkgs/applications/backup/crashplan/default.nix
    M pkgs/applications/editors/nano/default.nix
    M pkgs/applications/gis/qgis/default.nix
    M pkgs/applications/graphics/solvespace/default.nix
    M pkgs/applications/misc/buku/default.nix
    A pkgs/applications/misc/electrum-ltc/default.nix
    M pkgs/applications/misc/haxor-news/default.nix
    M pkgs/applications/misc/octoprint/default.nix
    M pkgs/applications/misc/rtv/default.nix
    M pkgs/applications/misc/toot/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/packages.nix
    A pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/errbot/default.nix
    M pkgs/applications/networking/flexget/default.nix
    M pkgs/applications/networking/mailreaders/neomutt/default.nix
    M pkgs/applications/networking/sync/acd_cli/default.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/office/watson/default.nix
    M pkgs/applications/version-management/git-review/default.nix
    M pkgs/applications/video/streamlink/default.nix
    M pkgs/applications/virtualization/openstack/glance.nix
    M pkgs/applications/virtualization/openstack/keystone.nix
    M pkgs/applications/virtualization/openstack/neutron.nix
    M pkgs/applications/virtualization/openstack/nova.nix
    M pkgs/applications/virtualization/virt-manager/default.nix
    M pkgs/applications/virtualization/virtinst/default.nix
    M pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
    M pkgs/development/compilers/asn1c/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    A pkgs/development/libraries/libscrypt/default.nix
    M pkgs/development/libraries/libtoxcore/default.nix
    M pkgs/development/libraries/mapnik/default.nix
    M pkgs/development/libraries/openal-soft/default.nix
    M pkgs/development/libraries/xapian/default.nix
    M pkgs/development/libraries/xapian/tools/omega/default.nix
    M pkgs/development/python-modules/coveralls/default.nix
    M pkgs/development/python-modules/docker.nix
    M pkgs/development/python-modules/docker_compose.nix
    M pkgs/development/python-modules/ipython/5.nix
    A pkgs/development/python-modules/libsoundtouch/default.nix
    A pkgs/development/python-modules/ltc_scrypt/default.nix
    M pkgs/development/python-modules/notebook/default.nix
    M pkgs/development/python-modules/plotly/default.nix
    M pkgs/development/python-modules/pyrax.nix
    M pkgs/development/python-modules/pytest-httpbin/default.nix
    M pkgs/development/python-modules/rackspace-novaclient.nix
    M pkgs/development/python-modules/requests-oauthlib.nix
    M pkgs/development/python-modules/treq/default.nix
    M pkgs/development/tools/backblaze-b2/default.nix
    M pkgs/development/tools/build-managers/conan/default.nix
    M pkgs/development/tools/coursier/default.nix
    M pkgs/development/tools/electron/default.nix
    M pkgs/development/tools/haskell/intero-nix-shim/default.nix
    A pkgs/games/mar1d/default.nix
    A pkgs/games/quakespasm/default.nix
    M pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
    M pkgs/os-specific/linux/kernel/manual-config.nix
    M pkgs/servers/http/tomcat/default.nix
    M pkgs/servers/inginious/default.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/shells/lambda-mod-zsh-theme/default.nix
    M pkgs/tools/admin/tigervnc/default.nix
    M pkgs/tools/audio/beets/default.nix
    M pkgs/tools/backup/attic/default.nix
    M pkgs/tools/backup/s3ql/default.nix
    A pkgs/tools/filesystems/irods/common.nix
    A pkgs/tools/filesystems/irods/default.nix
    A pkgs/tools/filesystems/irods/irods_root_path.patch
    M pkgs/tools/graphics/pngquant/default.nix
    M pkgs/tools/misc/asciinema/default.nix
    M pkgs/tools/misc/graylog/default.nix
    M pkgs/tools/misc/kargo/default.nix
    M pkgs/tools/misc/svtplay-dl/default.nix
    M pkgs/tools/misc/system-config-printer/default.nix
    M pkgs/tools/misc/vdirsyncer/default.nix
    A pkgs/tools/misc/winusb/default.nix
    M pkgs/tools/networking/dd-agent/default.nix
    M pkgs/tools/networking/httpie/default.nix
    M pkgs/tools/networking/linkchecker/default.nix
    M pkgs/tools/networking/mitmproxy/default.nix
    M pkgs/tools/networking/reaver-wps-t6x/default.nix
    M pkgs/tools/networking/reaver-wps/default.nix
    M pkgs/tools/networking/urlwatch/default.nix
    M pkgs/tools/package-management/nox/default.nix
    M pkgs/tools/security/pass/default.nix
    M pkgs/tools/security/vulnix/default.nix
    A pkgs/tools/system/socklog/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into HEAD


  Commit: 8b01ec9a9ef18636fa9a9cf13abd60de0d9c74b3
      
https://github.com/NixOS/nixpkgs/commit/8b01ec9a9ef18636fa9a9cf13abd60de0d9c74b3
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-10 (Wed, 10 May 2017)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/config/shells-environment.nix
    M nixos/modules/hardware/all-firmware.nix
    M nixos/modules/hardware/network/broadcom-43xx.nix
    M nixos/modules/hardware/network/intel-2030.nix
    M nixos/modules/hardware/network/intel-2100bg.nix
    M nixos/modules/hardware/network/intel-3945abg.nix
    M nixos/modules/hardware/network/intel-4965agn.nix
    M nixos/modules/hardware/network/intel-5000.nix
    M nixos/modules/hardware/network/intel-5150.nix
    M nixos/modules/hardware/network/intel-6000.nix
    M nixos/modules/hardware/network/intel-6000g2a.nix
    M nixos/modules/hardware/network/intel-6000g2b.nix
    M nixos/modules/hardware/network/ralink.nix
    M nixos/modules/hardware/network/rtl8192c.nix
    M nixos/modules/hardware/video/radeon.nix
    M nixos/modules/installer/cd-dvd/iso-image.nix
    M nixos/modules/installer/scan/not-detected.nix
    M nixos/modules/module-list.nix
    M nixos/modules/profiles/all-hardware.nix
    M nixos/modules/programs/environment.nix
    A nixos/modules/services/admin/salt/master.nix
    M nixos/modules/services/web-apps/mattermost.nix
    M nixos/modules/virtualisation/libvirtd.nix
    M pkgs/applications/editors/emacs-modes/elpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/emacs-modes/org-generated.nix
    M pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
    M pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/graphics/shotwell/default.nix
    M pkgs/applications/misc/camlistore/default.nix
    M pkgs/applications/networking/browsers/chromium/plugins.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
    M pkgs/applications/networking/ftp/filezilla/default.nix
    M pkgs/applications/networking/instant-messengers/qtox/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/networking/syncthing/inotify.nix
    M pkgs/applications/science/math/weka/default.nix
    M pkgs/applications/science/misc/cytoscape/default.nix
    M pkgs/applications/science/misc/openmvg/default.nix
    M pkgs/applications/version-management/git-and-tools/tig/default.nix
    M pkgs/applications/version-management/gitlab/default.nix
    M pkgs/build-support/vm/default.nix
    M pkgs/data/fonts/inconsolata/lgc.nix
    M pkgs/development/compilers/ghcjs/base.nix
    M pkgs/development/compilers/ghcjs/default.nix
    A pkgs/development/compilers/gnu-cobol/default.nix
    M pkgs/development/compilers/go/1.7.nix
    M pkgs/development/compilers/go/1.8.nix
    R pkgs/development/compilers/go/ssl-cert-file-1.7.patch
    R pkgs/development/compilers/go/ssl-cert-file-1.8.patch
    A pkgs/development/compilers/go/ssl-cert-file.patch
    M pkgs/development/compilers/ponyc/default.nix
    M pkgs/development/coq-modules/fiat/HEAD.nix
    M pkgs/development/haskell-modules/generic-builder.nix
    A pkgs/development/libraries/hpx/default.nix
    M pkgs/development/libraries/xcb-util-cursor/HEAD.nix
    A pkgs/development/python-modules/Pygments/default.nix
    M pkgs/development/python-modules/tensorflow/default.nix
    M pkgs/development/tools/misc/ycmd/default.nix
    M pkgs/development/tools/yarn/default.nix
    M pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
    M pkgs/os-specific/linux/kernel/hardened-config.nix
    M pkgs/os-specific/linux/kernel/linux-4.10.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/os-specific/linux/shadow/default.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    M pkgs/servers/dns/bind/default.nix
    M pkgs/servers/mattermost/default.nix
    M pkgs/servers/mattermost/matterircd.nix
    M pkgs/servers/monitoring/cadvisor/default.nix
    M pkgs/servers/search/elasticsearch/plugins.nix
    A pkgs/shells/zsh-git-prompt/default.nix
    M pkgs/tools/admin/salt/default.nix
    M pkgs/tools/graphics/pngquant/default.nix
    M pkgs/tools/misc/graylog/plugins.nix
    M pkgs/tools/misc/parallel/default.nix
    M pkgs/tools/networking/whois/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/security/enpass/default.nix
    M pkgs/tools/system/cron/default.nix
    A pkgs/tools/text/staccato/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: 28154f45a6b56258f9df7f7e7ffc3a743427aac9
      
https://github.com/NixOS/nixpkgs/commit/28154f45a6b56258f9df7f7e7ffc3a743427aac9
  Author: Linus Heckemann <g...@sphalerite.org>
  Date:   2017-05-10 (Wed, 10 May 2017)

  Changed paths:
    M pkgs/development/tools/build-managers/cmake/setup-hook.sh

  Log Message:
  -----------
  cmake setup hook: allow other build types


  Commit: fc873b69f08a881fe16d6d09e3c829fe1bc2396a
      
https://github.com/NixOS/nixpkgs/commit/fc873b69f08a881fe16d6d09e3c829fe1bc2396a
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-10 (Wed, 10 May 2017)

  Changed paths:
    M pkgs/development/tools/build-managers/cmake/setup-hook.sh

  Log Message:
  -----------
  Merge pull request #25675 from lheckemann/cmake-build-type

cmake setup hook: allow other build types


  Commit: 51e0f8f759250b77a7ab7529f5c7da5053465ff4
      
https://github.com/NixOS/nixpkgs/commit/51e0f8f759250b77a7ab7529f5c7da5053465ff4
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    M nixos/modules/programs/fish.nix
    M nixos/modules/security/acme.nix
    A nixos/modules/services/admin/salt/minion.nix
    M nixos/modules/services/network-filesystems/ipfs.nix
    M nixos/modules/services/x11/window-managers/i3.nix
    M nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
    M pkgs/applications/audio/ncmpcpp/default.nix
    M pkgs/applications/editors/eclipse/plugins.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
    M pkgs/applications/kde/default.nix
    A pkgs/applications/kde/k3b.nix
    A pkgs/applications/kde/libkcddb.nix
    R pkgs/applications/misc/k3b/default.nix
    M pkgs/applications/misc/krusader/default.nix
    M pkgs/applications/misc/mediainfo-gui/default.nix
    M pkgs/applications/misc/mediainfo/default.nix
    M pkgs/applications/misc/phwmon/default.nix
    M pkgs/applications/misc/pmenu/default.nix
    M pkgs/applications/misc/qsyncthingtray/default.nix
    M pkgs/applications/misc/tint2/default.nix
    M pkgs/applications/misc/tnef/default.nix
    M pkgs/applications/networking/cluster/minikube/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M 
pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
    M pkgs/applications/office/osmo/default.nix
    M pkgs/applications/science/biology/bcftools/default.nix
    M pkgs/applications/science/biology/samtools/default.nix
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
    M pkgs/applications/virtualization/docker/default.nix
    M pkgs/applications/virtualization/docker/proxy.nix
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/data/fonts/emojione/default.nix
    M pkgs/development/compilers/fstar/default.nix
    M pkgs/development/compilers/llvm/4/default.nix
    A pkgs/development/compilers/llvm/4/openmp.nix
    M pkgs/development/haskell-modules/configuration-nix.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/make-package-set.nix
    M pkgs/development/libraries/cmark/default.nix
    A pkgs/development/libraries/kpmcore/default.nix
    M pkgs/development/libraries/libmediainfo/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    M pkgs/development/libraries/opencv/default.nix
    M pkgs/development/libraries/science/biology/htslib/default.nix
    A pkgs/development/ocaml-modules/octavius/default.nix
    M pkgs/development/python-modules/django/1_11.nix
    M pkgs/development/python-modules/dogpile.cache/default.nix
    R pkgs/development/tools/activator/default.nix
    M pkgs/development/tools/flamegraph/default.nix
    M pkgs/development/tools/misc/usb-modeswitch/data.nix
    M pkgs/development/tools/vndr/default.nix
    M pkgs/games/sgt-puzzles/default.nix
    M pkgs/misc/emulators/pcsxr/default.nix
    M pkgs/misc/emulators/wine/sources.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/nvidia-x11/generic.nix
    M pkgs/os-specific/linux/nvidia-x11/settings.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/shells/fish-foreign-env/default.nix
    M pkgs/shells/fish/default.nix
    R pkgs/shells/fish/etc_config.patch
    M pkgs/tools/bluetooth/blueman/default.nix
    M pkgs/tools/compression/lzip/default.nix
    M pkgs/tools/compression/zstd/default.nix
    M pkgs/tools/graphics/wkhtmltopdf/default.nix
    M pkgs/tools/misc/clac/default.nix
    M pkgs/tools/misc/direnv/default.nix
    M pkgs/tools/misc/fzf/default.nix
    M pkgs/tools/misc/lnav/default.nix
    A pkgs/tools/misc/partition-manager/default.nix
    M pkgs/tools/misc/svtplay-dl/default.nix
    M pkgs/tools/networking/megatools/default.nix
    M pkgs/tools/networking/mu/default.nix
    M pkgs/tools/text/kdiff3/default.nix
    M pkgs/tools/text/languagetool/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

Some more larger rebuilds from master.


  Commit: beb43a651cbdd4ab0e153567b72bfaeacb0f28f6
      
https://github.com/NixOS/nixpkgs/commit/beb43a651cbdd4ab0e153567b72bfaeacb0f28f6
  Author: Tuomas Tynkkynen <tuo...@tuxera.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M doc/languages-frameworks/ruby.xml
    M nixos/modules/module-list.nix
    A nixos/modules/services/mail/nullmailer.nix
    M nixos/modules/services/misc/gitlab.nix
    M pkgs/applications/altcoins/bitcoin-unlimited.nix
    M pkgs/applications/editors/kdevelop5/kdevelop.nix
    M pkgs/applications/misc/openbrf/default.nix
    M pkgs/applications/networking/instant-messengers/qtox/default.nix
    M pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
    M pkgs/applications/networking/irc/weechat/default.nix
    A pkgs/applications/science/misc/openmvs/default.nix
    M pkgs/applications/video/streamlink/default.nix
    M pkgs/applications/virtualization/virt-manager/qt.nix
    M pkgs/data/fonts/fontconfig-penultimate/default.nix
    M pkgs/data/misc/iana-etc/default.nix
    M pkgs/development/compilers/souper/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/libraries/vcg/default.nix
    A pkgs/development/python-modules/whoosh/default.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    M pkgs/development/tools/build-managers/buildbot/plugins.nix
    M pkgs/development/tools/build-managers/buildbot/worker.nix
    M pkgs/development/tools/misc/checkbashisms/default.nix
    M pkgs/games/stepmania/default.nix
    M pkgs/os-specific/linux/hdparm/default.nix
    A pkgs/servers/mail/nullmailer/default.nix
    M pkgs/tools/filesystems/dosfstools/default.nix
    M pkgs/tools/networking/openvpn/default.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into staging


  Commit: 1c9ed32a343f4016a4b85bc3e179fc49e286e5c2
      
https://github.com/NixOS/nixpkgs/commit/1c9ed32a343f4016a4b85bc3e179fc49e286e5c2
  Author: Marc Nickert <marc...@gmail.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M pkgs/development/libraries/libtiff/default.nix

  Log Message:
  -----------
  libtiff: security 4.0.7-5 -> 4.0.7-6 (Debian patches)

Taken from PR #25742, only adding extra comment.


  Commit: fcdb4b51f852a5654e101f2035e55f129562658d
      
https://github.com/NixOS/nixpkgs/commit/fcdb4b51f852a5654e101f2035e55f129562658d
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M pkgs/development/libraries/mesa/default.nix

  Log Message:
  -----------
  mesa: maintenance 17.0.5 -> 17.0.6


  Commit: b0d2de45cddcd1e4578bfae121e606f89b00fc5e
      
https://github.com/NixOS/nixpkgs/commit/b0d2de45cddcd1e4578bfae121e606f89b00fc5e
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    A pkgs/development/libraries/freetype/cve-2017-8105.patch
    A pkgs/development/libraries/freetype/cve-2017-8287.patch
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  freetype: fix CVE-2017-{8105,8287} by upstream patches

I copied the patches, as the changelog changes would certainly conflict.


  Commit: 0b89f71a07676a09571e22c0e8e8e6928da9334b
      
https://github.com/NixOS/nixpkgs/commit/0b89f71a07676a09571e22c0e8e8e6928da9334b
  Author: Franz Pletz <fpl...@fnordicwalking.de>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M pkgs/tools/networking/unbound/default.nix

  Log Message:
  -----------
  unbound: 1.6.1 -> 1.6.2


  Commit: c68a24120815411e82224d6c96ff287cb79c11ac
      
https://github.com/NixOS/nixpkgs/commit/c68a24120815411e82224d6c96ff287cb79c11ac
  Author: mimadrid <mimad...@ucm.es>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M pkgs/development/libraries/gnutls/3.5.nix

  Log Message:
  -----------
  gnutls: 3.5.11 -> 3.5.12


  Commit: 65ede052fa9f005efcdb2e852315a0e6f02ce92d
      
https://github.com/NixOS/nixpkgs/commit/65ede052fa9f005efcdb2e852315a0e6f02ce92d
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M pkgs/applications/science/math/calc/default.nix
    M pkgs/development/compilers/bigloo/default.nix
    M pkgs/development/compilers/swift/default.nix
    M pkgs/development/libraries/libftdi/default.nix
    M pkgs/games/klavaro/default.nix
    M pkgs/os-specific/linux/libsmbios/default.nix
    M pkgs/tools/security/ssdeep/default.nix

  Log Message:
  -----------
  treewide: fixup packages with RPATH problems


  Commit: f5c568446a12dbf58836925c5487e5cdad1fa578
      
https://github.com/NixOS/nixpkgs/commit/f5c568446a12dbf58836925c5487e5cdad1fa578
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
    M pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix

  Log Message:
  -----------
  qtwebkit-*: fix #25585: bad RPATH entries


  Commit: 515414ed32779b20603ea9abe67a950cbac8d8a1
      
https://github.com/NixOS/nixpkgs/commit/515414ed32779b20603ea9abe67a950cbac8d8a1
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/config/sysctl.nix
    M nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
    M nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
    M nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
    M nixos/modules/programs/ssh.nix
    M nixos/modules/services/continuous-integration/gitlab-runner.nix
    M nixos/modules/services/networking/nsd.nix
    M nixos/modules/services/security/shibboleth-sp.nix
    M nixos/modules/system/boot/luksroot.nix
    M nixos/modules/tasks/powertop.nix
    M pkgs/applications/altcoins/default.nix
    A pkgs/applications/altcoins/seth.nix
    M pkgs/applications/graphics/sxiv/default.nix
    M pkgs/applications/networking/browsers/firefox/common.nix
    M pkgs/applications/networking/cluster/helm/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/instant-messengers/dino/default.nix
    A pkgs/applications/version-management/nbstripout/default.nix
    M pkgs/applications/window-managers/awesome/default.nix
    A pkgs/data/fonts/fira-code/symbols.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/elixir/default.nix
    M pkgs/development/libraries/accelio/default.nix
    M pkgs/development/libraries/log4shib/default.nix
    M pkgs/development/libraries/opensaml-cpp/default.nix
    M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
    A 
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/series
    M pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
    A 
pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/series
    M pkgs/development/libraries/shibboleth-sp/default.nix
    M pkgs/development/libraries/xml-tooling-c/default.nix
    A pkgs/development/python-modules/3to2/default.nix
    A pkgs/development/python-modules/cram/default.nix
    A pkgs/development/python-modules/natsort/default.nix
    A pkgs/development/python-modules/natsort/setup.patch
    R pkgs/development/python-modules/numpy-distutils-C++.patch
    R pkgs/development/python-modules/numpy.nix
    A pkgs/development/python-modules/numpy/default.nix
    A pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
    M pkgs/development/python-modules/pandas/default.nix
    A pkgs/development/python-modules/piexif/default.nix
    A pkgs/development/python-modules/pytest-cram/default.nix
    A pkgs/development/python-modules/pytest-xdist/default.nix
    R pkgs/development/python-modules/scipy.nix
    A pkgs/development/python-modules/scipy/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    A 
pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch
    M pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
    M pkgs/os-specific/linux/batman-adv/default.nix
    M pkgs/os-specific/linux/cryptsetup/default.nix
    M pkgs/os-specific/linux/firmware/raspberrypi/default.nix
    M pkgs/os-specific/linux/kernel-headers/default.nix
    M pkgs/os-specific/linux/kernel/linux-4.10.nix
    M pkgs/os-specific/linux/kernel/linux-4.11.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/os-specific/linux/kernel/linux-rpi.nix
    M pkgs/os-specific/linux/lttng-modules/default.nix
    M pkgs/os-specific/linux/rtl8723bs/default.nix
    M pkgs/os-specific/linux/rtl8812au/default.nix
    M pkgs/servers/mattermost/matterircd.nix
    M pkgs/servers/monitoring/telegraf/default.nix
    R pkgs/servers/monitoring/telegraf/deps-1.2.1.nix
    A pkgs/servers/monitoring/telegraf/deps-1.3.0.nix
    M pkgs/servers/openafs-client/default.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/servers/web-apps/shaarli/default.nix
    M pkgs/tools/filesystems/sshfs-fuse/default.nix
    M pkgs/tools/misc/ethtool/default.nix
    M pkgs/tools/networking/zerotierone/default.nix
    A pkgs/tools/security/metasploit/Gemfile
    A pkgs/tools/security/metasploit/Gemfile.lock
    M pkgs/tools/security/metasploit/default.nix
    A pkgs/tools/security/metasploit/gemset.nix
    A pkgs/tools/security/metasploit/shell.nix
    M pkgs/tools/security/tor/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: 2b5b38a9640da268c3121577f14b055747faa850
      
https://github.com/NixOS/nixpkgs/commit/2b5b38a9640da268c3121577f14b055747faa850
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M pkgs/development/libraries/gnutls/3.5.nix

  Log Message:
  -----------
  Merge #25807: gnutls: bugfix 3.5.11 -> 3.5.12


  Commit: 71a7e221d8f0def852f3a692daa3904a50523b30
      
https://github.com/NixOS/nixpkgs/commit/71a7e221d8f0def852f3a692daa3904a50523b30
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M pkgs/development/libraries/accounts-qt/default.nix
    M pkgs/development/libraries/libcommuni/default.nix
    M pkgs/development/libraries/libdwg/default.nix

  Log Message:
  -----------
  treewide: fixup packages with RPATH problems


  Commit: e9aeb55f3bc5206606ca22db8ad01bcabb8118a4
      
https://github.com/NixOS/nixpkgs/commit/e9aeb55f3bc5206606ca22db8ad01bcabb8118a4
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M lib/systems/doubles.nix
    M lib/systems/parse.nix
    R lib/tests.nix
    A lib/tests/misc.nix
    M lib/tests/release.nix
    M lib/tests/systems.nix
    M nixos/modules/config/users-groups.nix
    M nixos/modules/services/networking/wireguard.nix
    M nixos/modules/services/web-servers/varnish/default.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/misc/monero/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/p2p/gnunet/default.nix
    M pkgs/applications/networking/remote/rdesktop/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/version-management/nbstripout/default.nix
    M pkgs/applications/virtualization/docker/proxy.nix
    M pkgs/data/fonts/fontconfig-penultimate/default.nix
    M pkgs/desktops/gnome-3/3.22/core/vino/default.nix
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/gcc/snapshot/default.nix
    M pkgs/development/libraries/gmp/6.x.nix
    M pkgs/development/libraries/ncurses/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    M pkgs/development/libraries/opencv/default.nix
    M pkgs/development/libraries/rdkafka/default.nix
    M pkgs/development/libraries/v8/default.nix
    A pkgs/development/libraries/v8/no-xcode.patch
    M pkgs/development/python-modules/cram/default.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/misc/binutils/default.nix
    M pkgs/development/tools/misc/editorconfig-core-c/default.nix
    M pkgs/development/tools/rtags/default.nix
    M pkgs/os-specific/darwin/binutils/default.nix
    M pkgs/os-specific/darwin/cctools/port.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    M pkgs/servers/varnish/default.nix
    M pkgs/shells/oh-my-zsh/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/tools/misc/mc/default.nix
    M pkgs/tools/text/icdiff/default.nix
    M pkgs/tools/text/ripgrep/default.nix
    M pkgs/tools/text/sift/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/make-tarball.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-cross.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: cbdcc20e7778630cd67f6425c70d272055e2fecd
      
https://github.com/NixOS/nixpkgs/commit/cbdcc20e7778630cd67f6425c70d272055e2fecd
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M pkgs/development/tools/simavr/default.nix
    M pkgs/tools/typesetting/sile/default.nix

  Log Message:
  -----------
  sile, simavr: fixup packages with RPATH problems


  Commit: a19cf228d5032ad9aaaa722ef1aa82abc4814da5
      
https://github.com/NixOS/nixpkgs/commit/a19cf228d5032ad9aaaa722ef1aa82abc4814da5
  Author: John Ericson <ericson2...@yahoo.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M pkgs/development/libraries/ncurses/default.nix

  Log Message:
  -----------
  ncurses: Break hash to simplify derivation


  Commit: 5aa530f2a8f6ee640b166786a32fbf6788993516
      
https://github.com/NixOS/nixpkgs/commit/5aa530f2a8f6ee640b166786a32fbf6788993516
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/hardware/video/displaylink.nix
    M nixos/modules/module-list.nix
    M nixos/modules/services/networking/miredo.nix
    A nixos/modules/services/x11/xautolock.nix
    M pkgs/applications/editors/nano/default.nix
    M pkgs/applications/kde/fetch.sh
    M pkgs/applications/kde/l10n.nix
    M pkgs/applications/kde/srcs.nix
    M pkgs/applications/video/obs-studio/default.nix
    M pkgs/data/fonts/go-font/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    M pkgs/development/libraries/ffmpeg/generic.nix
    M pkgs/development/libraries/gtk+/2.x.nix
    A pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
    M pkgs/development/libraries/qt-4.x/4.8/default.nix
    M pkgs/development/libraries/science/math/clblas/cuda/default.nix
    M pkgs/development/tools/build-managers/bazel/default.nix
    M pkgs/misc/themes/flat-plat/default.nix
    M pkgs/os-specific/linux/displaylink/default.nix
    A pkgs/os-specific/linux/evdi/default.nix
    M pkgs/os-specific/linux/kernel/hardened-config.nix
    A pkgs/tools/misc/fwup/default.nix
    A pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
    M pkgs/tools/package-management/nixops/generic.nix
    M pkgs/tools/package-management/nixops/unstable.nix
    M pkgs/tools/system/socklog/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/release-cross.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

A few thousand rebuilds from master.


  Commit: acd32a4caf533ca6202afad07c085450649dbe4a
      
https://github.com/NixOS/nixpkgs/commit/acd32a4caf533ca6202afad07c085450649dbe4a
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M pkgs/development/interpreters/python/cpython/2.7/default.nix
    R pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.3/default.nix
    R pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.4/default.nix
    R pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.5/default.nix
    R pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    R pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh
    M pkgs/development/interpreters/python/mk-python-derivation.nix
    M pkgs/development/interpreters/python/pypy/2.7/default.nix
    R pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh
    A pkgs/development/interpreters/python/setup-hook.nix
    A pkgs/development/interpreters/python/setup-hook.sh
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook

The Python interpreters are patched so they can build .pyc bytecode free
of certain indeterminism.

When building Python packages we currently set

```
compiling python files.
in nix store.
DETERMINISTIC_BUILD=1;
PYTHONHASHSEED = 0;
```

Instead if setting these environment variables in the function that
builds the package, this commit sets the variables instead in the Python
setup hook. That way, whenever Python is included in a derivation, these
variables are set.

See also the issue https://github.com/NixOS/nixpkgs/issues/25707.


  Commit: b175feb8e141262b20f56d662d0b40f69df8e5c9
      
https://github.com/NixOS/nixpkgs/commit/b175feb8e141262b20f56d662d0b40f69df8e5c9
  Author: John Ericson <ericson2...@yahoo.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M pkgs/development/libraries/ncurses/default.nix

  Log Message:
  -----------
  Merge pull request #25875 from obsidiansystems/ncurses-cross

ncurses: Break hash to simplify derivation


  Commit: 99cfab07b9b27d559e9b1985f48c70e5fe94ea42
      
https://github.com/NixOS/nixpkgs/commit/99cfab07b9b27d559e9b1985f48c70e5fe94ea42
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M lib/maintainers.nix
    M nixos/doc/manual/development/option-declarations.xml
    M nixos/doc/manual/development/option-types.xml
    M nixos/doc/manual/installation/installing-virtualbox-guest.xml
    M nixos/lib/test-driver/Machine.pm
    M nixos/modules/module-list.nix
    M nixos/modules/programs/fish.nix
    M nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
    M nixos/modules/rename.nix
    M nixos/modules/services/backup/znapzend.nix
    M nixos/modules/services/continuous-integration/jenkins/default.nix
    M nixos/modules/services/misc/emby.nix
    M nixos/modules/services/misc/matrix-synapse.nix
    A nixos/modules/services/network-filesystems/kbfs.nix
    A nixos/modules/services/networking/keybase.nix
    A nixos/modules/services/networking/lldpd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/networking/znc.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/system/boot/systemd-nspawn.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    M nixos/modules/virtualisation/libvirtd.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    M nixos/tests/boot.nix
    M nixos/tests/installer.nix
    M pkgs/applications/altcoins/bitcoin-classic.nix
    M pkgs/applications/audio/csound/default.nix
    M pkgs/applications/editors/android-studio/default.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
    R pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
    M pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/editors/nano/default.nix
    A pkgs/applications/editors/typora/default.nix
    A pkgs/applications/graphics/timelapse-deflicker/default.nix
    A pkgs/applications/misc/madonctl/default.nix
    A pkgs/applications/misc/madonctl/deps.nix
    A pkgs/applications/misc/metar/default.nix
    M pkgs/applications/misc/st/default.nix
    M pkgs/applications/misc/tint2/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/packages.nix
    M pkgs/applications/networking/browsers/opera/default.nix
    A pkgs/applications/networking/cluster/terraform-inventory/default.nix
    A pkgs/applications/networking/cluster/terraform-inventory/deps.nix
    A pkgs/applications/networking/instant-messengers/mikutter/Gemfile
    A pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
    A 
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
    A 
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile
    A 
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
    A 
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
    A pkgs/applications/networking/instant-messengers/mikutter/default.nix
    A pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
    A pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop
    A pkgs/applications/networking/instant-messengers/mikutter/shell.nix
    M pkgs/applications/science/logic/coq/default.nix
    M pkgs/applications/science/logic/cvc4/default.nix
    M pkgs/applications/science/math/singular/default.nix
    A pkgs/applications/science/misc/root/ROOT-8728-extra.patch
    M pkgs/applications/science/misc/root/default.nix
    M pkgs/applications/science/misc/root/sw_vers.patch
    M pkgs/applications/science/physics/sherpa/default.nix
    A pkgs/applications/science/physics/sherpa/explicit_overloads.patch
    A pkgs/applications/version-management/srcml/default.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/virtualization/OVMF/default.nix
    M pkgs/applications/virtualization/lkl/default.nix
    M pkgs/applications/virtualization/xen/4.5.nix
    M pkgs/build-support/emacs/wrapper.nix
    M pkgs/build-support/fetchurl/default.nix
    M pkgs/common-updater/scripts.nix
    M pkgs/data/icons/elementary-icon-theme/default.nix
    M pkgs/desktops/gnome-3/3.22/default.nix
    A pkgs/desktops/lxde/core/lxpanel/default.nix
    M pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
    M pkgs/development/compilers/dale/default.nix
    M pkgs/development/compilers/go/1.8.nix
    M pkgs/development/compilers/haxe/default.nix
    R pkgs/development/compilers/haxe/haxelib-nix.patch
    M pkgs/development/go-modules/generic/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/php/default.nix
    R pkgs/development/libraries/despotify/default.nix
    M pkgs/development/libraries/fltk/default.nix
    M pkgs/development/libraries/glibc/common.nix
    M pkgs/development/libraries/glibc/default.nix
    M pkgs/development/libraries/glibc/info.nix
    M pkgs/development/libraries/glibc/locales.nix
    M pkgs/development/libraries/hunspell/dictionaries.nix
    M pkgs/development/libraries/libguestfs/default.nix
    M pkgs/development/libraries/libqmi/default.nix
    M pkgs/development/libraries/xapian/default.nix
    M pkgs/development/node-packages/generate.sh
    A pkgs/development/node-packages/node-packages-v4.json
    M pkgs/development/node-packages/node-packages-v4.nix
    A pkgs/development/node-packages/node-packages-v6.json
    M pkgs/development/node-packages/node-packages-v6.nix
    R pkgs/development/node-packages/node-packages.json
    A pkgs/development/python-modules/bitcoin-price-api/default.nix
    A pkgs/development/python-modules/browsermob-proxy/default.nix
    A pkgs/development/python-modules/confluent-kafka/default.nix
    A pkgs/development/python-modules/enzyme/default.nix
    A pkgs/development/python-modules/jsbeautifier/default.nix
    M pkgs/development/python-modules/libsoundtouch/default.nix
    A pkgs/development/python-modules/marionette-harness/default.nix
    A pkgs/development/python-modules/marionette-harness/manifestparser.nix
    A pkgs/development/python-modules/marionette-harness/marionette_driver.nix
    A pkgs/development/python-modules/marionette-harness/mozcrash.nix
    A pkgs/development/python-modules/marionette-harness/mozdevice.nix
    A pkgs/development/python-modules/marionette-harness/mozfile.nix
    A pkgs/development/python-modules/marionette-harness/mozhttpd.nix
    A pkgs/development/python-modules/marionette-harness/mozinfo.nix
    A pkgs/development/python-modules/marionette-harness/mozlog.nix
    A pkgs/development/python-modules/marionette-harness/moznetwork.nix
    A pkgs/development/python-modules/marionette-harness/mozprocess.nix
    A pkgs/development/python-modules/marionette-harness/mozprofile.nix
    A pkgs/development/python-modules/marionette-harness/mozrunner.nix
    A pkgs/development/python-modules/marionette-harness/moztest.nix
    A pkgs/development/python-modules/marionette-harness/mozversion.nix
    A pkgs/development/python-modules/metaphone/default.nix
    A pkgs/development/python-modules/pika-pool/default.nix
    M pkgs/development/python-modules/pyproj/default.nix
    A pkgs/development/python-modules/pysrt/default.nix
    A pkgs/development/python-modules/rarfile/default.nix
    A pkgs/development/python-modules/rfc3986/default.nix
    A pkgs/development/python-modules/subliminal/default.nix
    A pkgs/development/python-modules/wptserve/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/continuous-integration/jenkins/default.nix
    A pkgs/development/tools/git-series/default.nix
    A pkgs/development/tools/google-app-engine-go-sdk/default.nix
    M pkgs/development/tools/haskell/multi-ghc-travis/default.nix
    M pkgs/development/tools/selenium/chromedriver/default.nix
    M pkgs/games/banner/default.nix
    M pkgs/misc/cups/drivers/samsung/default.nix
    A pkgs/misc/screensavers/i3lock-pixeled/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    M pkgs/os-specific/linux/hwdata/default.nix
    R pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.10.patch
    R pkgs/os-specific/linux/kernel/linux-4.10.nix
    M pkgs/os-specific/linux/kernel/linux-4.11.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/os-specific/linux/phc-intel/default.nix
    A pkgs/servers/cloud-print-connector/default.nix
    A pkgs/servers/cloud-print-connector/deps.nix
    M pkgs/servers/coturn/default.nix
    M pkgs/servers/dns/bind/default.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/servers/sql/postgresql/default.nix
    M pkgs/shells/fish/default.nix
    M pkgs/shells/lambda-mod-zsh-theme/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/tools/admin/google-cloud-sdk/default.nix
    M pkgs/tools/admin/salt/default.nix
    M pkgs/tools/backup/bup/default.nix
    M pkgs/tools/cd-dvd/unetbootin/default.nix
    M pkgs/tools/compression/brotli/default.nix
    A pkgs/tools/compression/mozlz4a/default.nix
    A pkgs/tools/filesystems/bcachefs-tools/default.nix
    M pkgs/tools/misc/bibtool/default.nix
    M pkgs/tools/misc/dmg2img/default.nix
    M pkgs/tools/misc/fwup/default.nix
    M pkgs/tools/misc/yank/default.nix
    M pkgs/tools/networking/aria2/default.nix
    M pkgs/tools/networking/dnscrypt-proxy/default.nix
    A pkgs/tools/networking/hss/default.nix
    A pkgs/tools/networking/lldpd/default.nix
    A pkgs/tools/networking/network-manager/fortisslvpn.nix
    A pkgs/tools/networking/tcpreplay/default.nix
    A pkgs/tools/networking/tcptraceroute/default.nix
    A pkgs/tools/package-management/mynewt-newt/default.nix
    A pkgs/tools/package-management/mynewt-newt/deps.nix
    M pkgs/tools/security/duo-unix/default.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/keybase-gui/default.nix
    M pkgs/tools/security/sudo/default.nix
    M pkgs/tools/text/xml/basex/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-cross.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into HEAD


  Commit: 1267b155c4a5afc6bda0a27b458c649a420dce2b
      
https://github.com/NixOS/nixpkgs/commit/1267b155c4a5afc6bda0a27b458c649a420dce2b
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M pkgs/development/interpreters/python/cpython/2.7/default.nix
    R pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.3/default.nix
    R pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.4/default.nix
    R pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.5/default.nix
    R pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    R pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh
    M pkgs/development/interpreters/python/mk-python-derivation.nix
    M pkgs/development/interpreters/python/pypy/2.7/default.nix
    R pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh
    A pkgs/development/interpreters/python/setup-hook.nix
    A pkgs/development/interpreters/python/setup-hook.sh
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #25916 from FRidh/reproducible

Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook


  Commit: 8004e794153b34507f81a26f88174bdfee975aa8
      
https://github.com/NixOS/nixpkgs/commit/8004e794153b34507f81a26f88174bdfee975aa8
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
    M lib/systems/default.nix
    M lib/systems/doubles.nix
    A lib/systems/inspect.nix
    M lib/systems/parse.nix
    M lib/tests/release.nix
    M maintainers/scripts/rebuild-amount.sh
    M nixos/modules/config/nsswitch.nix
    M nixos/modules/module-list.nix
    M nixos/modules/services/backup/znapzend.nix
    M nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/continuous-integration/jenkins/default.nix
    A nixos/modules/services/networking/iwd.nix
    M nixos/modules/services/networking/znc.nix
    M nixos/modules/services/system/cloud-init.nix
    M nixos/modules/system/boot/systemd.nix
    M pkgs/applications/audio/aeolus/default.nix
    M pkgs/applications/audio/aj-snapshot/default.nix
    M pkgs/applications/audio/spotify/default.nix
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/hugo/deps.nix
    M pkgs/applications/networking/c14/default.nix
    M pkgs/applications/networking/c14/deps.nix
    M pkgs/applications/networking/cluster/kops/default.nix
    M pkgs/applications/networking/instant-messengers/jackline/default.nix
    R pkgs/applications/networking/instant-messengers/jackline/uchar.patch
    M pkgs/applications/networking/mailreaders/astroid/default.nix
    M pkgs/applications/networking/sniffers/wireshark/default.nix
    A pkgs/applications/science/logic/cryptominisat/default.nix
    A pkgs/applications/science/logic/minisat/unstable.nix
    M pkgs/applications/science/logic/stp/default.nix
    R pkgs/applications/science/logic/stp/fixbuild.diff
    R pkgs/applications/science/logic/stp/fixrefs.diff
    M pkgs/applications/video/kodi/plugins.nix
    M pkgs/applications/video/obs-studio/default.nix
    M pkgs/applications/virtualization/virt-manager/qt.nix
    M pkgs/build-support/rust/fetch-cargo-deps
    M pkgs/data/misc/hackage/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/gcc/snapshot/default.nix
    A pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
    M pkgs/development/compilers/llvm/3.4/llvm.nix
    M pkgs/development/compilers/urweb/default.nix
    M pkgs/development/libraries/aws-sdk-cpp/default.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    M pkgs/development/libraries/ffmpeg/3.3.nix
    A pkgs/development/libraries/libhdhomerun/default.nix
    M pkgs/development/libraries/libopus/default.nix
    A pkgs/development/python-modules/flake8/default.nix
    A pkgs/development/python-modules/mccabe/default.nix
    A pkgs/development/python-modules/pelican/default.nix
    A pkgs/development/python-modules/pyflakes/default.nix
    M pkgs/development/tools/ammonite/default.nix
    A pkgs/development/tools/build-managers/pants/default.nix
    M pkgs/development/tools/continuous-integration/jenkins/default.nix
    M pkgs/development/tools/coursier/default.nix
    M pkgs/development/tools/misc/gdb/default.nix
    A pkgs/development/tools/wllvm/default.nix
    M pkgs/games/eternity-engine/default.nix
    M pkgs/games/freeciv/default.nix
    M pkgs/games/gzdoom/default.nix
    A pkgs/games/robotfindskitten/default.nix
    A pkgs/games/vms-empire/default.nix
    M pkgs/misc/emulators/wine/base.nix
    M pkgs/misc/emulators/wine/default.nix
    M pkgs/misc/emulators/wine/staging.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    M pkgs/os-specific/darwin/cctools/port.nix
    M pkgs/os-specific/linux/acpid/default.nix
    A pkgs/os-specific/linux/iwd/default.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/servers/http/nginx/modules.nix
    M pkgs/servers/http/nginx/stable.nix
    M pkgs/servers/uwsgi/default.nix
    M pkgs/shells/zsh-autosuggestions/default.nix
    M pkgs/shells/zsh-completions/default.nix
    M pkgs/shells/zsh-syntax-highlighting/default.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/stdenv/freebsd/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/native/default.nix
    M pkgs/stdenv/nix/default.nix
    M pkgs/tools/archivers/zpaq/zpaqd.nix
    M pkgs/tools/inputmethods/ibus/default.nix
    M pkgs/tools/misc/aescrypt/default.nix
    A pkgs/tools/misc/esptool-ck/default.nix
    A pkgs/tools/misc/esptool/default.nix
    M pkgs/tools/misc/grc/default.nix
    M pkgs/tools/misc/tmux/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/package-management/nixops/unstable.nix
    M pkgs/tools/security/aide/default.nix
    M pkgs/tools/security/sslscan/default.nix
    M pkgs/tools/text/aha/default.nix
    A pkgs/tools/virtualization/cloud-init/add-nixos-support.patch
    M pkgs/tools/virtualization/cloud-init/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-cross.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: 78ea189a6b1c59e7c331fe57d1eb035b8977bdac
      
https://github.com/NixOS/nixpkgs/commit/78ea189a6b1c59e7c331fe57d1eb035b8977bdac
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/video/vlc/default.nix
    M pkgs/applications/virtualization/lkl/default.nix
    M pkgs/development/compilers/go/1.7.nix
    M pkgs/development/compilers/go/1.8.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    M pkgs/development/libraries/ffmpeg/3.3.nix
    A pkgs/development/python-modules/feedgenerator/default.nix
    M pkgs/development/tools/build-managers/pants/default.nix
    M pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
    A 
pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
    R 
pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch
    M pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
    M pkgs/misc/cups/filters.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

... to fix *some* of the evaluation problems.


  Commit: b7fed33057e29fa0d5ab4921598d037c040baae6
      
https://github.com/NixOS/nixpkgs/commit/b7fed33057e29fa0d5ab4921598d037c040baae6
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
    M pkgs/development/interpreters/python/cpython/3.3/default.nix

  Log Message:
  -----------
  python-3.3: fixup evaluation after #25916


  Commit: 00672dec8a1367a1d559660aa7a125b31f3f6562
      
https://github.com/NixOS/nixpkgs/commit/00672dec8a1367a1d559660aa7a125b31f3f6562
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M maintainers/scripts/rebuild-amount.sh
    M pkgs/applications/science/math/calc/default.nix
    M pkgs/build-support/cc-wrapper/utils.sh
    A pkgs/build-support/setup-hooks/audit-tmpdir.sh
    M pkgs/build-support/setup-hooks/multiple-outputs.sh
    M pkgs/development/compilers/bigloo/default.nix
    M pkgs/development/compilers/llvm/3.9/clang/default.nix
    M pkgs/development/compilers/llvm/3.9/llvm.nix
    M pkgs/development/compilers/swift/default.nix
    M pkgs/development/interpreters/python/cpython/2.7/default.nix
    R pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.3/default.nix
    R pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.4/default.nix
    R pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.5/default.nix
    R pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    R pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh
    M pkgs/development/interpreters/python/mk-python-derivation.nix
    M pkgs/development/interpreters/python/pypy/2.7/default.nix
    R pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh
    A pkgs/development/interpreters/python/setup-hook.nix
    A pkgs/development/interpreters/python/setup-hook.sh
    M pkgs/development/libraries/accounts-qt/default.nix
    A pkgs/development/libraries/freetype/cve-2017-8105.patch
    A pkgs/development/libraries/freetype/cve-2017-8287.patch
    M pkgs/development/libraries/freetype/default.nix
    M pkgs/development/libraries/gnutls/3.5.nix
    M pkgs/development/libraries/libcommuni/default.nix
    M pkgs/development/libraries/libdwg/default.nix
    M pkgs/development/libraries/libftdi/default.nix
    M pkgs/development/libraries/libtiff/default.nix
    M pkgs/development/libraries/mesa/default.nix
    M pkgs/development/libraries/ncurses/default.nix
    M pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
    M pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
    M pkgs/development/tools/build-managers/cmake/setup-hook.sh
    M pkgs/development/tools/simavr/default.nix
    M pkgs/games/klavaro/default.nix
    M pkgs/os-specific/linux/libsmbios/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/extra.list
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    M pkgs/stdenv/generic/default.nix
    M pkgs/stdenv/generic/setup.sh
    M pkgs/tools/networking/unbound/default.nix
    M pkgs/tools/security/ssdeep/default.nix
    M pkgs/tools/text/groff/default.nix
    M pkgs/tools/typesetting/sile/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/release.nix

  Log Message:
  -----------
  Merge older staging

This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.


Compare: https://github.com/NixOS/nixpkgs/compare/574e4e296f16...00672dec8a13
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to