diff options
| author | Bruno Inec <binec@scaleway.com> | 2021-12-08 10:39:32 +0100 |
|---|---|---|
| committer | Bruno Inec <binec@scaleway.com> | 2021-12-08 10:39:32 +0100 |
| commit | 8e27806b0654b6fdac365ba0f555b3c995291474 (patch) | |
| tree | 9db99824b1d6f9cb39a4db076402a7f4e43de41d | |
| parent | e25d9ef7b969464a69a0572dce361d64712efba6 (diff) | |
| download | nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar.gz nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar.bz2 nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar.lz nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar.xz nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.tar.zst nixpkgs-8e27806b0654b6fdac365ba0f555b3c995291474.zip | |
ddcci-driver: 4.1 -> 4.2
| -rw-r--r-- | pkgs/os-specific/linux/ddcci/default.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 086373f1ab5..fe16d283ffc 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,18 +1,15 @@ -{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchFromGitLab, kernel }: stdenv.mkDerivation rec { pname = "ddcci-driver"; - # XXX: We apply a patch for the upcoming version to the source of version 0.4.1 - # XXX: When 0.4.2 is actually released, don't forget to remove this comment, - # XXX: fix the rev in fetchFromGitLab, and remove the patch. version = "0.4.2"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; - rev = "v0.4.1"; - sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg"; + rev = "v${version}"; + sha256 = "sSmL8PqxqHHQiume62si/Kc9El58/b4wkB93iG0dnNM="; }; hardeningDisable = [ "pic" ]; @@ -28,13 +25,6 @@ stdenv.mkDerivation rec { --replace depmod \# ''; - patches = [ - (fetchpatch { - url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2.patch"; - sha256 = "sha256-ShqVzkoRnlX4Y5ARY11YVYatFI1K7bAtLulP3/8/nwg="; - }) - ]; - makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" |