Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bb8d3ad2ded248778e8a9b0965b597828d454a12
      
https://github.com/NixOS/nixpkgs/commit/bb8d3ad2ded248778e8a9b0965b597828d454a12
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M .gitignore
    M lib/maintainers.nix
    M maintainers/scripts/update-channel-branches.sh
    M nixos/lib/build-vms.nix
    M nixos/modules/hardware/video/nvidia.nix
    M nixos/modules/installer/tools/nixos-version.sh
    M nixos/modules/installer/tools/tools.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/programs/environment.nix
    M nixos/modules/security/pam.nix
    M nixos/modules/services/databases/redis.nix
    A nixos/modules/services/mail/exim.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/networking/dhcpcd.nix
    M nixos/modules/services/networking/haproxy.nix
    M nixos/modules/services/networking/vsftpd.nix
    M nixos/modules/services/scheduling/chronos.nix
    A nixos/modules/services/scheduling/marathon.nix
    M nixos/modules/services/security/fail2ban.nix
    M nixos/modules/services/x11/desktop-managers/kde5.nix
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/loader/grub/install-grub.pl
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-2-init.sh
    M nixos/modules/virtualisation/amazon-image.nix
    M nixos/modules/virtualisation/libvirtd.nix
    M nixos/modules/virtualisation/nova.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    M nixos/tests/chromium.nix
    A pkgs/applications/altcoins/bitcoin.nix
    A pkgs/applications/altcoins/darkcoin.nix
    A pkgs/applications/altcoins/default.nix
    A pkgs/applications/altcoins/dogecoin.nix
    A pkgs/applications/altcoins/litecoin.nix
    A pkgs/applications/altcoins/memorycoin.nix
    A pkgs/applications/altcoins/namecoin.nix
    A pkgs/applications/altcoins/namecoind.nix
    M pkgs/applications/audio/distrho/default.nix
    M pkgs/applications/audio/lmms/default.nix
    M pkgs/applications/audio/swh-lv2/default.nix
    M pkgs/applications/editors/emacs-24/macport-24.4.nix
    M pkgs/applications/graphics/inkscape/default.nix
    M pkgs/applications/kde-apps-14.12/default.nix
    M pkgs/applications/kde-apps-14.12/dependencies.nix
    M pkgs/applications/kde-apps-14.12/manifest.nix
    R pkgs/applications/misc/bitcoin/altcoins.nix
    R pkgs/applications/misc/bitcoin/default.nix
    R pkgs/applications/misc/bitcoin/dogecoin.nix
    R pkgs/applications/misc/bitcoin/litecoin.nix
    R pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
    M pkgs/applications/misc/calibre/default.nix
    R pkgs/applications/misc/namecoin/default.nix
    R pkgs/applications/misc/namecoin/qt.nix
    M pkgs/applications/misc/twmn/default.nix
    M pkgs/applications/networking/browsers/chromium/browser.nix
    M pkgs/applications/networking/browsers/chromium/common.nix
    M pkgs/applications/networking/browsers/chromium/default.nix
    M pkgs/applications/networking/browsers/chromium/source/default.nix
    A 
pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
    M pkgs/applications/networking/browsers/chromium/source/sources.nix
    M pkgs/applications/networking/cluster/chronos/default.nix
    A pkgs/applications/networking/cluster/marathon/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/silc-client/default.nix
    M pkgs/applications/networking/irc/quassel/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/homebank/default.nix
    M pkgs/applications/office/zotero/default.nix
    A pkgs/applications/science/programming/plm/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M pkgs/applications/version-management/git-and-tools/hub/default.nix
    M pkgs/applications/version-management/gitlab/default.nix
    M pkgs/applications/video/kino/default.nix
    A pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch
    A pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch
    A pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch
    A pkgs/applications/video/kino/kino-1.3.4-v4l1.patch
    M pkgs/applications/video/vlc/default.nix
    M pkgs/applications/virtualization/docker/default.nix
    M pkgs/applications/virtualization/xen/default.nix
    M pkgs/applications/window-managers/weston/default.nix
    M pkgs/build-support/autonix/default.nix
    M pkgs/build-support/autonix/manifest.sh
    M pkgs/build-support/fetchurl/mirrors.nix
    A pkgs/build-support/melpa/default.nix
    A pkgs/build-support/melpa/melpa2nix.el
    A pkgs/build-support/melpa/setup-hook.sh
    M pkgs/build-support/release/default.nix
    M pkgs/build-support/release/nix-build.nix
    A pkgs/data/misc/media-player-info/default.nix
    R pkgs/desktops/plasma-5.1/default.nix
    R pkgs/desktops/plasma-5.1/dependencies.nix
    R pkgs/desktops/plasma-5.1/dependencies.sh
    R pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch
    R pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch
    R pkgs/desktops/plasma-5.1/manifest.nix
    R pkgs/desktops/plasma-5.1/manifest.sh
    R pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch
    R pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch
    R pkgs/desktops/plasma-5.1/renames.nix
    R pkgs/desktops/plasma-5.1/setup-hook.sh
    R pkgs/desktops/plasma-5.1/startkde/default.nix
    R pkgs/desktops/plasma-5.1/startkde/kdeglobals
    R pkgs/desktops/plasma-5.1/startkde/startkde.in
    R pkgs/desktops/plasma-5.1/startkde/startupconfigkeys
    M pkgs/desktops/plasma-5.2/default.nix
    M pkgs/desktops/plasma-5.2/dependencies.nix
    M pkgs/desktops/plasma-5.2/manifest.nix
    M pkgs/development/compilers/julia/0.3.nix
    M pkgs/development/compilers/llvm/3.5/dragonegg.nix
    M pkgs/development/compilers/llvm/3.5/libc++/default.nix
    M pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
    M pkgs/development/compilers/llvm/3.5/llvm.nix
    A pkgs/development/compilers/teyjus/default.nix
    A pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    A pkgs/development/haskell-modules/wxc-no-ldconfig.patch
    M pkgs/development/interpreters/elixir/default.nix
    M pkgs/development/interpreters/ruby/bundler-head.nix
    M pkgs/development/interpreters/ruby/patches.nix
    M pkgs/development/libraries/ctl/default.nix
    R pkgs/development/libraries/ctl/gcc47.patch
    R pkgs/development/libraries/ctl/patch.patch
    A pkgs/development/libraries/ctl/source.nix
    M pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
    M pkgs/development/libraries/haskell/happstack/happstack-lite.nix
    M pkgs/development/libraries/haskell/pool-conduit/default.nix
    M pkgs/development/libraries/haskell/rest-core/default.nix
    M pkgs/development/libraries/haskell/rest-happstack/default.nix
    M pkgs/development/libraries/haskell/rest-snap/default.nix
    M pkgs/development/libraries/haskell/rest-types/default.nix
    M pkgs/development/libraries/haskell/rest-wai/default.nix
    M pkgs/development/libraries/ilmbase/default.nix
    R pkgs/development/libraries/kde-frameworks-5.5/default.nix
    R pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix
    R pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh
    R 
pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch
    R pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
    R pkgs/development/libraries/kde-frameworks-5.5/manifest.nix
    R pkgs/development/libraries/kde-frameworks-5.5/manifest.sh
    R 
pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch
    R pkgs/development/libraries/kde-frameworks-5.5/renames.nix
    R pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh
    R pkgs/development/libraries/kde-frameworks-5.6/default.nix
    R pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix
    R pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh
    R 
pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch
    R pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch
    R 
pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
    R pkgs/development/libraries/kde-frameworks-5.6/manifest.nix
    R pkgs/development/libraries/kde-frameworks-5.6/manifest.sh
    R 
pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch
    R pkgs/development/libraries/kde-frameworks-5.6/renames.nix
    R pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh
    A pkgs/development/libraries/kde-frameworks-5.7/default.nix
    A pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
    A pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
    A 
pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
    A pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
    A 
pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
    A pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
    A pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
    A 
pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
    A pkgs/development/libraries/kde-frameworks-5.7/renames.nix
    A pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
    M pkgs/development/libraries/kerberos/krb5.nix
    M pkgs/development/libraries/libdbusmenu-qt/qt5.nix
    M pkgs/development/libraries/libressl/default.nix
    M pkgs/development/libraries/openal-soft/default.nix
    M pkgs/development/libraries/openexr/default.nix
    A pkgs/development/libraries/openexr/source.nix
    R pkgs/development/libraries/openexr/stringh.patch
    M pkgs/development/libraries/pcre/default.nix
    M pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
    M pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
    M pkgs/development/libraries/phonon/qt5/default.nix
    M pkgs/development/libraries/polkit-qt-1/default.nix
    M pkgs/development/libraries/poppler/default.nix
    M pkgs/development/libraries/postgis/default.nix
    M pkgs/development/libraries/protobuf/generic.nix
    R pkgs/development/libraries/qt-5/5.3-submodules/0001-dlopen-gtkstyle.patch
    R 
pkgs/development/libraries/qt-5/5.3-submodules/0002-dlopen-webkit-nsplugin.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0003-glib-2.32.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0004-dlopen-resolv.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0005-dlopen-gl.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0006-tzdir.patch
    R 
pkgs/development/libraries/qt-5/5.3-submodules/0007-dlopen-webkit-gtk.patch
    R 
pkgs/development/libraries/qt-5/5.3-submodules/0008-dlopen-webkit-udev.patch
    R 
pkgs/development/libraries/qt-5/5.3-submodules/0009-dlopen-serialport-udev.patch
    R 
