its time to merge to master... its too big now xD #76

Open
gortium wants to merge 160 commits from uconsole-cm5-incremental into master
10 changed files with 512 additions and 52 deletions
Showing only changes of commit 2ee616839e - Show all commits

8
flake.lock generated
View File

@@ -235,16 +235,16 @@
]
},
"locked": {
"lastModified": 1781406889,
"narHash": "sha256-cUD2zvOgHMMjIn4wd4dvpW2GZtCFWtUS+7CPrzQwpPA=",
"lastModified": 1781476310,
"narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
"owner": "gortium",
"repo": "nixos-uconsole",
"rev": "b556f9315358dbd53bf868cc24e5872ee15763d8",
"rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
"type": "github"
},
"original": {
"owner": "gortium",
"ref": "cm5_fix",
"ref": "pr/dcs-panel-detection",
"repo": "nixos-uconsole",
"type": "github"
}

View File

@@ -14,7 +14,7 @@
};
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
nixos-uconsole = {
url = "github:gortium/nixos-uconsole/cm5_fix";
url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
inputs.nixpkgs.follows = "nixpkgs-uconsole";
inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
};
@@ -151,7 +151,7 @@
];
})
# Patches are now in gortium/nixos-uconsole fork (cm5_fix branch)
# Patches are now in gortium/nixos-uconsole fork (pr/dcs-panel-detection branch)
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
nixos-raspberrypi.lib.inject-overlays
nixos-raspberrypi.lib.inject-overlays-global