fix 24.05 evaluation
This commit is contained in:
parent
cc634b69c8
commit
584a5e5518
5
.github/workflows/test.yml
vendored
5
.github/workflows/test.yml
vendored
|
@ -7,11 +7,14 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
tests:
|
tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
channel: [ nixos-unstable, nixos-24.05 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: cachix/install-nix-action@V27
|
- uses: cachix/install-nix-action@V27
|
||||||
with:
|
with:
|
||||||
nix_path: nixpkgs=channel:nixos-unstable
|
nix_path: nixpkgs=channel:${{ matrix.channel }}
|
||||||
- name: Show nixpkgs version
|
- name: Show nixpkgs version
|
||||||
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
|
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
|
||||||
- run: ./tests/run.py
|
- run: ./tests/run.py
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
../../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: reverse compat
|
# TODO: reverse compat
|
||||||
|
|
|
@ -8,6 +8,7 @@ in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
|
../../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
services.xserver.videoDrivers = mkDefault [ "nvidiaLegacy340" ];
|
services.xserver.videoDrivers = mkDefault [ "nvidiaLegacy340" ];
|
||||||
|
|
|
@ -11,6 +11,7 @@ let
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../shared.nix
|
../shared.nix
|
||||||
|
../../../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
options.hardware.asus.zephyrus.ga402x.amdgpu = {
|
options.hardware.asus.zephyrus.ga402x.amdgpu = {
|
||||||
|
|
37
common/gpu/24.05-compat.nix
Normal file
37
common/gpu/24.05-compat.nix
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
# Backward-compat for 24.05, can be removed after we drop 24.05 support
|
||||||
|
options = {
|
||||||
|
hardware.graphics = lib.optionalAttrs (lib.versionOlder lib.version "24.11pre") {
|
||||||
|
enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
enable32Bit = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
extraPackages = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.package;
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
extraPackages32 = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.package;
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
hardware.opengl = lib.optionalAttrs (lib.versionOlder lib.version "24.11pre") {
|
||||||
|
enable = config.hardware.graphics.enable;
|
||||||
|
driSupport32Bit = config.hardware.graphics.enable32Bit;
|
||||||
|
extraPackages = config.hardware.graphics.extraPackages;
|
||||||
|
extraPackages32 = config.hardware.graphics.extraPackages32;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -7,6 +7,7 @@
|
||||||
default = true;
|
default = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
imports = [ ../24.05-compat.nix ];
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
{
|
{
|
||||||
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
|
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
imports = [ ../24.05-compat.nix ];
|
||||||
options.hardware.intelgpu.driver = lib.mkOption {
|
options.hardware.intelgpu.driver = lib.mkOption {
|
||||||
description = "Intel GPU driver to use";
|
description = "Intel GPU driver to use";
|
||||||
type = lib.types.enum [
|
type = lib.types.enum [
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
imports = [ ../24.05-compat.nix ];
|
||||||
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
|
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
vaapiVdpau
|
vaapiVdpau
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -6,6 +6,7 @@ in
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/laptop/ssd
|
../../common/pc/laptop/ssd
|
||||||
../../common/hidpi.nix
|
../../common/hidpi.nix
|
||||||
|
../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Necessary kernel modules
|
# Necessary kernel modules
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
../../../../common/gpu/24.05-compat.nix
|
||||||
|
];
|
||||||
hardware = {
|
hardware = {
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
../../../common/gpu/24.05-compat.nix
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/cpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ lib, config, ... }: {
|
{ lib, config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
../../../common/gpu/24.05-compat.nix
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../thinkpad/yoga.nix
|
../../../thinkpad/yoga.nix
|
||||||
../../../../common/gpu/amd/default.nix
|
../../../../common/gpu/amd/default.nix
|
||||||
|
../../../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "ideapad_laptop" ];
|
boot.initrd.kernelModules = [ "ideapad_laptop" ];
|
||||||
|
|
|
@ -8,6 +8,7 @@ let
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../shared.nix
|
../shared.nix
|
||||||
|
../../../../../common/gpu/24.05-compat.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# AMD RX680
|
# AMD RX680
|
||||||
|
|
|
@ -81,7 +81,7 @@ def write_eval_test(f: IO[str], profiles: list[str]) -> None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
system = "x86_64-linux"
|
system = "x86_64-linux"
|
||||||
if "raspberry-pi/4" == profile or "raspberry-pi/5" == profile:
|
if profile in ("raspberry-pi/4", "raspberry-pi/5"):
|
||||||
system = "aarch64-linux"
|
system = "aarch64-linux"
|
||||||
|
|
||||||
f.write(
|
f.write(
|
||||||
|
|
Loading…
Reference in a new issue