Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9eb540b807b0bb598352e550635c45c8a92d72b0
      
https://github.com/NixOS/nixpkgs/commit/9eb540b807b0bb598352e550635c45c8a92d72b0
  Author: Nikolay Amiantov <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  -----------
  qemu-vm module: fix boot.tmpOnTmpfs

This option caused systemd to mount /tmp on top of /tmp/{xchg,shared}.

Fixes #21490.


  Commit: fd005d0d7283dd62c69598c6bb7969b69ac9ebb8
      
https://github.com/NixOS/nixpkgs/commit/fd005d0d7283dd62c69598c6bb7969b69ac9ebb8
  Author: Josef Kemetmueller <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  catch: use upstream install target


  Commit: 4101f1fd18c1414ad3bbf198a038818906fa1e2f
      
https://github.com/NixOS/nixpkgs/commit/4101f1fd18c1414ad3bbf198a038818906fa1e2f
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  iptables: 1.6.0 -> 1.6.1


  Commit: d6710e3d66c09c0a7485b2079d6e0d01c14faf07
      
https://github.com/NixOS/nixpkgs/commit/d6710e3d66c09c0a7485b2079d6e0d01c14faf07
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  shadow: 4.2.1 -> 4.4


  Commit: 426dddd83dc5e4fdaf7dfeb11885cea33046ba29
      
https://github.com/NixOS/nixpkgs/commit/426dddd83dc5e4fdaf7dfeb11885cea33046ba29
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  harfbuzz: 1.4.1 -> 1.4.2


  Commit: ae5a27983698efb89f0b176b82d55785d3522492
      
https://github.com/NixOS/nixpkgs/commit/ae5a27983698efb89f0b176b82d55785d3522492
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  libmwaw: 0.3.9 -> 0.3.10


  Commit: c20f5102eb908260b41a5576ac145e99bdade88e
      
https://github.com/NixOS/nixpkgs/commit/c20f5102eb908260b41a5576ac145e99bdade88e
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py

  Log Message:
  -----------
  generate-libreoffice-srcs: support jars as well as tarballs


  Commit: 14ed123a40a58f6a1a9564d0b0bfa0139765cd88
      
https://github.com/NixOS/nixpkgs/commit/14ed123a40a58f6a1a9564d0b0bfa0139765cd88
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json

  Log Message:
  -----------
  libreoffice-srcs-additions.json: some files are in /extern/


  Commit: 58711ecf0c9baedbefc7138d1bc1e56c9e536eaf
      
https://github.com/NixOS/nixpkgs/commit/58711ecf0c9baedbefc7138d1bc1e56c9e536eaf
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
    M pkgs/applications/office/libreoffice/still-primary-src.nix
    M pkgs/applications/office/libreoffice/still.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  libreoffice-still: 5.1.6.2 -> 5.2.5.1 (branch switch upstream)


  Commit: 4675cb78cb5fbadb7aab67b125cd450322dcf3d1
      
https://github.com/NixOS/nixpkgs/commit/4675cb78cb5fbadb7aab67b125cd450322dcf3d1
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  xorg.libXpm: 3.5.11 -> 3.5.12


  Commit: d042a831a376a20f38d2b22e3caf31b94fc9f621
      
https://github.com/NixOS/nixpkgs/commit/d042a831a376a20f38d2b22e3caf31b94fc9f621
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

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

  Log Message:
  -----------
  libzmf: init at 0.0.1


  Commit: 47127e6951938749e46932069ed316007dc748c4
      
https://github.com/NixOS/nixpkgs/commit/47127e6951938749e46932069ed316007dc748c4
  Author: Michael Raskin <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/default-primary-src.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/office/libreoffice/libreoffice-srcs.nix

  Log Message:
  -----------
  libreoffice-fresh: 5.2.4.2 -> 5.3.0.3


  Commit: d66fa9acfd65c6a0fdffd71812964a5066a1acea
      
https://github.com/NixOS/nixpkgs/commit/d66fa9acfd65c6a0fdffd71812964a5066a1acea
  Author: Graham Christensen <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/tools/admin/tigervnc/default.nix

  Log Message:
  -----------
  tigervnc: 1.7.0 -> 1.7.1 for CVE-2017-5581


  Commit: dea81956fc0904c5723cf56f2bca4497b44ac3c3
      
https://github.com/NixOS/nixpkgs/commit/dea81956fc0904c5723cf56f2bca4497b44ac3c3
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M pkgs/tools/package-management/nix/default.nix

  Log Message:
  -----------
  nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d


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

  Changed paths:
    M nixos/modules/virtualisation/qemu-vm.nix
    M pkgs/applications/office/libreoffice/default-primary-src.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
    M pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
    M pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
    M pkgs/applications/office/libreoffice/libreoffice-srcs.nix
    M pkgs/applications/office/libreoffice/still-primary-src.nix
    M pkgs/applications/office/libreoffice/still.nix
    M pkgs/development/libraries/catch/default.nix
    M pkgs/development/libraries/harfbuzz/default.nix
    M pkgs/development/libraries/libmwaw/default.nix
    A pkgs/development/libraries/libzmf/default.nix
    M pkgs/os-specific/linux/iptables/default.nix
    M pkgs/os-specific/linux/shadow/default.nix
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/tools/admin/tigervnc/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/top-level/all-packages.nix

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

>11k more build jobs on master, just for Linux :-/
This way staging will never catch up.


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

Reply via email to