Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1712366bac9fabd51543545615b1ba3bccdc8776
      
https://github.com/NixOS/nixpkgs/commit/1712366bac9fabd51543545615b1ba3bccdc8776
  Author: Anthony Cowley <[email protected]>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M pkgs/os-specific/darwin/apple-sdk/default.nix

  Log Message:
  -----------
  apple-sdk: Include system cups libraries

The SDK includes cups header files, but not the libraries. The
`nixpkgs.cups` definition doesn't build on darwin due to the SDK being
too old. This change symlinks the system cups libraries into the old
SDK.


  Commit: 4ea9f4e325fcea0d6f7c5045d1e58443b688f07b
      
https://github.com/NixOS/nixpkgs/commit/4ea9f4e325fcea0d6f7c5045d1e58443b688f07b
  Author: Lancelot SIX <[email protected]>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

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

  Log Message:
  -----------
  gnugrep: 2.25 -> 2.27

See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00004.html
for release announcement.


  Commit: 31d672f4e5b94ae9a3b512602a44d8070dddb5c9
      
https://github.com/NixOS/nixpkgs/commit/31d672f4e5b94ae9a3b512602a44d8070dddb5c9
  Author: Eelco Dolstra <[email protected]>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #21001 from lsix/update_gnugrep_2_27

gnugrep: 2.25 -> 2.27


  Commit: ff62e8a72e20b641bd7006c9cb1966d63b656735
      
https://github.com/NixOS/nixpkgs/commit/ff62e8a72e20b641bd7006c9cb1966d63b656735
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

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

  Log Message:
  -----------
  glib: avoid runtime reference from gtk3

Fixes #21022.  Related: #15931.


  Commit: b05b1207797d5ac432ed24dad7c4cb1e381a79fb
      
https://github.com/NixOS/nixpkgs/commit/b05b1207797d5ac432ed24dad7c4cb1e381a79fb
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M doc/languages-frameworks/python.md
    M lib/attrsets.nix
    M lib/generators.nix
    M lib/maintainers.nix
    M lib/tests.nix
    M nixos/doc/manual/installation/upgrading.xml
    M nixos/lib/make-disk-image.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/security/grsecurity.nix
    M nixos/modules/security/grsecurity.xml
    M nixos/modules/security/hidepid.nix
    M nixos/modules/services/network-filesystems/ipfs.nix
    M nixos/modules/services/networking/privoxy.nix
    A nixos/modules/services/system/cgmanager.nix
    M nixos/modules/services/web-servers/uwsgi.nix
    M nixos/modules/services/x11/display-managers/default.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M nixos/modules/services/x11/display-managers/kdm.nix
    M nixos/modules/services/x11/display-managers/lightdm.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/display-managers/slim.nix
    M nixos/modules/virtualisation/containers.nix
    A nixos/modules/virtualisation/lxcfs.nix
    A nixos/tests/ipfs.nix
    M pkgs/applications/audio/non/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/idea/default.nix
    M pkgs/applications/editors/kdevelop5/kdevelop.nix
    M pkgs/applications/editors/kdevelop5/kdevplatform.nix
    M pkgs/applications/graphics/ImageMagick/default.nix
    R pkgs/applications/graphics/digikam/5.1.nix
    M pkgs/applications/misc/calibre/default.nix
    M pkgs/applications/misc/electrum/default.nix
    M pkgs/applications/misc/lyx/default.nix
    M pkgs/applications/misc/pdfpc/default.nix
    M pkgs/applications/misc/styx/default.nix
    A pkgs/applications/misc/styx/themes.nix
    M pkgs/applications/misc/xdgmenumaker/default.nix
    M pkgs/applications/networking/browsers/chromium/upstream-info.nix
    M pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    R pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
    A pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
    A pkgs/applications/networking/cluster/docker-machine/kvm.nix
    M pkgs/applications/networking/cluster/kubernetes/default.nix
    M pkgs/applications/networking/cluster/marathon/default.nix
    A pkgs/applications/networking/cluster/minikube/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/hipchat/default.nix
    M pkgs/applications/networking/instant-messengers/zoom-us/default.nix
    M pkgs/applications/networking/mailreaders/mutt/default.nix
    M pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
    M pkgs/applications/office/libreoffice/still-primary-src.nix
    M pkgs/applications/office/libreoffice/still.nix
    M pkgs/applications/science/logic/lean/default.nix
    A pkgs/applications/science/logic/lean2/default.nix
    M pkgs/applications/science/math/pari/default.nix
    M pkgs/applications/version-management/git-and-tools/git-bz/default.nix
    M pkgs/applications/virtualization/xen/4.5.nix
    M pkgs/applications/window-managers/ion-3/default.nix
    M pkgs/build-support/rust/default.nix
    M pkgs/build-support/setup-hooks/win-dll-link.sh
    M pkgs/build-support/trivial-builders.nix
    M pkgs/data/fonts/roboto/default.nix
    M pkgs/data/icons/arc-icon-theme/default.nix
    M pkgs/data/icons/elementary-icon-theme/default.nix
    A pkgs/data/icons/numix-icon-theme-square/default.nix
    M pkgs/data/icons/numix-icon-theme/default.nix
    M pkgs/data/icons/paper-icon-theme/default.nix
    A pkgs/data/misc/adapta-backgrounds/default.nix
    M pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
    A pkgs/desktops/rox/rox-filer/default.nix
    A pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
    M pkgs/development/compilers/sbcl/bootstrap.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/compilers/scala/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghcjs.nix
    M pkgs/development/interpreters/clisp/default.nix
    A pkgs/development/interpreters/erlang/R16B02-8-basho.nix
    R pkgs/development/interpreters/erlang/R16B03-1-basho.nix
    M pkgs/development/interpreters/lfe/default.nix
    A pkgs/development/interpreters/lfe/no-test-deps.patch
    R pkgs/development/interpreters/lfe/setup-hook.sh
    M pkgs/development/interpreters/picolisp/default.nix
    A pkgs/development/interpreters/python/build-python-package-common.nix
    A pkgs/development/interpreters/python/build-python-package-flit.nix
    A pkgs/development/interpreters/python/build-python-package-setuptools.nix
    A pkgs/development/interpreters/python/build-python-package-wheel.nix
    M pkgs/development/interpreters/python/build-python-package.nix
    M pkgs/development/interpreters/python/cpython/2.6/default.nix
    M pkgs/development/interpreters/python/cpython/2.7/default.nix
    M pkgs/development/interpreters/python/cpython/3.3/default.nix
    M pkgs/development/interpreters/python/cpython/3.4/default.nix
    M pkgs/development/interpreters/python/cpython/3.5/default.nix
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    M pkgs/development/interpreters/python/mk-python-derivation.nix
    M pkgs/development/interpreters/python/pypy/2.7/default.nix
    M pkgs/development/libraries/aws-sdk-cpp/default.nix
    M pkgs/development/libraries/cairomm/default.nix
    A pkgs/development/libraries/cpp-ipfs-api/default.nix
    M pkgs/development/libraries/gstreamer/bad/default.nix
    M pkgs/development/libraries/gstreamer/base/default.nix
    M pkgs/development/libraries/gstreamer/core/default.nix
    M pkgs/development/libraries/gstreamer/ges/default.nix
    M pkgs/development/libraries/gstreamer/good/default.nix
    M pkgs/development/libraries/gstreamer/libav/default.nix
    M pkgs/development/libraries/gstreamer/python/default.nix
    M pkgs/development/libraries/gstreamer/ugly/default.nix
    M pkgs/development/libraries/gstreamer/vaapi/default.nix
    M pkgs/development/libraries/gstreamer/validate/default.nix
    M pkgs/development/libraries/harfbuzz/default.nix
    R pkgs/development/libraries/icu/54.1.nix
    M pkgs/development/libraries/libdwarf/default.nix
    M pkgs/development/libraries/libibverbs/default.nix
    M pkgs/development/libraries/librdmacm/default.nix
    M pkgs/development/libraries/libre/default.nix
    M pkgs/development/libraries/librem/default.nix
    M pkgs/development/libraries/libxslt/default.nix
    R pkgs/development/libraries/portaudio/svn-head.nix
    M pkgs/development/libraries/qt-5/5.6/default.nix
    A pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
    M pkgs/development/libraries/qt-5/5.6/qtbase/series
    M pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
    A 
