diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/os-specific/linux/ch9344/default.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/ch9344/default.nix')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/ch9344/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix b/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix index e7da864b90c1..42c26503ea15 100644 --- a/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "ch9344"; - version = "1.9"; + version = "2.0"; src = fetchzip { name = "CH9344SER_LINUX.zip"; url = "https://www.wch.cn/downloads/file/386.html#CH9344SER_LINUX.zip"; - hash = "sha256-g55ftAfjKKlUFzGhI1a/O7Eqbz6rkGf1vWuEJjBZxBE="; + hash = "sha256-YKNMYpap7CjhgTIpd/M9+nB11NtpwGYT/P14J6q3XZg="; }; - patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [ - # https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1 + patches = [ ./fix-incompatible-pointer-types.patch - ] ++ lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.3") [ - # https://github.com/torvalds/linux/commit/5d420399073770134d2b03e004b2c0201c7fa26f - ./fix-incompatible-pointer-types_6_3.patch ]; sourceRoot = "${src.name}/driver"; |