From fdaa4fc5a8a81690e8c09f08d1053bc1794e4684 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Wed, 16 Oct 2024 17:54:58 -0700 Subject: [PATCH 1/2] system76-dkms: 1.0.13 -> 1.0.16 The latest release adds a small compatibility fix needed for Linux 6.11. --- pkgs/os-specific/linux/system76/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index 7d9cd9bde024..e6626ff6b5be 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.13"; - sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r"; + version = "1.0.16"; + sha256 = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA="; in stdenv.mkDerivation { name = "system76-module-${version}-${kernel.version}"; From 7c1d037fb15708bda50605fddde453d2c34b865b Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Tue, 29 Oct 2024 18:01:54 -0700 Subject: [PATCH 2/2] system76-dkms: style improvements --- pkgs/os-specific/linux/system76/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index e6626ff6b5be..b42b31c5a214 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let version = "1.0.16"; - sha256 = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA="; + hash = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA="; in stdenv.mkDerivation { name = "system76-module-${version}-${kernel.version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "pop-os"; repo = "system76-dkms"; rev = version; - inherit sha256; + inherit hash; }; hardeningDisable = [ "pic" ]; @@ -29,11 +29,10 @@ stdenv.mkDerivation { mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; - meta = with lib; { - maintainers = [ maintainers.khumba ]; - license = [ licenses.gpl2Plus ]; + meta = { + maintainers = [ lib.maintainers.khumba ]; + license = [ lib.licenses.gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = versionOlder kernel.version "4.14"; description = "System76 DKMS driver"; homepage = "https://github.com/pop-os/system76-dkms"; longDescription = ''