pkgs/development/libraries/qt-5/5.6/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
    M pkgs/development/libraries/qt-5/5.7/default.nix
    R pkgs/development/libraries/qt-5/5.7/qtwebengine.nix
    A pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
    A 
pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
    A pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
    A pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
    A pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
    M pkgs/development/libraries/snack/default.nix
    M pkgs/development/misc/loc/default.nix
    M pkgs/development/python-modules/bootstrapped-pip/default.nix
    M pkgs/development/python-modules/setuptools/default.nix
    M pkgs/development/tools/build-managers/rebar3/default.nix
    M pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
    M pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
    M pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
    M pkgs/development/tools/misc/uisp/default.nix
    A pkgs/development/tools/rq/default.nix
    M pkgs/development/tools/rust/rustfmt/default.nix
    M pkgs/development/tools/selenium/chromedriver/default.nix
    M pkgs/development/tools/wp-cli/default.nix
    M pkgs/games/teeworlds/default.nix
    M pkgs/games/xsokoban/default.nix
    M pkgs/misc/themes/arc/default.nix
    A pkgs/misc/themes/e17gtk/default.nix
    M pkgs/misc/themes/numix/default.nix
    M pkgs/misc/themes/paper/default.nix
    M pkgs/misc/uboot/guruplug.nix
    M pkgs/misc/uboot/nanonote.nix
    M pkgs/misc/uboot/sheevaplug.nix
    M pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
    M pkgs/os-specific/linux/broadcom-sta/default.nix
    M pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.8.nix
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/linux-rpi.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    A pkgs/os-specific/linux/lxcfs/default.nix
    M pkgs/os-specific/linux/ndiswrapper/default.nix
    M pkgs/servers/corosync/default.nix
    M pkgs/servers/dns/bind/default.nix
    M pkgs/servers/minio/default.nix
    M pkgs/servers/nosql/apache-jena/binary.nix
    M pkgs/servers/openafs-client/default.nix
    M pkgs/servers/sonarr/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    M pkgs/servers/x11/xorg/xwayland.nix
    M pkgs/stdenv/cross/default.nix
    M pkgs/stdenv/custom/default.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    M pkgs/stdenv/default.nix
    M pkgs/stdenv/freebsd/default.nix
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix
    M pkgs/stdenv/native/default.nix
    A pkgs/tools/admin/awslogs/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    M pkgs/tools/audio/beets/default.nix
    M pkgs/tools/bluetooth/blueman/default.nix
    A pkgs/tools/filesystems/gocrypfs/default.nix
    A pkgs/tools/filesystems/gocrypfs/deps.nix
    M pkgs/tools/filesystems/nilfs-utils/default.nix
    R pkgs/tools/misc/calamares/default.nix
    M pkgs/tools/misc/coreutils/default.nix
    M pkgs/tools/misc/diffoscope/default.nix
    M pkgs/tools/misc/diffoscope/ignore_links.patch
    A pkgs/tools/misc/diffoscope/locale.patch
    M pkgs/tools/misc/gti/default.nix
    M pkgs/tools/networking/dhcpcd/default.nix
    M pkgs/tools/networking/getmail/default.nix
    M pkgs/tools/networking/nzbget/default.nix
    M pkgs/tools/networking/privoxy/default.nix
    A pkgs/tools/networking/pssh/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/security/chkrootkit/default.nix
    A pkgs/tools/security/hashcat/hashcat3/default.nix
    M pkgs/tools/security/secp256k1/default.nix
    M pkgs/tools/security/sudolikeaboss/default.nix
    M pkgs/tools/security/sudolikeaboss/deps.nix
    M pkgs/tools/security/tor/torsocks.nix
    M pkgs/tools/system/freeipmi/default.nix
    M pkgs/tools/text/silver-searcher/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/default.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/platforms.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/rust-packages.nix
    A pkgs/top-level/stage.nix
    R pkgs/top-level/stdenv.nix
    A update.nix

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


  Commit: 10d9845a1a4a49f56aec3d473349511f9d95937a
      
https://github.com/NixOS/nixpkgs/commit/10d9845a1a4a49f56aec3d473349511f9d95937a
  Author: c0bw3b <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

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

  Log Message:
  -----------
  nghttp2: 1.16.1 -> 1.17.0

See release notes :
https://github.com/nghttp2/nghttp2/releases/tag/v1.17.0


  Commit: 0fa8ead76c1a50007f6d16db4de25bd376c01f18
      
https://github.com/NixOS/nixpkgs/commit/0fa8ead76c1a50007f6d16db4de25bd376c01f18
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M .mention-bot
    M pkgs/applications/editors/atom/default.nix
    A pkgs/applications/science/logic/minisat/darwin.patch
    M pkgs/applications/science/logic/minisat/default.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
    M pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
    M pkgs/development/compilers/solc/default.nix
    M pkgs/development/compilers/teyjus/default.nix
    M pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
    M pkgs/development/libraries/nghttp2/default.nix
    M pkgs/development/ocaml-modules/camlimages/4.0.nix
    M pkgs/development/ocaml-modules/camlimages/4.1.nix
    R pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
    M pkgs/development/tools/ocaml/omake/default.nix
    R pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
    R pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
    R pkgs/development/tools/ocaml/omake/warn.patch
    M pkgs/os-specific/linux/cifs-utils/default.nix
    M pkgs/os-specific/linux/kernel/common-config.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 #21029: nghttp2: 1.16.1 -> 1.17.0


  Commit: 879a98bf27f6de6cfdc4270ac35f93e0ebdec4a7
      
https://github.com/NixOS/nixpkgs/commit/879a98bf27f6de6cfdc4270ac35f93e0ebdec4a7
  Author: Frederik Rietdijk <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M pkgs/development/python-modules/pycairo/default.nix

  Log Message:
  -----------
  pythonPackages.pycairo: fix name


  Commit: af220f2a7a14e804885150e1a62cd29efc87498e
      
https://github.com/NixOS/nixpkgs/commit/af220f2a7a14e804885150e1a62cd29efc87498e
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

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

  Log Message:
  -----------
  cairo: maintenance 1.14.6 -> 1.14.8


  Commit: c3d20b2e43467fa669b51ca596d538fb0a613936
      
https://github.com/NixOS/nixpkgs/commit/c3d20b2e43467fa669b51ca596d538fb0a613936
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/gtk+/3.x.nix

  Log Message:
  -----------
  gtk3: maintenance 3.22.4 -> 3.22.5


  Commit: a3dbada1077fc124928e13dcddd4f4f2fcac66d4
      
https://github.com/NixOS/nixpkgs/commit/a3dbada1077fc124928e13dcddd4f4f2fcac66d4
  Author: Daiderd Jordan <[email protected]>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/wxmac/default.nix
    R pkgs/development/libraries/wxmac/wx.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  wxmac: fix build with clang-3.8


  Commit: 105fead2aab8e4bfcd84dbf456667751f83f07d4
      
https://github.com/NixOS/nixpkgs/commit/105fead2aab8e4bfcd84dbf456667751f83f07d4
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

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

  Log Message:
  -----------
  nghttp2 cleanup: unneeded patching, unused inputs

Suggested on
https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756


  Commit: 1626b1b652982363c9102343ee4100b513bb3cbf
      
https://github.com/NixOS/nixpkgs/commit/1626b1b652982363c9102343ee4100b513bb3cbf
  Author: Frederik Rietdijk <[email protected]>
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/json-glib/default.nix

  Log Message:
  -----------
  json_glib: use multiple outputs


  Commit: d77db89c3ffe7152639e7c94b22a63562d2dba62
      
https://github.com/NixOS/nixpkgs/commit/d77db89c3ffe7152639e7c94b22a63562d2dba62
  Author: Daniel Peebles <[email protected]>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/wxmac/default.nix
    R pkgs/development/libraries/wxmac/wx.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #21048 from LnL7/darwin-wxmac

wxmac: fix build with clang-3.8


  Commit: 8a43550e9008644b503a1cb985e0e991cd9044b2
      
https://github.com/NixOS/nixpkgs/commit/8a43550e9008644b503a1cb985e0e991cd9044b2
  Author: Daiderd Jordan <[email protected]>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/aws-sdk-cpp/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  aws-sdk-cpp: Enable on Darwin systems

This (re)reverts commit ef65353c73bccbedb60603725ca230fd1d4fc2ae.


  Commit: 0e64be20b7734d49a2aa4db0617febcf81da25a4
      
https://github.com/NixOS/nixpkgs/commit/0e64be20b7734d49a2aa4db0617febcf81da25a4
  Author: Daiderd Jordan <[email protected]>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/aws-sdk-cpp/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Revert "aws-sdk-cpp: Enable on Darwin systems"

This reverts commit 8a43550e9008644b503a1cb985e0e991cd9044b2.


  Commit: a01a5ed925552fcd7df113ce043d936f11f418b3
      
https://github.com/NixOS/nixpkgs/commit/a01a5ed925552fcd7df113ce043d936f11f418b3
  Author: Daiderd Jordan <[email protected]>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix

  Log Message:
  -----------
  darwin.libunwind: fix source

Fixes #20977

since this was the same sha as the linux package nix just used that instead.


  Commit: d12e540739a773319bbedf7714f3c482dedf39a1
      
https://github.com/NixOS/nixpkgs/commit/d12e540739a773319bbedf7714f3c482dedf39a1
  Author: AndersonTorres <[email protected]>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

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

  Log Message:
  -----------
  pythonPackages.docutils: 0.12 -> 0.13.1


  Commit: 86e4c9ed463b0e71e046c902638c0c0ed99e666f
      