pkgs/development/libraries/qt-5/5.3-submodules/0010-dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0011-dlopen-openssl.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/0012-dlopen-dbus.patch
    R pkgs/development/libraries/qt-5/5.3-submodules/default.nix
    R pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix
    R pkgs/development/libraries/qt-5/5.3-submodules/manifest.sh
    R pkgs/development/libraries/qt-5/5.3-submodules/qt-submodule.nix
    R pkgs/development/libraries/qt-5/5.3-submodules/qtbase.nix
    A pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch
    A pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch
    A pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch
    A pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch
    A pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch
    A pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch
    A pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch
    A pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch
    A pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch
    A pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch
    A pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch
    A pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch
    A pkgs/development/libraries/qt-5/5.4/default.nix
    A pkgs/development/libraries/qt-5/5.4/manifest.nix
    A pkgs/development/libraries/qt-5/5.4/manifest.sh
    A pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
    A pkgs/development/libraries/qt-5/5.4/qtbase.nix
    A pkgs/development/libraries/qt-5/5.4/setup-hook.sh
    M pkgs/development/libraries/quazip/default.nix
    M pkgs/development/libraries/ti-rpc/default.nix
    M pkgs/development/libraries/v8/default.nix
    M pkgs/development/libraries/wayland/default.nix
    M pkgs/development/libraries/xvidcore/default.nix
    R pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch
    M pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
    A pkgs/development/ocaml-modules/erm_xml/default.nix
    A pkgs/development/ocaml-modules/ocplib-endian/default.nix
    M pkgs/development/r-modules/cran-packages.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/r-modules/generic-builder.nix
    A pkgs/development/r-modules/patches/RMySQL.patch
    A pkgs/development/r-modules/patches/iFes.patch
    R pkgs/development/r-modules/patches/openssl.patch
    M pkgs/development/tools/misc/usb-modeswitch/default.nix
    A pkgs/development/tools/parsing/jshon/default.nix
    A pkgs/development/web/iojs/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    M pkgs/development/web/nodejs/default.nix
    M pkgs/development/web/wml/default.nix
    M pkgs/misc/drivers/hplip/default.nix
    R pkgs/misc/emulators/wine/build_winetricks.sh
    M pkgs/misc/emulators/wine/winetricks.nix
    R pkgs/misc/emulators/wine/winetricks.patch
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/nvidia-x11/builder.sh
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/uclibc/default.nix
    M pkgs/servers/consul/deps.nix
    A pkgs/servers/consul/template.nix
    A pkgs/servers/dns/mesos-dns/default.nix
    A pkgs/servers/mail/exim/default.nix
    A pkgs/servers/mqtt/mosquitto/default.nix
    M pkgs/servers/rpcbind/default.nix
    M pkgs/servers/search/elasticsearch/default.nix
    M pkgs/servers/xmpp/ejabberd/default.nix
    M pkgs/servers/xmpp/prosody/default.nix
    M pkgs/shells/fish/default.nix
    M pkgs/stdenv/darwin/default.nix
    A pkgs/stdenv/darwin/make-bootstrap-tools.nix
    A pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
    M pkgs/tools/X11/hsetroot/default.nix
    A pkgs/tools/X11/screen-message/default.nix
    M pkgs/tools/graphics/graphviz/default.nix
    A pkgs/tools/misc/cutecom/default.nix
    M pkgs/tools/misc/direnv/default.nix
    M pkgs/tools/misc/dvtm/default.nix
    A pkgs/tools/misc/makebootfat/default.nix
    M pkgs/tools/misc/xclip/default.nix
    M pkgs/tools/networking/airfield/default.nix
    M pkgs/tools/networking/haproxy/default.nix
    M pkgs/tools/networking/openssh/default.nix
    M pkgs/tools/networking/sproxy/default.nix
    M pkgs/tools/networking/wget/default.nix
    M pkgs/tools/package-management/disnix/DisnixWebService/default.nix
    M pkgs/tools/package-management/disnix/default.nix
    M pkgs/tools/package-management/disnix/disnixos/default.nix
    M pkgs/tools/package-management/disnix/dysnomia/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/package-management/nix/unstable.nix
    A pkgs/tools/package-management/nix/xfs.patch
    M pkgs/tools/system/stress-ng/default.nix
    A pkgs/tools/text/qprint/default.nix
    M pkgs/tools/video/rtmpdump/default.nix
    M pkgs/top-level/all-packages.nix
    A pkgs/top-level/emacs-melpa-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/lua-packages.nix
    M pkgs/top-level/node-packages-generated.nix
    M pkgs/top-level/node-packages.json
    M pkgs/top-level/python-packages.nix

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


  Commit: a112709b02b93f9690a4a5b422119f1a1dd6d8a8
      
https://github.com/NixOS/nixpkgs/commit/a112709b02b93f9690a4a5b422119f1a1dd6d8a8
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
    M pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
    M pkgs/development/tools/misc/fswatch/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  automake: use 1.14.* as the default

I see 1.15 has been released recently,
but that's probably too new to be the default.


  Commit: e8288a7e2e52ee3726388c3a536922f57a3e5624
      
https://github.com/NixOS/nixpkgs/commit/e8288a7e2e52ee3726388c3a536922f57a3e5624
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  grep: update

The 2.21 update fixes NixOS/nix#464.


  Commit: ff1a5a25282c11ea6debfb0ac03ce81632b43c0b
      
https://github.com/NixOS/nixpkgs/commit/ff1a5a25282c11ea6debfb0ac03ce81632b43c0b
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M pkgs/development/tools/misc/libtool/libtool2.nix

  Log Message:
  -----------
  libtool: update

I see nothing dangerous in NEWS.
Also refactored the expression.


  Commit: 2fd5f06acee84d44cc6966e794e621eeae8c0b46
      
https://github.com/NixOS/nixpkgs/commit/2fd5f06acee84d44cc6966e794e621eeae8c0b46
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  recode: fix build, needing texinfo now

Also make the build inputs native (no references are retained).


  Commit: a00f77155173f28edd05b8531f0afa3a1e5d9a84
      
https://github.com/NixOS/nixpkgs/commit/a00f77155173f28edd05b8531f0afa3a1e5d9a84
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    A pkgs/tools/text/gnugrep/cve-2015-1345.patch
    M pkgs/tools/text/gnugrep/default.nix

  Log Message:
  -----------
  gnugrep: fix CVE-2015-1345 by upstream patch


  Commit: 3d9e9f65715e30edc63c5395193c4bd18cc4e4d0
      
https://github.com/NixOS/nixpkgs/commit/3d9e9f65715e30edc63c5395193c4bd18cc4e4d0
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  glibc: fix -lgcc_s linking

https://github.com/NixOS/nixpkgs/commit/65221567c12eb20d12#commitcomment-9515597


  Commit: fe76b8e60803b8a82f1c760311b304be9139d4f3
      
https://github.com/NixOS/nixpkgs/commit/fe76b8e60803b8a82f1c760311b304be9139d4f3
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  libdrm: update


  Commit: bb587dd5cc86b08433b3901ef38009b73a91f360
      
https://github.com/NixOS/nixpkgs/commit/bb587dd5cc86b08433b3901ef38009b73a91f360
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  dbus: security bump to fix CVE-2015-0245


  Commit: bb2be45e086f53cede9164855b4d9c0ebd5de35c
      
https://github.com/NixOS/nixpkgs/commit/bb2be45e086f53cede9164855b4d9c0ebd5de35c
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  xorg: update various modules


  Commit: 99a740aa2178bb5ca4a96d4c2c70ee20b139d3ee
      
https://github.com/NixOS/nixpkgs/commit/99a740aa2178bb5ca4a96d4c2c70ee20b139d3ee
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  xf86-video-vmware: update


  Commit: c0def4a169755c17db2203bae3c8d46f08cb6d99
      
https://github.com/NixOS/nixpkgs/commit/c0def4a169755c17db2203bae3c8d46f08cb6d99
  Author: Eduard Bachmakov <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/llvm/3.5/llvm.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  llvm-3.5: enable RTTI to support mesa

Extracted from #6367.


  Commit: 0e9a0c9913a810af38cc644d4847b4b6bf3e5198
      
