[Nix-commits] [NixOS/nixpkgs] 42e131: nixos: remove duplicate wrapperDir PATH addition (...

2017-04-09 Thread Timofei Kushnir
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 42e13147278afea46d590fa761020b08ce8bdb1e
  
https://github.com/NixOS/nixpkgs/commit/42e13147278afea46d590fa761020b08ce8bdb1e
  Author: Timofei Kushnir <timop...@ecotelecom.ru>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
M nixos/modules/config/shells-environment.nix

  Log Message:
  ---
  nixos: remove duplicate wrapperDir PATH addition (#24703)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0ba1ea: virtualbox-{systemd-detect-virt, net-hostonlyif} te...

2016-10-29 Thread Timofei Kushnir
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0ba1ea81220ee0ef29c151c97036ffc2dc278dbd
  
https://github.com/NixOS/nixpkgs/commit/0ba1ea81220ee0ef29c151c97036ffc2dc278dbd
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2016-10-29 (Sat, 29 Oct 2016)

  Changed paths:
M nixos/tests/virtualbox.nix

  Log Message:
  ---
  virtualbox-{systemd-detect-virt,net-hostonlyif} test: fix dbus socket dir

The test complains[1][2] that

   Failed to start message bus: Failed to bind socket 
"/run/dbus/system_bus_socket": No such file or directory

In 639e5401ff51d4c0075b5ceffcbdbfec64c67db3, the dbus socket dir is set
to `/run/dbus`; in the test vm `/var/run/dbus` is used, but the standard
`/run -> /var/run` link is typically not created until stage 2 init, not
in the minimal init used here.  Thus, dbus fails to run within the test
environment .  Fix by changing `/var/run/dbus` to simply `/run/dbus`.

[1]: https://hydra.nixos.org/build/42534725
[2]: https://hydra.nixos.org/build/42523834

(cherry picked from commit c86fe2224e09b2ebb30c98de0b17b72147d7d226)


  Commit: dce54d4d2f245e57057fe7674d27885369d3b6ca
  
https://github.com/NixOS/nixpkgs/commit/dce54d4d2f245e57057fe7674d27885369d3b6ca
  Author: Timofei Kushnir <timop...@ecotelecom.ru>
  Date:   2016-10-29 (Sat, 29 Oct 2016)

  Changed paths:
M nixos/modules/security/grsecurity.nix

  Log Message:
  ---
  grsecurity: fix 'isYes' and 'isNo'

(cherry picked from commit faa6f9b6b3dc251c58ee0b6f8247b6d1a0678b81)


Compare: https://github.com/NixOS/nixpkgs/compare/6794cc113f5b...dce54d4d2f24___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits