update nixos

This commit is contained in:
Gabriel Ebner 2022-05-31 16:57:25 +02:00
parent c81774e6a7
commit 0c1d76cb38
3 changed files with 4 additions and 50 deletions

View File

@ -1,46 +0,0 @@
commit ddf273588e069b5267d116d8539dab09e8bb55ba
Author: Gabriel Ebner <gebner@gebner.org>
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;

View File

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1653581809,
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
"lastModified": 1653845079,
"narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
"rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7",
"type": "github"
},
"original": {

View File

@ -15,7 +15,7 @@
channels.nixpkgs.input = nixpkgs;
channels.nixpkgs.patches = [ ./d9963ed77dbdfe3a48537c6c8820199b99592368.patch ];
channels.nixpkgs.patches = [ ];
nix.generateRegistryFromInputs = true;