https://github.com/NixOS/nixpkgs/commit/86e4c9ed463b0e71e046c902638c0c0ed99e666f
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M .travis.yml
    M doc/package-notes.xml
    M lib/maintainers.nix
    M maintainers/scripts/travis-nox-review-pr.sh
    M nixos/doc/manual/configuration/modularity.xml
    M nixos/doc/manual/man-nixos-rebuild.xml
    M nixos/modules/config/gnu.nix
    M nixos/modules/config/i18n.nix
    M nixos/modules/config/networking.nix
    M nixos/modules/config/nsswitch.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/programs/mosh.nix
    M nixos/modules/services/cluster/kubernetes.nix
    M nixos/modules/services/computing/boinc/client.nix
    A nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/databases/couchdb.nix
    M nixos/modules/services/desktops/profile-sync-daemon.nix
    M nixos/modules/services/games/terraria.nix
    M nixos/modules/services/logging/syslogd.nix
    M nixos/modules/services/mail/postsrsd.nix
    M nixos/modules/services/monitoring/collectd.nix
    M nixos/modules/services/networking/bird.nix
    M nixos/modules/services/networking/chrony.nix
    M nixos/modules/services/networking/dante.nix
    M nixos/modules/services/networking/ferm.nix
    M nixos/modules/services/networking/ntpd.nix
    M nixos/modules/services/networking/openfire.nix
    M nixos/modules/services/networking/openntpd.nix
    M nixos/modules/services/networking/wireguard.nix
    M nixos/modules/services/printing/cupsd.nix
    M nixos/modules/services/security/fail2ban.nix
    M nixos/modules/services/x11/desktop-managers/lxqt.nix
    M nixos/modules/services/x11/urxvtd.nix
    M nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
    M nixos/modules/system/boot/networkd.nix
    M nixos/modules/system/boot/timesyncd.nix
    M nixos/modules/testing/test-instrumentation.nix
    M nixos/modules/virtualisation/containers.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    A nixos/modules/virtualisation/openstack/common.nix
    A nixos/modules/virtualisation/openstack/keystone.nix
    M nixos/modules/virtualisation/parallels-guest.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M nixos/modules/virtualisation/xen-domU.nix
    M nixos/release.nix
    A nixos/tests/containers-hosts.nix
    A nixos/tests/containers-macvlans.nix
    M nixos/tests/grsecurity.nix
    A nixos/tests/keystone.nix
    M pkgs/applications/audio/moc/default.nix
    A pkgs/applications/audio/sisco.lv2/default.nix
    M pkgs/applications/editors/android-studio/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/emacs-modes/org-generated.nix
    M pkgs/applications/editors/emacs/macport-24.5.nix
    M pkgs/applications/editors/emacs/macport-25.1.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/editors/kakoune/default.nix
    M pkgs/applications/editors/nano/default.nix
    M pkgs/applications/editors/vscode/default.nix
    M pkgs/applications/graphics/ImageMagick/default.nix
    M pkgs/applications/graphics/vimiv/default.nix
    R pkgs/applications/graphics/vimiv/fixes.patch
    M pkgs/applications/misc/cpp-ethereum/default.nix
    M pkgs/applications/networking/browsers/chromium/plugins.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M pkgs/applications/networking/browsers/google-chrome/default.nix
    M pkgs/applications/networking/cluster/docker-machine/default.nix
    A pkgs/applications/networking/cluster/helm/default.nix
    M pkgs/applications/networking/cluster/kubernetes/default.nix
    M pkgs/applications/networking/cluster/minikube/default.nix
    M pkgs/applications/networking/cluster/openshift/default.nix
    A pkgs/applications/networking/cluster/pachyderm/default.nix
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/applications/networking/ftp/filezilla/default.nix
    A pkgs/applications/networking/gopher/gopher/default.nix
    M pkgs/applications/networking/instant-messengers/discord/default.nix
    M pkgs/applications/networking/instant-messengers/profanity/default.nix
    M pkgs/applications/networking/instant-messengers/toxic/default.nix
    R pkgs/applications/networking/mailreaders/mutt-kz/default.nix
    M pkgs/applications/networking/sniffers/wireshark/default.nix
    M pkgs/applications/office/homebank/default.nix
    A pkgs/applications/science/logic/coq/8.6.nix
    M pkgs/applications/science/logic/coq/HEAD.nix
    M pkgs/applications/version-management/bazaar/default.nix
    M pkgs/applications/version-management/subversion/default.nix
    M pkgs/applications/video/kodi/wrapper.nix
    M pkgs/applications/virtualization/docker/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    A pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
    M pkgs/applications/virtualization/rkt/default.nix
    M pkgs/applications/virtualization/virtualbox/update.py
    M pkgs/applications/virtualization/virtualbox/upstream-info.json
    M pkgs/build-support/fetchgit/nix-prefetch-git
    M pkgs/data/documentation/man-pages/default.nix
    A pkgs/data/fonts/unscii/default.nix
    M pkgs/desktops/enlightenment/efl.nix
    M pkgs/desktops/enlightenment/enlightenment.nix
    A pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
    A 
pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
    M pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
    M pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
    M pkgs/desktops/lxqt/default.nix
    A pkgs/development/compilers/abcl/default.nix
    M pkgs/development/compilers/ecl/default.nix
    M pkgs/development/compilers/go/1.6.nix
    M pkgs/development/compilers/go/1.7.nix
    M pkgs/development/compilers/go/cacert-1.7.patch
    M pkgs/development/compilers/haxe/default.nix
    A pkgs/development/compilers/inform7/default.nix
    M pkgs/development/compilers/neko/default.nix
    M pkgs/development/compilers/openjdk-darwin/8.nix
    M pkgs/development/compilers/openjdk-darwin/default.nix
    M pkgs/development/compilers/ponyc/default.nix
    M pkgs/development/compilers/rust/nightlyBin.nix
    M pkgs/development/go-modules/generic/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.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
    M pkgs/development/interpreters/erlang/R16B02-8-basho.nix
    M pkgs/development/interpreters/falcon/default.nix
    M pkgs/development/interpreters/php/default.nix
    M pkgs/development/interpreters/python/build-python-package-common.nix
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    M pkgs/development/interpreters/ruby/rubygems-src.nix
    M pkgs/development/libraries/ffmpeg/generic.nix
    A pkgs/development/libraries/gbenchmark/default.nix
    M pkgs/development/libraries/gsl/default.nix
    M pkgs/development/libraries/ignition-math/default.nix
    A pkgs/development/libraries/isl/0.17.1.nix
    M pkgs/development/libraries/jasper/default.nix
    M pkgs/development/libraries/kde-frameworks/default.nix
    M pkgs/development/libraries/kde-frameworks/fetch.sh
    M pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
    M pkgs/development/libraries/kde-frameworks/kpackage/default.nix
    M pkgs/development/libraries/kde-frameworks/ktexteditor.nix
    M pkgs/development/libraries/kde-frameworks/plasma-framework.nix
    M pkgs/development/libraries/kde-frameworks/srcs.nix
    A pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
    M pkgs/development/libraries/libfilezilla/default.nix
    M pkgs/development/libraries/libgsf/default.nix
    A pkgs/development/libraries/libmesode/default.nix
    M pkgs/development/libraries/libxslt/default.nix
    M pkgs/development/libraries/mbedtls/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    M pkgs/development/libraries/pugixml/default.nix
    M pkgs/development/libraries/rocksdb/default.nix
    M pkgs/development/libraries/science/math/openblas/default.nix
    M pkgs/development/libraries/sqlite/default.nix
    M pkgs/development/mobile/androidenv/addon.xml
    M pkgs/development/mobile/androidenv/addons.nix
    M pkgs/development/mobile/androidenv/androidsdk.nix
    M pkgs/development/mobile/androidenv/build-tools.nix
    M pkgs/development/mobile/androidenv/platform-tools.nix
    M pkgs/development/mobile/androidenv/platforms-linux.nix
    M pkgs/development/mobile/androidenv/platforms-macosx.nix
    M pkgs/development/mobile/androidenv/repository-11.xml
    M pkgs/development/mobile/androidenv/support-repository.nix
    M pkgs/development/mobile/androidenv/sys-img.xml
    M pkgs/development/mobile/androidenv/sysimages.nix
    M pkgs/development/node-packages/node-env.nix
    M pkgs/development/node-packages/node-packages-v4.nix
    M pkgs/development/node-packages/node-packages-v6.nix
    M pkgs/development/node-packages/node-packages.json
    M pkgs/development/perl-modules/DBD-mysql/default.nix
    A pkgs/development/python-modules/async_timeout/default.nix
    A pkgs/development/python-modules/discordpy/default.nix
    A pkgs/development/python-modules/multidict/default.nix
    A pkgs/development/python-modules/websockets/default.nix
    A pkgs/development/python-modules/yarl/default.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/analysis/flow/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/database/liquibase/default.nix
    M pkgs/development/tools/glide/default.nix
    A pkgs/development/tools/jid/default.nix
    A pkgs/development/tools/jid/deps.nix
    M pkgs/development/tools/misc/intel-gpu-tools/default.nix
    M pkgs/development/tools/misc/strace/default.nix
    M pkgs/development/tools/misc/universal-ctags/default.nix
    M pkgs/development/tools/ocaml/findlib/default.nix
    M pkgs/development/tools/ocaml/findlib/install_topfind.patch
    M pkgs/development/tools/ocaml/ocamlbuild/default.nix
    M pkgs/development/tools/parsing/ragel/default.nix
    M pkgs/development/tools/watchman/default.nix
    M pkgs/development/tools/xcbuild/default.nix
    M pkgs/development/tools/xcbuild/platform.nix
    M pkgs/development/tools/xcbuild/wrapper.nix
    M pkgs/development/web/nodejs/nodejs.nix
    M pkgs/development/web/nodejs/v7.nix
    A pkgs/games/endless-sky/default.nix
    A pkgs/games/endless-sky/fixes.patch
    M pkgs/games/wesnoth/default.nix
    M pkgs/misc/themes/flat-plat/default.nix
    M pkgs/misc/urbit/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    R pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    A pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
    M pkgs/os-specific/linux/dstat/default.nix
    M pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.8.nix
    A pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/manual-config.nix
    A pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/kexectools/default.nix
    M pkgs/os-specific/linux/musl/default.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    A pkgs/servers/dns/knot-dns/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/mail/rmilter/default.nix
    M pkgs/servers/mail/rspamd/default.nix
    M pkgs/servers/monitoring/riemann/default.nix
    M pkgs/servers/monitoring/telegraf/default.nix
    R pkgs/servers/monitoring/telegraf/deps-1.1.1.nix
    A pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
    M pkgs/servers/monitoring/zabbix/2.2.nix
    M pkgs/servers/nextcloud/default.nix
    M pkgs/servers/web-apps/shaarli/default.nix
    M pkgs/shells/zsh/default.nix
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    A pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
    A pkgs/stdenv/linux/bootstrap-files/armv6l.nix
    A pkgs/stdenv/linux/bootstrap-files/armv7l.nix
    A pkgs/stdenv/linux/bootstrap-files/i686.nix
    A pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
    A pkgs/stdenv/linux/bootstrap-files/x86_64.nix
    A pkgs/stdenv/linux/bootstrap-tools/default.nix
    A pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
    R pkgs/stdenv/linux/bootstrap/armv5tel.nix
    R pkgs/stdenv/linux/bootstrap/armv6l.nix
    R pkgs/stdenv/linux/bootstrap/armv7l.nix
    R pkgs/stdenv/linux/bootstrap/i686.nix
    R pkgs/stdenv/linux/bootstrap/loongson2f.nix
    R pkgs/stdenv/linux/bootstrap/x86_64.nix
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix
    R pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
    A pkgs/tools/X11/ffcast/default.nix
    M pkgs/tools/admin/simp_le/default.nix
    M pkgs/tools/admin/tigervnc/default.nix
    A pkgs/tools/archivers/unzip/CVE-2014-9913.patch
    A pkgs/tools/archivers/unzip/CVE-2016-9844.patch
    M pkgs/tools/archivers/unzip/default.nix
    M pkgs/tools/backup/btrbk/default.nix
    A pkgs/tools/filesystems/genimage/default.nix
    A pkgs/tools/graphics/gromit-mpx/default.nix
    M pkgs/tools/graphics/netpbm/default.nix
    M pkgs/tools/misc/aptly/default.nix
    M pkgs/tools/misc/autorandr/default.nix
    M pkgs/tools/misc/direnv/default.nix
    M pkgs/tools/misc/fzf/default.nix
    M pkgs/tools/misc/fzf/deps.nix
    M pkgs/tools/misc/parallel/default.nix
    M pkgs/tools/misc/profile-cleaner/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/networking/chrony/default.nix
    M pkgs/tools/networking/httpie/default.nix
    M pkgs/tools/networking/mu/default.nix
    M pkgs/tools/networking/stunnel/default.nix
    M pkgs/tools/package-management/packagekit/default.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/tools/security/tor/torbrowser.nix
    M pkgs/tools/security/vault/default.nix
    M pkgs/tools/text/languagetool/default.nix
    M pkgs/tools/text/ripgrep/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/default.nix
    M pkgs/top-level/make-tarball.nix
    M pkgs/top-level/node-packages.json
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/rust-packages.nix

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


  Commit: 3a0f1975b09c4e0c7c68e4231b5c988a34af1ac5
      
