From 4ee298daf7108b96fe6538cb6507c6e2e9783297 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 5 Aug 2022 13:24:37 +0000 Subject: [PATCH] linuxPackages.bbswitch: 0.8 -> unstable-2021-11-29 (#179644) Co-authored-by: Sandro --- pkgs/os-specific/linux/bbswitch/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4f19c29e1c38..886bf3e6fee8 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.8"; + version = "unstable-2021-11-29"; name = "${baseName}-${version}-${kernel.version}"; in @@ -13,18 +13,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Bumblebee-Project"; repo = "bbswitch"; - rev = "v${version}"; - hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; + # https://github.com/Bumblebee-Project/bbswitch/tree/develop + rev = "23891174a80ea79c7720bcc7048a5c2bfcde5cd9"; + hash = "sha256-50v1Jxem5kaI1dHOKmgBbPLxI82QeYxiaRHhrHpWRzU="; }; patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) - (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; - sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0bd986055ba52887b81048de5c61e618eec06eb0/trunk/0003-kernel-5.18.patch"; + sha256 = "sha256-va62/bR1qyBBMPg0lUwCH7slGG0XijxVCsFa4FCoHEQ="; }) ]; @@ -64,6 +61,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; - broken = kernel.kernelAtLeast "5.18"; }; }