Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b25aeb8e7f9ce6d3c9a947f61cd90087fc69a645
      
https://github.com/NixOS/nixpkgs/commit/b25aeb8e7f9ce6d3c9a947f61cd90087fc69a645
  Author: Bart Brouns <[email protected]>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

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

  Log Message:
  -----------
  fftw: 3.3.4 -> 3.3.5


  Commit: b6153c8f9cce88d6a90e08e39ad0374435672026
      
https://github.com/NixOS/nixpkgs/commit/b6153c8f9cce88d6a90e08e39ad0374435672026
  Author: Bjørn Forsman <[email protected]>
  Date:   2016-08-02 (Tue, 02 Aug 2016)

  Changed paths:
    M pkgs/development/python-modules/generic/run_setup.py

  Log Message:
  -----------
  python: add file encoding spec to run_setup.py

Newer 'mutagen' versions have a test suite that trips over missing
encoding in this file. The file is copied to source trees at build time
with the name nix_run_setup.py.


  Commit: 8bff33a4ff6a65d1ecf2ba6c8e42f8a5878c2629
      
https://github.com/NixOS/nixpkgs/commit/8bff33a4ff6a65d1ecf2ba6c8e42f8a5878c2629
  Author: Lancelot SIX <[email protected]>
  Date:   2016-08-10 (Wed, 10 Aug 2016)

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

  Log Message:
  -----------
  diffutils: 3.3 -> 3.4

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


  Commit: 7d0f05f22c0676f66a3ffd1fa112476beefc4cfd
      
https://github.com/NixOS/nixpkgs/commit/7d0f05f22c0676f66a3ffd1fa112476beefc4cfd
  Author: rnhmjoj <[email protected]>
  Date:   2016-08-13 (Sat, 13 Aug 2016)

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

  Log Message:
  -----------
  mesa: 11.2.2 -> 12.0.1


  Commit: 3819044de11cc9f12b35f3f67abb4fd1699fcb1f
      
https://github.com/NixOS/nixpkgs/commit/3819044de11cc9f12b35f3f67abb4fd1699fcb1f
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/development/python-modules/generic/run_setup.py

  Log Message:
  -----------
  Merge #17430: python: add file encoding to run_setup.py


  Commit: 4bceaca196cd6be14a584be45510ca85f873ffe7
      
https://github.com/NixOS/nixpkgs/commit/4bceaca196cd6be14a584be45510ca85f873ffe7
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

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

  Log Message:
  -----------
  Re-merge #17112: fftw: 3.3.4 -> 3.3.5

By mistake in df2102b6a2 I merged an older version of the PR
so we only had an -RC version; I'm sorry.


  Commit: 4fbb37c5179915a0daf985c624ab02373111cdcb
      
