Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e1bbc6f35ccc53c20e72311e46767b9cc25d2fa2
      
https://github.com/NixOS/nixpkgs/commit/e1bbc6f35ccc53c20e72311e46767b9cc25d2fa2
  Author: Peter Simons <[email protected]>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
    M pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
    M pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
    M pkgs/development/tools/haskell/cabal2nix/language-nix.nix

  Log Message:
  -----------
  cabal2nix: fix version number 20180903 to 20150903

Thanks to @drvink for pointing this out.


  Commit: 9be2c355be2c30a016f4ed16df4d830152d1c0bb
      
https://github.com/NixOS/nixpkgs/commit/9be2c355be2c30a016f4ed16df4d830152d1c0bb
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

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

  Log Message:
  -----------
  remove 3 more outdated impure-deps


  Commit: 98782144edb8c6773c1b00af70d4aa8fef912174
      
https://github.com/NixOS/nixpkgs/commit/98782144edb8c6773c1b00af70d4aa8fef912174
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

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

  Log Message:
  -----------
  libtiff: 4.0.5 -> 4.0.6


  Commit: 8dc707354692798b4fa365625dd92ab7f51d8673
      
https://github.com/NixOS/nixpkgs/commit/8dc707354692798b4fa365625dd92ab7f51d8673
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M doc/haskell-users-guide.xml
    M lib/maintainers.nix
    M nixos/modules/config/i18n.nix
    M nixos/modules/config/system-path.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/programs/cdemu.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/prey.nix
    M nixos/modules/services/backup/bacula.nix
    M nixos/modules/services/backup/sitecopy-backup.nix
    M nixos/modules/services/cluster/kubernetes.nix
    M nixos/modules/services/databases/mysql.nix
    M nixos/modules/services/hardware/brltty.nix
    M nixos/modules/services/hardware/freefall.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/logging/logstash.nix
    M nixos/modules/services/mail/mlmmj.nix
    M nixos/modules/services/misc/gitit.nix
    M nixos/modules/services/monitoring/bosun.nix
    M nixos/modules/services/monitoring/grafana.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/networking/bitlbee.nix
    M nixos/modules/services/networking/connman.nix
    A nixos/modules/services/networking/dnschain.nix
    M nixos/modules/services/networking/dnsmasq.nix
    A nixos/modules/services/networking/namecoind.nix
    M nixos/modules/services/networking/ntpd.nix
    M nixos/modules/services/networking/openvpn.nix
    M nixos/modules/services/torrent/deluge.nix
    M nixos/modules/services/web-servers/apache-httpd/wordpress.nix
    M nixos/modules/services/web-servers/nginx/default.nix
    R nixos/modules/services/web-servers/nginx/reverse_proxy.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M nixos/modules/services/x11/redshift.nix
    M nixos/modules/system/boot/modprobe.nix
    M nixos/modules/system/boot/stage-1.nix
    M nixos/modules/virtualisation/containers.nix
    A nixos/modules/virtualisation/lxd.nix
    M nixos/modules/virtualisation/nixos-container.pl
    M nixos/modules/virtualisation/parallels-guest.nix
    M nixos/release.nix
    M nixos/tests/chromium.nix
    M nixos/tests/etcd.nix
    A nixos/tests/gnome3-gdm.nix
    M nixos/tests/logstash.nix
    M pkgs/applications/audio/dfasma/default.nix
    M pkgs/applications/audio/keyfinder-cli/default.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/editors/eclipse/plugins.nix
    M pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
    A pkgs/applications/editors/emacs-modes/erlang/default.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/editors/jedit/default.nix
    M pkgs/applications/editors/vim/configurable.nix
    M pkgs/applications/editors/vim/qvim.nix
    M pkgs/applications/editors/yi/wrapper.nix
    M pkgs/applications/graphics/graphicsmagick/default.nix
    M pkgs/applications/graphics/photoqt/default.nix
    M pkgs/applications/graphics/simple-scan/default.nix
    M pkgs/applications/graphics/synfigstudio/default.nix
    R pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
    M pkgs/applications/graphics/xaos/default.nix
    M pkgs/applications/kde-apps-15.04/packages.sh
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/devilspie2/default.nix
    M pkgs/applications/misc/gpa/default.nix
    M pkgs/applications/misc/gphoto2/gphotofs.nix
    M pkgs/applications/misc/grass/default.nix
    M pkgs/applications/misc/keepassx/2.0.nix
    M pkgs/applications/misc/khard/default.nix
    M pkgs/applications/misc/lxappearance/default.nix
    A pkgs/applications/misc/playonlinux/default.nix
    M pkgs/applications/misc/spacefm/default.nix
    M pkgs/applications/misc/viking/default.nix
    M pkgs/applications/networking/browsers/chromium/source/sources.nix
    M pkgs/applications/networking/browsers/links2/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
    M pkgs/applications/networking/browsers/qutebrowser/default.nix
    M pkgs/applications/networking/browsers/w3m/default.nix
    M pkgs/applications/networking/cluster/chronos/default.nix
    R pkgs/applications/networking/drive/default.nix
    M pkgs/applications/networking/feedreaders/rsstail/default.nix
    M pkgs/applications/networking/ftp/filezilla/default.nix
    A 
pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
    M pkgs/applications/networking/instant-messengers/bitlbee/default.nix
    A pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
    M pkgs/applications/networking/instant-messengers/blink/default.nix
    M pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
    M pkgs/applications/networking/mailreaders/claws-mail/default.nix
    R pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/libreoffice/default.nix
    R pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
    M pkgs/applications/office/libreoffice/libreoffice-srcs.nix
    M pkgs/applications/office/pinpoint/default.nix
    M pkgs/applications/science/geometry/drgeo/default.nix
    M pkgs/applications/science/logic/coq/8.3.nix
    M pkgs/applications/science/logic/coq/8.5.nix
    M pkgs/applications/science/logic/coq/HEAD.nix
    M pkgs/applications/science/logic/coq/default.nix
    M pkgs/applications/science/logic/hol_light/default.nix
    A pkgs/applications/science/logic/jonprl/default.nix
    M pkgs/applications/science/math/content/default.nix
    A pkgs/applications/science/math/csdp/default.nix
    M pkgs/applications/science/spyder/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    A pkgs/applications/version-management/git-and-tools/git-radar/default.nix
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M pkgs/applications/version-management/monotone-viz/mtn-head.nix
    M pkgs/applications/version-management/tailor/default.nix
    M pkgs/applications/version-management/viewmtn/0.10.nix
    M pkgs/applications/video/popcorntime/default.nix
    M pkgs/applications/virtualization/virtualbox/default.nix
    M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
    M pkgs/applications/window-managers/herbstluftwm/default.nix
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/build-support/builder-defs/builder-defs.nix
    M pkgs/build-support/emacs/trivial.nix
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/data/fonts/fontWrap/default.nix
    A pkgs/data/fonts/hack/default.nix
    M pkgs/data/fonts/libertine/default.nix
    M pkgs/data/fonts/pecita/default.nix
    M pkgs/data/icons/numix-icon-theme-circle/default.nix
    M pkgs/data/icons/numix-icon-theme/default.nix
    M pkgs/data/icons/tango-icon-theme/default.nix
    M pkgs/data/misc/geolite-legacy/default.nix
    A pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
    M pkgs/desktops/gnome-2/desktop/vte/default.nix
    M pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
    M pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
    M pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
    M pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
    M pkgs/desktops/plasma-5.3/packages.sh
    M pkgs/development/compilers/cudatoolkit/generic.nix
    R pkgs/development/compilers/cudatoolkit/setup-hook.sh
    M pkgs/development/compilers/gcl/default.nix
    A pkgs/development/compilers/ghc/7.8.3.nix
    M pkgs/development/compilers/go/1.5.nix
    A pkgs/development/compilers/intercal/default.nix
    M pkgs/development/compilers/julia/0.3.nix
    A pkgs/development/compilers/llvm/3.7/clang/default.nix
    A pkgs/development/compilers/llvm/3.7/clang/purity.patch
    A pkgs/development/compilers/llvm/3.7/default.nix
    A pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
    A pkgs/development/compilers/llvm/3.7/libc++/default.nix
    A pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
    A pkgs/development/compilers/llvm/3.7/libc++abi.nix
    A pkgs/development/compilers/llvm/3.7/lldb.nix
    A pkgs/development/compilers/llvm/3.7/llvm.nix
    M pkgs/development/compilers/neko/default.nix
    A pkgs/development/compilers/openjdk/7.nix
    A pkgs/development/compilers/openjdk/8.nix
    R pkgs/development/compilers/openjdk/default.nix
    R pkgs/development/compilers/openjdk/openjdk8.nix
    M pkgs/development/compilers/rustc/generic.nix
    M pkgs/development/compilers/rustc/head.nix
    M pkgs/development/compilers/rustc/patches/head.patch
    M pkgs/development/compilers/urweb/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/configuration-ghcjs.nix
    A pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/lib.nix
    A pkgs/development/interpreters/ceptre/default.nix
    M pkgs/development/interpreters/elixir/default.nix
    M pkgs/development/interpreters/mujs/default.nix
    M pkgs/development/interpreters/php/default.nix
    A pkgs/development/interpreters/python/3.5/default.nix
    A pkgs/development/interpreters/python/3.5/setup-hook.sh
    M pkgs/development/interpreters/ruby/bundler.nix
    M pkgs/development/interpreters/ruby/rubygems.nix
    A pkgs/development/interpreters/spidermonkey/31.5.nix
    A pkgs/development/libraries/CoinMP/default.nix
    M pkgs/development/libraries/amrnb/default.nix
    M pkgs/development/libraries/amrwb/default.nix
    M pkgs/development/libraries/box2d/default.nix
    M pkgs/development/libraries/cpp-netlib/default.nix
    M pkgs/development/libraries/dclxvi/default.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/gnutls/3.3.nix
    M pkgs/development/libraries/gnutls/3.4.nix
    M pkgs/development/libraries/gnutls/generic.nix
    M pkgs/development/libraries/gpgme/default.nix
    A pkgs/development/libraries/ip2location-c/default.nix
    M pkgs/development/libraries/java/junit/default.nix
    M pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
    M pkgs/development/libraries/kde-frameworks-5.10/packages.sh
    M pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
    M pkgs/development/libraries/kde-frameworks-5.12/packages.sh
    M pkgs/development/libraries/lesstif/default.nix
    A pkgs/development/libraries/libabw/default.nix
    M pkgs/development/libraries/libao/default.nix
    M pkgs/development/libraries/libarchive/default.nix
    M pkgs/development/libraries/libassuan/default.nix
    R pkgs/development/libraries/libassuan/git.nix
    M pkgs/development/libraries/libcangjie/default.nix
    A pkgs/development/libraries/libcmis/default.nix
    M pkgs/development/libraries/libevdev/default.nix
    M pkgs/development/libraries/libgcrypt/default.nix
    M pkgs/development/libraries/libgpg-error/default.nix
    R pkgs/development/libraries/libkeyfinder/0.11.nix
    M pkgs/development/libraries/libnetfilter_conntrack/default.nix
    M pkgs/development/libraries/libpsl/default.nix
    A pkgs/development/libraries/libsoundio/default.nix
    M pkgs/development/libraries/libva/default.nix
    M pkgs/development/libraries/libvirt/default.nix
    A pkgs/development/libraries/libwps/default.nix
    M pkgs/development/libraries/lirc/default.nix
    M pkgs/development/libraries/ncbi/default.nix
    A pkgs/development/libraries/netcdf-cxx4/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    A pkgs/development/libraries/pugixml/default.nix
    A pkgs/development/libraries/tidyp/default.nix
    M pkgs/development/libraries/unixODBCDrivers/default.nix
    M pkgs/development/libraries/vaapi-intel/default.nix
    M pkgs/development/libraries/webkitgtk/default.nix
    R pkgs/development/ocaml-modules/async-extra/default.nix
    R pkgs/development/ocaml-modules/async-find/default.nix
    R pkgs/development/ocaml-modules/async-kernel/default.nix
    R pkgs/development/ocaml-modules/async-shell/default.nix
    R pkgs/development/ocaml-modules/async-ssl/default.nix
    R pkgs/development/ocaml-modules/async-unix/default.nix
    M pkgs/development/ocaml-modules/async/default.nix
    A pkgs/development/ocaml-modules/async_extra/default.nix
    A pkgs/development/ocaml-modules/async_find/default.nix
    A pkgs/development/ocaml-modules/async_kernel/default.nix
    A pkgs/development/ocaml-modules/async_shell/default.nix
    A pkgs/development/ocaml-modules/async_ssl/default.nix
    A pkgs/development/ocaml-modules/async_unix/default.nix
    R pkgs/development/ocaml-modules/bin-prot/default.nix
    A pkgs/development/ocaml-modules/bin_prot/default.nix
    M pkgs/development/ocaml-modules/cohttp/default.nix
    M pkgs/development/ocaml-modules/comparelib/default.nix
    M pkgs/development/ocaml-modules/conduit/default.nix
    R pkgs/development/ocaml-modules/core-extended/default.nix
    R pkgs/development/ocaml-modules/core-kernel/default.nix
    M pkgs/development/ocaml-modules/core/default.nix
    A pkgs/development/ocaml-modules/core_extended/default.nix
    A pkgs/development/ocaml-modules/core_kernel/default.nix
    R pkgs/development/ocaml-modules/custom-printf/default.nix
    A pkgs/development/ocaml-modules/custom_printf/default.nix
    M pkgs/development/ocaml-modules/dolog/default.nix
    M pkgs/development/ocaml-modules/enumerate/default.nix
    R pkgs/development/ocaml-modules/erm-xml/default.nix
    R pkgs/development/ocaml-modules/erm-xmpp/default.nix
    A pkgs/development/ocaml-modules/erm_xml/default.nix
    A pkgs/development/ocaml-modules/erm_xmpp/default.nix
    M pkgs/development/ocaml-modules/fieldslib/default.nix
    M pkgs/development/ocaml-modules/odn/default.nix
    R pkgs/development/ocaml-modules/pa-bench/default.nix
    R pkgs/development/ocaml-modules/pa-ounit/default.nix
    R pkgs/development/ocaml-modules/pa-test/default.nix
    A pkgs/development/ocaml-modules/pa_bench/default.nix
    A pkgs/development/ocaml-modules/pa_ounit/default.nix
    A pkgs/development/ocaml-modules/pa_test/default.nix
    M pkgs/development/ocaml-modules/re2/default.nix
    M pkgs/development/ocaml-modules/sexplib/108.08.00.nix
    M pkgs/development/ocaml-modules/sexplib/111.25.00.nix
    M pkgs/development/ocaml-modules/sexplib/112.24.01.nix
    M pkgs/development/ocaml-modules/textutils/default.nix
    R pkgs/development/ocaml-modules/type-conv/108.08.00.nix
    R pkgs/development/ocaml-modules/type-conv/109.60.01.nix
    R pkgs/development/ocaml-modules/type-conv/112.01.01.nix
    A pkgs/development/ocaml-modules/type_conv/108.08.00.nix
    A pkgs/development/ocaml-modules/type_conv/109.60.01.nix
    A pkgs/development/ocaml-modules/type_conv/112.01.01.nix
    M pkgs/development/ocaml-modules/typerep/default.nix
    M pkgs/development/ocaml-modules/variantslib/default.nix
    M pkgs/development/pure-modules/octave/default.nix
    R pkgs/development/python-modules/btrees_interger_overflow.patch
    M pkgs/development/python-modules/irclib/default.nix
    M pkgs/development/python-modules/libsexy/default.nix
    A pkgs/development/python-modules/mathics/disable_console_tests.patch
    M pkgs/development/python-modules/pycangjie/default.nix
    M pkgs/development/python-modules/xmpppy/default.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/r-modules/patches/CARramps.patch
    M pkgs/development/r-modules/patches/WideLM.patch
    M pkgs/development/r-modules/patches/gputools.patch
    R pkgs/development/r-modules/patches/iFes.patch
    R pkgs/development/r-modules/patches/magma_cuda_include.patch
    M pkgs/development/r-modules/patches/rpud.patch
    M pkgs/development/tools/analysis/checkstyle/default.nix
    A pkgs/development/tools/build-managers/gup/build.nix
    A pkgs/development/tools/build-managers/gup/default.nix
    M pkgs/development/tools/build-managers/jam/default.nix
    M pkgs/development/tools/database/sqldeveloper/default.nix
    A pkgs/development/tools/github/github-release/default.nix
    R pkgs/development/tools/gocode/default.nix
    R pkgs/development/tools/goimports/default.nix
    R pkgs/development/tools/gotags/default.nix
    M pkgs/development/tools/grabserial/default.nix
    M pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
    M pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
    M pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
    R pkgs/development/tools/haskell/cabal2nix/language-nix.nix
    A pkgs/development/tools/haskell/lambdabot/custom-config.patch
    M pkgs/development/tools/haskell/lambdabot/default.nix
    M pkgs/development/tools/haskell/mueval/default.nix
    R pkgs/development/tools/misc/go-repo-root/default.nix
    M pkgs/development/tools/misc/intel-gpu-tools/default.nix
    A pkgs/development/tools/node-webkit/nw12.nix
    M pkgs/development/tools/ocaml/oasis/default.nix
    A pkgs/development/tools/rust/rustfmt/default.nix
    M pkgs/games/0ad/data.nix
    M pkgs/games/0ad/default.nix
    A pkgs/games/2048-in-terminal/default.nix
    A pkgs/games/airstrike/default.nix
    M pkgs/games/chocolate-doom/default.nix
    M pkgs/games/instead/default.nix
    M pkgs/games/jamp/default.nix
    M pkgs/games/lincity/default.nix
    M pkgs/games/liquidwar/default.nix
    M pkgs/games/openttd/default.nix
    M pkgs/games/scorched3d/default.nix
    M pkgs/games/steam/chrootenv.nix
    M pkgs/games/tennix/default.nix
    A pkgs/games/tennix/fix_FTBFS.patch
    A pkgs/games/xpilot/bloodspilot-client.nix
    A pkgs/games/xpilot/bloodspilot-server.nix
    A pkgs/games/xpilot/default.nix
    M pkgs/games/xsokoban/default.nix
    M pkgs/games/zangband/default.nix
    M pkgs/misc/cups/default.nix
    M pkgs/misc/drivers/sundtek/default.nix
    A pkgs/misc/emulators/desmume/default.nix
    M pkgs/misc/emulators/dolphin-emu/default.nix
    M pkgs/misc/emulators/wine/default.nix
    A pkgs/misc/jackaudio/git.nix
    A pkgs/misc/screensavers/xtrlock-pam/default.nix
    M pkgs/os-specific/linux/blcr/default.nix
    M pkgs/os-specific/linux/conntrack-tools/default.nix
    M pkgs/os-specific/linux/directvnc/default.nix
    M pkgs/os-specific/linux/dmidecode/default.nix
    M pkgs/os-specific/linux/dstat/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/htop/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-4.1.nix
    M pkgs/os-specific/linux/kernel/linux-4.2.nix
    M pkgs/os-specific/linux/kernel/linux-rpi.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    A pkgs/os-specific/linux/kmod-debian-aliases/default.nix
    M pkgs/os-specific/linux/lttng-modules/default.nix
    M pkgs/os-specific/linux/mcelog/default.nix
    M pkgs/os-specific/linux/prl-tools/default.nix
    M pkgs/os-specific/linux/spl/default.nix
    M pkgs/os-specific/linux/spl/git.nix
    M pkgs/os-specific/linux/systemd/fixes.patch
    R pkgs/os-specific/linux/upower/0.99.nix
    M pkgs/os-specific/linux/upower/default.nix
    R pkgs/os-specific/linux/zfs/compat-4.2-1.patch
    R pkgs/os-specific/linux/zfs/compat-4.2-2.patch
    R pkgs/os-specific/linux/zfs/compat-4.2-3.patch
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    R pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch
    R pkgs/servers/dns/mesos-dns/default.nix
    R pkgs/servers/dns/skydns/default.nix
    A pkgs/servers/dnschain/default.nix
    A pkgs/servers/dnschain/package.json
    A pkgs/servers/dnschain/package.nix
    M pkgs/servers/mail/exim/default.nix
    R pkgs/servers/monitoring/bosun/default.nix
    R pkgs/servers/monitoring/bosun/scollector.nix
    R pkgs/servers/nosql/influxdb/backup.nix
    M pkgs/servers/openafs-client/default.nix
    M pkgs/servers/shellinabox/default.nix
    M pkgs/servers/shellinabox/shellinabox-minus.patch
    M pkgs/servers/squid/squids.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
    M pkgs/servers/xmpp/pyIRCt/default.nix
    M pkgs/servers/xmpp/pyMAILt/default.nix
    R pkgs/shells/ipython/default.nix
    M pkgs/shells/zsh/default.nix
    M pkgs/tools/X11/bgs/default.nix
    M pkgs/tools/X11/keynav/default.nix
    M pkgs/tools/X11/xdotool/default.nix
    M pkgs/tools/admin/webdruid/default.nix
    M pkgs/tools/backup/obnam/default.nix
    M pkgs/tools/cd-dvd/unetbootin/default.nix
    M pkgs/tools/filesystems/btrfsprogs/default.nix
    A pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
    M pkgs/tools/filesystems/ceph/dev.nix
    M pkgs/tools/filesystems/ceph/git.nix
    R pkgs/tools/filesystems/exfat-utils/default.nix
    A pkgs/tools/filesystems/exfat/default.nix
    R pkgs/tools/filesystems/fuse-exfat/default.nix
    M pkgs/tools/graphics/argyllcms/default.nix
    M pkgs/tools/graphics/cuneiform/default.nix
    M pkgs/tools/inputmethods/ibus-anthy/default.nix
    M pkgs/tools/misc/byobu/default.nix
    R pkgs/tools/misc/cv/default.nix
    M pkgs/tools/misc/gnokii/default.nix
    M pkgs/tools/misc/logstash/default.nix
    M pkgs/tools/misc/man-db/default.nix
    M pkgs/tools/misc/parallel/default.nix
    A pkgs/tools/misc/progress/default.nix
    A pkgs/tools/misc/tmate/default.nix
    A pkgs/tools/misc/zsh-navigation-tools/default.nix
    A pkgs/tools/networking/dnscrypt-wrapper/default.nix
    M pkgs/tools/networking/gvpe/default.nix
    M pkgs/tools/networking/httping/default.nix
    M pkgs/tools/networking/imapsync/default.nix
    M pkgs/tools/networking/iodine/default.nix
    A pkgs/tools/networking/ip2location/default.nix
    M pkgs/tools/networking/ipv6calc/default.nix
    M pkgs/tools/networking/minidlna/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/networking/ntp/default.nix
    M pkgs/tools/networking/p2p/libtorrent/default.nix
    M pkgs/tools/networking/p2p/rtorrent/default.nix
    M pkgs/tools/networking/rp-pppoe/default.nix
    M pkgs/tools/networking/strongswan/default.nix
    M pkgs/tools/networking/vpnc/default.nix
    A pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
    M pkgs/tools/package-management/nix-repl/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/tools/security/bmrsa/11.nix
    M pkgs/tools/security/chkrootkit/default.nix
    M pkgs/tools/security/gnupg/20.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/metasploit/3.1.nix
    M pkgs/tools/system/ansible/default.nix
    M pkgs/tools/system/daemonize/default.nix
    M pkgs/tools/system/ddrescue/default.nix
    M pkgs/tools/system/fio/default.nix
    M pkgs/tools/system/plan9port/builder.sh
    M pkgs/tools/system/plan9port/default.nix
    M pkgs/tools/system/setserial/default.nix
    M pkgs/tools/system/stress-ng/default.nix
    M pkgs/tools/system/vbetool/default.nix
    M pkgs/tools/typesetting/patoline/default.nix
    M pkgs/tools/typesetting/pdf2djvu/default.nix
    M pkgs/tools/typesetting/tex/texlive/aggregate.nix
    M pkgs/tools/typesetting/tex/texlive/beamer.nix
    M pkgs/tools/typesetting/tex/texlive/cm-super.nix
    M pkgs/tools/typesetting/tex/texlive/context.nix
    M pkgs/tools/typesetting/tex/texlive/default.nix
    M pkgs/tools/typesetting/tex/texlive/extra.nix
    M pkgs/tools/typesetting/tex/texlive/moderncv.nix
    M pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
    M pkgs/tools/typesetting/tex/texlive/xcolor.nix
    M pkgs/tools/video/vncrec/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/haskell-packages.nix
    M pkgs/top-level/lua-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

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


  Commit: 276e38a1bb8ab19aed754977523bcc6b8161dc0c
      