https://github.com/NixOS/nixpkgs/commit/0e9a0c9913a810af38cc644d4847b4b6bf3e5198
  Author: Eduard Bachmakov <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/mesa/default.nix
    R pkgs/development/libraries/mesa/rtti.patch
    R pkgs/development/libraries/mesa/static-gallium.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  mesa: big update, and related improvements (close #6367)

* Remove upstreamed patch
* EGL driver dirs are no longer a thing, see mesa commit
  407450eb84f5a1b466a2eff19b85cdee7ac15dfb
  Patching runtime search dir in sources instead (by vcunat).
* static-gallium patch dropped as it causes visibility issues with
  nouveau
* rtti patch dropped as it the relevant configuration has been removed
  upstream; properly fixed by an LLVM flag now
* Checks disabled. This is known and solved upstream. Checks will be
  re-enabled in a future commit when updating to a version containing
  the fixes
* Use llvm-3.5 now (by vcunat).


  Commit: b8bf8e502c21f24d7a52fe83171d65d8272f4fd5
      
https://github.com/NixOS/nixpkgs/commit/b8bf8e502c21f24d7a52fe83171d65d8272f4fd5
  Author: Peter Simons <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/7.8.4.nix
    M pkgs/development/compilers/ghc/head.nix

  Log Message:
  -----------
  ghc: re-instate code that configures statically linked builds by default

The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.

Fixes https://github.com/NixOS/nixpkgs/issues/6399.


  Commit: d3dd218bc2d6bfea1c9365f49b0e78802a249b8a
      
https://github.com/NixOS/nixpkgs/commit/d3dd218bc2d6bfea1c9365f49b0e78802a249b8a
  Author: Peter Simons <[email protected]>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  haskell-generic-builder: consistently use $TMPDIR to refer to the designated 
place for temporary files

Resolves https://github.com/NixOS/nixpkgs/issues/6525.


  Commit: 7b531e28454412a68b68f821b3dd394e5ec4f141
      
https://github.com/NixOS/nixpkgs/commit/7b531e28454412a68b68f821b3dd394e5ec4f141
  Author: mancha <[email protected]>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pkgs/tools/archivers/unzip/CVE-2014-9636.diff

  Log Message:
  -----------
  unzip: fix CVE-2014-9636 patch

Close #6544, fixes #6543.
vcunat: no security impact; just fixes false rejections of some rarer
inputs - a problem introduced by the CVE patch.


  Commit: bf521d7b55fb4913c895946f9d0af2e89fc36033
      
https://github.com/NixOS/nixpkgs/commit/bf521d7b55fb4913c895946f9d0af2e89fc36033
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pkgs/applications/graphics/shotwell/default.nix
    M pkgs/data/icons/hicolor-icon-theme/default.nix
    A pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
    M pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
    M pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
    M pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
    M pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
    M pkgs/desktops/gnome-3/3.12/core/eog/default.nix
    M pkgs/desktops/gnome-3/3.12/core/evince/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
    R pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh
    M pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
    M pkgs/desktops/gnome-3/3.12/core/totem/default.nix
    M pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
    M pkgs/desktops/xfce/applications/ristretto.nix
    M pkgs/development/tools/misc/d-feet/default.nix

  Log Message:
  -----------
  Add setup-hook to hicolor_icon_theme


  Commit: 5ea3b3e36ff69925ffd07e5c885d45c606a5f17e
      
https://github.com/NixOS/nixpkgs/commit/5ea3b3e36ff69925ffd07e5c885d45c606a5f17e
  Author: Peter Simons <[email protected]>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  haskell-generic-builder.nix: don't add lib64 directories to the search path

Packages that provide 32 and 64-bit libraries in the same store path are rare
and usually require manual overrides anyway. It seems pointless to try and
guess proper settings for them. The effect is that we'll end up with bogus
settings that take more effort to correct that it takes to configure proper
settings in the first place. Point in case: haskell-cuda and it's configuration
for "cudatools".

Fixes https://github.com/NixOS/nixpkgs/issues/6564.


  Commit: d732039ecc95aaaf4126a33e76b58e592ebb67d1
      
https://github.com/NixOS/nixpkgs/commit/d732039ecc95aaaf4126a33e76b58e592ebb67d1
  Author: Peter Simons <[email protected]>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  haskell-generic-builder: set LOCALE_ARCHIVE only on Linux


  Commit: 3021f2f529c914fe2ac8212e4388b16f57663e1d
      
https://github.com/NixOS/nixpkgs/commit/3021f2f529c914fe2ac8212e4388b16f57663e1d
  Author: Peter Simons <[email protected]>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  haskell-generic-builder: update and jailbreak cabal files before patchPhase 
is run

The updated and jailbroken Cabal file must be in place before the
'patchPhase' hook is run, otherwise we cannot use that hook to patch the
Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922.

As an added bonus, this change makes the "jailbreakPhase" obsolete.


  Commit: d6c295e4694902131f457c34dfa5df48bf7585eb
      
https://github.com/NixOS/nixpkgs/commit/d6c295e4694902131f457c34dfa5df48bf7585eb
  Author: Peter Simons <[email protected]>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M lib/maintainers.nix
    A lib/tests/modules.sh
    A lib/tests/modules/declare-enable.nix
    A lib/tests/modules/declare-loaOfSub-any-enable.nix
    A lib/tests/modules/default.nix
    A lib/tests/modules/define-enable-force.nix
    A lib/tests/modules/define-enable.nix
    A lib/tests/modules/define-force-enable.nix
    A lib/tests/modules/define-force-loaOfSub-foo-enable.nix
    A lib/tests/modules/define-loaOfSub-bar-enable.nix
    A lib/tests/modules/define-loaOfSub-bar.nix
    A lib/tests/modules/define-loaOfSub-foo-enable-force.nix
    A lib/tests/modules/define-loaOfSub-foo-enable.nix
    A lib/tests/modules/define-loaOfSub-foo-force-enable.nix
    A lib/tests/modules/define-loaOfSub-foo.nix
    A lib/tests/modules/define-loaOfSub-force-foo-enable.nix
    A lib/tests/release.nix
    M nixos/doc/manual/configuration/network-manager.xml
    M nixos/modules/config/nsswitch.nix
    M nixos/modules/config/update-users-groups.pl
    M nixos/modules/programs/ssh.nix
    M nixos/modules/security/pam.nix
    M nixos/modules/services/databases/mongodb.nix
    M nixos/modules/services/networking/dnsmasq.nix
    M nixos/modules/services/networking/ssh/sshd.nix
    M nixos/modules/services/x11/display-managers/default.nix
    M nixos/modules/tasks/network-interfaces-systemd.nix
    A pkgs/applications/editors/edbrowse/default.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/misc/cherrytree/default.nix
    M pkgs/applications/misc/finalterm/default.nix
    A pkgs/applications/misc/xkblayout-state/default.nix
    M pkgs/applications/networking/bittorrentsync/default.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/dropbox/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/remote/freerdp/unstable.nix
    M pkgs/applications/video/mpv/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/build-support/fetchgit/nix-prefetch-git
    M pkgs/build-support/fetchpatch/default.nix
    M pkgs/build-support/fetchurl/default.nix
    M pkgs/data/misc/tzdata/default.nix
    M pkgs/development/compilers/emscripten-fastcomp/default.nix
    M pkgs/development/compilers/emscripten/default.nix
    M pkgs/development/compilers/llvm/3.5/dragonegg.nix
    M pkgs/development/compilers/urweb/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/with-packages-wrapper.nix
    M pkgs/development/interpreters/groovy/default.nix
    M pkgs/development/interpreters/octave/default.nix
    M pkgs/development/interpreters/python/3.4/default.nix
    M pkgs/development/libraries/ffmpeg/2.x.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/libav/default.nix
    A pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
    M pkgs/development/libraries/libbluray/default.nix
    M pkgs/development/libraries/libharu/default.nix
    M pkgs/development/libraries/libinput/default.nix
    A pkgs/development/libraries/libsass/default.nix
    M pkgs/development/libraries/libuv/default.nix
    M pkgs/development/libraries/libvirt-glib/default.nix
    M pkgs/development/libraries/libvirt/default.nix
    M pkgs/development/libraries/nss/default.nix
    A pkgs/development/libraries/openjpeg/1.x.nix
    A pkgs/development/libraries/openjpeg/2.0.1.nix
    A pkgs/development/libraries/openjpeg/2.1.nix
    R pkgs/development/libraries/openjpeg/default.nix
    A pkgs/development/libraries/openjpeg/generic.nix
    M pkgs/development/libraries/sqlite/default.nix
    A pkgs/development/ocaml-modules/cstruct/default.nix
    M pkgs/development/python-modules/generic/default.nix
    M pkgs/development/tools/analysis/coan/default.nix
    M pkgs/development/web/iojs/default.nix
    A pkgs/development/web/iojs/update-iojs
    M pkgs/development/web/nodejs/build-node-package.nix
    M pkgs/development/web/nodejs/default.nix
    M pkgs/games/urbanterror/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/gradm/default.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/nvidia-x11/builder.sh
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/servers/consul/default.nix
    M pkgs/servers/consul/deps.nix
    M pkgs/servers/consul/template.nix
    M pkgs/servers/http/apache-httpd/2.4.nix
    M pkgs/servers/nosql/cassandra/default.nix
    M pkgs/servers/samba/3.x.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/tools/cd-dvd/dvdisaster/default.nix
    M pkgs/tools/misc/parallel/default.nix
    M pkgs/tools/networking/aria2/default.nix
    M pkgs/tools/networking/bully/default.nix
    M pkgs/tools/networking/i2pd/default.nix
    M pkgs/tools/networking/ipv6calc/default.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/tools/security/sudo/default.nix
    M pkgs/tools/system/stress-ng/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/lua-packages.nix
    M pkgs/top-level/node-packages-generated.nix
    M pkgs/top-level/node-packages.json
    M pkgs/top-level/node-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release.nix

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


  Commit: fffcb14e0636ed2713066177005e788e8d82a1f8
      
https://github.com/NixOS/nixpkgs/commit/fffcb14e0636ed2713066177005e788e8d82a1f8
  Author: Peter Simons <[email protected]>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  -----------
  haskell-highlighting-kate: make build work without patching


  Commit: c01dd4ab57c82dacee742c0d49bf676df4d97eb1
      
https://github.com/NixOS/nixpkgs/commit/c01dd4ab57c82dacee742c0d49bf676df4d97eb1
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  gtk2: small maintenance update


  Commit: 90979e6aa4a7663c414640355797a478d614f405
      
https://github.com/NixOS/nixpkgs/commit/90979e6aa4a7663c414640355797a478d614f405
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M pkgs/servers/x11/xorg/overrides.nix

  Log Message:
  -----------
  xf86-video-vmware: drop patch included in update


  Commit: be18346534184a21e5835cb38449528435896f51
      
https://github.com/NixOS/nixpkgs/commit/be18346534184a21e5835cb38449528435896f51
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  glib: maintenance update


  Commit: fefe6d69832861546a73fca9e9b011918601d76f
      
https://github.com/NixOS/nixpkgs/commit/fefe6d69832861546a73fca9e9b011918601d76f
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  trustedGrub: fix build by using older automake (again)


  Commit: d3bfead0d4178c22bea9584f4ad8cc7b43160ae4
      
https://github.com/NixOS/nixpkgs/commit/d3bfead0d4178c22bea9584f4ad8cc7b43160ae4
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  dbus-glib: maintenance update


  Commit: a24ef4f33804c8e6a2574315639d0cef9f468b78
      
https://github.com/NixOS/nixpkgs/commit/a24ef4f33804c8e6a2574315639d0cef9f468b78
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  harfbuzz: small update


  Commit: 5341196f01a0ab594c69b12f2d407cd6ff95a3ea
      
https://github.com/NixOS/nixpkgs/commit/5341196f01a0ab594c69b12f2d407cd6ff95a3ea
  Author: Peter Simons <[email protected]>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M lib/lists.nix
    M lib/maintainers.nix
    M nixos/modules/module-list.nix
    M nixos/modules/security/grsecurity.nix
    M nixos/modules/services/databases/couchdb.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/misc/disnix.nix
    A nixos/modules/services/network-filesystems/u9fs.nix
    M nixos/modules/services/networking/consul.nix
    M nixos/modules/services/x11/window-managers/default.nix
    M nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/loader/init-script/init-script.nix
    M nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
    M nixos/modules/tasks/kbd.nix
    M nixos/modules/virtualisation/containers.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    M nixos/modules/virtualisation/lxc.nix
    M nixos/modules/virtualisation/nixos-container.pl
    M nixos/modules/virtualisation/xen-dom0.nix
    M nixos/modules/virtualisation/xen-domU.nix
    M nixos/release.nix
    M pkgs/applications/altcoins/bitcoin.nix
    M pkgs/applications/audio/ams-lv2/default.nix
    M pkgs/applications/graphics/darktable/default.nix
    M pkgs/applications/graphics/yed/default.nix
    M pkgs/applications/misc/blender/default.nix
    A pkgs/applications/misc/blender/sm52.patch
    M pkgs/applications/misc/finalterm/default.nix
    M pkgs/applications/misc/procmail/default.nix
    A pkgs/applications/misc/rofi/default.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M pkgs/applications/networking/newsreaders/liferea/default.nix
    M pkgs/applications/networking/remote/rdesktop/default.nix
    R pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch
    A pkgs/applications/networking/sipcmd/default.nix
    M pkgs/applications/science/electronics/gtkwave/default.nix
    M pkgs/applications/version-management/meld/default.nix
    M pkgs/applications/version-management/vcsh/default.nix
    M pkgs/applications/video/kdenlive/default.nix
    M pkgs/applications/video/vlc/default.nix
    M pkgs/applications/virtualization/docker/default.nix
    M pkgs/applications/virtualization/virt-manager/default.nix
    M pkgs/applications/virtualization/virt-viewer/default.nix
    A pkgs/applications/virtualization/xen/4.4.1.nix
    A pkgs/applications/virtualization/xen/4.5.0.nix
    R pkgs/applications/virtualization/xen/default.nix
    A pkgs/applications/virtualization/xen/generic.nix
    M pkgs/applications/window-managers/fluxbox/default.nix
    M pkgs/applications/window-managers/i3/default.nix
    A pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
    A pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
    M pkgs/build-support/vm/default.nix
    M pkgs/data/misc/media-player-info/default.nix
    M pkgs/desktops/e19/terminology.nix
    M pkgs/desktops/plasma-5.2/default.nix
    M pkgs/desktops/plasma-5.2/dependencies.nix
    M pkgs/desktops/plasma-5.2/manifest.nix
    M pkgs/desktops/plasma-5.2/manifest.sh
    A pkgs/development/compilers/cudatoolkit/6.5.nix
    M pkgs/development/compilers/nasm/default.nix
    M pkgs/development/coq-modules/contribs/all.nix
    M pkgs/development/coq-modules/contribs/default.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/octave/default.nix
    M pkgs/development/interpreters/ruby/bundix/Gemfile
    M pkgs/development/interpreters/ruby/bundix/Gemfile.lock
    M pkgs/development/interpreters/ruby/bundix/gemset.nix
    M pkgs/development/libraries/botan/unstable.nix
    M pkgs/development/libraries/java/smack/builder.sh
    M pkgs/development/libraries/java/smack/default.nix
    A pkgs/development/libraries/libctemplate/2.2.nix
    M pkgs/development/libraries/lirc/default.nix
    M pkgs/development/libraries/openssl/default.nix
    M pkgs/development/libraries/science/math/openblas/default.nix
    A pkgs/development/ocaml-modules/asn1-combinators/default.nix
    A pkgs/development/ocaml-modules/erm_xmpp/default.nix
    A pkgs/development/ocaml-modules/io-page/default.nix
    M pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
    M pkgs/development/tools/analysis/checkstyle/default.nix
    M pkgs/development/tools/analysis/coan/default.nix
    M pkgs/development/tools/build-managers/gradle/default.nix
    M pkgs/development/tools/misc/dfu-programmer/default.nix
    A pkgs/development/tools/misc/sipp/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    M pkgs/misc/emulators/dolphin-emu/master.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/nvidia-x11/builder.sh
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/spl/git.nix
    M pkgs/servers/consul/default.nix
    M pkgs/servers/consul/template.nix
    M pkgs/servers/dns/bind/default.nix
    A pkgs/servers/nosql/cassandra/2.0.nix
    A pkgs/servers/nosql/cassandra/2.1.nix
    R pkgs/servers/nosql/cassandra/default.nix
    M pkgs/servers/nosql/mongodb/default.nix
    M pkgs/servers/sql/postgresql/9.0.x.nix
    M pkgs/servers/sql/postgresql/9.1.x.nix
    M pkgs/servers/sql/postgresql/9.2.x.nix
    M pkgs/servers/sql/postgresql/9.3.x.nix
    M pkgs/servers/sql/postgresql/9.4.x.nix
    A pkgs/servers/u9fs/default.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/tools/X11/xpra/default.nix
    A pkgs/tools/X11/xpra/gtk3.nix
    A pkgs/tools/X11/xpra/libfakeXinerama.nix
    M pkgs/tools/archivers/cpio/default.nix
    M pkgs/tools/archivers/dar/default.nix
    M pkgs/tools/misc/abduco/default.nix
    A pkgs/tools/misc/memtest86+/compile-fix.patch
    A pkgs/tools/misc/memtest86+/crash-fix.patch
    M pkgs/tools/misc/memtest86+/default.nix
    A pkgs/tools/misc/memtest86+/no-optimization.patch
    A pkgs/tools/networking/dhcpdump/default.nix
    A pkgs/tools/networking/noip/default.nix
    M pkgs/tools/networking/tinc/pre.nix
    M pkgs/tools/networking/urlwatch/default.nix
    M pkgs/tools/package-management/disnix/DisnixWebService/default.nix
    M pkgs/tools/package-management/disnix/default.nix
    M pkgs/tools/package-management/disnix/disnixos/default.nix
    M pkgs/tools/package-management/disnix/dysnomia/default.nix
    M pkgs/tools/system/ansible/default.nix
    M pkgs/tools/system/stress-ng/default.nix
    A pkgs/tools/text/nkf/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/lua-packages.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: 54fc2db1b86918f9204107d623294740c64b4c32
      
https://github.com/NixOS/nixpkgs/commit/54fc2db1b86918f9204107d623294740c64b4c32
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M pkgs/development/libraries/glibc/common.nix
    M pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch

  Log Message:
  -----------
  glibc: update 2.20 -> 2.21, including security fixes

Fixes #6578.
https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html

- I had to disable one warning-error type.
- One of our patches needed modification - it seemed that just the context
  changed without affecting the purpose of the patch.


  Commit: 4dd253c30602a273dfc58ee5c45fc7e1ea0633a0
      
https://github.com/NixOS/nixpkgs/commit/4dd253c30602a273dfc58ee5c45fc7e1ea0633a0
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M pkgs/development/tools/analysis/valgrind/default.nix

  Log Message:
  -----------
  valgrind: fix build with glibc-2.21 by Arch patch


  Commit: bd87d32efc2e6a7b178bbe5ed0f372477c1a9949
      
https://github.com/NixOS/nixpkgs/commit/bd87d32efc2e6a7b178bbe5ed0f372477c1a9949
  Author: Alexander V. Nikolaev <[email protected]>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M pkgs/os-specific/linux/util-linux/default.nix
    R pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch

  Log Message:
  -----------
  util-linux: update to 2.26 (close #6553)

Patch unshare-fix-map-root-user.patch appiled upstream, and removed.

Trigger mass-rebuild, so PR will be to staging


  Commit: 91fa9b27d57c58d9a7be9b5d49dcb4e767e4c109
      
https://github.com/NixOS/nixpkgs/commit/91fa9b27d57c58d9a7be9b5d49dcb4e767e4c109
  Author: James Cook <[email protected]>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    A pkgs/tools/graphics/graphviz/cve-2014-9157.patch
    M pkgs/tools/graphics/graphviz/default.nix

  Log Message:
  -----------
  graphviz: Patch to fix CVE-2014-9157 (close #6640)


  Commit: 856d1ff27f0ca573d9fc26cab6e64a6c659985ca
      
https://github.com/NixOS/nixpkgs/commit/856d1ff27f0ca573d9fc26cab6e64a6c659985ca
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  more build fixups concerning automake defaults


  Commit: 7e042659b7821a38ef2c63d92badc581937e4c52
      
https://github.com/NixOS/nixpkgs/commit/7e042659b7821a38ef2c63d92badc581937e4c52
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M pkgs/os-specific/linux/plymouth/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  plymouth: hacky fix build (automake-related)


  Commit: 2485055a963395f80be238ba7663027fd703e3d2
      
https://github.com/NixOS/nixpkgs/commit/2485055a963395f80be238ba7663027fd703e3d2
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

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

  Log Message:
  -----------
  gtk2: maintenance update

Perhaps a bugfix important for us:
745052 Icon theme code assumes directories with mtime 0 don't exist


  Commit: f1b7e4d12717630ec9f46a71c5a72ee35d0d7f18
      
https://github.com/NixOS/nixpkgs/commit/f1b7e4d12717630ec9f46a71c5a72ee35d0d7f18
  Author: Benjamin Saunders <[email protected]>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    A pkgs/development/compilers/llvm/3.6/clang-exports.patch
    A pkgs/development/compilers/llvm/3.6/clang-purity.patch
    A pkgs/development/compilers/llvm/3.6/clang.nix
    A pkgs/development/compilers/llvm/3.6/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/darwin.patch
    A pkgs/development/compilers/llvm/3.6/libc++/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
    A pkgs/development/compilers/llvm/3.6/libc++abi/default.nix
    A pkgs/development/compilers/llvm/3.6/lldb.nix
    A pkgs/development/compilers/llvm/3.6/llvm.nix

  Log Message:
  -----------
  LLVM, clang, and lldb 3.6


  Commit: de89820f69c0d8ed076d9fbd2b79dda90a41e71e
      
https://github.com/NixOS/nixpkgs/commit/de89820f69c0d8ed076d9fbd2b79dda90a41e71e
  Author: Benjamin Saunders <[email protected]>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

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

  Log Message:
  -----------
  Add LLVM 3.6 to all-packages


  Commit: 36c1a8a6c7b9fd137f4428dc802978cbc765bdd9
      
https://github.com/NixOS/nixpkgs/commit/36c1a8a6c7b9fd137f4428dc802978cbc765bdd9
  Author: koral <[email protected]>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M pkgs/applications/version-management/git-and-tools/git/default.nix

  Log Message:
  -----------
  git: 2.3.0 -> 2.3.1


  Commit: 1d953779b06bcaee9159dc8fb697b8db2bcd7a18
      
https://github.com/NixOS/nixpkgs/commit/1d953779b06bcaee9159dc8fb697b8db2bcd7a18
  Author: Peter Simons <[email protected]>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M lib/lists.nix
    M maintainers/scripts/travis-nox-review-pr.sh
    M nixos/modules/config/users-groups.nix
    M nixos/modules/hardware/video/nvidia.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    M nixos/release.nix
    A nixos/tests/i3wm.nix
    M pkgs/applications/audio/ncmpcpp/default.nix
    M pkgs/applications/editors/kdevelop/default.nix
    M pkgs/applications/misc/mysql-workbench/default.nix
    A pkgs/applications/misc/procmail/CVE-2014-3618.patch
    M pkgs/applications/misc/procmail/default.nix
    M pkgs/applications/networking/instant-messengers/profanity/default.nix
    M pkgs/applications/networking/instant-messengers/teamspeak/client.nix
    M pkgs/applications/networking/instant-messengers/teamspeak/server.nix
    M pkgs/applications/networking/irc/weechat/default.nix
    A pkgs/applications/networking/remote/teamviewer/10.nix
    R pkgs/applications/networking/remote/teamviewer/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/taxes/aangifte-2007/builder.sh
    M pkgs/applications/taxes/aangifte-2008/builder.sh
    M pkgs/applications/taxes/aangifte-2009/default.nix
    M pkgs/applications/taxes/aangifte-2010/default.nix
    M pkgs/applications/taxes/aangifte-2011/default.nix
    M pkgs/applications/taxes/aangifte-2012/default.nix
    M pkgs/applications/taxes/aangifte-2013/default.nix
    M pkgs/applications/video/mpv/default.nix
    M pkgs/applications/virtualization/virtualbox/default.nix
    M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
    M pkgs/build-support/gcc-cross-wrapper/builder.sh
    M pkgs/build-support/gcc-wrapper-old/builder.sh
    A pkgs/data/icons/numix-icon-theme-circle/default.nix
    A pkgs/data/icons/numix-icon-theme/default.nix
    M pkgs/development/compilers/chicken/default.nix
    M pkgs/development/compilers/cudatoolkit/5.5.nix
    M pkgs/development/compilers/cudatoolkit/6.0.nix
    M pkgs/development/compilers/cudatoolkit/6.5.nix
    M pkgs/development/compilers/gnatboot/default.nix
    M pkgs/development/compilers/go/1.4.nix
    M pkgs/development/compilers/microscheme/default.nix
    M pkgs/development/compilers/rustc/1.0.0-alpha.nix
    A pkgs/development/compilers/rustc/1.0.0-alpha2.nix
    R pkgs/development/compilers/rustc/common.nix
    R pkgs/development/compilers/rustc/grsec.HEAD.patch
    R pkgs/development/compilers/rustc/grsec.patch
    R pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
    R pkgs/development/compilers/rustc/hardcode_paths.patch
    M pkgs/development/compilers/rustc/head.nix
    R pkgs/development/compilers/rustc/local_stage0.HEAD.patch
    R pkgs/development/compilers/rustc/local_stage0.patch
    A pkgs/development/compilers/rustc/makeRustcDerivation.nix
    A pkgs/development/compilers/rustc/patches/alpha2.patch
    A pkgs/development/compilers/rustc/patches/grsec.patch
    A pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch
    A pkgs/development/compilers/rustc/patches/head.patch
    A pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch
    M pkgs/development/compilers/yap/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/ruby/bundler-env/default.nix
    M pkgs/development/libraries/kdevplatform/default.nix
    M pkgs/development/libraries/kerberos/heimdal.nix
    M pkgs/development/libraries/kerberos/krb5.nix
    M pkgs/development/libraries/libffi/default.nix
    A pkgs/development/libraries/libsoup/bad-symbol.patch
    M pkgs/development/libraries/libsoup/default.nix
    A pkgs/development/libraries/nss_wrapper/default.nix
    M pkgs/development/libraries/openct/default.nix
    A pkgs/development/libraries/socket_wrapper/default.nix
    M pkgs/development/libraries/tevent/default.nix
    A pkgs/development/libraries/uid_wrapper/default.nix
    M pkgs/development/mobile/androidenv/addons.nix
    A pkgs/development/mobile/androidenv/androidndk_r8e.nix
    M pkgs/development/mobile/androidenv/androidsdk.nix
    M pkgs/development/mobile/androidenv/default.nix
    A pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
    A pkgs/development/ocaml-modules/base64/default.nix
    A pkgs/development/ocaml-modules/fileutils/default.nix
    M pkgs/development/r-modules/cran-packages.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/r-modules/generate-cran-packages.R
    M pkgs/development/tools/analysis/checkstyle/default.nix
    M pkgs/development/tools/build-managers/cargo/snapshot.nix
    M pkgs/development/tools/misc/cflow/default.nix
    M pkgs/development/tools/rust/racer/default.nix
    M pkgs/development/tools/selenium/chromedriver/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    M pkgs/games/castle-combat/default.nix
    M pkgs/games/tibia/default.nix
    A pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/kernel/linux-3.10.nix
    M pkgs/os-specific/linux/kernel/linux-3.12.nix
    M pkgs/os-specific/linux/kernel/linux-3.14.nix
    M pkgs/os-specific/linux/kernel/linux-3.18.nix
    M pkgs/os-specific/linux/kernel/linux-3.2.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/pax-utils/default.nix
    M pkgs/os-specific/linux/spl/git.nix
    M pkgs/os-specific/linux/zfs/git.nix
    A pkgs/servers/samba/4.x-heimdal-compat.patch
    M pkgs/servers/samba/4.x-no-persistent-install.patch
    M pkgs/servers/samba/4.x.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/tools/archivers/sharutils/default.nix
    M pkgs/tools/archivers/zpaq/default.nix
    M pkgs/tools/archivers/zpaq/zpaqd.nix
    M pkgs/tools/audio/volumeicon/default.nix
    M pkgs/tools/filesystems/ceph/default.nix
    M pkgs/tools/filesystems/encfs/default.nix
    M pkgs/tools/misc/autojump/default.nix
    M pkgs/tools/misc/mssys/default.nix
    M pkgs/tools/misc/yubico-piv-tool/default.nix
    M pkgs/tools/security/opensc/default.nix
    M pkgs/tools/system/tree/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/go-packages.nix

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


  Commit: 0ce3dcd91a7b7823f0582668ae66e1c6957d3c87
      
https://github.com/NixOS/nixpkgs/commit/0ce3dcd91a7b7823f0582668ae66e1c6957d3c87
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  libxmi: fix build after libtool bump

The file copied by libxmi builder seems moved.


  Commit: 33153a216679f903478ad6a3a9a0b5aea489db91
      
https://github.com/NixOS/nixpkgs/commit/33153a216679f903478ad6a3a9a0b5aea489db91
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M pkgs/applications/graphics/paraview/default.nix
    M pkgs/development/libraries/vtk/default.nix

  Log Message:
  -----------
  paraview, vtk: fix build after mesa update


  Commit: 0ea7d9b6f9437cc2db761967a782786453bc61ba
      
https://github.com/NixOS/nixpkgs/commit/0ea7d9b6f9437cc2db761967a782786453bc61ba
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M pkgs/development/libraries/opencascade/6.5.nix
    M pkgs/development/libraries/opencascade/default.nix
    M pkgs/development/libraries/opencascade/oce.nix

  Log Message:
  -----------
  opencascade*: fix build after mesa update


  Commit: 33fbec14b643b47a611e13c4d9bf3858c28568c3
      
https://github.com/NixOS/nixpkgs/commit/33fbec14b643b47a611e13c4d9bf3858c28568c3
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M pkgs/development/libraries/opencascade/6.5.nix

  Log Message:
  -----------
  opencascade-6.5: maintenance update

They claim it's ABI-compatible.


  Commit: 55cf0151424be6a2dba0eda5459ece0840472f1a
      
https://github.com/NixOS/nixpkgs/commit/55cf0151424be6a2dba0eda5459ece0840472f1a
  Author: Shea Levy <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  clang-3.6: provide path to gcc on Linux

gcc contains core runtime bits that aren't available elsewhere for Linux.

Refs #6449


  Commit: 41f074f1b36bd18b30a62a96e0fb4313af457c0f
      
https://github.com/NixOS/nixpkgs/commit/41f074f1b36bd18b30a62a96e0fb4313af457c0f
  Author: Benjamin Saunders <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #1 from shlevy/llvm-3.6-gcc-ref

clang-3.6: provide path to gcc on Linux


  Commit: 6b53021205cba1074ecddcdd269feb7bad9b34a9
      
https://github.com/NixOS/nixpkgs/commit/6b53021205cba1074ecddcdd269feb7bad9b34a9
  Author: Shea Levy <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/programs/uim.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/x11/display-managers/lightdm.nix
    A nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    A pkgs/applications/display-managers/sddm/cmake_paths.patch
    A pkgs/applications/display-managers/sddm/default.nix
    A pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
    A pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
    A pkgs/applications/misc/scim/default.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M pkgs/applications/networking/browsers/opera/default.nix
    A pkgs/applications/networking/remote/x2goclient/default.nix
    M pkgs/applications/video/zdfmediathk/default.nix
    A pkgs/build-support/emacs/generic.nix
    A pkgs/build-support/emacs/melpa.nix
    A pkgs/build-support/emacs/melpa2nix.el
    A pkgs/build-support/emacs/setup-hook.sh
    A pkgs/build-support/emacs/trivial.nix
    R pkgs/build-support/melpa/default.nix
    R pkgs/build-support/melpa/melpa2nix.el
    R pkgs/build-support/melpa/setup-hook.sh
    M pkgs/desktops/e19/econnman.nix
    M pkgs/desktops/e19/efl.nix
    M pkgs/desktops/e19/elementary.nix
    M pkgs/desktops/e19/emotion.nix
    M pkgs/desktops/e19/enlightenment.nix
    M pkgs/desktops/e19/evas.nix
    M pkgs/desktops/e19/terminology.nix
    M pkgs/development/compilers/ats2/default.nix
    M pkgs/development/compilers/llvm/3.5/clang.nix
    R pkgs/development/compilers/openjdk/nonreparenting-wm.patch
    M pkgs/development/compilers/openjdk/openjdk8.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/spidermonkey/17.0.nix
    M pkgs/development/libraries/libav/default.nix
    A pkgs/development/libraries/libxcomp/default.nix
    M pkgs/development/libraries/nss_wrapper/default.nix
    M pkgs/development/libraries/socket_wrapper/default.nix
    M pkgs/development/libraries/uid_wrapper/default.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/tools/selenium/chromedriver/default.nix
    M pkgs/misc/cups/drivers/samsung/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    R pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
    A pkgs/os-specific/linux/kernel/linux-rpi.nix
    M pkgs/os-specific/linux/kernel/manual-config.nix
    M pkgs/os-specific/linux/pax-utils/default.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/shells/fish/default.nix
    M pkgs/stdenv/linux/default.nix
    A pkgs/tools/admin/nxproxy/default.nix
    M pkgs/tools/inputmethods/uim/default.nix
    M pkgs/tools/networking/dhcpcd/default.nix
    M pkgs/tools/package-management/disnix/DisnixWebService/default.nix
    M pkgs/tools/package-management/disnix/default.nix
    M pkgs/tools/package-management/disnix/disnixos/default.nix
    M pkgs/tools/package-management/disnix/dysnomia/default.nix
    M pkgs/tools/security/gnupg/1.nix
    M pkgs/top-level/all-packages.nix
    R pkgs/top-level/emacs-melpa-packages.nix
    A pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/make-tarball.nix
    M pkgs/top-level/platforms.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: f91dea4c0be410c52d8131d6a1237f04b1b8da71
      
https://github.com/NixOS/nixpkgs/commit/f91dea4c0be410c52d8131d6a1237f04b1b8da71
  Author: Shea Levy <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  cc-wrapper: Set default system include flags for non-gcc c++ on Linux

Without this, clang can't find libstdc++. This needs to happen in the wrapper
so that the libc++ setup hook can still override it


  Commit: c62b5456f589f4e6970368563a0e711f221c0c4e
      
https://github.com/NixOS/nixpkgs/commit/c62b5456f589f4e6970368563a0e711f221c0c4e
  Author: Shea Levy <[email protected]>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A pkgs/development/compilers/llvm/3.6/clang-exports.patch
    A pkgs/development/compilers/llvm/3.6/clang-purity.patch
    A pkgs/development/compilers/llvm/3.6/clang.nix
    A pkgs/development/compilers/llvm/3.6/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/darwin.patch
    A pkgs/development/compilers/llvm/3.6/libc++/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
    A pkgs/development/compilers/llvm/3.6/libc++abi/default.nix
    A pkgs/development/compilers/llvm/3.6/lldb.nix
    A pkgs/development/compilers/llvm/3.6/llvm.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge

LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
        pkgs/top-level/all-packages.nix


  Commit: b37fd11351ed60eb8c2c83170d04bfe5364a3107
      
https://github.com/NixOS/nixpkgs/commit/b37fd11351ed60eb8c2c83170d04bfe5364a3107
  Author: Shea Levy <[email protected]>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    R pkgs/development/compilers/llvm/3.6/clang-exports.patch
    R pkgs/development/compilers/llvm/3.6/clang-purity.patch
    R pkgs/development/compilers/llvm/3.6/clang.nix
    A pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
    A pkgs/development/compilers/llvm/3.6/clang/default.nix
    A pkgs/development/compilers/llvm/3.6/clang/purity.patch
    M pkgs/development/compilers/llvm/3.6/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++abi.nix
    R pkgs/development/compilers/llvm/3.6/libc++abi/default.nix

  Log Message:
  -----------
  llvm-3.6 packages: Rearrange directory structure


  Commit: e57e44f867b7d308d2296907f400b87f5393ce83
      
https://github.com/NixOS/nixpkgs/commit/e57e44f867b7d308d2296907f400b87f5393ce83
  Author: Shea Levy <[email protected]>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M pkgs/development/compilers/llvm/3.6/default.nix
    M pkgs/development/compilers/llvm/3.6/lldb.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  llvm-3.6 packages: Build everything (except clang and llvm) with clang


  Commit: de892761cf10a161663fbf97c80f17281ed5e65f
      
https://github.com/NixOS/nixpkgs/commit/de892761cf10a161663fbf97c80f17281ed5e65f
  Author: Shea Levy <[email protected]>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  dragonegg: Pull from llvm 3.5

If someone uses it, we can add the 3.6 version of course


  Commit: 6694ef42a9aba02a16dba72378a73122cbbafc75
      
https://github.com/NixOS/nixpkgs/commit/6694ef42a9aba02a16dba72378a73122cbbafc75
  Author: Peter Simons <[email protected]>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M lib/maintainers.nix
    M lib/strings.nix
    M nixos/doc/manual/configuration/config-file.xml
    M nixos/doc/manual/man-nixos-rebuild.xml
    M nixos/modules/installer/tools/nixos-rebuild.sh
    M nixos/modules/security/pam.nix
    M nixos/modules/services/audio/mpd.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/networking/ssh/sshd.nix
    M nixos/modules/services/web-servers/apache-httpd/default.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/system/activation/switch-to-configuration.pl
    M nixos/modules/system/boot/stage-1-init.sh
    M pkgs/applications/audio/yoshimi/default.nix
    M pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
    R 
pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
    M pkgs/applications/display-managers/lightdm/default.nix
    R pkgs/applications/display-managers/lightdm/lightdm.patch
    M pkgs/applications/editors/emacs-24/default.nix
    A pkgs/applications/editors/emacs-24/site-start.el
    A pkgs/applications/editors/music/tuxguitar/default.nix
    M pkgs/applications/graphics/darktable/default.nix
    M pkgs/applications/misc/cura/default.nix
    M pkgs/applications/misc/curaengine/default.nix
    A pkgs/applications/misc/hstr/default.nix
    M pkgs/applications/misc/kde-wacomtablet/default.nix
    M pkgs/applications/misc/keybase-node-client/default.nix
    M pkgs/applications/misc/keybase-node-client/package.nix
    A pkgs/applications/misc/khal/default.nix
    M pkgs/applications/misc/qpdfview/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/instant-messengers/gajim/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    A pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch
    M pkgs/applications/office/antiword/default.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/office/zim/default.nix
    M pkgs/applications/science/math/R/default.nix
    M pkgs/applications/science/math/pari/default.nix
    M pkgs/applications/window-managers/awesome/default.nix
    M pkgs/applications/window-managers/compiz/default.nix
    M pkgs/applications/window-managers/xmonad/wrapper.nix
    M pkgs/build-support/autonix/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/build-support/build-fhs-chrootenv/init.sh.in
    M pkgs/build-support/build-fhs-chrootenv/load.sh.in
    M pkgs/build-support/build-fhs-userenv/chroot-user.rb
    M pkgs/data/icons/hicolor-icon-theme/default.nix
    M pkgs/development/compilers/ecl/default.nix
    M pkgs/development/compilers/llvm/3.5/lldb.nix
    M pkgs/development/compilers/oraclejdk/jdk8-linux.nix
    M pkgs/development/compilers/rustc/head.nix
    M pkgs/development/compilers/sbcl/1.2.5.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/compilers/scala/2.10.nix
    M pkgs/development/compilers/scala/default.nix
    A pkgs/development/compilers/uhc/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/xmonad-nix.patch
    M pkgs/development/interpreters/angelscript/default.nix
    M pkgs/development/interpreters/php/5.4.nix
    A pkgs/development/libraries/SDL2_ttf/default.nix
    M pkgs/development/libraries/botan/default.nix
    M pkgs/development/libraries/botan/generic.nix
    M pkgs/development/libraries/botan/unstable.nix
    M pkgs/development/libraries/directfb/default.nix
    M pkgs/development/libraries/ffmpeg/0.10.nix
    A pkgs/development/libraries/ffmpeg/0.11.nix
    A pkgs/development/libraries/ffmpeg/0.5.nix
    R pkgs/development/libraries/ffmpeg/0.6.90.nix
    R pkgs/development/libraries/ffmpeg/0.6.nix
    A pkgs/development/libraries/ffmpeg/1.2.nix
    R pkgs/development/libraries/ffmpeg/1.x.nix
    A pkgs/development/libraries/ffmpeg/2.2.nix
    R pkgs/development/libraries/ffmpeg/2.2.x.nix
    A pkgs/development/libraries/ffmpeg/2.5.nix
    R pkgs/development/libraries/ffmpeg/2.x.nix
    A pkgs/development/libraries/ffmpeg/generic.nix
    M pkgs/development/libraries/java/swt/default.nix
    M pkgs/development/libraries/judy/default.nix
    M pkgs/development/libraries/kde-frameworks-5.7/default.nix
    M pkgs/development/libraries/libgcrypt/1.6.nix
    M pkgs/development/libraries/libgpg-error/default.nix
    M pkgs/development/libraries/libyubikey/default.nix
    A pkgs/development/libraries/utf8proc/default.nix
    A pkgs/development/ocaml-modules/enumerate/default.nix
    M pkgs/development/python-modules/generic/wrap.sh
    M pkgs/development/python-modules/gevent_sslwrap.patch
    M pkgs/development/r-modules/cran-packages.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/tools/analysis/findbugs/default.nix
    M pkgs/development/tools/misc/cl-launch/default.nix
    M pkgs/development/tools/misc/global/default.nix
    M pkgs/development/tools/misc/help2man/default.nix
    M pkgs/development/tools/misc/strace/default.nix
    M pkgs/development/tools/ocaml/merlin/default.nix
    A pkgs/games/scrolls/default.nix
    M pkgs/games/steam/chrootenv.nix
    M pkgs/games/steam/default.nix
    M pkgs/misc/emulators/nestopia/default.nix
    M pkgs/misc/emulators/wine/unstable.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/os-specific/linux/firejail/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/kbd/default.nix
    M pkgs/os-specific/linux/kernel/linux-3.10.nix
    M pkgs/os-specific/linux/kernel/linux-3.14.nix
    M pkgs/os-specific/linux/kernel/linux-3.18.nix
    M pkgs/os-specific/linux/kernel/linux-3.19.nix
    M pkgs/os-specific/linux/kernel/linux-3.2.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/spl/git.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/servers/http/nginx/unstable.nix
    M pkgs/servers/nosql/influxdb/default.nix
    M pkgs/servers/nosql/mongodb/default.nix
    M pkgs/tools/X11/primus/default.nix
    A pkgs/tools/X11/wmutils-core/default.nix
    M pkgs/tools/archivers/zpaq/default.nix
    M pkgs/tools/compression/lrzip/default.nix
    M pkgs/tools/filesystems/nilfs-utils/default.nix
    M pkgs/tools/graphics/pngcrush/default.nix
    M pkgs/tools/misc/cpuminer/default.nix
    M pkgs/tools/misc/pipelight/default.nix
    M pkgs/tools/misc/vdirsyncer/default.nix
    M pkgs/tools/networking/autossh/default.nix
    M pkgs/tools/networking/getmail/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/package-management/disnix/DisnixWebService/default.nix
    M pkgs/tools/package-management/disnix/default.nix
    M pkgs/tools/package-management/disnix/disnixos/default.nix
    M pkgs/tools/package-management/disnix/dysnomia/default.nix
    M pkgs/tools/package-management/nix/unstable.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/tools/security/ecryptfs/default.nix
    M pkgs/tools/security/gnupg/20.nix
    M pkgs/tools/security/gnupg/21.nix
    A pkgs/tools/security/pcsctools/default.nix
    A pkgs/tools/text/grin/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/python-packages.nix

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

Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix


  Commit: 50933385c53ae640bfe9188d4111a540feeb648f
      
https://github.com/NixOS/nixpkgs/commit/50933385c53ae640bfe9188d4111a540feeb648f
  Author: koral <[email protected]>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M pkgs/applications/version-management/git-and-tools/git/default.nix

  Log Message:
  -----------
  git: 2.3.1 -> 2.3.2


  Commit: e457fdb44cef428177423d562591b7b90ab84b78
      
https://github.com/NixOS/nixpkgs/commit/e457fdb44cef428177423d562591b7b90ab84b78
  Author: Peter Simons <[email protected]>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M pkgs/applications/version-management/git-and-tools/git/default.nix

  Log Message:
  -----------
  Merge pull request #6742 from k0ral/git-staging

git: 2.3.1 -> 2.3.2


  Commit: e729dfbd3f63f1a840e0f6bc02cb6dde804b2091
      
https://github.com/NixOS/nixpkgs/commit/e729dfbd3f63f1a840e0f6bc02cb6dde804b2091
  Author: Shea Levy <[email protected]>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M pkgs/development/compilers/gcc/4.9/default.nix

  Log Message:
  -----------
  gcc-4.9: Set isGNU

Fixes #6787


  Commit: cd89c697984c31198b5918a7a017e32b1234aeab
      
https://github.com/NixOS/nixpkgs/commit/cd89c697984c31198b5918a7a017e32b1234aeab
  Author: Peter Simons <[email protected]>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

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

  Log Message:
  -----------
  Switch default version of GNU Make to 4.1.


  Commit: 2c1041acc74844251a2456024e99f25126419f35
      
https://github.com/NixOS/nixpkgs/commit/2c1041acc74844251a2456024e99f25126419f35
  Author: koral <[email protected]>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

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

  Log Message:
  -----------
  curl: 7.40.0 -> 7.41.0 (close #6844)


  Commit: e924f05cc3b2eed9156daa9592860a7e7bb2b72d
      
https://github.com/NixOS/nixpkgs/commit/e924f05cc3b2eed9156daa9592860a7e7bb2b72d
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M lib/lists.nix
    M lib/maintainers.nix
    M nixos/doc/manual/administration/declarative-containers.xml
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    A nixos/modules/programs/ibus.nix
    M nixos/modules/programs/ssh.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/apparmor.nix
    M nixos/modules/security/grsecurity.nix
    M nixos/modules/services/audio/mpd.nix
    M nixos/modules/services/backup/tarsnap.nix
    M nixos/modules/services/hardware/tcsd.nix
    M nixos/modules/services/networking/haproxy.nix
    M nixos/modules/services/printing/cupsd.nix
    M nixos/modules/services/torrent/transmission.nix
    M nixos/modules/services/web-servers/fcgiwrap.nix
    M nixos/modules/services/web-servers/nginx/default.nix
    M nixos/modules/services/x11/desktop-managers/kde5.nix
    M nixos/modules/services/x11/desktop-managers/xfce.nix
    M nixos/modules/services/x11/display-managers/lightdm.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/hardware/multitouch.nix
    A nixos/modules/services/x11/unclutter.nix
    M nixos/modules/tasks/trackpoint.nix
    M nixos/modules/virtualisation/parallels-guest.nix
    M pkgs/applications/altcoins/dogecoin.nix
    A pkgs/applications/audio/ario/default.nix
    A pkgs/applications/audio/ario/glib-single-include.patch
    M pkgs/applications/audio/lmms/default.nix
    A pkgs/applications/audio/pd-plugins/cyclone/default.nix
    A pkgs/applications/audio/pd-plugins/helmholtz/default.nix
    A pkgs/applications/audio/pd-plugins/maxlib/default.nix
    A pkgs/applications/audio/pd-plugins/mrpeach/default.nix
    A pkgs/applications/audio/pd-plugins/puremapping/default.nix
    A pkgs/applications/audio/pd-plugins/timbreid/default.nix
    A pkgs/applications/audio/pd-plugins/zexy/default.nix
    A pkgs/applications/audio/puredata/wrapper.nix
    M pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/editors/eclipse/default.nix
    M pkgs/applications/editors/gobby/default.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/editors/jedit/build.xml.patch
    M pkgs/applications/editors/jedit/default.nix
    M pkgs/applications/editors/lighttable/default.nix
    M pkgs/applications/editors/music/tuxguitar/default.nix
    M pkgs/applications/graphics/digikam/default.nix
    M pkgs/applications/kde-apps-14.12/default.nix
    M pkgs/applications/kde-apps-14.12/manifest.nix
    M pkgs/applications/kde-apps-14.12/manifest.sh
    M pkgs/applications/misc/batti/default.nix
    M pkgs/applications/misc/blender/default.nix
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/cbatticon/default.nix
    M pkgs/applications/misc/doomseeker/default.nix
    M pkgs/applications/networking/browsers/chromium/source/sources.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
    M pkgs/applications/networking/ids/snort/default.nix
    A pkgs/applications/networking/instant-messengers/choqok/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/tagainijisho/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    A pkgs/applications/version-management/git-and-tools/git-cola/default.nix
    M pkgs/applications/version-management/mercurial/default.nix
    M pkgs/applications/video/kodi/plugins.nix
    M pkgs/applications/video/mkvtoolnix/default.nix
    M pkgs/applications/video/mplayer/default.nix
    A pkgs/applications/video/qarte/default.nix
    M pkgs/applications/video/xine-ui/default.nix
    M pkgs/applications/window-managers/i3/default.nix
    A pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
    A pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
    M pkgs/build-support/build-fhs-userenv/chroot-user.rb
    M pkgs/build-support/build-fhs-userenv/default.nix
    M pkgs/build-support/fetchgit/builder.sh
    M pkgs/build-support/fetchgit/default.nix
    M pkgs/build-support/grsecurity/default.nix
    M pkgs/data/fonts/fira/default.nix
    A pkgs/data/misc/ddccontrol-db/default.nix
    M pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
    A 
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
    M pkgs/desktops/xfce/applications/mousepad.nix
    M pkgs/desktops/xfce/core/exo.nix
    M pkgs/desktops/xfce/core/garcon.nix
    M pkgs/desktops/xfce/core/gtk-xfce-engine.nix
    M pkgs/desktops/xfce/core/libxfce4ui.nix
    M pkgs/desktops/xfce/core/libxfce4util.nix
    M pkgs/desktops/xfce/core/thunar-volman.nix
    M pkgs/desktops/xfce/core/thunar.nix
    M pkgs/desktops/xfce/core/tumbler.nix
    M pkgs/desktops/xfce/core/xfce4-appfinder.nix
    M pkgs/desktops/xfce/core/xfce4-dev-tools.nix
    M pkgs/desktops/xfce/core/xfce4-panel.nix
    M pkgs/desktops/xfce/core/xfce4-power-manager.nix
    M pkgs/desktops/xfce/core/xfce4-session.nix
    M pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
    M pkgs/desktops/xfce/core/xfce4-settings.nix
    M pkgs/desktops/xfce/core/xfconf.nix
    M pkgs/desktops/xfce/core/xfdesktop.nix
    M pkgs/desktops/xfce/core/xfwm4.nix
    M pkgs/desktops/xfce/default.nix
    M pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
    M pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
    M pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
    M pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
    M pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
    M pkgs/development/compilers/ats/default.nix
    M pkgs/development/compilers/ghc/6.10.4.nix
    M pkgs/development/compilers/ghc/6.12.3.nix
    M pkgs/development/compilers/ghc/7.10.1.nix
    M pkgs/development/compilers/rustc/makeRustcDerivation.nix
    M pkgs/development/compilers/rustc/patches/alpha2.patch
    M pkgs/development/compilers/rustc/patches/head.patch
    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-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    A pkgs/development/interpreters/gnu-apl/default.nix
    M pkgs/development/interpreters/php/5.4.nix
    M pkgs/development/interpreters/php/5.5.nix
    M pkgs/development/interpreters/php/5.6.nix
    R pkgs/development/interpreters/php/fix-5.4.patch
    A pkgs/development/interpreters/php/fix-paths.patch
    M pkgs/development/libraries/botan/generic.nix
    M pkgs/development/libraries/botan/unstable.nix
    A pkgs/development/libraries/ceres-solver/default.nix
    M pkgs/development/libraries/czmq/default.nix
    R pkgs/development/libraries/eglibc/builder.sh
    R pkgs/development/libraries/eglibc/default.nix
    M pkgs/development/libraries/frei0r/default.nix
    A pkgs/development/libraries/hiredis/default.nix
    R pkgs/development/libraries/ibus/default.nix
    A pkgs/development/libraries/jemalloc/default.nix
    M pkgs/development/libraries/judy/default.nix
    M pkgs/development/libraries/kde-frameworks-5.7/default.nix
    M pkgs/development/libraries/levmar/default.nix
    M pkgs/development/libraries/libav/default.nix
    M pkgs/development/libraries/libdbi-drivers/default.nix
    M pkgs/development/libraries/libdbi/default.nix
    M pkgs/development/libraries/libestr/default.nix
    A pkgs/development/libraries/libevhtp/default.nix
    M pkgs/development/libraries/libinfinity/default.nix
    M pkgs/development/libraries/liblogging/default.nix
    A pkgs/development/libraries/liblognorm/default.nix
    A pkgs/development/libraries/libmongo-client/default.nix
    A pkgs/development/libraries/libmsgpack/0.5-CMake.patch
    A pkgs/development/libraries/libmsgpack/0.5.nix
    R pkgs/development/libraries/libmsgpack/CMakeLists.patch
    M pkgs/development/libraries/libmsgpack/default.nix
    A pkgs/development/libraries/libmsgpack/generic.nix
    M pkgs/development/libraries/libnet/default.nix
    A pkgs/development/libraries/librelp/default.nix
    M pkgs/development/libraries/libressl/default.nix
    A pkgs/development/libraries/libtermkey/default.nix
    M pkgs/development/libraries/libxcomp/default.nix
    M pkgs/development/libraries/rabbitmq-c/default.nix
    M pkgs/development/libraries/rdkafka/default.nix
    M pkgs/development/libraries/sqlite/default.nix
    M pkgs/development/libraries/talloc/default.nix
    A pkgs/development/libraries/unibilium/default.nix
    M pkgs/development/libraries/zeromq/3.x.nix
    M pkgs/development/libraries/zeromq/4.x.nix
    A pkgs/development/ocaml-modules/xml-light/default.nix
    R pkgs/development/python-modules/boto-1.9-python-2.7.patch
    A pkgs/development/python-modules/boto/content-length-str.patch
    M pkgs/development/tools/analysis/pmd/default.nix
    A pkgs/development/tools/database/sqldeveloper/default.nix
    A pkgs/development/tools/misc/automake/automake-1.10.x.nix
    M pkgs/development/tools/misc/uncrustify/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    M pkgs/games/mnemosyne/default.nix
    M pkgs/games/planetaryannihilation/default.nix
    M pkgs/games/stuntrally/default.nix
    A pkgs/os-specific/linux/apparmor/2.9/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/kernel/linux-3.18.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/kernel/perf.nix
    M pkgs/os-specific/linux/pax-utils/default.nix
    A pkgs/os-specific/linux/perf-tools/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/servers/dns/mesos-dns/default.nix
    M pkgs/servers/nosql/cassandra/2.0.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/servers/sql/mariadb/default.nix
    M pkgs/servers/sql/pgpool/default.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/tools/admin/nxproxy/default.nix
    M pkgs/tools/filesystems/encfs/default.nix
    A pkgs/tools/inputmethods/ibus-anthy/default.nix
    A pkgs/tools/inputmethods/ibus-qt/default.nix
    A pkgs/tools/inputmethods/ibus/default.nix
    A pkgs/tools/misc/ddccontrol/default.nix
    M pkgs/tools/misc/grub/default.nix
    A pkgs/tools/misc/mpdscribble/default.nix
    A pkgs/tools/misc/vmtouch/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/networking/asynk/default.nix
    M pkgs/tools/networking/ipv6calc/default.nix
    M pkgs/tools/networking/wicd/default.nix
    M pkgs/tools/package-management/disnix/DisnixWebService/default.nix
    M pkgs/tools/package-management/disnix/default.nix
    M pkgs/tools/package-management/disnix/disnixos/default.nix
    M pkgs/tools/package-management/disnix/dysnomia/default.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/srm/default.nix
    M pkgs/tools/security/tor/torbrowser.nix
    M pkgs/tools/system/rsyslog/default.nix
    M pkgs/tools/system/syslog-ng/default.nix
    M pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
    M pkgs/tools/typesetting/xmlto/default.nix
    M pkgs/tools/virtualization/euca2ools/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/php-packages.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: e73933da9c2fb4d731d8bedd7603e6850b38632e
      
https://github.com/NixOS/nixpkgs/commit/e73933da9c2fb4d731d8bedd7603e6850b38632e
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  coreutils: skip dd/sparse test (fixes #6306)

It's not done very nicely, as the main build log still prints as if the
test ran and succeeded, but I'm lazy to dig deeper into the framework.


  Commit: 2fe351c7e31f47400d752a59ab7b1e2e89acf392
      
https://github.com/NixOS/nixpkgs/commit/2fe351c7e31f47400d752a59ab7b1e2e89acf392
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M pkgs/development/libraries/openssl/cert-file.patch
    M pkgs/development/libraries/openssl/default.nix

  Log Message:
  -----------
  openssl: Update to 1.0.1m

Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt


  Commit: cd97c581106208e902f32569d3ff14592e8dc416
      
https://github.com/NixOS/nixpkgs/commit/cd97c581106208e902f32569d3ff14592e8dc416
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M pkgs/development/libraries/openssl/1.0.1j.nix
    A pkgs/development/libraries/openssl/cert-file-1.0.1j.patch

  Log Message:
  -----------
  openssl_1_0_1j: fix after updating the main version


  Commit: 19cd9f16a0e7908a37efa60ed70dd6f4f2eabc0d
      
https://github.com/NixOS/nixpkgs/commit/19cd9f16a0e7908a37efa60ed70dd6f4f2eabc0d
  Author: Shea Levy <[email protected]>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M pkgs/applications/graphics/paraview/default.nix
    M pkgs/build-support/cc-wrapper/cc-wrapper.sh
    M pkgs/build-support/cc-wrapper/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    A pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
    A pkgs/development/compilers/llvm/3.6/clang/default.nix
    A pkgs/development/compilers/llvm/3.6/clang/purity.patch
    A pkgs/development/compilers/llvm/3.6/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/darwin.patch
    A pkgs/development/compilers/llvm/3.6/libc++/default.nix
    A pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
    A pkgs/development/compilers/llvm/3.6/libc++abi.nix
    A pkgs/development/compilers/llvm/3.6/lldb.nix
    A pkgs/development/compilers/llvm/3.6/llvm.nix
    M pkgs/development/libraries/glibc/common.nix
    M pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
    M pkgs/development/libraries/gtk+/2.x.nix
    M pkgs/development/libraries/libxmi/default.nix
    M pkgs/development/libraries/opencascade/6.5.nix
    M pkgs/development/libraries/opencascade/default.nix
    M pkgs/development/libraries/opencascade/oce.nix
    M pkgs/development/libraries/openssl/1.0.1j.nix
    A pkgs/development/libraries/openssl/cert-file-1.0.1j.patch
    M pkgs/development/libraries/openssl/cert-file.patch
    M pkgs/development/libraries/openssl/default.nix
    M pkgs/development/libraries/vtk/default.nix
    M pkgs/development/tools/analysis/valgrind/default.nix
    M pkgs/os-specific/linux/plymouth/default.nix
    M pkgs/os-specific/linux/util-linux/default.nix
    R pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch
    A pkgs/tools/graphics/graphviz/cve-2014-9157.patch
    M pkgs/tools/graphics/graphviz/default.nix
    M pkgs/tools/misc/coreutils/default.nix
    M pkgs/tools/networking/curl/default.nix
    M pkgs/top-level/all-packages.nix

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


Compare: https://github.com/NixOS/nixpkgs/compare/89f41b90fa6f...19cd9f16a0e7
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to