https://github.com/NixOS/nixpkgs/commit/4fbb37c5179915a0daf985c624ab02373111cdcb
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M .travis.yml
    M doc/languages-frameworks/go.xml
    M doc/languages-frameworks/python.md
    M lib/licenses.nix
    M lib/lists.nix
    M lib/sources.nix
    M lib/strings.nix
    M lib/trivial.nix
    M maintainers/scripts/travis-nox-review-pr.sh
    M nixos/doc/manual/release-notes/rl-1609.xml
    M nixos/modules/config/system-path.nix
    M nixos/modules/i18n/input-method/default.xml
    R nixos/modules/installer/tools/get-git-revision
    A nixos/modules/installer/tools/get-version-suffix
    M nixos/modules/installer/tools/nixos-install.sh
    M nixos/modules/installer/tools/nixos-rebuild.sh
    M nixos/modules/installer/tools/tools.nix
    M nixos/modules/misc/version.nix
    M nixos/modules/module-list.nix
    R nixos/modules/programs/unity3d.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/chromium-suid-sandbox.nix
    M nixos/modules/services/continuous-integration/gocd-agent/default.nix
    A nixos/modules/services/databases/cassandra.nix
    M nixos/modules/services/misc/gitlab.nix
    M nixos/modules/services/web-servers/nginx/default.nix
    R nixos/modules/services/web-servers/phpfpm.nix
    A nixos/modules/services/web-servers/phpfpm/default.nix
    A nixos/modules/services/web-servers/phpfpm/pool-options.nix
    M nixos/modules/services/x11/hardware/libinput.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-1.nix
    M nixos/release-small.nix
    A nixos/tests/cassandra.nix
    M nixos/tests/gocd-agent.nix
    M nixos/tests/gocd-server.nix
    M nixos/tests/installer.nix
    M pkgs/applications/audio/audacious/default.nix
    M pkgs/applications/audio/i-score/default.nix
    M pkgs/applications/audio/musescore/default.nix
    M pkgs/applications/audio/sooperlooper/default.nix
    M pkgs/applications/audio/spotify/default.nix
    A pkgs/applications/editors/android-studio/default.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/graphics/geeqie/default.nix
    M pkgs/applications/misc/acbuild/default.nix
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/fehlstart/default.nix
    A pkgs/applications/misc/fehlstart/use-nix-profiles.patch
    M pkgs/applications/misc/gsimplecal/default.nix
    M pkgs/applications/misc/hello/default.nix
    M pkgs/applications/misc/hugo/deps.json
    M pkgs/applications/misc/mop/deps.json
    M pkgs/applications/misc/playonlinux/default.nix
    M pkgs/applications/misc/timewarrior/default.nix
    M pkgs/applications/misc/wego/deps.json
    M pkgs/applications/misc/wikicurses/default.nix
    M pkgs/applications/networking/browsers/chromium/default.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/applications/networking/drive/deps.json
    M pkgs/applications/networking/ftp/filezilla/default.nix
    M pkgs/applications/networking/instant-messengers/baresip/default.nix
    M 
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
    M pkgs/applications/networking/instant-messengers/pond/deps.json
    M pkgs/applications/networking/instant-messengers/teamspeak/client.nix
    M pkgs/applications/networking/instant-messengers/vacuum/default.nix
    M pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
    M pkgs/applications/networking/syncthing012/deps.json
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
    M pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
    M pkgs/applications/office/libreoffice/libreoffice-srcs.nix
    M pkgs/applications/office/libreoffice/still.nix
    M pkgs/applications/science/biology/bcftools/default.nix
    M pkgs/applications/science/logic/abc/default.nix
    M pkgs/applications/science/logic/aspino/default.nix
    M pkgs/applications/science/math/LiE/default.nix
    A pkgs/applications/science/math/geogebra/default.nix
    M pkgs/applications/science/math/pari/default.nix
    M pkgs/applications/science/math/sage/default.nix
    M pkgs/applications/science/misc/golly/default.nix
    M pkgs/applications/science/misc/golly/default.upstream
    M 
pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
    M 
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
    A pkgs/applications/version-management/yadm/default.nix
    M pkgs/applications/virtualization/rkt/default.nix
    M pkgs/applications/window-managers/compiz/default.nix
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/build-support/gcc-cross-wrapper/builder.sh
    M pkgs/build-support/upstream-updater/update-walker-service-specific.sh
    M pkgs/build-support/vm/default.nix
    M pkgs/data/fonts/baekmuk-ttf/default.nix
    M pkgs/data/fonts/gdouros/default.nix
    M pkgs/data/misc/tzdata/default.nix
    M pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
    M pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
    M pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
    M pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
    M pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
    M pkgs/desktops/gnome-3/3.20/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
    A pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
    A pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
    M pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
    M pkgs/desktops/kde-5/applications/default.nix
    A pkgs/desktops/kde-5/applications/kdenlive.nix
    M pkgs/desktops/kde-5/plasma/default.nix
    A pkgs/desktops/kde-5/plasma/kwallet-pam.nix
    M pkgs/development/arduino/arduino-core/default.nix
    M pkgs/development/compilers/compcert/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/go/1.6.nix
    M pkgs/development/compilers/jsonnet/default.nix
    M pkgs/development/compilers/rust/beta.nix
    M pkgs/development/compilers/rust/bootstrap.nix
    M pkgs/development/compilers/rust/cargo.nix
    M pkgs/development/compilers/rust/default.nix
    M pkgs/development/compilers/rust/head.nix
    A 
pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch
    M pkgs/development/compilers/rust/rustc.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/go-modules/generic/default.nix
    R pkgs/development/go-modules/libs.json
    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/interpreters/angelscript/default.nix
    M pkgs/development/interpreters/lolcode/default.nix
    M pkgs/development/libraries/SDL_mixer/default.nix
    M pkgs/development/libraries/alure/default.nix
    M pkgs/development/libraries/appstream-glib/default.nix
    M pkgs/development/libraries/botan/default.nix
    M pkgs/development/libraries/botan/unstable.nix
    M pkgs/development/libraries/ffmpeg/3.1.nix
    M pkgs/development/libraries/ffmpeg/generic.nix
    M pkgs/development/libraries/gdbm/default.nix
    M pkgs/development/libraries/gdcm/default.nix
    M pkgs/development/libraries/gegl/3.0.nix
    M pkgs/development/libraries/git2/default.nix
    A pkgs/development/libraries/git2/disable-security.framework.patch
    A pkgs/development/libraries/globalplatform/default.nix
    A pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
    M pkgs/development/libraries/libatomic_ops/default.nix
    A pkgs/development/libraries/libircclient/default.nix
    M pkgs/development/libraries/libmikmod/default.nix
    M pkgs/development/libraries/libmwaw/default.nix
    M pkgs/development/libraries/libraw/default.nix
    M pkgs/development/libraries/libre/default.nix
    M pkgs/development/libraries/libsamplerate/default.nix
    M pkgs/development/libraries/libshout/default.nix
    A pkgs/development/libraries/libsidplayfp/default.nix
    A pkgs/development/libraries/mdds/0.12.1.nix
    M pkgs/development/libraries/mdds/default.nix
    M pkgs/development/libraries/mdds/default.upstream
    M pkgs/development/libraries/mlt/qt-5.nix
    A pkgs/development/libraries/nlohmann_json/default.nix
    M pkgs/development/libraries/nss/default.nix
    M pkgs/development/libraries/pcl/default.nix
    A pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
    M pkgs/development/libraries/protobuf/generic.nix
    M pkgs/development/libraries/ptlib/default.nix
    A pkgs/development/libraries/ptlib/sslv3.patch
    M pkgs/development/libraries/qt-5/5.5/default.nix
    R pkgs/development/libraries/qt-5/5.5/qttools.nix
    A pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
    A pkgs/development/libraries/qt-5/5.5/qttools/default.nix
    A pkgs/development/libraries/qt-5/5.5/qttools/series
    M pkgs/development/libraries/qt-5/5.6/default.nix
    R pkgs/development/libraries/qt-5/5.6/qttools.nix
    A pkgs/development/libraries/qt-5/5.6/qttools/cmake-paths.patch
    A pkgs/development/libraries/qt-5/5.6/qttools/default.nix
    A pkgs/development/libraries/qt-5/5.6/qttools/series
    M pkgs/development/libraries/qt-5/5.7/default.nix
    R pkgs/development/libraries/qt-5/5.7/qttools.nix
    A pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
    A pkgs/development/libraries/qt-5/5.7/qttools/default.nix
    A pkgs/development/libraries/qt-5/5.7/qttools/series
    M pkgs/development/libraries/vtk/default.nix
    M pkgs/development/libraries/wolfssl/default.nix
    M pkgs/development/python-modules/pyqt/4.x.nix
    M pkgs/development/python-modules/pyqt/5.x.nix
    M pkgs/development/tools/analysis/flow/default.nix
    M pkgs/development/tools/continuous-integration/gocd-agent/default.nix
    M pkgs/development/tools/continuous-integration/gocd-server/default.nix
    M pkgs/development/tools/deis/deps.json
    M pkgs/development/tools/go2nix/deps.json
    M pkgs/development/tools/golint/deps.json
    M pkgs/development/tools/gotools/deps.json
    M pkgs/development/tools/gox/deps.json
    A pkgs/development/tools/misc/gpshell/default.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/remarshal/deps.json
    M pkgs/development/tools/textql/deps.json
    M pkgs/development/tools/unity3d/default.nix
    M pkgs/development/tools/vagrant/default.nix
    M pkgs/development/web/minify/deps.json
    M pkgs/development/web/nodejs/nodejs.nix
    M pkgs/games/gambatte/default.nix
    A pkgs/games/gambatte/fix-scons-paths.patch
    M pkgs/games/openttd/default.nix
    A pkgs/games/pokerth/default.nix
    M pkgs/games/vessel/default.nix
    M pkgs/games/xboard/default.nix
    M pkgs/os-specific/linux/eudev/default.nix
    M pkgs/os-specific/linux/firejail/default.nix
    M pkgs/os-specific/linux/hwdata/default.nix
    M pkgs/os-specific/linux/iputils/default.nix
    M pkgs/os-specific/linux/jool/source.nix
    R pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-mptcp.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    R pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
    M pkgs/os-specific/linux/microcode/intel.nix
    M pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
    M pkgs/os-specific/linux/uclibc/default.nix
    R pkgs/os-specific/linux/uksmtools/default.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    M pkgs/servers/amqp/rabbitmq-server/default.nix
    M pkgs/servers/caddy/deps.json
    M pkgs/servers/dico/default.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/etcd/deps.json
    M pkgs/servers/gotty/deps.json
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/interlock/deps.json
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/servers/mesos-dns/deps.json
    M pkgs/servers/monitoring/prometheus/cli_deps.json
    M pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
    M pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
    M pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
    M pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
    M pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
    M pkgs/servers/monitoring/prometheus/prom2json_deps.json
    M pkgs/servers/monitoring/prometheus/pushgateway_deps.json
    M pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
    M pkgs/servers/nosql/cassandra/1.2.nix
    M pkgs/servers/nosql/cassandra/2.0.nix
    M pkgs/servers/nosql/cassandra/2.1.nix
    M pkgs/servers/nosql/cassandra/3.0.nix
    A pkgs/servers/nosql/cassandra/generic.nix
    M pkgs/servers/nsq/deps.json
    M pkgs/servers/oauth2_proxy/deps.json
    M pkgs/servers/serf/deps.json
    M pkgs/servers/skydns/deps.json
    M pkgs/servers/sql/mariadb/default.nix
    R pkgs/servers/sql/mariadb/my_context_asm.patch
    A pkgs/servers/uftp/default.nix
    M pkgs/shells/elvish/deps.json
    M pkgs/shells/oh/deps.json
    M pkgs/tools/X11/go-sct/deps.json
    M pkgs/tools/admin/lxd/deps.json
    M pkgs/tools/filesystems/ceph/default.nix
    M pkgs/tools/filesystems/glusterfs/default.nix
    M pkgs/tools/filesystems/go-mtpfs/deps.json
    M pkgs/tools/filesystems/gpart/default.nix
    M pkgs/tools/filesystems/grive/default.nix
    R pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
    A pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
    M pkgs/tools/filesystems/xfsprogs/default.nix
    M pkgs/tools/filesystems/xtreemfs/default.nix
    M pkgs/tools/graphics/gmic/default.nix
    A pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
    M pkgs/tools/misc/fasd/default.nix
    M pkgs/tools/misc/gawp/deps.json
    M pkgs/tools/misc/i3cat/deps.json
    M pkgs/tools/misc/ised/default.nix
    A pkgs/tools/misc/kronometer/default.nix
    M pkgs/tools/misc/mongodb-tools/deps.json
    M pkgs/tools/misc/upower-notify/deps.json
    M pkgs/tools/misc/xfstests/default.nix
    A pkgs/tools/networking/dibbler/default.nix
    M pkgs/tools/networking/email/default.nix
    M pkgs/tools/networking/getmail/default.nix
    M pkgs/tools/networking/ngrok/deps.json
    M pkgs/tools/networking/offlineimap/default.nix
    R pkgs/tools/networking/openssh/CVE-2015-8325.patch
    M pkgs/tools/networking/openssh/default.nix
    M pkgs/tools/networking/s3gof3r/deps.json
    M pkgs/tools/networking/tlsdate/default.nix
    M pkgs/tools/package-management/nox/default.nix
    M pkgs/tools/package-management/opkg/default.nix
    M pkgs/tools/package-management/packagekit/default.nix
    M pkgs/tools/security/hologram/deps.json
    M pkgs/tools/security/nmap/default.nix
    A pkgs/tools/security/shc/default.nix
    M pkgs/tools/security/thc-hydra/default.nix
    M pkgs/tools/system/confd/deps.json
    A pkgs/tools/system/datefudge/default.nix
    M pkgs/tools/system/freeipmi/default.nix
    M pkgs/tools/system/wsmancli/default.nix
    A pkgs/tools/text/par/default.nix
    M pkgs/tools/text/platinum-searcher/deps.json
    A pkgs/tools/text/reckon/Gemfile
    A pkgs/tools/text/reckon/Gemfile.lock
    A pkgs/tools/text/reckon/default.nix
    A pkgs/tools/text/reckon/gemset.nix
    M pkgs/tools/text/sift/deps.json
    M pkgs/tools/typesetting/hevea/default.nix
    M pkgs/tools/typesetting/tex/texlive-new/bin.nix
    M pkgs/tools/video/atomicparsley/default.nix
    M pkgs/tools/virtualization/nixos-container/nixos-container.pl
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/node-packages-generated.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

