Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fb893a8ad2f02029e71c1fef51913adf2f2bc995
      
https://github.com/NixOS/nixpkgs/commit/fb893a8ad2f02029e71c1fef51913adf2f2bc995
  Author: José Romildo Malaquias <[email protected]>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix

  Log Message:
  -----------
  docbook-xsl: 1.78.1 -> 1.79.1


  Commit: 67555277e10f403dcf41863b398f2a3b46602058
      
https://github.com/NixOS/nixpkgs/commit/67555277e10f403dcf41863b398f2a3b46602058
  Author: José Romildo Malaquias <[email protected]>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M pkgs/tools/typesetting/xmlto/default.nix

  Log Message:
  -----------
  xmlto: 0.0.26 -> 0.0.28


  Commit: 28919e5bfa23111e099f91b7edcc5828a9d451b3
      
https://github.com/NixOS/nixpkgs/commit/28919e5bfa23111e099f91b7edcc5828a9d451b3
  Author: Marius Bakke <[email protected]>
  Date:   2016-04-16 (Sat, 16 Apr 2016)

  Changed paths:
    M pkgs/development/python-modules/generic/wrap.sh

  Log Message:
  -----------
  wrapPythonPrograms: preserve quoted strings from makeWrapperArgs

Currently, if a user tries to to set a variable that contains
spaces, it will be broken up before being passed to wrapProgram.

This commit resolves that by converting makeWrapperArgs to an
array that preserves any quoted elements using bash's parser.


  Commit: d534e38d58fb8c91236db5aff6dd2a1b8566bfa2
      
https://github.com/NixOS/nixpkgs/commit/d534e38d58fb8c91236db5aff6dd2a1b8566bfa2
  Author: Marius Bakke <[email protected]>
  Date:   2016-04-16 (Sat, 16 Apr 2016)

  Changed paths:
    M pkgs/build-support/setup-hooks/make-wrapper.sh

  Log Message:
  -----------
  makeWrapper: allow special characters in variable contents


  Commit: 78f793382980e93cbeb60fec0d68da3282c8448f
      
https://github.com/NixOS/nixpkgs/commit/78f793382980e93cbeb60fec0d68da3282c8448f
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  infinite recursion and cross-build fix


  Commit: 0265285b9636c5d900aded5d17073d8538ae60ba
      
https://github.com/NixOS/nixpkgs/commit/0265285b9636c5d900aded5d17073d8538ae60ba
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  moving builder.sh hooks into nix


  Commit: 44ae9a3c0a92b68c3e4b8425784ddc8a777c866d
      
https://github.com/NixOS/nixpkgs/commit/44ae9a3c0a92b68c3e4b8425784ddc8a777c866d
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  reorganize crossDrv hooks


  Commit: e8ca9dca5302c86cb56a8bca1d3bc1a7b3435e85
      
https://github.com/NixOS/nixpkgs/commit/e8ca9dca5302c86cb56a8bca1d3bc1a7b3435e85
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  manual strip broke crossDrv. no clue why it was ever added; should be 
automatic


  Commit: 7399d0949c4dc2d05e2c487288914e95be8ec831
      
https://github.com/NixOS/nixpkgs/commit/7399d0949c4dc2d05e2c487288914e95be8ec831
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M pkgs/build-support/gcc-cross-wrapper/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  -----------
  fixing libcCross related flags

(excluding darwin and mingw for now)


  Commit: 527f619aae26a50884b0246b1aa0a746de3f6322
      
https://github.com/NixOS/nixpkgs/commit/527f619aae26a50884b0246b1aa0a746de3f6322
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  same changes to gcc6


  Commit: 251c97adee1381b9d04872e22dc15c83959b7f88
      
https://github.com/NixOS/nixpkgs/commit/251c97adee1381b9d04872e22dc15c83959b7f88
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M pkgs/development/libraries/glibc/common.nix
    A pkgs/development/libraries/glibc/fix_warnings.patch

  Log Message:
  -----------
  fix brace warnings in glibc


  Commit: 89c9a8896b8b0793cdad1728c39e300bf10c5df7
      
https://github.com/NixOS/nixpkgs/commit/89c9a8896b8b0793cdad1728c39e300bf10c5df7
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.6/builder.sh
    M pkgs/development/compilers/gcc/4.6/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix

  Log Message:
  -----------
  same changes to the rest. 4.5 has inf recursion still, 4.6 too old for 
glibc2.23


  Commit: fa4fcaf6b46af3fb4f0273bb657f96223763ac86
      
https://github.com/NixOS/nixpkgs/commit/fa4fcaf6b46af3fb4f0273bb657f96223763ac86
  Author: Eric Litak <[email protected]>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  darwin output paths


  Commit: b9d42f79c979489d678e99b0faa2fc6e0a8977dc
      
https://github.com/NixOS/nixpkgs/commit/b9d42f79c979489d678e99b0faa2fc6e0a8977dc
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M lib/maintainers.nix
    M maintainers/scripts/travis-nox-review-pr.sh
    M nixos/doc/manual/release-notes/rl-1609.xml
    M nixos/modules/hardware/video/ati.nix
    M nixos/modules/services/databases/openldap.nix
    M nixos/modules/services/hardware/pcscd.nix
    M nixos/modules/services/networking/openvpn.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/services/x11/desktop-managers/kde5.nix
    M nixos/modules/services/x11/xserver.nix
    A nixos/tests/gnome3_20-gdm.nix
    A nixos/tests/gnome3_20.nix
    M pkgs/applications/audio/abcde/default.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/editors/emacs-24/at-fdcwd.patch
    M pkgs/applications/editors/emacs-25/at-fdcwd.patch
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-packages.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/graphics/inkscape/default.nix
    A pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch
    A pkgs/applications/graphics/ktikz/default.nix
    M pkgs/applications/misc/avrdudess/default.nix
    M pkgs/applications/misc/camlistore/default.nix
    M pkgs/applications/misc/ipmiview/default.nix
    A pkgs/applications/misc/pcmanfm-qt/default.nix
    M pkgs/applications/misc/taskwarrior/default.nix
    M pkgs/applications/misc/xxkb/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M pkgs/applications/networking/cluster/kubernetes/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/pidgin/default.nix
    M pkgs/applications/office/impressive/default.nix
    A pkgs/applications/science/biology/bwa/default.nix
    M pkgs/applications/science/math/gap/default.nix
    M pkgs/applications/science/misc/openmodelica/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    M pkgs/applications/video/kazam/default.nix
    M pkgs/applications/video/mjpg-streamer/default.nix
    M pkgs/applications/virtualization/rkt/default.nix
    M pkgs/applications/window-managers/weston/default.nix
    A pkgs/applications/window-managers/yabar/default.nix
    M pkgs/data/fonts/corefonts/default.nix
    M pkgs/data/fonts/libertine/default.nix
    M pkgs/data/misc/geolite-legacy/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/glade/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/glade/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch
    A pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/polari/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/polari/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix
    A pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix
    A pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix
    A pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix
    A pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix
    A pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
    A pkgs/desktops/gnome-3/3.20/core/baobab/src.nix
    A pkgs/desktops/gnome-3/3.20/core/caribou/default.nix
    A pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
    A pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix
    A pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
    A pkgs/desktops/gnome-3/3.20/core/empathy/default.nix
    A pkgs/desktops/gnome-3/3.20/core/eog/default.nix
    A pkgs/desktops/gnome-3/3.20/core/eog/src.nix
    A pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
    A pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch
    A pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
    A pkgs/desktops/gnome-3/3.20/core/evince/default.nix
    A pkgs/desktops/gnome-3/3.20/core/evince/src.nix
    A pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
    A pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
    A pkgs/desktops/gnome-3/3.20/core/folks/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gconf/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gcr/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix
    A 
pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch
    A pkgs/desktops/gnome-3/3.20/core/gdm/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch
    A pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix
    A pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gjs/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gjs/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch
    A pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix
    A pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
    A pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
    A pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
    A pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch
    A pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix
    A pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix
    A pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix
    A pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch
    A pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
    A pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix
    A pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
    A pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
    A pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix
    A pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
    A pkgs/desktops/gnome-3/3.20/core/mutter/math.patch
    A pkgs/desktops/gnome-3/3.20/core/mutter/src.nix
    A pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch
    A pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix
    A pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch
    A pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
    A pkgs/desktops/gnome-3/3.20/core/rest/default.nix
    A pkgs/desktops/gnome-3/3.20/core/sushi/default.nix
    A pkgs/desktops/gnome-3/3.20/core/sushi/src.nix
    A pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix
    A pkgs/desktops/gnome-3/3.20/core/totem/default.nix
    A pkgs/desktops/gnome-3/3.20/core/totem/src.nix
    A pkgs/desktops/gnome-3/3.20/core/totem/x86.patch
    A pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
    A pkgs/desktops/gnome-3/3.20/core/tracker/src.nix
    A pkgs/desktops/gnome-3/3.20/core/vino/default.nix
    A pkgs/desktops/gnome-3/3.20/core/vino/src.nix
    A pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix
    A pkgs/desktops/gnome-3/3.20/core/vte/default.nix
    A pkgs/desktops/gnome-3/3.20/core/vte/src.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp/default.nix
    A pkgs/desktops/gnome-3/3.20/core/yelp/src.nix
    A pkgs/desktops/gnome-3/3.20/core/zenity/default.nix
    A pkgs/desktops/gnome-3/3.20/core/zenity/src.nix
    A pkgs/desktops/gnome-3/3.20/default.nix
    A pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix
    A pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix
    A pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix
    A pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix
    A pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix
    A pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix
    A pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix
    A pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix
    A pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
    A pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix
    A pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix
    A pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix
    A pkgs/desktops/gnome-3/3.20/games/hitori/default.nix
    A pkgs/desktops/gnome-3/3.20/games/hitori/src.nix
    A pkgs/desktops/gnome-3/3.20/games/iagno/default.nix
    A pkgs/desktops/gnome-3/3.20/games/iagno/src.nix
    A pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix
    A pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix
    A pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix
    A pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix
    A pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix
    A pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix
    A pkgs/desktops/gnome-3/3.20/games/tali/default.nix
    A pkgs/desktops/gnome-3/3.20/games/tali/src.nix
    A pkgs/desktops/gnome-3/3.20/installer.nix
    A 
pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
    A pkgs/desktops/gnome-3/3.20/misc/california/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch
    A pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix
    A 
pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
    A 
pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
    A 
pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
    A pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch
    A pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix
    A pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix
    A pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix
    A pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix
    A pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix
    A pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix
    A pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
    M pkgs/desktops/kde-5/plasma-5.6/default.nix
    M pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
    M pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
    A pkgs/desktops/kde-5/plasma-5.6/plasma-integration.nix
    M pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
    A pkgs/development/compilers/factor-lang/default.nix
    A pkgs/development/compilers/serpent/default.nix
    M pkgs/development/compilers/uhc/default.nix
    A pkgs/development/compilers/vala/0.32.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.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/configuration-ghc-8.0.x.nix
    M pkgs/development/haskell-modules/configuration-lts-0.0.nix
    M pkgs/development/haskell-modules/configuration-lts-0.1.nix
    M pkgs/development/haskell-modules/configuration-lts-0.2.nix
    M pkgs/development/haskell-modules/configuration-lts-0.3.nix
    M pkgs/development/haskell-modules/configuration-lts-0.4.nix
    M pkgs/development/haskell-modules/configuration-lts-0.5.nix
    M pkgs/development/haskell-modules/configuration-lts-0.6.nix
    M pkgs/development/haskell-modules/configuration-lts-0.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.0.nix
    M pkgs/development/haskell-modules/configuration-lts-1.1.nix
    M pkgs/development/haskell-modules/configuration-lts-1.10.nix
    M pkgs/development/haskell-modules/configuration-lts-1.11.nix
    M pkgs/development/haskell-modules/configuration-lts-1.12.nix
    M pkgs/development/haskell-modules/configuration-lts-1.13.nix
    M pkgs/development/haskell-modules/configuration-lts-1.14.nix
    M pkgs/development/haskell-modules/configuration-lts-1.15.nix
    M pkgs/development/haskell-modules/configuration-lts-1.2.nix
    M pkgs/development/haskell-modules/configuration-lts-1.4.nix
    M pkgs/development/haskell-modules/configuration-lts-1.5.nix
    M pkgs/development/haskell-modules/configuration-lts-1.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.8.nix
    M pkgs/development/haskell-modules/configuration-lts-1.9.nix
    M pkgs/development/haskell-modules/configuration-lts-2.0.nix
    M pkgs/development/haskell-modules/configuration-lts-2.1.nix
    M pkgs/development/haskell-modules/configuration-lts-2.10.nix
    M pkgs/development/haskell-modules/configuration-lts-2.11.nix
    M pkgs/development/haskell-modules/configuration-lts-2.12.nix
    M pkgs/development/haskell-modules/configuration-lts-2.13.nix
    M pkgs/development/haskell-modules/configuration-lts-2.14.nix
    M pkgs/development/haskell-modules/configuration-lts-2.15.nix
    M pkgs/development/haskell-modules/configuration-lts-2.16.nix
    M pkgs/development/haskell-modules/configuration-lts-2.17.nix
    M pkgs/development/haskell-modules/configuration-lts-2.18.nix
    M pkgs/development/haskell-modules/configuration-lts-2.19.nix
    M pkgs/development/haskell-modules/configuration-lts-2.2.nix
    M pkgs/development/haskell-modules/configuration-lts-2.20.nix
    M pkgs/development/haskell-modules/configuration-lts-2.21.nix
    M pkgs/development/haskell-modules/configuration-lts-2.22.nix
    M pkgs/development/haskell-modules/configuration-lts-2.3.nix
    M pkgs/development/haskell-modules/configuration-lts-2.4.nix
    M pkgs/development/haskell-modules/configuration-lts-2.5.nix
    M pkgs/development/haskell-modules/configuration-lts-2.6.nix
    M pkgs/development/haskell-modules/configuration-lts-2.7.nix
    M pkgs/development/haskell-modules/configuration-lts-2.8.nix
    M pkgs/development/haskell-modules/configuration-lts-2.9.nix
    M pkgs/development/haskell-modules/configuration-lts-3.0.nix
    M pkgs/development/haskell-modules/configuration-lts-3.1.nix
    M pkgs/development/haskell-modules/configuration-lts-3.10.nix
    M pkgs/development/haskell-modules/configuration-lts-3.11.nix
    M pkgs/development/haskell-modules/configuration-lts-3.12.nix
    M pkgs/development/haskell-modules/configuration-lts-3.13.nix
    M pkgs/development/haskell-modules/configuration-lts-3.14.nix
    M pkgs/development/haskell-modules/configuration-lts-3.15.nix
    M pkgs/development/haskell-modules/configuration-lts-3.16.nix
    M pkgs/development/haskell-modules/configuration-lts-3.17.nix
    M pkgs/development/haskell-modules/configuration-lts-3.18.nix
    M pkgs/development/haskell-modules/configuration-lts-3.19.nix
    M pkgs/development/haskell-modules/configuration-lts-3.2.nix
    M pkgs/development/haskell-modules/configuration-lts-3.20.nix
    M pkgs/development/haskell-modules/configuration-lts-3.21.nix
    M pkgs/development/haskell-modules/configuration-lts-3.22.nix
    M pkgs/development/haskell-modules/configuration-lts-3.3.nix
    M pkgs/development/haskell-modules/configuration-lts-3.4.nix
    M pkgs/development/haskell-modules/configuration-lts-3.5.nix
    M pkgs/development/haskell-modules/configuration-lts-3.6.nix
    M pkgs/development/haskell-modules/configuration-lts-3.7.nix
    M pkgs/development/haskell-modules/configuration-lts-3.8.nix
    M pkgs/development/haskell-modules/configuration-lts-3.9.nix
    M pkgs/development/haskell-modules/configuration-lts-4.0.nix
    M pkgs/development/haskell-modules/configuration-lts-4.1.nix
    M pkgs/development/haskell-modules/configuration-lts-4.2.nix
    M pkgs/development/haskell-modules/configuration-lts-5.0.nix
    M pkgs/development/haskell-modules/configuration-lts-5.1.nix
    M pkgs/development/haskell-modules/configuration-lts-5.10.nix
    M pkgs/development/haskell-modules/configuration-lts-5.11.nix
    M pkgs/development/haskell-modules/configuration-lts-5.12.nix
    M pkgs/development/haskell-modules/configuration-lts-5.13.nix
    M pkgs/development/haskell-modules/configuration-lts-5.14.nix
    M pkgs/development/haskell-modules/configuration-lts-5.15.nix
    M pkgs/development/haskell-modules/configuration-lts-5.16.nix
    M pkgs/development/haskell-modules/configuration-lts-5.17.nix
    M pkgs/development/haskell-modules/configuration-lts-5.18.nix
    M pkgs/development/haskell-modules/configuration-lts-5.2.nix
    M pkgs/development/haskell-modules/configuration-lts-5.3.nix
    M pkgs/development/haskell-modules/configuration-lts-5.4.nix
    M pkgs/development/haskell-modules/configuration-lts-5.5.nix
    M pkgs/development/haskell-modules/configuration-lts-5.6.nix
    M pkgs/development/haskell-modules/configuration-lts-5.7.nix
    M pkgs/development/haskell-modules/configuration-lts-5.8.nix
    M pkgs/development/haskell-modules/configuration-lts-5.9.nix
    M pkgs/development/haskell-modules/configuration-lts-6.0.nix
    M pkgs/development/haskell-modules/configuration-lts-6.1.nix
    A pkgs/development/haskell-modules/configuration-lts-6.2.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/dart/default.nix
    M pkgs/development/interpreters/elixir/default.nix
    A pkgs/development/interpreters/icon-lang/default.nix
    M pkgs/development/interpreters/php/default.nix
    M pkgs/development/libraries/agda/Agda-Sheaves/default.nix
    M pkgs/development/libraries/agda/TotalParserCombinators/default.nix
    M pkgs/development/libraries/agda/agda-base/default.nix
    M pkgs/development/libraries/agda/agda-prelude/default.nix
    M pkgs/development/libraries/agda/agda-stdlib/default.nix
    M pkgs/development/libraries/agda/bitvector/default.nix
    M pkgs/development/libraries/aqbanking/default.nix
    A pkgs/development/libraries/aqbanking/gwenhywfar.nix
    A pkgs/development/libraries/aqbanking/libchipcard.nix
    A pkgs/development/libraries/aqbanking/sources.nix
    A pkgs/development/libraries/aqbanking/update.sh
    M pkgs/development/libraries/clutter-gst/3.0.nix
    A pkgs/development/libraries/clutter-gtk/1.8.nix
    A pkgs/development/libraries/clutter/1.26.nix
    M pkgs/development/libraries/glibmm/default.nix
    A pkgs/development/libraries/glui/default.nix
    M pkgs/development/libraries/gtkmm/3.x.nix
    R pkgs/development/libraries/gwenhywfar/default.nix
    M pkgs/development/libraries/libchamplain/default.nix
    M pkgs/development/libraries/libexttextcat/default.nix
    M pkgs/development/libraries/libmpack/default.nix
    M pkgs/development/libraries/libmtp/default.nix
    M pkgs/development/libraries/netcdf/default.nix
    M pkgs/development/libraries/opencv/3.x.nix
    M pkgs/development/libraries/opencv/default.nix
    M pkgs/development/libraries/pangomm/default.nix
    A pkgs/development/libraries/uhttpmock/default.nix
    M pkgs/development/libraries/unibilium/default.nix
    M pkgs/development/libraries/wayland/default.nix
    M pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
    M pkgs/development/ocaml-modules/eliom/camlp4.patch
    M pkgs/development/ocaml-modules/eliom/default.nix
    M pkgs/development/ocaml-modules/lambda-term/default.nix
    A pkgs/development/ocaml-modules/markup/default.nix
    M pkgs/development/ocaml-modules/ocamlnet/default.nix
    M pkgs/development/ocaml-modules/ocsigen-server/default.nix
    M pkgs/development/ocaml-modules/piqi-ocaml/default.nix
    M pkgs/development/ocaml-modules/piqi/default.nix
    M pkgs/development/ocaml-modules/ppx_tools/default.nix
    M pkgs/development/ocaml-modules/re/default.nix
    M pkgs/development/ocaml-modules/react/default.nix
    M pkgs/development/ocaml-modules/reactivedata/default.nix
    M pkgs/development/ocaml-modules/tyxml/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
    M pkgs/development/tools/misc/iozone/default.nix
    M pkgs/development/tools/ocaml/js_of_ocaml/default.nix
    M pkgs/development/tools/ocaml/utop/default.nix
    M pkgs/development/tools/scalafmt/default.nix
    M pkgs/games/gtypist/default.nix
    M pkgs/games/terraria-server/default.nix
    M pkgs/games/typespeed/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    M pkgs/os-specific/linux/fusionio/util.nix
    M pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/mcelog/default.nix
    M pkgs/os-specific/linux/pktgen/default.nix
    M pkgs/servers/consul/ui.nix
    M pkgs/servers/http/nginx/modules.nix
    M pkgs/servers/meteor/default.nix
    M pkgs/servers/sql/postgresql/default.nix
    M pkgs/servers/ums/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    M pkgs/servers/xmpp/ejabberd/default.nix
    M pkgs/shells/fish/default.nix
    M pkgs/shells/xonsh/default.nix
    A pkgs/tools/X11/xgeometry-select/default.nix
    M pkgs/tools/filesystems/exfat/default.nix
    M pkgs/tools/misc/cloc/default.nix
    M pkgs/tools/misc/debian-devscripts/default.nix
    M pkgs/tools/misc/duc/default.nix
    M pkgs/tools/misc/moreutils/default.nix
    M pkgs/tools/misc/rmlint/default.nix
    R pkgs/tools/misc/tmuxinator/Gemfile
    R pkgs/tools/misc/tmuxinator/Gemfile.lock
    M pkgs/tools/misc/tmuxinator/default.nix
    R pkgs/tools/misc/tmuxinator/gemset.nix
    M pkgs/tools/networking/httpie/default.nix
    M pkgs/tools/networking/offlineimap/default.nix
    M pkgs/tools/networking/toxvpn/default.nix
    M pkgs/tools/networking/zap/default.nix
    M pkgs/tools/security/bruteforce-luks/default.nix
    A pkgs/tools/security/pcsc-cyberjack/default.nix
    M pkgs/tools/security/pcsclite/default.nix
    A pkgs/tools/security/pcsclite/no-dropdir-literals.patch
    M pkgs/tools/security/tor/torbrowser.nix
    R pkgs/tools/typesetting/patoline/default.nix
    M pkgs/tools/typesetting/tex/auctex/default.nix
    M pkgs/top-level/aliases.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

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

This would be a fast-forward, but --no-ff seems cleaner in this case.
Hydra nixpkgs: ?compare=1278067


  Commit: cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c
      
https://github.com/NixOS/nixpkgs/commit/cec03a8ecdd5f74f7bc258c0b8406e1e61dc6c9c
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M pkgs/build-support/setup-hooks/make-wrapper.sh
    M pkgs/development/python-modules/generic/wrap.sh

  Log Message:
  -----------
  Merge #14753: makeWrapper: allow spaces in variables


  Commit: bd458e56b6778cc7bbc2f076150657de574184da
      
https://github.com/NixOS/nixpkgs/commit/bd458e56b6778cc7bbc2f076150657de574184da
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
    M pkgs/tools/typesetting/xmlto/default.nix

  Log Message:
  -----------
  Merge #14356: docbook updates


  Commit: 772c92ba5c60ab63694bdffbf847ed7434aa3142
      
https://github.com/NixOS/nixpkgs/commit/772c92ba5c60ab63694bdffbf847ed7434aa3142
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

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

  Log Message:
  -----------
  gcc: maintenance 5.3 -> 5.4


  Commit: 46f22d89b94f6072153687dd50db1bee7c7bd34c
      
https://github.com/NixOS/nixpkgs/commit/46f22d89b94f6072153687dd50db1bee7c7bd34c
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M pkgs/build-support/gcc-cross-wrapper/default.nix
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.6/builder.sh
    M pkgs/development/compilers/gcc/4.6/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/gcc/builder.sh
    M pkgs/development/libraries/gettext/default.nix
    R pkgs/development/libraries/glibc/builder.sh
    M pkgs/development/libraries/glibc/common.nix
    M pkgs/development/libraries/glibc/default.nix
    A pkgs/development/libraries/glibc/fix_warnings.patch

  Log Message:
  -----------
  Merge #15867: glibc, gcc: fixes for ARM targets

