From 3b2787f1aa804da7da1ddee6f148c3d9760f65a2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 20 Nov 2024 19:39:32 +0100 Subject: [PATCH 1/3] linuxKernel.packages.linux_6_11.evdi: autoformat with nixfmt --- pkgs/os-specific/linux/evdi/default.nix | 32 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index fb664e92cf176..e088246ff3de1 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,15 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, kernel -, libdrm -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + libdrm, + python3, }: let - python3WithLibs = python3.withPackages (ps: with ps; [ - pybind11 - ]); + python3WithLibs = python3.withPackages ( + ps: with ps; [ + pybind11 + ] + ); in stdenv.mkDerivation (finalAttrs: { pname = "evdi"; @@ -41,7 +44,11 @@ stdenv.mkDerivation (finalAttrs: { "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - hardeningDisable = [ "format" "pic" "fortify" ]; + hardeningDisable = [ + "format" + "pic" + "fortify" + ]; installPhase = '' runHook preInstall @@ -57,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; - license = with licenses; [ lgpl21Only gpl2Only ]; + license = with licenses; [ + lgpl21Only + gpl2Only + ]; maintainers = [ ]; platforms = platforms.linux; }; From 7e6a62051ed61a16904144f3593fe706bfad5999 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 20 Nov 2024 19:41:43 +0100 Subject: [PATCH 2/3] linuxKernel.packages.linux_6_11.evdi: set broken for kernel >= 6.12 --- pkgs/os-specific/linux/evdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e088246ff3de1..e865b25ae9a3a 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { - broken = kernel.kernelOlder "4.19"; + meta = { + broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.12"; changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; From 63e45baa95b5300c3ee2463f1797a9dac3766931 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 20 Nov 2024 19:45:55 +0100 Subject: [PATCH 3/3] linuxKernel.packages.linux_6_11.evdi: adopt maintenance --- pkgs/os-specific/linux/evdi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e865b25ae9a3a..e65790ef26080 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; - license = with licenses; [ + license = with lib.licenses; [ lgpl21Only gpl2Only ]; - maintainers = [ ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; }; })