Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ff4035bca699291d78c781b2f1d2b640ea4a5036
      
https://github.com/NixOS/nixpkgs/commit/ff4035bca699291d78c781b2f1d2b640ea4a5036
  Author: Eelco Dolstra <edols...@gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

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

  Log Message:
  -----------
  libunistring: Don't propagate glibc

On Linux, libiconv is an alias of glibc. Propagating glibc breaks
using GCC 6 as an override (not sure why). So let's not do that.

(cherry picked from commit dfc94720b88e7f2358fb08aae47881a00546dd94)


  Commit: 261665cc4b927706c8f99b397ee04ec658900e54
      
https://github.com/NixOS/nixpkgs/commit/261665cc4b927706c8f99b397ee04ec658900e54
  Author: Eelco Dolstra <edols...@gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

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

  Log Message:
  -----------
  libunistring: Do propagate libiconv on non-Linux

Fixes #19492.

(cherry picked from commit ed6006790a220c055da9813b35c27ee17429b354)


  Commit: 7cfc69fdbdc2b57fbe7939c67d94a0b4d91e6e34
      
https://github.com/NixOS/nixpkgs/commit/7cfc69fdbdc2b57fbe7939c67d94a0b4d91e6e34
  Author: Eelco Dolstra <edols...@gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M lib/maintainers.nix
    M nixos/doc/manual/release-notes/rl-1609.xml
    M nixos/lib/testing.nix
    M nixos/modules/config/timezone.nix
    A nixos/modules/hardware/video/amdgpu-pro.nix
    M nixos/modules/module-list.nix
    M nixos/modules/security/acme.nix
    M nixos/modules/services/networking/kippo.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/modules/system/activation/activation-script.nix
    M nixos/modules/virtualisation/ec2-amis.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/misc/octoprint/default.nix
    M pkgs/applications/networking/browsers/chromium/upstream-info.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/hipchat/default.nix
    M pkgs/applications/networking/irc/irssi/otr/default.nix
    M pkgs/applications/networking/remote/remmina/default.nix
    R pkgs/applications/networking/remote/remmina/lgthread.patch
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/science/logic/coq/default.nix
    M pkgs/applications/video/openshot-qt/default.nix
    M pkgs/applications/video/openshot-qt/libopenshot-audio.nix
    M pkgs/applications/video/openshot-qt/libopenshot.nix
    M pkgs/applications/video/shotcut/default.nix
    M pkgs/applications/virtualization/cbfstool/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/build-support/cc-wrapper/default.nix
    M pkgs/build-support/emacs/buffer.nix
    M pkgs/data/fonts/dejavu-fonts/default.nix
    M pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
    M pkgs/development/compilers/go/1.7.nix
    M pkgs/development/compilers/go/remove-tools-1.7.patch
    M pkgs/development/compilers/llvm/3.8/clang/default.nix
    M pkgs/development/compilers/llvm/3.8/default.nix
    M pkgs/development/compilers/llvm/3.8/libc++/default.nix
    M pkgs/development/compilers/llvm/3.8/libc++abi.nix
    M pkgs/development/compilers/llvm/3.8/lldb.nix
    M pkgs/development/compilers/llvm/3.8/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-hackage2nix.yaml
    M pkgs/development/haskell-modules/default.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/mujs/default.nix
    M pkgs/development/libraries/c-ares/default.nix
    A pkgs/development/libraries/czmqpp/default.nix
    A pkgs/development/libraries/czmqpp/socket.patch
    M pkgs/development/libraries/libass/default.nix
    M pkgs/development/libraries/libdwarf/default.nix
    M pkgs/development/libraries/openjpeg/2.0.nix
    M pkgs/development/libraries/openjpeg/2.1.nix
    A pkgs/development/libraries/uri/default.nix
    A pkgs/development/perl-modules/dbiclassx-fix.patch
    M pkgs/development/tools/misc/gpshell/default.nix
    M pkgs/development/tools/misc/kibana/default.nix
    M pkgs/development/tools/vagrant/default.nix
    M pkgs/misc/emulators/fs-uae/default.nix
    A pkgs/os-specific/linux/amdgpu-pro/default.nix
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch
    A 
pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch
    A pkgs/os-specific/linux/kernel/linux-3.14.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.7.nix
    A pkgs/os-specific/linux/kernel/linux-4.8.nix
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/kmod/aggregator.nix
    R pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/rtkit/default.nix
    M pkgs/os-specific/linux/util-linux/default.nix
    M pkgs/servers/kippo/default.nix
    A pkgs/servers/web-apps/pump.io/composition.nix
    M pkgs/servers/web-apps/pump.io/default.nix
    A pkgs/servers/web-apps/pump.io/generate.sh
    M pkgs/servers/web-apps/pump.io/node-packages.json
    M pkgs/servers/web-apps/pump.io/node-packages.nix
    M pkgs/shells/bash/bash-4.3-patches.nix
    M pkgs/tools/backup/borg/default.nix
    A pkgs/tools/compression/lhasa/default.nix
    M pkgs/tools/misc/tmuxp/default.nix
    M pkgs/tools/networking/gmvault/default.nix
    M pkgs/tools/networking/libreswan/default.nix
    M pkgs/tools/networking/modemmanager/default.nix
    M pkgs/tools/networking/network-manager-applet/default.nix
    M pkgs/tools/networking/network-manager/default.nix
    M pkgs/tools/networking/network-manager/openconnect.nix
    M pkgs/tools/networking/network-manager/openvpn.nix
    M pkgs/tools/networking/network-manager/pptp.nix
    M pkgs/tools/networking/network-manager/vpnc.nix
    A pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
    M pkgs/tools/networking/openssh/default.nix
    A pkgs/tools/security/enpass/data.json
    A pkgs/tools/security/enpass/default.nix
    A pkgs/tools/security/enpass/update_script.py
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

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


  Commit: 53612bb0f5511d1c1c4b27bcffc2484ea7c44b89
      
https://github.com/NixOS/nixpkgs/commit/53612bb0f5511d1c1c4b27bcffc2484ea7c44b89
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

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

  Log Message:
  -----------
  xorg: security fixes #19234

https://lists.x.org/archives/xorg-announce/2016-October/002720.html
(cherry picked from commit f75529944374c3f0569035cf7641222b7fd7e98f)


  Commit: 24dc3f203618c588057afeeebc03ba4adfb56673
      
https://github.com/NixOS/nixpkgs/commit/24dc3f203618c588057afeeebc03ba4adfb56673
  Author: Graham Christensen <gra...@grahamc.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

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

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


Compare: https://github.com/NixOS/nixpkgs/compare/1904edc2dfa2...24dc3f203618
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to