From c81774e6a79417dacdef077a173d21e9369107a6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 28 May 2022 16:51:26 +0200 Subject: [PATCH] update nixos --- ...3ed77dbdfe3a48537c6c8820199b99592368.patch | 46 +++++++++++++++++++ flake.lock | 6 +-- flake.nix | 2 +- 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 d9963ed77dbdfe3a48537c6c8820199b99592368.patch diff --git a/d9963ed77dbdfe3a48537c6c8820199b99592368.patch b/d9963ed77dbdfe3a48537c6c8820199b99592368.patch new file mode 100644 index 0000000..91edfb2 --- /dev/null +++ b/d9963ed77dbdfe3a48537c6c8820199b99592368.patch @@ -0,0 +1,46 @@ +commit ddf273588e069b5267d116d8539dab09e8bb55ba +Author: Gabriel Ebner +Date: Sat May 28 16:32:14 2022 +0200 + + linuxPackages.digimend: unstable-2019-06-18 -> 10 + +diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix +index b0ae7cc8508..70fc58232ab 100644 +--- a/pkgs/os-specific/linux/digimend/default.nix ++++ b/pkgs/os-specific/linux/digimend/default.nix +@@ -1,14 +1,14 @@ +-{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: ++{ lib, stdenv, fetchFromGitHub, kernel }: + + stdenv.mkDerivation rec { + pname = "digimend"; +- version = "unstable-2019-06-18"; ++ version = "10"; + + src = fetchFromGitHub { + owner = "digimend"; + repo = "digimend-kernel-drivers"; +- rev = "8b228a755e44106c11f9baaadb30ce668eede5d4"; +- sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm"; ++ rev = "v${version}"; ++ sha256 = "0lifd6cx6aa6hcms4zn4hlla3alra08r0svj5x1l8nlsv0ydnl6i"; + }; + + postPatch = '' +@@ -16,14 +16,8 @@ stdenv.mkDerivation rec { + sed 's/depmod /true /' -i Makefile + ''; + +- patches = [ +- # Fix build on Linux kernel >= 5.4 +- # https://github.com/DIGImend/digimend-kernel-drivers/pull/331 +- (fetchpatch { +- url = "https://github.com/DIGImend/digimend-kernel-drivers/commit/fb8a2eb6a9198bb35aaccb81e22dd5ebe36124d1.patch"; +- sha256 = "1j7l5hsk59gccydpf7n6xx1ki4rm6aka7k879a7ah5jn8p1ylgw9"; +- }) +- ]; ++ # Fix build on Linux kernel >= 5.18 ++ NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + diff --git a/flake.lock b/flake.lock index ad3e969..0bdc659 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653407748, - "narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 47a420b..65299ea 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ]; + channels.nixpkgs.patches = [ ./d9963ed77dbdfe3a48537c6c8820199b99592368.patch ]; nix.generateRegistryFromInputs = true;