https://github.com/NixOS/nixpkgs/commit/276e38a1bb8ab19aed754977523bcc6b8161dc0c
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M pkgs/build-support/setup-hooks/patch-shebangs.sh

  Log Message:
  -----------
  patchShebangs: Ignore outputs that don't exist yet


  Commit: 471e5697e4c39b74cbdce7d8b570e6d5f367a0b3
      
https://github.com/NixOS/nixpkgs/commit/471e5697e4c39b74cbdce7d8b570e6d5f367a0b3
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  libabw: fix build by using older boost


  Commit: bed1eb3260f82ee18ac66ec5c6266244967ceeed
      
https://github.com/NixOS/nixpkgs/commit/bed1eb3260f82ee18ac66ec5c6266244967ceeed
  Author: Lancelot SIX <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M pkgs/development/tools/misc/autogen/default.nix

  Log Message:
  -----------
  autogen: 5.18.5 -> 5.18.6 (close #9885)

See http://lists.gnu.org/archive/html/info-gnu/2015-09/msg00006.html for
announcement


  Commit: a418096d6a6a51913a7b940d1ff791e98d6181d4
      
https://github.com/NixOS/nixpkgs/commit/a418096d6a6a51913a7b940d1ff791e98d6181d4
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M doc/stdenv.xml
    R maintainers/scripts/gnome-latest.sh
    A maintainers/scripts/gnome.sh
    M nixos/modules/config/system-path.nix
    M nixos/modules/services/mail/mlmmj.nix
    M nixos/modules/services/search/elasticsearch.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/modules/virtualisation/containers.nix
    A nixos/modules/virtualisation/nixos-container-completion.sh
    M nixos/modules/virtualisation/virtualbox-image.nix
    M nixos/tests/virtualbox.nix
    M pkgs/applications/audio/foo-yc20/default.nix
    A pkgs/applications/audio/renoise/default.nix
    M pkgs/applications/editors/eclipse/plugins.nix
    M pkgs/applications/misc/hello/ex-2/default.nix
    M pkgs/applications/misc/super_user_spark/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/hipchat/default.nix
    M pkgs/applications/networking/instant-messengers/jitsi/default.nix
    M pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
    M 
pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
    M pkgs/applications/networking/sniffers/wireshark/default.nix
    M pkgs/applications/version-management/git-repo/default.nix
    A pkgs/applications/version-management/rabbitvcs/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    M pkgs/applications/virtualization/virtualbox/default.nix
    M pkgs/applications/virtualization/xhyve/default.nix
    A pkgs/build-support/setup-hooks/separate-debug-info.sh
    M pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
    A pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
    M pkgs/development/compilers/ccl/default.nix
    M pkgs/development/compilers/intercal/default.nix
    M pkgs/development/compilers/julia/0.3.nix
    M pkgs/development/compilers/openjdk/8.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/libraries/kerberos/heimdal.nix
    M pkgs/development/libraries/ldns/default.nix
    A pkgs/development/libraries/ldns/perl-5.22-compat.patch
    M pkgs/development/libraries/libabw/default.nix
    M pkgs/development/libraries/libpsl/default.nix
    M pkgs/development/libraries/libtasn1/default.nix
    M pkgs/development/libraries/science/math/arpack/default.nix
    M pkgs/development/libraries/wavpack/default.nix
    A pkgs/development/libraries/wavpack/wavpack_clang.patch
    A pkgs/development/libraries/zimlib/default.nix
    M pkgs/development/tools/misc/gdb/default.nix
    M pkgs/development/tools/misc/global/default.nix
    A pkgs/development/tools/misc/teensy-loader-cli/default.nix
    R pkgs/development/tools/misc/teensy/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    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-4.1.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/systemd/fixes.patch
    M pkgs/servers/http/lighttpd/default.nix
    M pkgs/servers/nosql/rethinkdb/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/tools/backup/duply/default.nix
    M pkgs/tools/graphics/argyllcms/default.nix
    A pkgs/tools/graphics/argyllcms/gcc5.patch
    M pkgs/tools/misc/svtplay-dl/default.nix
    M pkgs/tools/networking/lftp/default.nix
    M pkgs/tools/networking/miniupnpc/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/security/eid-mw/default.nix
    M pkgs/tools/security/eid-mw/eid-nssdb.in
    M pkgs/tools/system/stress-ng/default.nix
    M pkgs/tools/text/ascii/default.nix
    M pkgs/tools/text/diffstat/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/python-packages.nix

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


  Commit: 453b986d2f1061dd04f7a2f198c4e5276ddc8d8f
      
https://github.com/NixOS/nixpkgs/commit/453b986d2f1061dd04f7a2f198c4e5276ddc8d8f
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M pkgs/development/libraries/pcre/default.nix
    A pkgs/development/libraries/pcre/fixes.patch

  Log Message:
  -----------
  pcre: Updates to fix a number of vulnerabilities

  - CVE-2015-3210
  - CVE-2015-5073
  - http://seclists.org/oss-sec/2015/q3/295


  Commit: bea831a96822411bd30d0494ac574c549ef9f078
      
https://github.com/NixOS/nixpkgs/commit/bea831a96822411bd30d0494ac574c549ef9f078
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  Revert "libabw: fix build by using older boost"

This reverts commit 471e5697e4c39b74cbdce7d8b570e6d5f367a0b3.

This should have already been fixed by
35b3a53829962e1007323dfc857eacb4dbc25505.


  Commit: da908b458bb368641142144a309411e92507a232
      
https://github.com/NixOS/nixpkgs/commit/da908b458bb368641142144a309411e92507a232
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    R pkgs/development/libraries/boost/1.58.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  boost: Remove unused 1.58


  Commit: fb30776a77122b687fd5f758672311dbcbd81cc2
      
https://github.com/NixOS/nixpkgs/commit/fb30776a77122b687fd5f758672311dbcbd81cc2
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  pcre: Fix patch method


  Commit: f8e7cee32e702d7e46d4326d436da78af690d529
      
https://github.com/NixOS/nixpkgs/commit/f8e7cee32e702d7e46d4326d436da78af690d529
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  folly: 0.57.0 -> 2015-09-17


  Commit: 1bc98b2e36669e8418e3521ae1dc57ae09f8d6fd
      
https://github.com/NixOS/nixpkgs/commit/1bc98b2e36669e8418e3521ae1dc57ae09f8d6fd
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M pkgs/applications/kde-apps-15.04/default.nix
    M pkgs/desktops/plasma-5.3/default.nix
    R pkgs/development/libraries/boost/1.56.nix
    R pkgs/development/libraries/boost/1.57.nix
    M pkgs/development/libraries/kde-frameworks-5.10/default.nix
    M pkgs/development/libraries/kde-frameworks-5.12/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  boost: Reduce the number of supported versions


  Commit: d78936131a701a727ad70969fa762b4db0e59f37
      
https://github.com/NixOS/nixpkgs/commit/d78936131a701a727ad70969fa762b4db0e59f37
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M pkgs/development/libraries/mesa-darwin/default.nix
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M pkgs/os-specific/darwin/apple-sdk/frameworks.nix
    M pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  preparation for being able to build xquartz


  Commit: 58fa09a40a287c891328ce7b4864cc911b96d21a
      
https://github.com/NixOS/nixpkgs/commit/58fa09a40a287c891328ce7b4864cc911b96d21a
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  git-credential-osxkeychain


  Commit: 3278007dae02dbe72c7ba128a3a592685b6af8f6
      
https://github.com/NixOS/nixpkgs/commit/3278007dae02dbe72c7ba128a3a592685b6af8f6
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    A pkgs/tools/archivers/cpio/CVE-2015-1197-cpio-2.12.patch
    R pkgs/tools/archivers/cpio/darwin-fix.patch
    M pkgs/tools/archivers/cpio/default.nix
    R pkgs/tools/archivers/cpio/no-gets.patch

  Log Message:
  -----------
  cpio: 2.11 -> 2.12

Enable tests (which may fail on Darwin, another reason to stage this).


  Commit: 27678026d7201dee69fde7bc250e7f3cf69a5ee1
      
https://github.com/NixOS/nixpkgs/commit/27678026d7201dee69fde7bc250e7f3cf69a5ee1
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    R pkgs/tools/archivers/cpio/CVE-2015-1197-cpio-2.12.patch
    M pkgs/tools/archivers/cpio/default.nix

  Log Message:
  -----------
  cpio: unbundle patch (fetch from my GitHub acct.)


  Commit: 8b54192b85eb8b28fdcb0badbedd1bfca57e139e
      
https://github.com/NixOS/nixpkgs/commit/8b54192b85eb8b28fdcb0badbedd1bfca57e139e
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

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

  Log Message:
  -----------
  Revert "git-credential-osxkeychain"

This reverts commit 58fa09a40a287c891328ce7b4864cc911b96d21a.


  Commit: 6e092236273bbcd95654392430a281365bc2278a
      
https://github.com/NixOS/nixpkgs/commit/6e092236273bbcd95654392430a281365bc2278a
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M lib/types.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/config/ldap.nix
    M nixos/modules/config/shells-environment.nix
    M nixos/modules/config/system-environment.nix
    M nixos/modules/profiles/base.nix
    M nixos/modules/programs/venus.nix
    M nixos/modules/programs/wvdial.nix
    M nixos/modules/programs/xfs_quota.nix
    M nixos/modules/security/pam.nix
    M nixos/modules/security/prey.nix
    M nixos/modules/services/monitoring/smartd.nix
    M nixos/modules/services/networking/oidentd.nix
    M nixos/modules/system/activation/top-level.nix
    M nixos/modules/system/boot/loader/efi.nix
    M nixos/modules/system/boot/luksroot.nix
    M nixos/modules/tasks/encrypted-devices.nix
    M nixos/modules/tasks/filesystems.nix
    M nixos/modules/tasks/network-interfaces.nix
    M nixos/modules/virtualisation/azure-image.nix
    M nixos/modules/virtualisation/brightbox-image.nix
    M nixos/modules/virtualisation/containers.nix
    M nixos/modules/virtualisation/docker.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    M nixos/modules/virtualisation/virtualbox-image.nix
    M pkgs/applications/display-managers/lightdm/default.nix
    M pkgs/applications/editors/emacs-modes/ocaml/default.nix
    R 
pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch
    R 
pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
    M pkgs/applications/misc/audio/sox/default.nix
    M pkgs/applications/misc/dfilemanager/default.nix
    A pkgs/applications/misc/tthsum/default.nix
    M pkgs/applications/networking/browsers/chromium/source/sources.nix
    M pkgs/applications/networking/instant-messengers/jitsi/default.nix
    M pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
    M pkgs/applications/networking/mailreaders/claws-mail/default.nix
    A pkgs/applications/networking/mailreaders/claws-mail/mime.patch
    M pkgs/applications/version-management/subversion/default.nix
    M pkgs/applications/video/pitivi/default.nix
    M pkgs/applications/video/vlc/default.nix
    M pkgs/build-support/buildenv/builder.pl
    M pkgs/build-support/buildenv/default.nix
    M pkgs/development/compilers/dmd/default.nix
    M pkgs/development/compilers/gcl/default.nix
    M pkgs/development/compilers/icedtea-web/default.nix
    M pkgs/development/compilers/julia/0.3.nix
    M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
    M pkgs/development/libraries/check/default.nix
    M pkgs/development/libraries/czmq/default.nix
    M pkgs/development/libraries/geos/default.nix
    M pkgs/development/libraries/gnu-efi/default.nix
    M pkgs/development/libraries/gstreamer/default.nix
    M pkgs/development/libraries/gstreamer/python/default.nix
    M pkgs/development/libraries/libedit/default.nix
    A pkgs/development/libraries/libhangul/default.nix
    M pkgs/development/libraries/libibmad/default.nix
    M pkgs/development/libraries/libibumad/default.nix
    A pkgs/development/libraries/libksi/default.nix
    M pkgs/development/libraries/liblognorm/default.nix
    M pkgs/development/libraries/libnftnl/default.nix
    M pkgs/development/libraries/libraw1394/default.nix
    M pkgs/development/libraries/librelp/default.nix
    M pkgs/development/libraries/libressl/default.nix
    M pkgs/development/libraries/libs3/default.nix
    M pkgs/development/libraries/libu2f-host/default.nix
    A pkgs/development/libraries/libwebsockets/default.nix
    M pkgs/development/libraries/libxmlxx/default.nix
    M pkgs/development/libraries/libykneomgr/default.nix
    M pkgs/development/libraries/nspr/default.nix
    M pkgs/development/libraries/nss/default.nix
    A pkgs/development/libraries/openldap/CVE-2015-6908.patch
    M pkgs/development/libraries/openldap/default.nix
    M pkgs/development/libraries/poppler/default.nix
    M pkgs/development/libraries/proj/default.nix
    A pkgs/development/libraries/resolv_wrapper/default.nix
    M pkgs/development/libraries/snappy/default.nix
    M pkgs/development/libraries/socket_wrapper/default.nix
    M pkgs/development/libraries/spice-gtk/default.nix
    M pkgs/development/libraries/spice-protocol/default.nix
    M pkgs/development/libraries/zeromq/4.x.nix
    M pkgs/development/ocaml-modules/ocsigen-server/default.nix
    M pkgs/development/python-modules/wxPython/2.8.nix
    M pkgs/development/python-modules/wxPython/3.0.nix
    R pkgs/development/python-modules/wxPython/builder.sh
    R pkgs/development/python-modules/wxPython/builder3.0.sh
    A pkgs/development/python-modules/wxPython/generic.nix
    A pkgs/development/tools/parsing/lemon/default.nix
    M pkgs/misc/drivers/hplip/default.nix
    R pkgs/os-specific/linux/apparmor/2.9/default.nix
    R pkgs/os-specific/linux/apparmor/capability.patch
    M pkgs/os-specific/linux/apparmor/default.nix
    M pkgs/os-specific/linux/audit/default.nix
    R pkgs/os-specific/linux/autofs/autofs-v5.nix
    R pkgs/os-specific/linux/autofs/create-patches-v5.sh
    A pkgs/os-specific/linux/autofs/default.nix
    R pkgs/os-specific/linux/autofs/patches-v5.nix
    M pkgs/os-specific/linux/cgmanager/default.nix
    M pkgs/os-specific/linux/iproute/default.nix
    M pkgs/os-specific/linux/nftables/default.nix
    A pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/servers/dns/bind/default.nix
    M pkgs/servers/nosql/mongodb/default.nix
    M pkgs/servers/samba/4.x.nix
    M pkgs/tools/backup/bareos/default.nix
    M pkgs/tools/filesystems/ceph/generic.nix
    A pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
    M pkgs/tools/filesystems/xfsprogs/default.nix
    R pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch
    A pkgs/tools/inputmethods/nabi/default.nix
    M pkgs/tools/misc/fdupes/default.nix
    M pkgs/tools/misc/yubico-piv-tool/default.nix
    M pkgs/tools/misc/yubikey-personalization-gui/default.nix
    M pkgs/tools/networking/dhcp/default.nix
    M pkgs/tools/networking/keepalived/default.nix
    A pkgs/tools/networking/minissdpd/default.nix
    M pkgs/tools/networking/miniupnpc/default.nix
    M pkgs/tools/system/rsyslog/default.nix
    A pkgs/tools/system/rsyslog/fix-gnutls-detection.patch
    M pkgs/tools/typesetting/tex/latex2html/default.nix
    R pkgs/tools/typesetting/tex/lazylist/builder.sh
    R pkgs/tools/typesetting/tex/lazylist/default.nix
    R pkgs/tools/typesetting/tex/polytable/builder.sh
    R pkgs/tools/typesetting/tex/polytable/default.nix
    A pkgs/tools/typesetting/tex/texlive-new/bin.nix
    A pkgs/tools/typesetting/tex/texlive-new/combine.nix
    A pkgs/tools/typesetting/tex/texlive-new/default.nix
    A pkgs/tools/typesetting/tex/texlive-new/fixHashes.sh
    A pkgs/tools/typesetting/tex/texlive-new/fixedHashes.nix
    A pkgs/tools/typesetting/tex/texlive-new/pkgs.nix
    A pkgs/tools/typesetting/tex/texlive-new/setup-hook.sh
    A pkgs/tools/typesetting/tex/texlive-new/texlinks.patch
    A pkgs/tools/typesetting/tex/texlive-new/tl2nix.sed
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: d77588d127d4916eba76a2d692184133263f7add
      
https://github.com/NixOS/nixpkgs/commit/d77588d127d4916eba76a2d692184133263f7add
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M pkgs/development/libraries/gdk-pixbuf/default.nix

  Log Message:
  -----------
  gdk_pixbuf: maintenance update 2.31.6 -> 2.31.7


  Commit: 67ad72140b73eaedd9471c3544c0576ce8b862b8
      
https://github.com/NixOS/nixpkgs/commit/67ad72140b73eaedd9471c3544c0576ce8b862b8
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  harfbuzz: update 1.0.2 -> 1.0.3


  Commit: a5b0136b1a3d648a0f2fd473a8230934e354a92c
      
https://github.com/NixOS/nixpkgs/commit/a5b0136b1a3d648a0f2fd473a8230934e354a92c
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  gkt3: maintenance update 3.16.6 -> 3.16.7


  Commit: c8f462b80b9fc6ae26a91b4a074d85839b1f8fb4
      
https://github.com/NixOS/nixpkgs/commit/c8f462b80b9fc6ae26a91b4a074d85839b1f8fb4
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  libdrm: update 2.4.64 -> 2.4.65


  Commit: b868ec950d7a85e7856baa6e5f85c4d80f1a91a3
      
https://github.com/NixOS/nixpkgs/commit/b868ec950d7a85e7856baa6e5f85c4d80f1a91a3
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  mesa: maintenance update 10.6.7 -> 10.6.8


  Commit: 8a1b8a5b0a4bc1bb7995f7f867a66a400259326c
      
https://github.com/NixOS/nixpkgs/commit/8a1b8a5b0a4bc1bb7995f7f867a66a400259326c
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M pkgs/os-specific/darwin/cctools/port.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  alias libtool to darwin.cctools on darwin


  Commit: dfb2f6151983074396b670c4808b88c50a227ed5
      
https://github.com/NixOS/nixpkgs/commit/dfb2f6151983074396b670c4808b88c50a227ed5
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  fix autoreconfHook


  Commit: 5ba050a1a3971ea3a350238f6b6b15f90e516e6e
      
https://github.com/NixOS/nixpkgs/commit/5ba050a1a3971ea3a350238f6b6b15f90e516e6e
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  cmake: 3.3.1 -> 3.3.2


  Commit: 1bada3e658d529d13d0fc7f4e83f9556ccefd327
      
https://github.com/NixOS/nixpkgs/commit/1bada3e658d529d13d0fc7f4e83f9556ccefd327
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

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

  Log Message:
  -----------
  all-packages: Fix extraneous reference to deleted boost 1.57


  Commit: 3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270
      
https://github.com/NixOS/nixpkgs/commit/3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M doc/haskell-users-guide.xml
    M lib/attrsets.nix
    M lib/maintainers.nix
    M nixos/doc/manual/release-notes/rl-unstable.xml
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/services/misc/gitit.nix
    A nixos/modules/services/search/kibana.nix
    A nixos/modules/services/security/physlock.nix
    M pkgs/applications/audio/beast/default.nix
    M pkgs/applications/graphics/djview/default.nix
    R pkgs/applications/graphics/djview/djview4-qt-4.8.patch
    M pkgs/applications/misc/mupdf/default.nix
    A pkgs/applications/misc/vit/default.nix
    M pkgs/applications/misc/xterm/default.nix
    M pkgs/applications/networking/browsers/chromium/source/default.nix
    M pkgs/applications/networking/ftp/filezilla/default.nix
    M pkgs/applications/networking/instant-messengers/profanity/default.nix
    M pkgs/applications/networking/irc/quassel/default.nix
    A pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
    M pkgs/applications/networking/linssid/default.nix
    M pkgs/applications/networking/p2p/retroshare/0.6.nix
    M pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
    A pkgs/applications/science/math/perseus/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    M pkgs/build-support/fetchgit/nix-prefetch-git
    A pkgs/data/fonts/noto-fonts/default.nix
    M pkgs/data/fonts/source-han-sans/default.nix
    M pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
    M pkgs/desktops/xfce/core/exo.nix
    M pkgs/desktops/xfce/default.nix
    M pkgs/development/compilers/julia/0.3.nix
    M pkgs/development/compilers/llvm/3.3/llvm.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    A pkgs/development/haskell-modules/configuration-lts-0.0.nix
    A pkgs/development/haskell-modules/configuration-lts-0.1.nix
    A pkgs/development/haskell-modules/configuration-lts-0.2.nix
    A pkgs/development/haskell-modules/configuration-lts-0.3.nix
    A pkgs/development/haskell-modules/configuration-lts-0.4.nix
    A pkgs/development/haskell-modules/configuration-lts-0.5.nix
    A pkgs/development/haskell-modules/configuration-lts-0.6.nix
    A pkgs/development/haskell-modules/configuration-lts-0.7.nix
    A pkgs/development/haskell-modules/configuration-lts-1.0.nix
    A pkgs/development/haskell-modules/configuration-lts-1.1.nix
    A pkgs/development/haskell-modules/configuration-lts-1.10.nix
    A pkgs/development/haskell-modules/configuration-lts-1.11.nix
    A pkgs/development/haskell-modules/configuration-lts-1.12.nix
    A pkgs/development/haskell-modules/configuration-lts-1.13.nix
    A pkgs/development/haskell-modules/configuration-lts-1.14.nix
    A pkgs/development/haskell-modules/configuration-lts-1.15.nix
    A pkgs/development/haskell-modules/configuration-lts-1.2.nix
    A pkgs/development/haskell-modules/configuration-lts-1.4.nix
    A pkgs/development/haskell-modules/configuration-lts-1.5.nix
    A pkgs/development/haskell-modules/configuration-lts-1.7.nix
    A pkgs/development/haskell-modules/configuration-lts-1.8.nix
    A pkgs/development/haskell-modules/configuration-lts-1.9.nix
    A pkgs/development/haskell-modules/configuration-lts-2.0.nix
    A pkgs/development/haskell-modules/configuration-lts-2.1.nix
    A pkgs/development/haskell-modules/configuration-lts-2.10.nix
    A pkgs/development/haskell-modules/configuration-lts-2.11.nix
    A pkgs/development/haskell-modules/configuration-lts-2.12.nix
    A pkgs/development/haskell-modules/configuration-lts-2.13.nix
    A pkgs/development/haskell-modules/configuration-lts-2.14.nix
    A pkgs/development/haskell-modules/configuration-lts-2.15.nix
    A pkgs/development/haskell-modules/configuration-lts-2.16.nix
    A pkgs/development/haskell-modules/configuration-lts-2.17.nix
    A pkgs/development/haskell-modules/configuration-lts-2.18.nix
    A pkgs/development/haskell-modules/configuration-lts-2.19.nix
    A pkgs/development/haskell-modules/configuration-lts-2.2.nix
    A pkgs/development/haskell-modules/configuration-lts-2.20.nix
    A pkgs/development/haskell-modules/configuration-lts-2.21.nix
    A pkgs/development/haskell-modules/configuration-lts-2.22.nix
    A pkgs/development/haskell-modules/configuration-lts-2.3.nix
    A pkgs/development/haskell-modules/configuration-lts-2.4.nix
    A pkgs/development/haskell-modules/configuration-lts-2.5.nix
    A pkgs/development/haskell-modules/configuration-lts-2.6.nix
    A pkgs/development/haskell-modules/configuration-lts-2.7.nix
    A pkgs/development/haskell-modules/configuration-lts-2.8.nix
    A pkgs/development/haskell-modules/configuration-lts-2.9.nix
    A pkgs/development/haskell-modules/configuration-lts-3.0.nix
    A pkgs/development/haskell-modules/configuration-lts-3.1.nix
    A pkgs/development/haskell-modules/configuration-lts-3.2.nix
    A pkgs/development/haskell-modules/configuration-lts-3.3.nix
    A pkgs/development/haskell-modules/configuration-lts-3.4.nix
    A pkgs/development/haskell-modules/configuration-lts-3.5.nix
    M pkgs/development/haskell-modules/default.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    R pkgs/development/libraries/qt-5/5.3/0001-dlopen-gtkstyle.patch
    R pkgs/development/libraries/qt-5/5.3/0002-dlopen-webkit-nsplugin.patch
    R pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch
    R pkgs/development/libraries/qt-5/5.3/0004-dlopen-resolv.patch
    R pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch
    R pkgs/development/libraries/qt-5/5.3/0006-tzdir.patch
    R pkgs/development/libraries/qt-5/5.3/0007-dlopen-webkit-gtk.patch
    R pkgs/development/libraries/qt-5/5.3/0008-dlopen-webkit-udev.patch
    R pkgs/development/libraries/qt-5/5.3/0009-dlopen-serialport-udev.patch
    R pkgs/development/libraries/qt-5/5.3/0010-dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.3/0011-dlopen-openssl.patch
    R pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch
    R pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch
    R pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch
    R pkgs/development/libraries/qt-5/5.3/default.nix
    M pkgs/development/libraries/qt-5/qt-env.nix
    M pkgs/development/libraries/qwt/6.nix
    A pkgs/development/ocaml-modules/fontconfig/default.nix
    M pkgs/development/tools/misc/kibana/default.nix
    M pkgs/development/tools/misc/swig/3.x.nix
    M pkgs/development/web/nodejs/default.nix
    M pkgs/games/hedgewars/default.nix
    M pkgs/misc/emulators/mgba/default.nix
    M pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
    A pkgs/os-specific/linux/kernel/flush_workqueue-export.patch
    M pkgs/os-specific/linux/kernel/linux-4.2.nix
    R pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/tools/X11/xdg-utils/default.nix
    M pkgs/tools/misc/pal/default.nix
    M pkgs/tools/misc/picocom/default.nix
    M pkgs/tools/misc/sl/default.nix
    M pkgs/tools/networking/mosh/default.nix
    M pkgs/tools/package-management/nixops/unstable.nix
    M pkgs/tools/security/afl/default.nix
    M pkgs/tools/system/pciutils/default.nix
    A pkgs/tools/text/zimreader/default.nix
    A pkgs/tools/text/zimwriterfs/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/haskell-packages.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: 71d98332e9f17d92b56841ba8f938f77b1c5a3a1
      
https://github.com/NixOS/nixpkgs/commit/71d98332e9f17d92b56841ba8f938f77b1c5a3a1
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M pkgs/applications/editors/emacs-24/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  make emacs buildable


  Commit: 2d464f75ed46869b5942c4b479772a0367b30608
      
https://github.com/NixOS/nixpkgs/commit/2d464f75ed46869b5942c4b479772a0367b30608
  Author: Jude Taylor <[email protected]>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

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

  Log Message:
  -----------
  give libuv real libtool


  Commit: 5cfe893cc48cef16691facbb2bd01826e34afeaf
      
https://github.com/NixOS/nixpkgs/commit/5cfe893cc48cef16691facbb2bd01826e34afeaf
  Author: William A. Kennington III <[email protected]>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M pkgs/applications/editors/emacs-24/default.nix
    M pkgs/applications/kde-apps-15.04/default.nix
    M pkgs/build-support/setup-hooks/patch-shebangs.sh
    M pkgs/desktops/plasma-5.3/default.nix
    R pkgs/development/libraries/boost/1.56.nix
    R pkgs/development/libraries/boost/1.57.nix
    R pkgs/development/libraries/boost/1.58.nix
    M pkgs/development/libraries/folly/default.nix
    M pkgs/development/libraries/gdk-pixbuf/default.nix
    M pkgs/development/libraries/gtk+/3.x.nix
    M pkgs/development/libraries/harfbuzz/default.nix
    M pkgs/development/libraries/kde-frameworks-5.10/default.nix
    M pkgs/development/libraries/kde-frameworks-5.12/default.nix
    M pkgs/development/libraries/libdrm/default.nix
    M pkgs/development/libraries/libtiff/default.nix
    M pkgs/development/libraries/libuv/default.nix
    M pkgs/development/libraries/mesa-darwin/default.nix
    M pkgs/development/libraries/mesa/default.nix
    M pkgs/development/libraries/pcre/default.nix
    A pkgs/development/libraries/pcre/fixes.patch
    M pkgs/development/tools/build-managers/cmake/default.nix
    M pkgs/development/tools/misc/autogen/default.nix
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M pkgs/os-specific/darwin/apple-sdk/frameworks.nix
    M pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
    M pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
    M pkgs/os-specific/darwin/cctools/port.nix
    M pkgs/servers/x11/xorg/overrides.nix
    R pkgs/tools/archivers/cpio/darwin-fix.patch
    M pkgs/tools/archivers/cpio/default.nix
    R pkgs/tools/archivers/cpio/no-gets.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream

This is a partial commit from staging in an attempt to make merges
smaller.


Compare: https://github.com/NixOS/nixpkgs/compare/0d0be1387869...5cfe893cc48c
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to