Hydra nixpkgs: ?compare=1287298


  Commit: 433670eb3f0c65e37cf244941a77e06c108f3817
      
https://github.com/NixOS/nixpkgs/commit/433670eb3f0c65e37cf244941a77e06c108f3817
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

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

  Log Message:
  -----------
  Merge #17495: mesa: 11.2.2 -> 12.0.1

It also contains some refactoring of the expression.


  Commit: 4e8775fd17217c3b4ae9aa91f02b24a5172ed8c7
      
https://github.com/NixOS/nixpkgs/commit/4e8775fd17217c3b4ae9aa91f02b24a5172ed8c7
  Author: Frederik Rietdijk <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

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

  Log Message:
  -----------
  pythonPackages.tflearn: remove maintainer, fixes eval

(cherry picked from commit 9fc37cc89cdbe183b3bf613035e45c793989575d)


  Commit: 344c672bb5b63790f4cf67c1e00e138ad641fb0e
      
https://github.com/NixOS/nixpkgs/commit/344c672bb5b63790f4cf67c1e00e138ad641fb0e
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

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

  Log Message:
  -----------
  libdrm: 2.4.68 -> 2.4.70


  Commit: 948b7f23bbc42a87e66a473c5c4543cfa5a03da7
      
https://github.com/NixOS/nixpkgs/commit/948b7f23bbc42a87e66a473c5c4543cfa5a03da7
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix

  Log Message:
  -----------
  darwin.{xnu, Libc}: 10.9 -> 10.11