https://github.com/NixOS/nixpkgs/commit/3a0f1975b09c4e0c7c68e4231b5c988a34af1ac5
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M pkgs/tools/misc/coreutils/default.nix

  Log Message:
  -----------
  Revert "Revert "Merge pull request #21234 from l2dy/coreutils-up""

This reverts commit ffb90e8c4fc0c8ed2d0fb817e5dafbded1c5a6c8.
This moves the coreutils update from master.


  Commit: bb18e10ba0431bf9b8685d3b589f0ef262d5184d
      
https://github.com/NixOS/nixpkgs/commit/bb18e10ba0431bf9b8685d3b589f0ef262d5184d
  Author: Aristid Breitkreuz <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M doc/languages-frameworks/beam.xml
    M lib/maintainers.nix
    A maintainers/scripts/update.nix
    M nixos/doc/manual/release-notes/rl-1703.xml
    M nixos/lib/build-vms.nix
    M nixos/lib/testing.nix
    M nixos/modules/installer/tools/nixos-rebuild.sh
    M nixos/modules/services/databases/mysql.nix
    M nixos/modules/services/hardware/brltty.nix
    M nixos/modules/services/mail/rmilter.nix
    M nixos/modules/system/boot/systemd-unit-options.nix
    M nixos/modules/system/boot/systemd.nix
    M nixos/modules/testing/test-instrumentation.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M nixos/tests/kde5.nix
    M nixos/tests/sddm.nix
    A pkgs/applications/audio/audacious/qt-5.nix
    M pkgs/applications/audio/spotify/default.nix
    A pkgs/applications/editors/fte/default.nix
    M pkgs/applications/editors/neovim/default.nix
    A pkgs/applications/editors/neovim/ruby_provider/Gemfile
    A pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
    A pkgs/applications/editors/neovim/ruby_provider/gemset.nix
    M pkgs/applications/graphics/tesseract/default.nix
    M pkgs/applications/misc/electrum/default.nix
    M pkgs/applications/misc/keepass-plugins/keefox/default.nix
    M pkgs/applications/misc/octoprint/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    A pkgs/applications/networking/browsers/firefox-bin/update.nix
    M pkgs/applications/networking/browsers/vivaldi/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/remote/teamviewer/default.nix
    M pkgs/applications/office/mendeley/default.nix
    A pkgs/applications/office/paperwork/default.nix
    M pkgs/applications/office/zim/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    M pkgs/applications/virtualization/xhyve/default.nix
    A pkgs/desktops/kde-5/applications/akonadi-contacts.nix
    A pkgs/desktops/kde-5/applications/akonadi-mime.nix
    A pkgs/desktops/kde-5/applications/akonadi.nix
    M pkgs/desktops/kde-5/applications/default.nix
    M pkgs/desktops/kde-5/applications/fetch.sh
    R pkgs/desktops/kde-5/applications/gpgmepp.nix
    A pkgs/desktops/kde-5/applications/kcontacts.nix
    A pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
    M pkgs/desktops/kde-5/applications/kgpg.nix
    A pkgs/desktops/kde-5/applications/kmime.nix
    M pkgs/desktops/kde-5/applications/l10n.nix
    M pkgs/desktops/kde-5/applications/okular.nix
    M pkgs/desktops/kde-5/applications/srcs.nix
    M pkgs/development/compilers/ghc/7.4.2-binary.nix
    M pkgs/development/compilers/ghc/8.0.1.nix
    M pkgs/development/compilers/ghc/8.0.2.nix
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/development/compilers/teyjus/default.nix
    M pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/gnu-apl/default.nix
    A pkgs/development/libraries/boost/1.62.nix
    R pkgs/development/libraries/fmod/4.24.16.nix
    R pkgs/development/libraries/fmod/default.nix
    M pkgs/development/libraries/grantlee/5.x.nix
    M pkgs/development/libraries/kde-frameworks/kpackage/default.nix
    M pkgs/development/libraries/kde-frameworks/srcs.nix
    R pkgs/development/libraries/liborc/default.nix
    M pkgs/development/libraries/libvirt/default.nix
    M pkgs/development/libraries/poppler/default.nix
    A pkgs/development/libraries/qtstyleplugins/default.nix
    M pkgs/development/libraries/rocksdb/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/misc/luarocks/default.nix
    A pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
    A pkgs/development/tools/ocaml/omake/warn.patch
    M pkgs/development/tools/vagrant/default.nix
    M pkgs/games/gzdoom/default.nix
    M pkgs/games/zandronum/default.nix
    A pkgs/games/zandronum/fmod.nix
    M pkgs/games/zdoom/default.nix
    M pkgs/misc/screensavers/light-locker/default.nix
    A pkgs/misc/screensavers/light-locker/systemd.patch
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M pkgs/os-specific/darwin/apple-sdk/frameworks.nix
    M pkgs/os-specific/linux/batman-adv/alfred.nix
    M pkgs/os-specific/linux/batman-adv/batctl.nix
    M pkgs/os-specific/linux/batman-adv/default.nix
    A pkgs/os-specific/linux/kexectools/arm.patch
    M pkgs/os-specific/linux/kexectools/default.nix
    M pkgs/os-specific/linux/tp_smapi/default.nix
    A pkgs/os-specific/linux/tp_smapi/update.json
    A pkgs/os-specific/linux/tp_smapi/update.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/servers/matrix-synapse/matrix-synapse.patch
    M pkgs/servers/nosql/riak-cs/2.1.1.nix
    M pkgs/servers/nosql/riak-cs/stanchion.nix
    M pkgs/servers/squid/default.nix
    M pkgs/shells/oh-my-zsh/default.nix
    M pkgs/tools/admin/google-cloud-sdk/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    A pkgs/tools/archivers/p7zip/setup-hook.sh
    M pkgs/tools/misc/goaccess/default.nix
    A pkgs/tools/misc/kdecoration-viewer/default.nix
    M pkgs/tools/misc/parted/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/security/tor/default.nix
    A pkgs/tools/system/ior/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix
    M pkgs/top-level/python-packages.nix
    R update.nix

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


  Commit: ec4d73573ae944611346bef8d769994b3bc1ec41
      
https://github.com/NixOS/nixpkgs/commit/ec4d73573ae944611346bef8d769994b3bc1ec41
  Author: Aristid Breitkreuz <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  -----------
  boost: default version 1.62.0


  Commit: 76c4b5fcca06441e00e1d27d44f3a601915f8d66
      
https://github.com/NixOS/nixpkgs/commit/76c4b5fcca06441e00e1d27d44f3a601915f8d66
  Author: Aristid Breitkreuz <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M pkgs/development/tools/build-managers/cmake/default.nix

  Log Message:
  -----------
  cmake: 3.6.2 -> 3.7.1


  Commit: 8a5fb68b0cdd235f7cd930a25075c96fd356976c
      
https://github.com/NixOS/nixpkgs/commit/8a5fb68b0cdd235f7cd930a25075c96fd356976c
  Author: Aristid Breitkreuz <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  -----------
  mariadb: use latest boost


  Commit: a60500ce7028a1888aa2e367cf69c53dd93e01b6
      
https://github.com/NixOS/nixpkgs/commit/a60500ce7028a1888aa2e367cf69c53dd93e01b6
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/cyrus-sasl/default.nix

  Log Message:
  -----------
  cyrus_sasl: 2.1.26 -> 2.5.10


  Commit: f84344ed41ec43319d08a396b42c7a35d9154544
      
https://github.com/NixOS/nixpkgs/commit/f84344ed41ec43319d08a396b42c7a35d9154544
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/kerberos/krb5.nix
    R pkgs/development/libraries/kerberos/path_char_fix.patch

  Log Message:
  -----------
  libkrb5: 1.14.3 -> 1.15


  Commit: b0a1028a1a18932aced53f36f0a80a3a213f91e4
      
https://github.com/NixOS/nixpkgs/commit/b0a1028a1a18932aced53f36f0a80a3a213f91e4
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M pkgs/servers/samba/4.x.nix

  Log Message:
  -----------
  samba4: 4.4.6 -> 4.5.3


  Commit: 41f55691a96ca4f37a87c8659884edf19b2c8446
      
https://github.com/NixOS/nixpkgs/commit/41f55691a96ca4f37a87c8659884edf19b2c8446
  Author: Graham Christensen <[email protected]>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    A pkgs/development/libraries/zlib/CVE-2016-9840.patch
    A pkgs/development/libraries/zlib/CVE-2016-9841.patch
    A pkgs/development/libraries/zlib/CVE-2016-9842.patch
    A pkgs/development/libraries/zlib/CVE-2016-9843.patch
    M pkgs/development/libraries/zlib/default.nix

  Log Message:
  -----------
  zlib: patch for CVE-2016-9840, CVE-2016-9841, CVE-9842, CVE-9843


  Commit: 2e03ae274d36e695e4db63fb0a6b71346621b6af
      