... needed after closure-size merge (#7701)


  Commit: 7a5b85cdda7d619ec81de124e601e2333084dce4
      
https://github.com/NixOS/nixpkgs/commit/7a5b85cdda7d619ec81de124e601e2333084dce4
  Author: Domen Kožar <[email protected]>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M pkgs/build-support/trivial-builders.nix
    M pkgs/stdenv/generic/setup.sh

  Log Message:
  -----------
  pkgs.runCommand: passAsFile (buildCommand can be very long)

Close #15803. This avoids the error:

while setting up the build environment: executing
‘/nix/store/7sb42axk5lrxqz45nldrb2pchlys14s1-bash-4.3-p42/bin/bash’:
Argument list too long

Note: I wanted to make it optional based on buildCommand length,
but that seems pointless as I'm sure it's less performant.

Amended by vcunat:
https://github.com/NixOS/nixpkgs/pull/15803#issuecomment-224841225


  Commit: 2d3d105b02a6057dcac1c4e78472e8b55cc8ad30
      
https://github.com/NixOS/nixpkgs/commit/2d3d105b02a6057dcac1c4e78472e8b55cc8ad30
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

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

  Log Message:
  -----------
  make-bootstrap-tools-cross.nix: Strip extra whitespace


  Commit: 5fe4076683cef025f366b0723b170b10140ce211
      
https://github.com/NixOS/nixpkgs/commit/5fe4076683cef025f366b0723b170b10140ce211
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.6/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix

  Log Message:
  -----------
  gcc: Pass --with-mpc in crossAttrs

Just for consistency, it should be already coming from buildInputs
anyway.


  Commit: aaf008bda42e51c48c72d95f1e6dbd548c0b18c2
      
https://github.com/NixOS/nixpkgs/commit/aaf008bda42e51c48c72d95f1e6dbd548c0b18c2
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2016-06-11 (Sat, 11 Jun 2016)

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

  Log Message:
  -----------
  libelf: Fix cross compilation


  Commit: a06a405d0bf57699a8fb9976c6acae08641852cc
      
https://github.com/NixOS/nixpkgs/commit/a06a405d0bf57699a8fb9976c6acae08641852cc
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2016-06-11 (Sat, 11 Jun 2016)

  Changed paths:
    M pkgs/build-support/cc-wrapper/default.nix
    M pkgs/build-support/gcc-cross-wrapper/builder.sh
    M pkgs/build-support/gcc-cross-wrapper/default.nix
    M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  -----------
  cross GCC: Fix some paths to libc headers (after multiple outputs)

It's not completely clear to me why the path to libc headers is set
differently when cross building...


  Commit: ab450c0909411be75adb671bc892987e608f16b7
      
https://github.com/NixOS/nixpkgs/commit/ab450c0909411be75adb671bc892987e608f16b7
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-11 (Sat, 11 Jun 2016)

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

  Log Message:
  -----------
  gcc: fixup the tarball job after merging #15867

The evaluation problem happened in while checking find-tarballs.nix
http://hydra.nixos.org/build/36754203/nixlog/1/raw
(it didn't seem worth digging into why exactly)


  Commit: e9c612cdfe9852a394fd3e68e6f88deacdd9903c
      
https://github.com/NixOS/nixpkgs/commit/e9c612cdfe9852a394fd3e68e6f88deacdd9903c
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

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

  Log Message:
  -----------
  rr: fix build after gcc-5.4 bump

Discussion: https://github.com/NixOS/nixpkgs/commit/772c92ba5c60a


  Commit: d133a168f082d2f4c94984190e836e55f5e389a7
      
https://github.com/NixOS/nixpkgs/commit/d133a168f082d2f4c94984190e836e55f5e389a7
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

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

  Log Message:
  -----------
  rr: improve the parent commit


  Commit: 2a91dd0f65c44ef72cc7df6f51fbb56164fad728
      
https://github.com/NixOS/nixpkgs/commit/2a91dd0f65c44ef72cc7df6f51fbb56164fad728
  Author: Dmitry Kalinkin <[email protected]>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  krb5: fix for stores with paths containing '+' character


  Commit: 97c484a10f4b38efc4fb3dd210defed96003ae7d
      
https://github.com/NixOS/nixpkgs/commit/97c484a10f4b38efc4fb3dd210defed96003ae7d
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M pkgs/applications/graphics/leocad/default.nix
    M pkgs/applications/graphics/photivo/default.nix
    M pkgs/applications/misc/cli-visualizer/default.nix
    M pkgs/applications/misc/termite/default.nix
    M pkgs/applications/science/robotics/qgroundcontrol/default.nix
    M pkgs/applications/video/simplescreenrecorder/default.nix
    M pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
    M pkgs/development/libraries/botan/generic.nix
    M pkgs/development/libraries/botan/unstable.nix
    M pkgs/development/libraries/xgboost/default.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/games/cataclysm-dda/default.nix
    M pkgs/games/dwarf-fortress/dfhack/default.nix
    M pkgs/games/dwarf-fortress/unfuck.nix
    M pkgs/games/openspades/default.nix
    M pkgs/games/openspades/git.nix
    M pkgs/games/the-butterfly-effect/default.nix
    M pkgs/misc/emulators/higan/default.nix
    M pkgs/misc/emulators/pcsx2/default.nix
    M pkgs/os-specific/linux/sysdig/default.nix

  Log Message:
  -----------
  treewide: fix #include errors after gcc-5.4

They were mostly missing <cmath> or <math.h>.


  Commit: a02e5ad9263e508b4df6a3e5841e95bace0e787b
      
https://github.com/NixOS/nixpkgs/commit/a02e5ad9263e508b4df6a3e5841e95bace0e787b
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M pkgs/applications/virtualization/virtualbox/default.nix

  Log Message:
  -----------
  virtualbox: fix build with gcc-5.4 by Debian patch


  Commit: e75740455546f85cbf9849907b1f6520fdb487d8
      
https://github.com/NixOS/nixpkgs/commit/e75740455546f85cbf9849907b1f6520fdb487d8
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M doc/functions.xml
    M doc/languages-frameworks/go.xml
    M doc/languages-frameworks/haskell.md
    M doc/languages-frameworks/python.md
    M lib/lists.nix
    M lib/maintainers.nix
    M lib/strings.nix
    A maintainers/scripts/fetch-kde-qt.sh
    A maintainers/scripts/generate-kde-applications.sh
    A maintainers/scripts/generate-kde-frameworks.sh
    A maintainers/scripts/generate-kde-plasma.sh
    A maintainers/scripts/generate-qt.sh
    M maintainers/scripts/travis-nox-review-pr.sh
    M nixos/modules/config/users-groups.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/grsecurity.nix
    A nixos/modules/services/continuous-integration/buildkite-agent.nix
    M nixos/modules/services/databases/openldap.nix
    M nixos/modules/services/mail/postfix.nix
    M nixos/modules/services/misc/confd.nix
    M nixos/modules/services/misc/disnix.nix
    A nixos/modules/services/misc/dysnomia.nix
    M nixos/modules/services/misc/etcd.nix
    M nixos/modules/services/misc/parsoid.nix
    M nixos/modules/services/monitoring/bosun.nix
    M nixos/modules/services/monitoring/grafana.nix
    M nixos/modules/services/monitoring/scollector.nix
    M nixos/modules/services/networking/consul.nix
    M nixos/modules/services/networking/dnscrypt-proxy.nix
    A nixos/modules/services/networking/pptpd.nix
    M nixos/modules/services/networking/skydns.nix
    M nixos/modules/services/networking/wpa_supplicant.nix
    M nixos/modules/services/security/hologram.nix
    A nixos/modules/services/security/oauth2_proxy.nix
    M nixos/modules/services/web-servers/apache-httpd/default.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/services/x11/desktop-managers/kde5.nix
    M nixos/modules/services/x11/window-managers/i3.nix
    A nixos/modules/services/x11/xbanish.nix
    M nixos/modules/virtualisation/docker.nix
    M nixos/tests/grsecurity.nix
    M pkgs/applications/audio/cantata/default.nix
    M pkgs/applications/display-managers/sddm/default.nix
    M pkgs/applications/editors/atom/default.nix
    M pkgs/applications/editors/emacs-25/default.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/idea/default.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/editors/vim/configurable.nix
    A pkgs/applications/graphics/krita/default.nix
    M pkgs/applications/graphics/sane/backends/git.nix
    M pkgs/applications/misc/cura/default.nix
    A pkgs/applications/misc/cura/numpy-cast.patch
    M pkgs/applications/misc/font-manager/default.nix
    M pkgs/applications/misc/gksu/default.nix
    A pkgs/applications/misc/green-pdfviewer/default.nix
    A pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
    M pkgs/applications/misc/khal/default.nix
    M pkgs/applications/misc/llpp/default.nix
    M pkgs/applications/misc/makeself/default.nix
    M pkgs/applications/misc/mediainfo-gui/default.nix
    M pkgs/applications/misc/mediainfo/default.nix
    A pkgs/applications/misc/mlterm/default.nix
    M pkgs/applications/misc/mupdf/default.nix
    M pkgs/applications/misc/qtpass/default.nix
    A pkgs/applications/misc/wego/default.nix
    A pkgs/applications/misc/wego/deps.json
    M pkgs/applications/misc/xterm/default.nix
    A pkgs/applications/misc/xterm/sixel-256.support.patch
    M pkgs/applications/misc/zathura/core/default.nix
    M pkgs/applications/misc/zathura/default.nix
    R pkgs/applications/misc/zathura/pdf-mupdf/config.patch
    M pkgs/applications/misc/zathura/pdf-mupdf/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
    M pkgs/applications/networking/browsers/qutebrowser/default.nix
    M pkgs/applications/networking/browsers/vivaldi/default.nix
    A pkgs/applications/networking/cluster/nomad/default.nix
    A pkgs/applications/networking/cluster/terraform/default.nix
    A pkgs/applications/networking/drive/default.nix
    A pkgs/applications/networking/drive/deps.json
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/feedreaders/canto-curses/default.nix
    M pkgs/applications/networking/feedreaders/canto-daemon/default.nix
    A pkgs/applications/networking/instant-messengers/pond/default.nix
    A pkgs/applications/networking/instant-messengers/pond/deps.json
    M 
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
    A pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
    A pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
    A pkgs/applications/networking/ipfs/default.nix
    M pkgs/applications/networking/mailreaders/neomutt/default.nix
    M pkgs/applications/networking/owncloud-client/default.nix
    M pkgs/applications/networking/sync/lsyncd/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    A pkgs/applications/networking/syncthing012/default.nix
    A pkgs/applications/networking/syncthing012/deps.json
    M pkgs/applications/office/jabref/default.nix
    A pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
    A pkgs/applications/science/math/gmsh/default.nix
    M pkgs/applications/science/math/weka/default.nix
    A pkgs/applications/science/misc/cytoscape/default.nix
    M pkgs/applications/search/catfish/default.nix
    M pkgs/applications/version-management/git-and-tools/default.nix
    A 
pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
    A 
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
    A 
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    A pkgs/applications/version-management/git-lfs/default.nix
    M pkgs/applications/version-management/meld/default.nix
    M pkgs/applications/version-management/mercurial/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    M pkgs/applications/virtualization/rkt/default.nix
    A pkgs/applications/window-managers/i3/gaps.nix
    M pkgs/applications/window-managers/jwm/default.nix
    M pkgs/applications/window-managers/xmonad/wrapper.nix
    R pkgs/build-support/build-fhs-chrootenv/default.nix
    R pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
    R pkgs/build-support/build-fhs-chrootenv/env.nix
    R pkgs/build-support/build-fhs-chrootenv/init.sh.in
    R pkgs/build-support/build-fhs-chrootenv/load.sh.in
    R pkgs/build-support/build-fhs-chrootenv/mount.sh.in
    R pkgs/build-support/build-fhs-chrootenv/umount.sh.in
    M pkgs/build-support/build-fhs-userenv/chroot-user.rb
    M pkgs/build-support/build-fhs-userenv/default.nix
    A pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/build-support/docker/default.nix
    M pkgs/build-support/fetchgit/nix-prefetch-git
    M pkgs/build-support/grsecurity/default.nix
    R pkgs/build-support/grsecurity/flavors.nix
    M pkgs/build-support/rust/default.nix
    M pkgs/build-support/rust/fetchcargo.nix
    M pkgs/build-support/vm/default.nix
    A pkgs/data/documentation/bgnet/default.nix
    M pkgs/data/fonts/libertine/default.nix
    A pkgs/data/fonts/mononoki/default.nix
    A pkgs/data/icons/arc-icon-theme/default.nix
    A pkgs/data/icons/faba-icon-theme/default.nix
    A pkgs/data/icons/faba-mono-icons/default.nix
    A pkgs/data/icons/moka-icon-theme/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/paper-icon-theme/default.nix
    M pkgs/data/misc/cacert/default.nix
    M pkgs/data/misc/geolite-legacy/default.nix
    M pkgs/data/misc/tzdata/default.nix
    M pkgs/desktops/enlightenment/enlightenment.nix
    M pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
    M pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
    M pkgs/desktops/kde-5/applications-16.04/default.nix
    R pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
    A pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
    M pkgs/desktops/kde-5/applications-16.04/srcs.nix
    M pkgs/desktops/kde-5/frameworks-5.22/default.nix
    M pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
    R pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh
    M pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
    M pkgs/desktops/kde-5/plasma-5.6/default.nix
    R pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
    R pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
    M pkgs/desktops/kde-5/plasma-5.6/srcs.nix
    M pkgs/desktops/mate/mate-common/default.nix
    M pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
    M pkgs/desktops/mate/mate-icon-theme/default.nix
    M pkgs/desktops/mate/mate-themes/default.nix
    M pkgs/desktops/xfce/core/libxfce4ui.nix
    M pkgs/desktops/xfce/core/thunar-build.nix
    M pkgs/desktops/xfce/core/xfce4-power-manager.nix
    M pkgs/desktops/xfce/default.nix
    M pkgs/development/beam-modules/build-erlang-mk.nix
    M pkgs/development/beam-modules/build-mix.nix
    M pkgs/development/beam-modules/build-rebar3.nix
    M pkgs/development/beam-modules/fetch-hex.nix
    M pkgs/development/beam-modules/hex-packages.nix
    M pkgs/development/beam-modules/hex-registry-snapshot.nix
    A pkgs/development/compilers/avian/default.nix
    M pkgs/development/compilers/factor-lang/default.nix
    M pkgs/development/compilers/ghc/7.10.2.nix
    M pkgs/development/compilers/ghc/7.10.3.nix
    M pkgs/development/compilers/ghc/8.0.1.nix
    M pkgs/development/compilers/go/1.5.nix
    M pkgs/development/compilers/julia/git.nix
    M pkgs/development/compilers/nim/default.nix
    M pkgs/development/compilers/openjdk/8.nix
    A pkgs/development/compilers/rust/beta.nix
    A pkgs/development/compilers/rust/bootstrap.nix
    A pkgs/development/compilers/rust/cargo.nix
    A pkgs/development/compilers/rust/default.nix
    A pkgs/development/compilers/rust/head.nix
    A pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
    A pkgs/development/compilers/rust/patches/grsec.patch
    A pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
    A pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
    A pkgs/development/compilers/rust/print-hashes.sh
    A pkgs/development/compilers/rust/rustc.nix
    A pkgs/development/compilers/rust/snapshot.nix
    R pkgs/development/compilers/rustc/beta.nix
    R pkgs/development/compilers/rustc/bootstrap.nix
    R pkgs/development/compilers/rustc/generic.nix
    R pkgs/development/compilers/rustc/head.nix
    R pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch
    R pkgs/development/compilers/rustc/patches/grsec.patch
    R pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch
    R pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch
    R pkgs/development/compilers/rustc/stable.nix
    M pkgs/development/compilers/terra/default.nix
    M pkgs/development/compilers/tinycc/default.nix
    M pkgs/development/go-modules/generic/default.nix
    A pkgs/development/go-modules/libs.json
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
    M pkgs/development/haskell-modules/configuration-lts-0.0.nix
    M pkgs/development/haskell-modules/configuration-lts-0.1.nix
    M pkgs/development/haskell-modules/configuration-lts-0.2.nix
    M pkgs/development/haskell-modules/configuration-lts-0.3.nix
    M pkgs/development/haskell-modules/configuration-lts-0.4.nix
    M pkgs/development/haskell-modules/configuration-lts-0.5.nix
    M pkgs/development/haskell-modules/configuration-lts-0.6.nix
    M pkgs/development/haskell-modules/configuration-lts-0.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.0.nix
    M pkgs/development/haskell-modules/configuration-lts-1.1.nix
    M pkgs/development/haskell-modules/configuration-lts-1.10.nix
    M pkgs/development/haskell-modules/configuration-lts-1.11.nix
    M pkgs/development/haskell-modules/configuration-lts-1.12.nix
    M pkgs/development/haskell-modules/configuration-lts-1.13.nix
    M pkgs/development/haskell-modules/configuration-lts-1.14.nix
    M pkgs/development/haskell-modules/configuration-lts-1.15.nix
    M pkgs/development/haskell-modules/configuration-lts-1.2.nix
    M pkgs/development/haskell-modules/configuration-lts-1.4.nix
    M pkgs/development/haskell-modules/configuration-lts-1.5.nix
    M pkgs/development/haskell-modules/configuration-lts-1.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.8.nix
    M pkgs/development/haskell-modules/configuration-lts-1.9.nix
    M pkgs/development/haskell-modules/configuration-lts-2.0.nix
    M pkgs/development/haskell-modules/configuration-lts-2.1.nix
    M pkgs/development/haskell-modules/configuration-lts-2.10.nix
    M pkgs/development/haskell-modules/configuration-lts-2.11.nix
    M pkgs/development/haskell-modules/configuration-lts-2.12.nix
    M pkgs/development/haskell-modules/configuration-lts-2.13.nix
    M pkgs/development/haskell-modules/configuration-lts-2.14.nix
    M pkgs/development/haskell-modules/configuration-lts-2.15.nix
    M pkgs/development/haskell-modules/configuration-lts-2.16.nix
    M pkgs/development/haskell-modules/configuration-lts-2.17.nix
    M pkgs/development/haskell-modules/configuration-lts-2.18.nix
    M pkgs/development/haskell-modules/configuration-lts-2.19.nix
    M pkgs/development/haskell-modules/configuration-lts-2.2.nix
    M pkgs/development/haskell-modules/configuration-lts-2.20.nix
    M pkgs/development/haskell-modules/configuration-lts-2.21.nix
    M pkgs/development/haskell-modules/configuration-lts-2.22.nix
    M pkgs/development/haskell-modules/configuration-lts-2.3.nix
    M pkgs/development/haskell-modules/configuration-lts-2.4.nix
    M pkgs/development/haskell-modules/configuration-lts-2.5.nix
    M pkgs/development/haskell-modules/configuration-lts-2.6.nix
    M pkgs/development/haskell-modules/configuration-lts-2.7.nix
    M pkgs/development/haskell-modules/configuration-lts-2.8.nix
    M pkgs/development/haskell-modules/configuration-lts-2.9.nix
    M pkgs/development/haskell-modules/configuration-lts-3.0.nix
    M pkgs/development/haskell-modules/configuration-lts-3.1.nix
    M pkgs/development/haskell-modules/configuration-lts-3.10.nix
    M pkgs/development/haskell-modules/configuration-lts-3.11.nix
    M pkgs/development/haskell-modules/configuration-lts-3.12.nix
    M pkgs/development/haskell-modules/configuration-lts-3.13.nix
    M pkgs/development/haskell-modules/configuration-lts-3.14.nix
    M pkgs/development/haskell-modules/configuration-lts-3.15.nix
    M pkgs/development/haskell-modules/configuration-lts-3.16.nix
    M pkgs/development/haskell-modules/configuration-lts-3.17.nix
    M pkgs/development/haskell-modules/configuration-lts-3.18.nix
    M pkgs/development/haskell-modules/configuration-lts-3.19.nix
    M pkgs/development/haskell-modules/configuration-lts-3.2.nix
    M pkgs/development/haskell-modules/configuration-lts-3.20.nix
    M pkgs/development/haskell-modules/configuration-lts-3.21.nix
    M pkgs/development/haskell-modules/configuration-lts-3.22.nix
    M pkgs/development/haskell-modules/configuration-lts-3.3.nix
    M pkgs/development/haskell-modules/configuration-lts-3.4.nix
    M pkgs/development/haskell-modules/configuration-lts-3.5.nix
    M pkgs/development/haskell-modules/configuration-lts-3.6.nix
    M pkgs/development/haskell-modules/configuration-lts-3.7.nix
    M pkgs/development/haskell-modules/configuration-lts-3.8.nix
    M pkgs/development/haskell-modules/configuration-lts-3.9.nix
    M pkgs/development/haskell-modules/configuration-lts-4.0.nix
    M pkgs/development/haskell-modules/configuration-lts-4.1.nix
    M pkgs/development/haskell-modules/configuration-lts-4.2.nix
    M pkgs/development/haskell-modules/configuration-lts-5.0.nix
    M pkgs/development/haskell-modules/configuration-lts-5.1.nix
    M pkgs/development/haskell-modules/configuration-lts-5.10.nix
    M pkgs/development/haskell-modules/configuration-lts-5.11.nix
    M pkgs/development/haskell-modules/configuration-lts-5.12.nix
    M pkgs/development/haskell-modules/configuration-lts-5.13.nix
    M pkgs/development/haskell-modules/configuration-lts-5.14.nix
    M pkgs/development/haskell-modules/configuration-lts-5.15.nix
    M pkgs/development/haskell-modules/configuration-lts-5.16.nix
    M pkgs/development/haskell-modules/configuration-lts-5.17.nix
    M pkgs/development/haskell-modules/configuration-lts-5.18.nix
    M pkgs/development/haskell-modules/configuration-lts-5.2.nix
    M pkgs/development/haskell-modules/configuration-lts-5.3.nix
    M pkgs/development/haskell-modules/configuration-lts-5.4.nix
    M pkgs/development/haskell-modules/configuration-lts-5.5.nix
    M pkgs/development/haskell-modules/configuration-lts-5.6.nix
    M pkgs/development/haskell-modules/configuration-lts-5.7.nix
    M pkgs/development/haskell-modules/configuration-lts-5.8.nix
    M pkgs/development/haskell-modules/configuration-lts-5.9.nix
    M pkgs/development/haskell-modules/configuration-lts-6.0.nix
    M pkgs/development/haskell-modules/configuration-lts-6.1.nix
    M pkgs/development/haskell-modules/configuration-lts-6.2.nix
    A pkgs/development/haskell-modules/configuration-lts-6.3.nix
    M pkgs/development/haskell-modules/default.nix
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/haskell-modules/generic-stack-builder.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/lib.nix
    M pkgs/development/interpreters/clojure/default.nix
    M pkgs/development/interpreters/elixir/default.nix
    M pkgs/development/interpreters/erlang/R16.nix
    M pkgs/development/interpreters/erlang/R17.nix
    M pkgs/development/interpreters/erlang/R18.nix
    M pkgs/development/interpreters/io/default.nix
    M pkgs/development/interpreters/j/default.nix
    M pkgs/development/interpreters/php/default.nix
    M pkgs/development/interpreters/rakudo/default.nix
    A pkgs/development/interpreters/rebol/default.nix
    A pkgs/development/interpreters/unicon-lang/default.nix
    A pkgs/development/libraries/SDL_sixel/default.nix
    A pkgs/development/libraries/armadillo/default.nix
    A pkgs/development/libraries/cutee/default.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    A pkgs/development/libraries/ffmpeg-sixel/default.nix
    A pkgs/development/libraries/ffmpeg/3.0.nix
    A pkgs/development/libraries/gle/default.nix
    A pkgs/development/libraries/lasso/default.nix
    M pkgs/development/libraries/libav/default.nix
    M pkgs/development/libraries/libgksu/default.nix
    M pkgs/development/libraries/libinput/default.nix
    M pkgs/development/libraries/libmediainfo/default.nix
    M pkgs/development/libraries/libmpack/default.nix
    M pkgs/development/libraries/libpsl/default.nix
    M pkgs/development/libraries/libressl/2.3.nix
    A pkgs/development/libraries/libsixel/default.nix
    M pkgs/development/libraries/libu2f-server/default.nix
    M pkgs/development/libraries/mapnik/default.nix
    A pkgs/development/libraries/mimetic/default.nix
    M pkgs/development/libraries/nanomsg/default.nix
    A pkgs/development/libraries/nvidia-video-sdk/default.nix
    A pkgs/development/libraries/opencl-icd/default.nix
    M pkgs/development/libraries/protobuf/3.0.nix
    M pkgs/development/libraries/qt-5/5.6/default.nix
    R pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
    M pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
    M 
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
    M pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
    M pkgs/development/libraries/qt-5/5.6/srcs.nix
    A pkgs/development/libraries/science/math/clblas/cuda/default.nix
    A pkgs/development/libraries/science/math/clblas/cuda/platform.patch
    M pkgs/development/libraries/x264/default.nix
    M pkgs/development/libraries/x265/default.nix
    M pkgs/development/python-modules/generic/catch_conflicts.py
    M pkgs/development/python-modules/generic/default.nix
    A pkgs/development/python-modules/libgpuarray/cuda/default.nix
    A pkgs/development/python-modules/pycuda/compyte.nix
    A pkgs/development/python-modules/pycuda/default.nix
    M pkgs/development/python-modules/pyside/shiboken.nix
    A pkgs/development/python-modules/pyside/shiboken_py35.patch
    M pkgs/development/ruby-modules/bundler/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    R pkgs/development/tools/build-managers/cargo/common.nix
    R pkgs/development/tools/build-managers/cargo/default.nix
    R pkgs/development/tools/build-managers/cargo/head.nix
    R pkgs/development/tools/build-managers/cargo/snapshot.nix
    M pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
    R pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
    A pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
    A pkgs/development/tools/deis/default.nix
    A pkgs/development/tools/deis/deps.json
    M pkgs/development/tools/electron/default.nix
    A pkgs/development/tools/glide/default.nix
    A pkgs/development/tools/go-bindata/default.nix
    A pkgs/development/tools/go-repo-root/default.nix
    A pkgs/development/tools/go2nix/default.nix
    A pkgs/development/tools/go2nix/deps.json
    A pkgs/development/tools/gocode/default.nix
    M pkgs/development/tools/godep/default.nix
    M pkgs/development/tools/godep/deps.nix
    A pkgs/development/tools/goimports/default.nix
    A pkgs/development/tools/golint/default.nix
    A pkgs/development/tools/golint/deps.json
    A pkgs/development/tools/gotags/default.nix
    A pkgs/development/tools/gotools/default.nix
    A pkgs/development/tools/gotools/deps.json
    A pkgs/development/tools/govers/default.nix
    A pkgs/development/tools/gox/default.nix
    A pkgs/development/tools/gox/deps.json
    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/misc/gdb/default.nix
    M pkgs/development/tools/misc/kibana/default.nix
    M pkgs/development/tools/nimble/default.nix
    M pkgs/development/tools/packer/default.nix
    M pkgs/development/tools/packer/deps.nix
    A pkgs/development/tools/pup/default.nix
    M pkgs/development/tools/remarshal/default.nix
    A pkgs/development/tools/remarshal/deps.json
    M pkgs/development/tools/rust/racer/default.nix
    M pkgs/development/tools/rust/racerd/default.nix
    A pkgs/development/tools/textql/default.nix
    A pkgs/development/tools/textql/deps.json
    M pkgs/development/web/nodejs/v6.nix
    M pkgs/development/web/remarkjs/default.nix
    M pkgs/games/crrcsim/default.nix
    M pkgs/games/klavaro/default.nix
    M pkgs/games/minecraft/default.nix
    A pkgs/games/openrw/default.nix
    A pkgs/misc/drivers/postscript-lexmark/default.nix
    M pkgs/misc/emulators/retroarch/default.nix
    M pkgs/misc/emulators/wine/base.nix
    M pkgs/misc/emulators/wine/default.nix
    M pkgs/misc/emulators/wine/packages.nix
    M pkgs/misc/emulators/wine/sources.nix
    M pkgs/misc/emulators/wine/staging.nix
    M pkgs/misc/emulators/zsnes/default.nix
    M pkgs/misc/screensavers/xscreensaver/default.nix
    A pkgs/misc/themes/adapta/default.nix
    M pkgs/misc/themes/arc/default.nix
    A pkgs/misc/themes/gnome-breeze/default.nix
    M pkgs/misc/themes/numix-gtk-theme/default.nix
    M pkgs/misc/themes/paper-gtk-theme/default.nix
    M pkgs/misc/urbit/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    M pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
    M pkgs/os-specific/linux/jfbview/default.nix
    A pkgs/os-specific/linux/jfbview/mupdf-1.9.patch
    M pkgs/os-specific/linux/kernel/common-config.nix
    A pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
    A pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
    R pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch
    M pkgs/os-specific/linux/kernel/linux-4.1.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.5.nix
    M pkgs/os-specific/linux/kernel/linux-4.6.nix
    R pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
    A pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/kmod-debian-aliases/default.nix
    A pkgs/os-specific/linux/odp-dpdk/default.nix
    A pkgs/servers/caddy/default.nix
    A pkgs/servers/caddy/deps.json
    A pkgs/servers/consul/default.nix
    M pkgs/servers/consul/ui.nix
    A pkgs/servers/etcd/default.nix
    A pkgs/servers/etcd/deps.json
    A pkgs/servers/gotty/default.nix
    A pkgs/servers/gotty/deps.json
    M pkgs/servers/hbase/default.nix
    A pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
    A pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
    R pkgs/servers/http/jetty/6.1/bin-builder.sh
    R pkgs/servers/http/jetty/6.1/default.nix
    R pkgs/servers/http/jetty/9.2.nix
    R pkgs/servers/http/jetty/bin-builder.sh
    M pkgs/servers/http/jetty/default.nix
    A pkgs/servers/interlock/default.nix
    A pkgs/servers/interlock/deps.json
    M pkgs/servers/mail/dspam/default.nix
    A pkgs/servers/mesos-dns/default.nix
    A pkgs/servers/mesos-dns/deps.json
    M pkgs/servers/monitoring/bosun/default.nix
    A pkgs/servers/monitoring/consul-alerts/default.nix
    M pkgs/servers/monitoring/grafana/default.nix
    M pkgs/servers/monitoring/heapster/default.nix
    A pkgs/servers/monitoring/prometheus/alertmanager.nix
    A pkgs/servers/monitoring/prometheus/cli.nix
    A pkgs/servers/monitoring/prometheus/cli_deps.json
    A pkgs/servers/monitoring/prometheus/collectd-exporter.nix
    A pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/default.nix
    A pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
    A pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/mesos-exporter.nix
    A pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
    A pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/nginx-exporter.nix
    A pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/node-exporter.nix
    A pkgs/servers/monitoring/prometheus/node-exporter_deps.json
    A pkgs/servers/monitoring/prometheus/prom2json.nix
    A pkgs/servers/monitoring/prometheus/prom2json_deps.json
    A pkgs/servers/monitoring/prometheus/pushgateway.nix
    A pkgs/servers/monitoring/prometheus/pushgateway_deps.json
    A pkgs/servers/monitoring/prometheus/statsd-bridge.nix
    A pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
    M pkgs/servers/monitoring/riemann-dash/Gemfile
    M pkgs/servers/monitoring/riemann-dash/Gemfile.lock
    M pkgs/servers/monitoring/riemann-dash/default.nix
    M pkgs/servers/monitoring/riemann-dash/gemset.nix
    A pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
    M pkgs/servers/mpd/default.nix
    A pkgs/servers/nosql/cassandra/3.0.nix
    M pkgs/servers/nosql/influxdb/default.nix
    A pkgs/servers/nosql/influxdb/deps.json
    M pkgs/servers/nosql/rethinkdb/default.nix
    A pkgs/servers/nsq/default.nix
    A pkgs/servers/nsq/deps.json
    A pkgs/servers/oauth2_proxy/default.nix
    A pkgs/servers/oauth2_proxy/deps.json
    A pkgs/servers/serf/default.nix
    A pkgs/servers/serf/deps.json
    A pkgs/servers/skydns/default.nix
    A pkgs/servers/skydns/deps.json
    M pkgs/servers/uwsgi/default.nix
    M pkgs/shells/fish/default.nix
    A pkgs/shells/oh/default.nix
    A pkgs/shells/oh/deps.json
    A pkgs/tools/X11/go-sct/default.nix
    A pkgs/tools/X11/go-sct/deps.json
    M pkgs/tools/admin/google-cloud-sdk/default.nix
    A pkgs/tools/admin/lxd/default.nix
    A pkgs/tools/admin/lxd/deps.json
    M pkgs/tools/audio/gvolicon/default.nix
    A pkgs/tools/cd-dvd/uif2iso/default.nix
    M pkgs/tools/compression/lrzip/default.nix
    M pkgs/tools/compression/zstd/default.nix
    A pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
    M pkgs/tools/filesystems/bonnie/default.nix
    M pkgs/tools/filesystems/btrfs-progs/default.nix
    A pkgs/tools/filesystems/e2tools/default.nix
    A pkgs/tools/filesystems/go-mtpfs/default.nix
    A pkgs/tools/filesystems/go-mtpfs/deps.json
    A pkgs/tools/filesystems/lizardfs/check-includes.patch
    A pkgs/tools/filesystems/lizardfs/default.nix
    M pkgs/tools/graphics/exif/default.nix
    M pkgs/tools/graphics/pngcheck/default.nix
    M pkgs/tools/graphics/scanbd/default.nix
    A pkgs/tools/misc/asciinema/default.nix
    A pkgs/tools/misc/eot-utilities/default.nix
    M pkgs/tools/misc/exa/default.nix
    M pkgs/tools/misc/fluentd/Gemfile.lock
    M pkgs/tools/misc/fluentd/default.nix
    M pkgs/tools/misc/fluentd/gemset.nix
    M pkgs/tools/misc/fontforge/default.nix
    A pkgs/tools/misc/fzf/default.nix
    A pkgs/tools/misc/fzf/deps.json
    A pkgs/tools/misc/gawp/default.nix
    A pkgs/tools/misc/gawp/deps.json
    M pkgs/tools/misc/goaccess/default.nix
    M pkgs/tools/misc/gparted/default.nix
    M pkgs/tools/misc/grub4dos/default.nix
    A pkgs/tools/misc/i3cat/default.nix
    A pkgs/tools/misc/i3cat/deps.json
    A pkgs/tools/misc/mongodb-tools/default.nix
    A pkgs/tools/misc/mongodb-tools/deps.json
    M pkgs/tools/misc/opentsdb/default.nix
    M pkgs/tools/misc/system-config-printer/default.nix
    M pkgs/tools/misc/tmux/default.nix
    A pkgs/tools/misc/upower-notify/default.nix
    A pkgs/tools/misc/upower-notify/deps.json
    M pkgs/tools/networking/dnscrypt-wrapper/default.nix
    M pkgs/tools/networking/dropbear/default.nix
    A pkgs/tools/networking/flannel/default.nix
    M pkgs/tools/networking/i2p/default.nix
    M pkgs/tools/networking/i2pd/default.nix
    A pkgs/tools/networking/ngrok/default.nix
    A pkgs/tools/networking/ngrok/deps.json
    A pkgs/tools/networking/pptpd/default.nix
    A pkgs/tools/networking/s3gof3r/default.nix
    A pkgs/tools/networking/s3gof3r/deps.json
    M pkgs/tools/networking/shadowsocks-libev/default.nix
    M pkgs/tools/networking/socat/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
    A pkgs/tools/package-management/gx/default.nix
    A pkgs/tools/package-management/gx/deps.json
    A pkgs/tools/package-management/gx/go/default.nix
    M pkgs/tools/package-management/nix-serve/default.nix
    A pkgs/tools/security/hologram/default.nix
    A pkgs/tools/security/hologram/deps.json
    M pkgs/tools/security/oath-toolkit/default.nix
    M pkgs/tools/security/pass/rofi-pass.nix
    A pkgs/tools/security/vault/default.nix
    M pkgs/tools/system/augeas/default.nix
    A pkgs/tools/system/confd/default.nix
    A pkgs/tools/system/confd/deps.json
    A pkgs/tools/system/consul-template/default.nix
    A pkgs/tools/system/hiera-eyaml/Gemfile
    A pkgs/tools/system/hiera-eyaml/Gemfile.lock
    A pkgs/tools/system/hiera-eyaml/default.nix
    A pkgs/tools/system/hiera-eyaml/gemset.nix
    M pkgs/tools/system/storebrowse/default.nix
    M pkgs/tools/text/platinum-searcher/default.nix
    A pkgs/tools/text/platinum-searcher/deps.json
    A pkgs/tools/text/shfmt/default.nix
    M pkgs/tools/typesetting/tex/texlive-new/bin.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/default.nix
    R pkgs/top-level/go-packages.nix
    M pkgs/top-level/haskell-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/perl-packages.nix
    M pkgs/top-level/platforms.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release.nix

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

Hydra nixpkgs: ?compare=1279790


  Commit: 61b8d27b4ce60b18778505d0ca26fdaaf5a5745a
      
https://github.com/NixOS/nixpkgs/commit/61b8d27b4ce60b18778505d0ca26fdaaf5a5745a
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M nixos/lib/testing.nix
    M pkgs/build-support/setup-hooks/make-wrapper.sh

  Log Message:
  -----------
  make-wrapper: fixup #14753 changes to make tests work

The tests need to expand passed variable and very carefully.
I could see no other easy way than to change single-quoting in
makeWrapper to double-quoting.
The tests now fail with the same problem as on master...


  Commit: 429fdbcd6314cbf7c8e4e47be50ef07986ac1c3c
      
https://github.com/NixOS/nixpkgs/commit/429fdbcd6314cbf7c8e4e47be50ef07986ac1c3c
  Author: Marius Bakke <[email protected]>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

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

  Log Message:
  -----------
  libxkbcommon: set X11 locale directory (close #16340)


  Commit: b626e8383828c4888507c6cd47847569ced422e0
      
https://github.com/NixOS/nixpkgs/commit/b626e8383828c4888507c6cd47847569ced422e0
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

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

  Log Message:
  -----------
  Merge #16291: krb5: fix compilation on weird prefixes

(when nix store prefix contains a "+" character)


  Commit: ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7
      
https://github.com/NixOS/nixpkgs/commit/ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M pkgs/games/openspades/default.nix
    M pkgs/servers/nosql/arangodb/default.nix

  Log Message:
  -----------
  openspades, arangodb: more #include error fixups

... after gcc-5.4.


  Commit: c05d8295988697adbb920a7b4a999ae3670c5504
      
https://github.com/NixOS/nixpkgs/commit/c05d8295988697adbb920a7b4a999ae3670c5504
  Author: Vladimír Čunát <[email protected]>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M nixos/lib/testing.nix
    M pkgs/applications/graphics/leocad/default.nix
    M pkgs/applications/graphics/photivo/default.nix
    M pkgs/applications/misc/cli-visualizer/default.nix
    M pkgs/applications/misc/termite/default.nix
    M pkgs/applications/science/robotics/qgroundcontrol/default.nix
    M pkgs/applications/video/simplescreenrecorder/default.nix
    M pkgs/applications/virtualization/virtualbox/default.nix
    M pkgs/build-support/cc-wrapper/default.nix
    M pkgs/build-support/gcc-cross-wrapper/builder.sh
    M pkgs/build-support/gcc-cross-wrapper/default.nix
    M pkgs/build-support/setup-hooks/make-wrapper.sh
    M pkgs/build-support/trivial-builders.nix
    M pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
    M pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.6/builder.sh
    M pkgs/development/compilers/gcc/4.6/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/gcc/builder.sh
    M pkgs/development/libraries/botan/generic.nix
    M pkgs/development/libraries/botan/unstable.nix
    M pkgs/development/libraries/gettext/default.nix
    R pkgs/development/libraries/glibc/builder.sh
    M pkgs/development/libraries/glibc/common.nix
    M pkgs/development/libraries/glibc/default.nix
    A pkgs/development/libraries/glibc/fix_warnings.patch
    M pkgs/development/libraries/kerberos/krb5.nix
    A pkgs/development/libraries/kerberos/path_char_fix.patch
    M pkgs/development/libraries/libelf/default.nix
    M pkgs/development/libraries/libxkbcommon/default.nix
    M pkgs/development/libraries/xgboost/default.nix
    M pkgs/development/python-modules/generic/wrap.sh
    M pkgs/development/tools/analysis/rr/default.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/games/cataclysm-dda/default.nix
    M pkgs/games/dwarf-fortress/dfhack/default.nix
    M pkgs/games/dwarf-fortress/unfuck.nix
    M pkgs/games/openspades/default.nix
    M pkgs/games/openspades/git.nix
    M pkgs/games/the-butterfly-effect/default.nix
    M pkgs/misc/emulators/higan/default.nix
    M pkgs/misc/emulators/pcsx2/default.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    M pkgs/servers/nosql/arangodb/default.nix
    M pkgs/stdenv/generic/setup.sh
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/tools/typesetting/xmlto/default.nix

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


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

Reply via email to