I can't submit this in smaller units because the various components all
depend on one another during the stdenv bootstrap, so I think this is
the smallest sensible change I can make.

I also removed the symbol-hiding shenanigans in Libsystem. It might mess
up compatibility with 10.9 but I don't really want to support the added
complexity and I see little evidence of anyone else wanting to support
it. If someone cares, we might be able to revive compatibility, but for
now it'll stay like this.


  Commit: 8f4bbdce99938bc9387f9d9e9a6a8d8b2d1cc34f
      
https://github.com/NixOS/nixpkgs/commit/8f4bbdce99938bc9387f9d9e9a6a8d8b2d1cc34f
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix

  Log Message:
  -----------
  make-bootstrap-tools: fix on darwin

A couple of things broke after my stdenv change.


  Commit: 98b5e3a531a5f560314104ceecb730e59fc78a58
      
https://github.com/NixOS/nixpkgs/commit/98b5e3a531a5f560314104ceecb730e59fc78a58
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

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

  Log Message:
  -----------
  darwin.libpthread: fix messed-up header

We don't actually need the private headers and the private qos.h was
overwriting the public one, causing weird issues downstream (especially
with Swift's CoreFoundation)


  Commit: 1861744e7cea7db1014b35ba3b1fdce6190d7ac9
      
https://github.com/NixOS/nixpkgs/commit/1861744e7cea7db1014b35ba3b1fdce6190d7ac9
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    A pkgs/os-specific/darwin/swift-corefoundation/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  swift-corefoundation: init

This currently only produces a static library, but is a start :) soon we
might be able to incorporate it into our stdenv, but we need to get the
build system to produce a proper .framework first.


  Commit: 6cf13bfe6697734c282b4e36cd882cc8c3d3a429
      
