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.

Sign up for GitHub

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

Jump to bottom

surface: linux 6.6.13 -> 6.7.6 #878

Closed
wants to merge 1 commit into from
Closed

surface: linux 6.6.13 -> 6.7.6 #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion microsoft/surface/common/kernel/default.nix
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ let

in {
imports = [
./linux-6.6.x
./linux-6.7.x
Copy link
Contributor

Choose a reason for hiding this comment

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

If you're not going to expose the 6.6.x .nix files, you may as well delete them, yeah?

In the past, @Mic92 has asked people to try to minimise the number of different kernel versions that have to be maintained for any particular hardware.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, sound like a good idea.

];

options.microsoft-surface.kernelVersion = mkOption {
Expand Down
4 changes: 2 additions & 2 deletions ...ace/common/kernel/linux-6.6.x/default.nix → ...ace/common/kernel/linux-6.7.x/default.nix
View file
Open in desktop
Expand Up @@ -7,14 +7,14 @@ let

cfg = config.microsoft-surface;

version = "6.6.13";
version = "6.7.6";
kernelPatches = surfacePatches {
inherit version;
patchFn = ./patches.nix;
};
kernelPackages = linuxPackage {
inherit version kernelPatches;
sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
sha256 = "";
Copy link
Contributor

Choose a reason for hiding this comment

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

Empty hash should be sha256-5InsDhNw0Im0RtVlre16aYCT0rfEEioY8h7bbvk9N9M=

Edit:
It looks like the linux-surface repo needs to be pulled forward as well to:

  linux-surface = fetchFromGitHub {
    owner = "linux-surface";
    repo = "linux-surface";
    rev = "arch-6.7.6-1";
    sha256 = "1f89xzzn11d25g70zqqj3ybk68g11m33qpmh0rj46nhh9bzlj4ya";
  };

With that the build advances to compilation (in progress as of this edit)

Edit 2: With those changes (see this commit) I am able to successfully compile and boot into 6.7.6. I am editing from a Surface Laptop Studio with this as a nixos flake input :) Passes ad-hoc testing on this device.

Copy link
Contributor

Choose a reason for hiding this comment

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

Any chance we can bump this to arch-6.7.9-1? That pulls in linux-surface/linux-surface@852fcb1 which has improvements to the fan profiles on the SP9.

To cherry-pick (on top of @tracteurblinde 's commit); cf462d6

Copy link

Choose a reason for hiding this comment

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

Any chance we can bump this to arch-6.7.9-1? That pulls in linux-surface/linux-surface@852fcb1 which has improvements to the fan profiles on the SP9.

To cherry-pick (on top of @tracteurblinde 's commit); cf462d6

not only that but also finally has working cameras again which would be nice to have

ignoreConfigErrors=true;
};

Expand Down
0 ...ace/common/kernel/linux-6.6.x/patches.nix → ...ace/common/kernel/linux-6.7.x/patches.nix
View file
Open in desktop
File renamed without changes.