Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 11eb84bb9fd9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e8c1ff9ef8a1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 6, 2020

  1. grub: Fix incorrect upgrade to new jsonStateLine. See #85895. (#92520) 

    Fixes error

    Can't use an undefined value as an ARRAY reference at /nix/store/...-install-grub.pl line 642, <FILE> line 5.

with `/boot/grub/state` being:

```
grub
2.04
no
/dev/sda
/boot

```

I am not sure where the trailing empty line can come from; the script does not
seem to write it. In any case, now we handle that situation as well.

Further, ensure that `extraGrubInstallArgs` defaults to the empty array
if its key is not present in the `jsonState`.
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    e8c1ff9 View commit details
    Browse the repository at this point in the history