https://github.com/NixOS/nixpkgs/commit/6cf13bfe6697734c282b4e36cd882cc8c3d3a429
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/os-specific/darwin/swift-corefoundation/default.nix

  Log Message:
  -----------
  swift-corefoundation: remove spurious buildInput

libpthread is part of libSystem, so there's no need to depend on it
explicitly


  Commit: 4705a9a6c1809840333a612aabe1fc8feb5c089e
      
https://github.com/NixOS/nixpkgs/commit/4705a9a6c1809840333a612aabe1fc8feb5c089e
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/os-specific/darwin/swift-corefoundation/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  swift-corefoundation: actually remove spurious dependency


  Commit: ea34fe82bced57d11127d4c23e5a5ade9fa56334
      
https://github.com/NixOS/nixpkgs/commit/ea34fe82bced57d11127d4c23e5a5ade9fa56334
  Author: Dan Peebles <[email protected]>
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
    M pkgs/os-specific/darwin/swift-corefoundation/default.nix

  Log Message:
  -----------
  swift-corefoundation: some cleanup

I upstreamed some patches so I'm using those now


  Commit: 5b296a147066bfaa652b37aaa88751e1955df9c9
      
https://github.com/NixOS/nixpkgs/commit/5b296a147066bfaa652b37aaa88751e1955df9c9
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-15 (Mon, 15 Aug 2016)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/services/backup/crashplan.nix
    M nixos/modules/services/misc/autofs.nix
    M nixos/modules/services/networking/ejabberd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M pkgs/applications/audio/morituri/default.nix
    M pkgs/applications/audio/picard/default.nix
    M pkgs/applications/editors/nano/default.nix
    M pkgs/applications/graphics/screencloud/default.nix
    M pkgs/applications/graphics/yed/default.nix
    M pkgs/applications/misc/dmenu/default.nix
    M pkgs/applications/misc/gramps/default.nix
    M pkgs/applications/misc/mysql-workbench/default.nix
    R pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch
    M pkgs/applications/misc/octoprint/default.nix
    A pkgs/applications/misc/octoprint/m33-fio-one-library.patch
    M pkgs/applications/misc/octoprint/plugins.nix
    M pkgs/applications/misc/rofi/default.nix
    M pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/browsers/midori/default.nix
    M pkgs/applications/networking/instant-messengers/blink/default.nix
    M pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
    M 
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
    M pkgs/applications/networking/mailreaders/claws-mail/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/impressive/default.nix
    M pkgs/applications/search/catfish/default.nix
    M pkgs/applications/version-management/meld/default.nix
    M pkgs/applications/version-management/reposurgeon/default.nix
    M pkgs/applications/version-management/src/default.nix
    M pkgs/applications/video/miro/default.nix
    M pkgs/applications/video/qarte/default.nix
    M pkgs/applications/virtualization/tini/default.nix
    M pkgs/build-support/kernel/modules-closure.sh
    M pkgs/data/fonts/emojione/default.nix
    M pkgs/data/misc/wireless-regdb/default.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
    M pkgs/desktops/gnome-3/3.20/core/vte/default.nix
    M pkgs/desktops/kde-4.14/applications/kate.nix
    M pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
    M pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
    M pkgs/development/interpreters/renpy/default.nix
    M pkgs/development/libraries/cppzmq/default.nix
    M pkgs/development/libraries/folly/default.nix
    M pkgs/development/libraries/icu/default.nix
    M pkgs/development/libraries/jemalloc/default.nix
    M pkgs/development/libraries/libbsd/default.nix
    A pkgs/development/libraries/libdynd/default.nix
    M pkgs/development/libraries/libvdpau-va-gl/default.nix
    M pkgs/development/libraries/science/math/ipopt/default.nix
    M pkgs/development/libraries/xgboost/default.nix
    M pkgs/development/python-modules/pyqt/4.x.nix
    A pkgs/development/tools/java/visualvm/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/pypi2nix/deps.nix
    M pkgs/games/crawl/default.nix
    M pkgs/games/dwarf-fortress/default.nix
    M pkgs/games/dwarf-fortress/dfhack/default.nix
    M pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
    M pkgs/games/dwarf-fortress/game.nix
    M pkgs/games/dwarf-fortress/themes/cla.nix
    M pkgs/games/dwarf-fortress/themes/phoebus.nix
    M pkgs/games/dwarf-fortress/unfuck.nix
    M pkgs/games/factorio/fetch.nix
    M pkgs/games/factorio/fetch.sh
    M pkgs/games/mnemosyne/default.nix
    M pkgs/games/quake3/ioquake/default.nix
    M pkgs/games/steam/runtime-generated.nix
    M pkgs/games/steam/runtime.nix
    M pkgs/games/the-powder-toy/default.nix
    M pkgs/games/wesnoth/dev.nix
    M pkgs/misc/drivers/hplip/3.15.9.nix
    M pkgs/misc/drivers/hplip/default.nix
    A pkgs/misc/drivers/m33-linux/default.nix
    R pkgs/misc/drivers/m3d-linux/default.nix
    M pkgs/misc/emulators/wine/sources.nix
    M pkgs/misc/frescobaldi/default.nix
    M pkgs/misc/long-shebang/default.nix
    M pkgs/os-specific/linux/android-udev-rules/default.nix
    M pkgs/os-specific/linux/autofs/default.nix
    M pkgs/os-specific/linux/btfs/default.nix
    R pkgs/os-specific/linux/kernel/linux-4.5.nix
    M pkgs/os-specific/linux/kernel/linux-4.6.nix
    M pkgs/os-specific/linux/pam_pgsql/default.nix
    M pkgs/os-specific/linux/spl/default.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    M pkgs/servers/apache-kafka/default.nix
    M pkgs/servers/caddy/default.nix
    M pkgs/servers/caddy/deps.json
    M pkgs/servers/emby/default.nix
    M pkgs/servers/mail/dspam/default.nix
    M pkgs/servers/rpcbind/default.nix
    M pkgs/servers/sql/mariadb/default.nix
    M pkgs/servers/uwsgi/default.nix
    A pkgs/servers/x11/xorg/xcb-util-xrm.nix
    M pkgs/servers/xmpp/ejabberd/default.nix
    M pkgs/tools/X11/primus/lib.nix
    M pkgs/tools/X11/virtualgl/lib.nix
    M pkgs/tools/X11/xpra/default.nix
    M pkgs/tools/backup/duplicity/default.nix
    M pkgs/tools/backup/obnam/default.nix
    M pkgs/tools/bluetooth/blueman/default.nix
    M pkgs/tools/filesystems/bcache-tools/default.nix
    M pkgs/tools/graphics/imgurbash2/default.nix
    M pkgs/tools/misc/debian-devscripts/default.nix
    M pkgs/tools/misc/grub4dos/default.nix
    M pkgs/tools/misc/svtplay-dl/default.nix
    M pkgs/tools/networking/logmein-hamachi/default.nix
    M pkgs/tools/networking/network-manager/default.nix
    M pkgs/tools/networking/openvpn/update-resolv-conf.nix
    M pkgs/tools/networking/wicd/default.nix
    M pkgs/tools/security/fail2ban/default.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/knockknock/default.nix
    M pkgs/tools/security/nmap/default.nix
    M pkgs/tools/security/volatility/default.nix
    M pkgs/tools/typesetting/tex/texlive-new/pkgs.nix
    M pkgs/tools/video/mjpegtools/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 branch 'master' into staging


  Commit: 131fca0a85c6a2f7912061f8f3e57f582fb94f38
      