https://github.com/NixOS/nixpkgs/commit/2e03ae274d36e695e4db63fb0a6b71346621b6af
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M doc/languages-frameworks/python.md
    M nixos/lib/make-system-tarball.sh
    M nixos/modules/services/monitoring/prometheus/default.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M nixos/tests/kde5.nix
    M nixos/tests/prometheus.nix
    M pkgs/applications/audio/game-music-emu/default.nix
    M pkgs/applications/audio/spotify/default.nix
    A pkgs/applications/audio/ssrc/default.nix
    A pkgs/applications/misc/gnome15/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/scudcloud/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/science/astronomy/stellarium/default.nix
    M pkgs/applications/version-management/meld/default.nix
    M pkgs/applications/virtualization/xen/4.5.nix
    M pkgs/applications/virtualization/xhyve/default.nix
    R pkgs/build-support/kernel/cpio-clean.pl
    M pkgs/build-support/kernel/make-initrd.nix
    M pkgs/build-support/kernel/make-initrd.sh
    A pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
    M pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
    R pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix
    M pkgs/desktops/gnome-2/default.nix
    M pkgs/desktops/kde-5/applications/okular.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/go/1.4.nix
    M pkgs/development/compilers/go/1.6.nix
    M pkgs/development/compilers/go/1.7.nix
    A pkgs/development/compilers/go/creds-test-1.4.patch
    A pkgs/development/compilers/go/creds-test.patch
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/hackage-packages.nix
    R pkgs/development/libraries/boehm-gc/cygwin.patch
    M pkgs/development/libraries/boehm-gc/default.nix
    M pkgs/development/libraries/libfaketime/default.nix
    A pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
    M pkgs/development/libraries/openjpeg/2.1.nix
    A pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch
    M pkgs/development/libraries/openjpeg/generic.nix
    M pkgs/development/libraries/pupnp/default.nix
    M pkgs/development/libraries/qt-5/5.7/fetch.sh
    M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
    M pkgs/development/libraries/qt-5/5.7/srcs.nix
    M pkgs/development/ocaml-modules/containers/default.nix
    M pkgs/development/ocaml-modules/lablgtk/default.nix
    M pkgs/development/ocaml-modules/pcre/default.nix
    M pkgs/development/tools/misc/rolespec/default.nix
    M pkgs/development/tools/sauce-connect/default.nix
    M pkgs/games/minecraft-server/default.nix
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M pkgs/os-specific/darwin/apple-sdk/frameworks.nix
    M pkgs/os-specific/linux/kernel/linux-3.12.nix
    M pkgs/os-specific/linux/kernel/linux-3.18.nix
    M pkgs/os-specific/linux/multipath-tools/default.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    M pkgs/servers/http/tomcat/default.nix
    M pkgs/servers/monitoring/nagios/default.nix
    M pkgs/shells/nix-zsh-completions/default.nix
    M pkgs/shells/zsh/default.nix
    M pkgs/tools/admin/certbot/default.nix
    M pkgs/tools/admin/simp_le/default.nix
    A pkgs/tools/cd-dvd/nrg2iso/default.nix
    M pkgs/tools/misc/lnav/default.nix
    M pkgs/tools/misc/parted/default.nix
    M pkgs/tools/misc/yank/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/networking/stun/default.nix
    M pkgs/tools/networking/zerotierone/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/default.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: 2b883c6f564202a32169d3bf762aa8c40156c8fb
      
https://github.com/NixOS/nixpkgs/commit/2b883c6f564202a32169d3bf762aa8c40156c8fb
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

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

  Log Message:
  -----------
  Revert "Revert "Merge pull request #21350 from spacekitteh/patch-23""

This reverts commit 0c1382085b2969ce38359bcb28fc5dfe67cca7eb.
Moved to staging.


  Commit: 39e4d93649ce8cbe5f3ad6467c545df0125fb816
      
https://github.com/NixOS/nixpkgs/commit/39e4d93649ce8cbe5f3ad6467c545df0125fb816
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

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

  Log Message:
  -----------
  libuv: disable tests broken on Hydra

They were broken by nix starting to use user namespaces.


  Commit: 2fe61cb9dfd3062282d5f264d2d22920e4f48cdb
      
https://github.com/NixOS/nixpkgs/commit/2fe61cb9dfd3062282d5f264d2d22920e4f48cdb
  Author: Frederik Rietdijk <[email protected]>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

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

  Log Message:
  -----------
  pythonPackages.lockfile: 0.10.2 -> 0.12.2


  Commit: fd23914961b7e258a7040af9b10416fe651acb82
      
https://github.com/NixOS/nixpkgs/commit/fd23914961b7e258a7040af9b10416fe651acb82
  Author: Frederik Rietdijk <[email protected]>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

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

  Log Message:
  -----------
  pythonPackages.sphinx: 1.4.6 -> 1.5.1


  Commit: 0e2f1af5e748df1eacf8c92785a68dde8d03c779
      
https://github.com/NixOS/nixpkgs/commit/0e2f1af5e748df1eacf8c92785a68dde8d03c779
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-24 (Sat, 24 Dec 2016)

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

  Log Message:
  -----------
  switch packages back to boost-1.60

They don't build with 1.62.


  Commit: 324a115747ade5e7a3fa932d453ba49cbc1c48df
      
https://github.com/NixOS/nixpkgs/commit/324a115747ade5e7a3fa932d453ba49cbc1c48df
  Author: Sophie Taylor <[email protected]>
  Date:   2016-12-24 (Sat, 24 Dec 2016)

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

  Log Message:
  -----------
  libssh2: 1.7.0 -> 1.8.0


  Commit: c655399126608c80b66566e847764346a4b4383d
      
https://github.com/NixOS/nixpkgs/commit/c655399126608c80b66566e847764346a4b4383d
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-12-24 (Sat, 24 Dec 2016)

  Changed paths:
    M pkgs/development/libraries/cairo/default.nix
    M pkgs/development/libraries/cyrus-sasl/default.nix
    M pkgs/development/libraries/glib/default.nix
    M pkgs/development/libraries/gtk+/3.x.nix
    M pkgs/development/libraries/json-glib/default.nix
    M pkgs/development/libraries/kerberos/krb5.nix
    R pkgs/development/libraries/kerberos/path_char_fix.patch
    M pkgs/development/libraries/libuv/default.nix
    M pkgs/development/libraries/ncurses/default.nix
    M pkgs/development/libraries/nghttp2/default.nix
    M pkgs/development/libraries/wxmac/default.nix
    R pkgs/development/libraries/wxmac/wx.patch
    A pkgs/development/libraries/zlib/CVE-2016-9840.patch
    A pkgs/development/libraries/zlib/CVE-2016-9841.patch
    A pkgs/development/libraries/zlib/CVE-2016-9842.patch
    A pkgs/development/libraries/zlib/CVE-2016-9843.patch
    M pkgs/development/libraries/zlib/default.nix
    M pkgs/development/python-modules/pycairo/default.nix
    M pkgs/development/tools/build-managers/cmake/default.nix
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/tools/misc/coreutils/default.nix
    M pkgs/tools/text/gnugrep/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

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


Compare: https://github.com/NixOS/nixpkgs/compare/231d7755ca65...c65539912660
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to