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

linux-jovian: Revert breaking change from Quectel #442

Merged
merged 1 commit into from
Nov 3, 2024
Merged

linux-jovian: Revert breaking change from Quectel #442

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion pkgs/linux-jovian/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
{ lib, fetchFromGitHub, buildLinux, fetchpatch, ... } @ args:

let
inherit (lib) versions;
Expand All @@ -10,6 +10,22 @@ in
buildLinux (args // rec {
version = "${kernelVersion}-${vendorVersion}";

kernelPatches = (args.kernelPatches or []) ++ [
{
name = "revert-bluetooth-mgmt-quectel.diff";
# The patch originally intended to make bluez aware of its own flag changes.
# Bluez now is aware of its own changes starting with bluez 5.78
# - https://github.com/bluez/bluez/commit/9cc587947b6ac56a4c94dcc880b273bc72af22a8
# Without reverting this change, Bluez 5.78+ gets into a loop setting flags.
# See: https://github.com/Jovian-Experiments/Jovian-NixOS/issues/441
patch = fetchpatch {
url = "https://github.com/Jovian-Experiments/linux/commit/3ea1541efc91116181ec4abcebd62810df7aff33.patch";
hash = "sha256-RYDnJGz349VVZ3YWpDfPb3aSLH2noAnn2xFDqHW26DQ=";
revert = true;
};
}
];

# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;

Expand Down
Loading