https://github.com/NixOS/nixpkgs/commit/131fca0a85c6a2f7912061f8f3e57f582fb94f38
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M pkgs/os-specific/linux/kmod/default.nix
    M pkgs/os-specific/linux/kmod/module-dir.patch

  Log Message:
  -----------
  kmod: add patch to allow searching for modules in several directories


  Commit: 1afd2506768760a6a55d23c47dc064f732f27807
      
https://github.com/NixOS/nixpkgs/commit/1afd2506768760a6a55d23c47dc064f732f27807
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M nixos/modules/services/network-filesystems/openafs-client/default.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M pkgs/development/tools/misc/lttng-tools/default.nix
    M pkgs/os-specific/linux/kernel/manual-config.nix
    M pkgs/os-specific/linux/kmod/aggregator.nix
    M pkgs/tools/networking/network-manager/default.nix
    M pkgs/tools/networking/network-manager/openconnect.nix
    M pkgs/tools/networking/network-manager/openvpn.nix
    M pkgs/tools/networking/network-manager/vpnc.nix

  Log Message:
  -----------
  treewide: replace several /sbin paths by /bin


  Commit: b2ebecd9e50471ec967ab9cdb2aba793d75cb747
      
https://github.com/NixOS/nixpkgs/commit/b2ebecd9e50471ec967ab9cdb2aba793d75cb747
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M nixos/modules/config/zram.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/networking/fan.nix
    M nixos/modules/services/networking/strongswan.nix
    M nixos/modules/system/boot/modprobe.nix
    M nixos/modules/tasks/cpu-freq.nix
    M nixos/modules/virtualisation/docker.nix

  Log Message:
  -----------
  modprobe service: drop kmod wrapper


  Commit: 1f639587729daf6c34535addbc35fd6e5c816ffc
      
