nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

treewide: drop 25.05 compat code

Browse source
This commit is contained in:
Sandro Jäckel 2026-01-11 09:40:29 +01:00
parent 388f38215d
commit 639ca38126
No known key found for this signature in database
GPG key ID: 236B6291555E8401
3 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apple/t2/default.nix
View file

@ -7,7 +7,6 @@
let let
inherit (lib) types; inherit (lib) types;
nixosVersion = lib.versions.majorMinor lib.version;
audioFiles = pkgs.fetchFromGitHub { audioFiles = pkgs.fetchFromGitHub {
owner = "kekrby"; owner = "kekrby";
@ -106,16 +105,9 @@ in
powerManagement.enable = true; powerManagement.enable = true;
} }
( {
if lib.versionAtLeast nixosVersion "25.05" then services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
{ }
services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
}
else
{
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
}
)
(lib.mkIf t2Cfg.enableIGPU { (lib.mkIf t2Cfg.enableIGPU {
# Enable the iGPU by default if present # Enable the iGPU by default if present

9
lenovo/thinkpad/z/gen2/z13/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
@ -14,8 +14,7 @@
path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/${id}"; path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/${id}";
}; };
in in
if lib.versionOlder lib.version "25.05pre" then {
{ networkmanager.fccUnlockScripts = [ fcc_unlock_script ]; } modemmanager.fccUnlockScripts = [ fcc_unlock_script ];
else };
{ modemmanager.fccUnlockScripts = [ fcc_unlock_script ]; };
} }

29
purism/librem/5r4/audio.nix
View file

@ -19,25 +19,14 @@
''; '';
}; };
in in
if lib.versionOlder (lib.versions.majorMinor lib.version) "25.05" then {
{ assertions = [
assertions = [ {
{ assertion = config.services.pulseaudio.enable;
assertion = config.hardware.pulseaudio.enable; message = "Call audio on Librem5 requires pulse audio to be enabled through `services.pulseaudio.enable`.";
message = "Call audio on Librem5 requires pulse audio to be enabled through `hardware.pulseaudio.enable`."; }
} ];
]; services.pulseaudio = paConfig;
hardware.pulseaudio = paConfig; }
}
else
{
assertions = [
{
assertion = config.services.pulseaudio.enable;
message = "Call audio on Librem5 requires pulse audio to be enabled through `services.pulseaudio.enable`.";
}
];
services.pulseaudio = paConfig;
}
); );
} }