Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3754de550f8cb0d1b8f79b40d2865db07c8cdf53
      
https://github.com/NixOS/nixpkgs/commit/3754de550f8cb0d1b8f79b40d2865db07c8cdf53
  Author: Luca Bruno <[email protected]>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/loader/grub/install-grub.pl

  Log Message:
  -----------
  nixos/grub: allow customization of the nix store path


  Commit: c3e832b323deced79b49ecf42a06714e2aa661e9
      
https://github.com/NixOS/nixpkgs/commit/c3e832b323deced79b49ecf42a06714e2aa661e9
  Author: Luca Bruno <[email protected]>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M nixos/modules/system/boot/stage-1-init.sh

  Log Message:
  -----------
  stage-1: mkdir -p /mnt-root, it may be created earlier by some hooks


  Commit: 033605e87f150d19919aefaa4d65006b55e9f456
      
https://github.com/NixOS/nixpkgs/commit/033605e87f150d19919aefaa4d65006b55e9f456
  Author: Luca Bruno <[email protected]>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/loader/grub/install-grub.pl
    M nixos/modules/system/boot/stage-1-init.sh

  Log Message:
  -----------
  Merge branch 'nixos-subdir'

Conflicts:
        nixos/modules/system/boot/loader/grub/grub.nix


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

Reply via email to