https://github.com/NixOS/nixpkgs/commit/1f639587729daf6c34535addbc35fd6e5c816ffc
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M nixos/modules/hardware/video/bumblebee.nix
    M nixos/modules/hardware/video/webcam/facetimehd.nix
    M nixos/modules/services/hardware/tlp.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/system/boot/kernel.nix
    M nixos/modules/system/boot/modprobe.nix
    M nixos/modules/system/boot/stage-2-init.sh
    M nixos/modules/virtualisation/docker.nix

  Log Message:
  -----------
  nixos treewide: don't set MODULE_DIR


  Commit: cd05a8ed000a48a617f3fd061c2837774f4e8c66
      
https://github.com/NixOS/nixpkgs/commit/cd05a8ed000a48a617f3fd061c2837774f4e8c66
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M pkgs/tools/networking/network-manager/default.nix

  Log Message:
  -----------
  networkmanager: point to kmod's modprobe


  Commit: b067b5301104c7d09d86d69febaa423a49ce14c0
      
https://github.com/NixOS/nixpkgs/commit/b067b5301104c7d09d86d69febaa423a49ce14c0
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-08-16 (Tue, 16 Aug 2016)

  Changed paths:
    M pkgs/tools/networking/network-manager/0.9.8/default.nix
    M pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch

  Log Message:
  -----------
  networkmanager098: fix binary paths


  Commit: 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1
      
https://github.com/NixOS/nixpkgs/commit/57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1
  Author: Shea Levy <[email protected]>
  Date:   2016-08-15 (Mon, 15 Aug 2016)

  Changed paths:
    M nixos/modules/config/zram.nix
    M nixos/modules/hardware/video/bumblebee.nix
    M nixos/modules/hardware/video/webcam/facetimehd.nix
    M nixos/modules/services/hardware/tlp.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/network-filesystems/openafs-client/default.nix
    M nixos/modules/services/networking/fan.nix
    M nixos/modules/services/networking/strongswan.nix
    M nixos/modules/system/boot/kernel.nix
    M nixos/modules/system/boot/modprobe.nix
    M nixos/modules/system/boot/stage-2-init.sh
    M nixos/modules/tasks/cpu-freq.nix
    M nixos/modules/virtualisation/docker.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M pkgs/development/libraries/fftw/default.nix
    M pkgs/development/libraries/libdrm/default.nix
    M pkgs/development/libraries/mesa/default.nix
    M pkgs/development/python-modules/generic/run_setup.py
    M pkgs/development/tools/misc/lttng-tools/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
    A pkgs/os-specific/darwin/swift-corefoundation/default.nix
    M pkgs/os-specific/linux/kernel/manual-config.nix
    M pkgs/os-specific/linux/kmod/aggregator.nix
    M pkgs/os-specific/linux/kmod/default.nix
    M pkgs/os-specific/linux/kmod/module-dir.patch
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    M pkgs/tools/networking/network-manager/0.9.8/default.nix
    M pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
    M pkgs/tools/networking/network-manager/default.nix
    M pkgs/tools/networking/network-manager/openconnect.nix
    M pkgs/tools/networking/network-manager/openvpn.nix
    M pkgs/tools/networking/network-manager/vpnc.nix
    M pkgs/tools/text/diffutils/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs


Compare: https://github.com/NixOS/nixpkgs/compare/760b2b9048ea...57b2d1e9b0dc
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to