Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msi-ec-kmods: init at 0-unstable-2024-09-19 #343038

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

m1dugh
Copy link

@m1dugh m1dugh commented Sep 19, 2024

Adds driver msi-ec-kmods

Adds the driver for (msi embedded controller)[https://github.com/BeardOverflow/msi-ec].

Things done

  • Built on platform(s)

    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage

  • Tested basic functionality of driver

  • Fits CONTRIBUTING.md.


Add a 👍 reaction to pull requests you find important.

Copy link
Member

@NotAShelf NotAShelf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be several issues with this PR.

  1. You will want to format new files with nixfmt-rfc-style. You might have noticed that the formatting PR is failing
  2. Editorconfig check is also failing, see if your editor integrates with it and try to conform to nixpkgs' editorconfig
  3. Please rebase this PR, a rogue PR has managed to sneak in your git history, you might want to drop it.
  4. Adding yourself to maintainers/maintainer-list.nix must be done in a separate commit. You will need to rebase again for this.

@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch 2 times, most recently from b61fc42 to 99a43f1 Compare September 19, 2024 17:05
@m1dugh
Copy link
Author

m1dugh commented Sep 19, 2024

I have fixed most issues, I am not sure to understand the rogue PR part.

@NotAShelf
Copy link
Member

Sorry, I meant a rogue commit*. Seems to be fixed though, so no worries.

pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from 99a43f1 to df60482 Compare September 19, 2024 17:21
@m1dugh
Copy link
Author

m1dugh commented Sep 19, 2024

Should be all good now

Copy link
Member

@NotAShelf NotAShelf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Derivation LGTM. As a last remark, you will want to update the commit message and the PR title to both show msi-ec-kmods: init at 0-unstable-2024-09-19

@m1dugh m1dugh changed the title Add msi embedded controller driver msi-ec-kmods: initat 0-unstable-2024-09-19 Sep 19, 2024
@m1dugh m1dugh changed the title msi-ec-kmods: initat 0-unstable-2024-09-19 msi-ec-kmods: init at 0-unstable-2024-09-19 Sep 19, 2024
@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from f56c1e7 to 77e7790 Compare September 19, 2024 17:37
Copy link
Member

@GetPsyched GetPsyched left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Derivation LGTM

@NotAShelf
Copy link
Member

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

10 packages marked as broken and skipped:
  • linuxKernel.packages.linux_4_19.msi-ec
  • linuxKernel.packages.linux_4_19_hardened.msi-ec
  • linuxKernel.packages.linux_5_10.msi-ec
  • linuxKernel.packages.linux_5_10_hardened.msi-ec
  • linuxKernel.packages.linux_5_15.msi-ec
  • linuxKernel.packages.linux_5_15_hardened.msi-ec
  • linuxKernel.packages.linux_5_4.msi-ec
  • linuxKernel.packages.linux_5_4_hardened.msi-ec
  • linuxKernel.packages.linux_6_1.msi-ec
  • linuxKernel.packages.linux_6_1_hardened.msi-ec
2 packages failed to build:
  • linuxKernel.packages.linux_6_11.msi-ec
  • linuxKernel.packages.linux_latest_libre.msi-ec
8 packages built:
  • linuxKernel.packages.linux_6_10.msi-ec
  • linuxKernel.packages.linux_6_6.msi-ec
  • linuxKernel.packages.linux_hardened.msi-ec (linuxKernel.packages.linux_6_6_hardened.msi-ec)
  • linuxKernel.packages.linux_libre.msi-ec
  • linuxKernel.packages.linux_lqx.msi-ec
  • linuxKernel.packages.linux_xanmod.msi-ec
  • linuxKernel.packages.linux_xanmod_latest.msi-ec (linuxKernel.packages.linux_xanmod_stable.msi-ec)
  • linuxKernel.packages.linux_zen.msi-ec

@m1dugh
Copy link
Author

m1dugh commented Sep 19, 2024

Should the 2 build failures be fixed before merging or not @NotAShelf ?

@NotAShelf
Copy link
Member

Yes, the build fails on both mainline Linux and Linux-Libre. Neither of those are packages we can skip.

@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from 77e7790 to 985c9a8 Compare September 19, 2024 18:28
@m1dugh
Copy link
Author

m1dugh commented Sep 19, 2024

Here is the result after fix of nixpkgs-review pr 343038 on x86_64-linux

10 packages marked as broken and skipped:
linuxKernel.packages.linux_4_19.msi-ec linuxKernel.packages.linux_4_19_hardened.msi-ec linuxKernel.packages.linux_5_10.msi-ec linuxKernel.packages.linux_5_10_hardened.msi-ec linuxKernel.packages.linux_5_15.msi-ec linuxKernel.packages.linux_5_15_hardened.msi-ec linuxKernel.packages.linux_5_4.msi-ec linuxKernel.packages.linux_5_4_hardened.msi-ec linuxKernel.packages.linux_6_1.msi-ec linuxKernel.packages.linux_6_1_hardened.msi-ec

10 packages built:
linuxKernel.packages.linux_6_10.msi-ec linuxKernel.packages.linux_6_11.msi-ec linuxKernel.packages.linux_6_6.msi-ec linuxKernel.packages.linux_hardened.msi-ec linuxKernel.packages.linux_latest_libre.msi-ec linuxKernel.packages.linux_libre.msi-ec linuxKernel.packages.linux_lqx.msi-ec linuxKernel.packages.linux_xanmod.msi-ec linuxKernel.packages.linux_xanmod_latest.msi-ec linuxKernel.packages.linux_zen.msi-ec

@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from 985c9a8 to 516bd90 Compare September 20, 2024 08:30
Copy link
Member

@Bot-wxt1221 Bot-wxt1221 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@m1dugh
Copy link
Author

m1dugh commented Sep 29, 2024

Any idea of when it can be merged ?

pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/msi-ec/default.nix Outdated Show resolved Hide resolved
@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from 516bd90 to f706ca3 Compare October 6, 2024 14:32
@m1dugh
Copy link
Author

m1dugh commented Oct 6, 2024

@tomodachi94 Should be all good

@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from f706ca3 to 5cda1c9 Compare October 6, 2024 14:35
@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch 2 times, most recently from 6fc5caa to a5fd31b Compare October 6, 2024 17:43
@m1dugh
Copy link
Author

m1dugh commented Oct 6, 2024

@tomodachi94 The requested changes cannot be resolved due to force-push, if it is good for you can you accept the changes ? 😅

Copy link
Member

@tomodachi94 tomodachi94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, thank you! The initial PR was really good for just your first contribution 🙂

Adds msi-ec-kmods kernel module for msi embedded controllers.
@m1dugh m1dugh force-pushed the add-msi-embedded-controller-driver branch from a5fd31b to 50e1733 Compare October 6, 2024 18:39
Copy link
Member

@tomodachi94 tomodachi94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something small that I missed in the original review

meta = {
description = "Kernel modules for MSI Embedded controller";
homepage = "https://github.com/BeardOverflow/msi-ec";
license = lib.licenses.gpl2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
license = lib.licenses.gpl2;
license = lib.licenses.gpl2Plus;

See https://github.com/BeardOverflow/msi-ec/blob/main/msi-ec.c#L1. `lib.licenses.gpl2' is deprecated.

lib,
fetchFromGitHub,
linuxPackages,
pkgs,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could be wrong here, but can we not simply import git instead of pkgs and replace pkgs.git -> git later in the derivation?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants