Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 195246c316b186473192a5704ed0c3c178c72767
      
https://github.com/NixOS/nixpkgs/commit/195246c316b186473192a5704ed0c3c178c72767
  Author: Damien Cassou <[email protected]>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

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

  Log Message:
  -----------
  elisp-ffi: git-20141103 → 1.0.0


  Commit: 971b90e98d7cebf9d8b5a0cb48db9efd47539100
      
https://github.com/NixOS/nixpkgs/commit/971b90e98d7cebf9d8b5a0cb48db9efd47539100
  Author: Damien Cassou <[email protected]>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #11015 from DamienCassou/elisp-ffi-1.0.0

elisp-ffi: git-20141103 → 1.0.0


  Commit: e4feccce818416c39c8e86e6f9ac01674ad98c88
      
https://github.com/NixOS/nixpkgs/commit/e4feccce818416c39c8e86e6f9ac01674ad98c88
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/applications/display-managers/lightdm/default.nix

  Log Message:
  -----------
  lightdm: 1.16.3 -> 1.16.5


  Commit: 60ba5ad4797144462249a24b5aaece9032251b44
      
https://github.com/NixOS/nixpkgs/commit/60ba5ad4797144462249a24b5aaece9032251b44
  Author: Guillaume Maudoux <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M nixos/modules/services/web-servers/lighttpd/default.nix

  Log Message:
  -----------
  lighttpd: fix mod_rewrite appearing twice


  Commit: fb864b8898394bd3b59e34e4fef6835d805c2761
      
https://github.com/NixOS/nixpkgs/commit/fb864b8898394bd3b59e34e4fef6835d805c2761
  Author: Luca Bruno <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/os-specific/linux/pommed/default.nix

  Log Message:
  -----------
  pommed: mark as broken, src hash changed

cc @shlevy


  Commit: 6602f49495c94e8533c8b482698bcf570a8d8933
      
https://github.com/NixOS/nixpkgs/commit/6602f49495c94e8533c8b482698bcf570a8d8933
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M doc/haskell-users-guide.md
    M lib/maintainers.nix
    M nixos/modules/services/mail/opensmtpd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/tasks/network-interfaces.nix
    M pkgs/applications/audio/audacity/default.nix
    A pkgs/applications/audio/jackmix/default.nix
    M pkgs/applications/graphics/gimp/plugins/default.nix
    M pkgs/applications/graphics/hugin/default.nix
    M pkgs/applications/networking/ids/daq/default.nix
    A pkgs/applications/networking/iptraf-ng/default.nix
    M pkgs/applications/version-management/git-and-tools/git-hub/default.nix
    M pkgs/applications/version-management/subversion/default.nix
    M pkgs/applications/video/smplayer/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
    M pkgs/development/libraries/glpk/default.nix
    M pkgs/development/libraries/libdnet/default.nix
    R pkgs/development/libraries/libunwind/native.nix
    M pkgs/development/libraries/neon/default.nix
    A pkgs/development/web/nodejs/default-arch.patch
    M pkgs/development/web/nodejs/default.nix
    M pkgs/development/web/nodejs/no-xcode.patch
    A pkgs/development/web/nodejs/pkg-libpath.patch
    M pkgs/development/web/nodejs/v0_10.nix
    M pkgs/misc/jackaudio/jack1.nix
    A pkgs/misc/urbit/default.nix
    A pkgs/os-specific/linux/miraclecast/default.nix
    M pkgs/os-specific/linux/nvidiabl/default.nix
    A pkgs/os-specific/linux/nvidiabl/linux4compat.patch
    M pkgs/os-specific/linux/syslinux/default.nix
    R pkgs/os-specific/linux/syslinux/gcc5-fix.patch
    M pkgs/os-specific/linux/systemd/default.nix
    M pkgs/servers/mail/opensmtpd/default.nix
    A pkgs/servers/mail/opensmtpd/extras.nix
    A pkgs/servers/mail/opensmtpd/proc_path.diff
    M pkgs/tools/filesystems/duff/default.nix
    M pkgs/tools/graphics/enblend-enfuse/default.nix
    A pkgs/tools/misc/heatseeker/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/perl-packages.nix

  Log Message:
  -----------
  Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

This reverts commit 741bf840dad05cd1728481045466811ae8ae8281.

This reverts the fallout from reverting the major changes.


  Commit: 4ead61ca39206de1b6f696426df6c7a33b5808fb
      
https://github.com/NixOS/nixpkgs/commit/4ead61ca39206de1b6f696426df6c7a33b5808fb
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M nixos/modules/services/web-servers/lighttpd/default.nix
    M pkgs/os-specific/linux/pommed/default.nix

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


  Commit: 6e18a33183006514021f63baebb78a502bdff8aa
      
https://github.com/NixOS/nixpkgs/commit/6e18a33183006514021f63baebb78a502bdff8aa
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

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

  Log Message:
  -----------
  syslinux: 6.03 -> 2015-11-09


  Commit: 453f7c7218dfb5788f91f9cecae4a4d3cf650af6
      
https://github.com/NixOS/nixpkgs/commit/453f7c7218dfb5788f91f9cecae4a4d3cf650af6
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M doc/haskell-users-guide.md
    M lib/maintainers.nix
    M nixos/modules/services/mail/opensmtpd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/web-servers/lighttpd/default.nix
    M nixos/modules/tasks/network-interfaces.nix
    M pkgs/applications/audio/audacity/default.nix
    A pkgs/applications/audio/jackmix/default.nix
    M pkgs/applications/display-managers/lightdm/default.nix
    M pkgs/applications/graphics/gimp/plugins/default.nix
    M pkgs/applications/graphics/hugin/default.nix
    M pkgs/applications/networking/ids/daq/default.nix
    A pkgs/applications/networking/iptraf-ng/default.nix
    M pkgs/applications/version-management/git-and-tools/git-hub/default.nix
    M pkgs/applications/version-management/subversion/default.nix
    M pkgs/applications/video/smplayer/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
    M pkgs/development/libraries/glpk/default.nix
    M pkgs/development/libraries/libdnet/default.nix
    R pkgs/development/libraries/libunwind/native.nix
    M pkgs/development/libraries/neon/default.nix
    A pkgs/development/web/nodejs/default-arch.patch
    M pkgs/development/web/nodejs/default.nix
    M pkgs/development/web/nodejs/no-xcode.patch
    A pkgs/development/web/nodejs/pkg-libpath.patch
    M pkgs/development/web/nodejs/v0_10.nix
    M pkgs/misc/jackaudio/jack1.nix
    A pkgs/misc/urbit/default.nix
    M pkgs/os-specific/linux/nvidiabl/default.nix
    A pkgs/os-specific/linux/nvidiabl/linux4compat.patch
    M pkgs/os-specific/linux/pommed/default.nix
    M pkgs/os-specific/linux/syslinux/default.nix
    R pkgs/os-specific/linux/syslinux/gcc5-fix.patch
    M pkgs/servers/mail/opensmtpd/default.nix
    A pkgs/servers/mail/opensmtpd/extras.nix
    A pkgs/servers/mail/opensmtpd/proc_path.diff
    M pkgs/tools/filesystems/duff/default.nix
    M pkgs/tools/graphics/enblend-enfuse/default.nix
    A pkgs/tools/misc/heatseeker/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/perl-packages.nix

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


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

Reply via email to