grub2: fix grub-kbdcomp #100078

mdevlamynck · 2020-10-09T12:06:35Z

The grub-kbdcomp command was calling ckbcomp directly without patching to provide its path in the nix store. As a result the command was crashing because ckbcomp was not found.

Motivation for this change

This change adds the option kbdcompSupport and fixes grub-kbdcomp:

when kbdcompSupport = true the command works correctly
when kbdcompSupport = false (default value) the command is replaced with an explanation message (is this a good thing?)

This will also help with #41247 since a possible solution for this issue uses grub-kbdcomp.

The motivation for adding an option is to avoid bringing ckbcomp and its dependencies (some part of x11 as xkeyboardconfig) when we only want to use grub.

Things done

doronbehar · 2020-10-09T16:36:45Z

@GrahamcOfBorg eval

SuperSandro2000 · 2020-11-27T22:33:44Z

Please rebase this to fix the eval error.

jtojnar · 2021-02-02T17:07:23Z

pkgs/tools/misc/grub/2.0x.nix

@@ -53,6 +55,13 @@ stdenv.mkDerivation rec {
    ./fix-bash-completion.patch
  ];

+  patchPhase = if kbdcompSupport then ''


Overriding patchPhase breaks patches field. Use prePatch or postPatch instead.

Updated to use postPatch and tested. Thanks for reviewing this :)

jtojnar · 2021-02-02T17:35:32Z

pkgs/tools/misc/grub/2.0x.nix

+  postPatch = if kbdcompSupport then ''
+    sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@'
+  '' else ''
+    echo '#! ${stdenv.shell}' > util/grub-kbdcomp.in


Also you might need runtimeShell or something, to work properly with cross-compilation. cc @lopsided98

Yes, runtimeShell is needed here because this script will need to run on the host platform.

Changed, I don't know how to test it with cross-compilation though.

Fyi @mdevlamynck it's as easy as e.g. pkgsCross.aarch64-multiplatform.grub2. And if you don't have a non-x86 machine for testing you can "cross-compile" to 32-bit and test locally with pkgsCross.gnu32 :)

SuperSandro2000 · 2021-02-03T10:44:56Z

pkgs/tools/misc/grub/2.0x.nix

 , zfs ? null
 , efiSupport ? false
 , zfsSupport ? false
 , xenSupport ? false
+, kbdcompSupport ? false, ckbcomp ? null


Suggested change

, kbdcompSupport ? false, ckbcomp ? null

, kbdcompSupport ? false, ckbcomp

SuperSandro2000 · 2021-02-03T10:45:03Z

pkgs/tools/misc/grub/2.0x.nix

@@ -37,6 +39,7 @@ in (

 assert efiSupport -> canEfi;
 assert zfsSupport -> zfs != null;
+assert kbdcompSupport -> ckbcomp != null;


Suggested change

assert kbdcompSupport -> ckbcomp != null;

The grub-kbdcomp command was calling ckbcomp directly without patching to provide its path in the nix store.

bqv · 2021-02-12T12:26:10Z

@jtojnar @SuperSandro2000 merge?

SuperSandro2000 · 2021-02-17T19:44:32Z

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 100078 run on x86_64-linux 1

1 package blacklisted:

tests.nixos-functions.nixosTest-test

6 packages built:

grub2 (grub2_full ,grub2_light)
grub2_efi
grub2_pvgrub_image
grub2_xen
os-prober
woeusb

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

grub2_efi:

A likely typo in grubTarget argument was found, did you mean distTarget?

Near pkgs/tools/misc/grub/2.0x.nix:108:3:

    |
108 |   grubTarget = if efiSupport
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-typo.md
Package does not have a maintainer. Consider adding yourself?

Near pkgs/tools/misc/grub/2.0x.nix:122:3:

    |
122 |   meta = with lib; {
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/maintainers-missing.md
libtool is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

Near pkgs/tools/misc/grub/2.0x.nix:66:3:

   |
66 |   buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/tools/misc/grub/2.0x.nix:55:5:

   |
55 |     ./fix-bash-completion.patch
   |     ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md

grub2:

A likely typo in grubTarget argument was found, did you mean distTarget?

Near pkgs/tools/misc/grub/2.0x.nix:108:3:

    |
108 |   grubTarget = if efiSupport
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-typo.md
Package does not have a maintainer. Consider adding yourself?

Near pkgs/tools/misc/grub/2.0x.nix:122:3:

    |
122 |   meta = with lib; {
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/maintainers-missing.md
libtool is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

Near pkgs/tools/misc/grub/2.0x.nix:66:3:

   |
66 |   buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/tools/misc/grub/2.0x.nix:55:5:

   |
55 |     ./fix-bash-completion.patch
   |     ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md

grub2_pvgrub_image:

Package does not have a maintainer. Consider adding yourself?

Near pkgs/tools/misc/grub/pvgrub_image/default.nix:32:3:

   |
32 |   meta = with lib; {
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/maintainers-missing.md
Package is missing a license

Near pkgs/tools/misc/grub/pvgrub_image/default.nix:32:3:

   |
32 |   meta = with lib; {
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/license-missing.md

grub2_xen:

A likely typo in grubTarget argument was found, did you mean distTarget?

Near pkgs/tools/misc/grub/2.0x.nix:108:3:

    |
108 |   grubTarget = if efiSupport
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-typo.md
Package does not have a maintainer. Consider adding yourself?

Near pkgs/tools/misc/grub/2.0x.nix:122:3:

    |
122 |   meta = with lib; {
    |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/maintainers-missing.md
libtool is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

Near pkgs/tools/misc/grub/2.0x.nix:66:3:

   |
66 |   buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/tools/misc/grub/2.0x.nix:55:5:

   |
55 |     ./fix-bash-completion.patch
   |     ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md

os-prober:

Please consider this feature to be alpha.

A substituteInPlace with an unmatched pattern got detected:

substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/05efi'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/05efi'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/10elilo'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/10elilo'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/efi/10elilo'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20microsoft'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/30utility'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/30utility'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/30utility'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/83haiku'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/83haiku'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/83haiku'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20macosx'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20macosx'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/20macosx'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/70hurd'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/70hurd'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/70hurd'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10freedos'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10freedos'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10freedos'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/80minix'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/80minix'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/80minix'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/40lsb'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/40lsb'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/40lsb'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90solaris'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90solaris'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90solaris'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10qnx'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10qnx'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/10qnx'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90linux-distro'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90linux-distro'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/mounted/90linux-distro'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/50mounted-tests'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/50mounted-tests'
substituteStream(): WARNING: pattern '/usr/share/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/init/10filesystems'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/init/10filesystems'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/init/10filesystems'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/os-probes/init/10filesystems'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/50mounted-tests'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/50mounted-tests'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub2'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub2'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub2'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/90fallback'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/90fallback'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/90fallback'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/50lilo'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/50lilo'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/50lilo'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/lib/linux-boot-probes/mounted/40grub'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/bin/os-prober'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/bin/os-prober'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/bin/linux-boot-prober'
substituteStream(): WARNING: pattern '/usr/lib/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/bin/linux-boot-prober'
substituteStream(): WARNING: pattern '/usr/share/os-prober/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/share/common.sh'
substituteStream(): WARNING: pattern '/usr/lib/os-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/share/common.sh'
substituteStream(): WARNING: pattern '/usr/lib/linux-boot-probes/' doesn't match anything in file '/nix/store/70q22frd5xm9kj4myasmscprmfizisxq-os-prober-1.78/share/common.sh'

Please check the offending substituteInPlace for typos or changes in source.

makeWrapper is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

Near pkgs/tools/misc/os-prober/default.nix:24:3:

   |
24 |   buildInputs = [ makeWrapper ];
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md
installPhase should probably contain runHook preInstall and runHook postInstall.

Near pkgs/tools/misc/os-prober/default.nix:25:3:

   |
25 |   installPhase = ''
   |   ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-phase-hooks.md

tests.nixos-functions.nixosTest-test:

Package does not have a maintainer. Consider adding yourself?

Near nixos/lib/testing-python.nix:64:7:

   |
64 |       buildCommand =
   |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/maintainers-missing.md
Package is missing a license

Near nixos/lib/testing-python.nix:64:7:

   |
64 |       buildCommand =
   |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/license-missing.md

woeusb:

gpl3 is a deprecated license, check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

Near pkgs/tools/misc/woeusb/default.nix:56:5:

   |
56 |     license = licenses.gpl3;
   |     ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/unclear-gpl.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/tools/misc/woeusb/default.nix:16:15:

   |
16 |   patches = [ ./remove-workaround.patch ];
   |               ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md

SuperSandro2000 · 2021-02-17T20:08:20Z

Does not break cross compile with #112857.

mdevlamynck force-pushed the fix-grub-kbdcomp branch from 1b33844 to 6491297 Compare November 28, 2020 09:18

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Nov 28, 2020

mdevlamynck force-pushed the fix-grub-kbdcomp branch from 6491297 to 8dea800 Compare November 28, 2020 09:47

SuperSandro2000 added the 2.status: merge conflict label Jan 18, 2021

mdevlamynck force-pushed the fix-grub-kbdcomp branch from 8dea800 to 6f417af Compare January 30, 2021 18:30

ofborg bot removed the 2.status: merge conflict label Jan 30, 2021

jtojnar requested changes Feb 2, 2021

View reviewed changes

mdevlamynck force-pushed the fix-grub-kbdcomp branch 2 times, most recently from fe0390d to 8ca9c7f Compare February 2, 2021 17:27

jtojnar reviewed Feb 2, 2021

View reviewed changes

mdevlamynck force-pushed the fix-grub-kbdcomp branch from 8ca9c7f to ac181d8 Compare February 3, 2021 07:50

SuperSandro2000 reviewed Feb 3, 2021

View reviewed changes

mdevlamynck force-pushed the fix-grub-kbdcomp branch from ac181d8 to 1fda9df Compare February 3, 2021 11:40

grub2: fix grub-kbdcomp

b3792f9

The grub-kbdcomp command was calling ckbcomp directly without patching to provide its path in the nix store.

mdevlamynck force-pushed the fix-grub-kbdcomp branch from 1fda9df to b3792f9 Compare February 3, 2021 11:41

SuperSandro2000 merged commit b62f1a1 into NixOS:master Feb 17, 2021

mdevlamynck deleted the fix-grub-kbdcomp branch May 25, 2021 08:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

grub2: fix grub-kbdcomp #100078

grub2: fix grub-kbdcomp #100078

mdevlamynck commented Oct 9, 2020

doronbehar commented Oct 9, 2020

SuperSandro2000 commented Nov 27, 2020

jtojnar Feb 2, 2021

mdevlamynck Feb 2, 2021

jtojnar Feb 2, 2021

lopsided98 Feb 3, 2021

mdevlamynck Feb 3, 2021

r-burns Feb 17, 2021

SuperSandro2000 Feb 3, 2021

bqv Feb 9, 2021

SuperSandro2000 Feb 3, 2021

bqv Feb 9, 2021

bqv commented Feb 12, 2021

SuperSandro2000 commented Feb 17, 2021

SuperSandro2000 commented Feb 17, 2021

	, kbdcompSupport ? false, ckbcomp ? null
	, kbdcompSupport ? false, ckbcomp

grub2: fix grub-kbdcomp #100078

grub2: fix grub-kbdcomp #100078

Conversation

mdevlamynck commented Oct 9, 2020

Motivation for this change

Things done

doronbehar commented Oct 9, 2020

SuperSandro2000 commented Nov 27, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bqv commented Feb 12, 2021

SuperSandro2000 commented Feb 17, 2021

SuperSandro2000 commented Feb 17, 2021