From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id 88E041806A; Thu, 29 Jul 2021 10:11:06 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 707A517E68; Thu, 29 Jul 2021 10:10:20 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id DC48A17E06; Thu, 29 Jul 2021 10:10:16 +0000 (UTC) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by atuin.qyliss.net (Postfix) with ESMTPS id CE8EE17DBB for ; Thu, 29 Jul 2021 10:10:09 +0000 (UTC) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 8C7DF32000CC for ; Thu, 29 Jul 2021 06:10:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 29 Jul 2021 06:10:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=FFPg/NPQsYRBZ uO+ZEw6rxLpwT8xbUY56aJ70TcsUKc=; b=bXrIj4jEjfIsy5jXU+haK2BHLxMg9 qqv9LBNREpV77eYqnQQIklUO61zG833T0jnDxJUsrZ5AuxbvIfKtvw+VWlbHIccD mDSWOFndIrRjk9dkCIzw8TTHbMmSCfMnA8uCqxrDPu121EWbyJXVy8D8r/AseIQt 0qU2l9fqQZuNzGuFq3IQ9ExDzTIsxAtbR2rDDX2R6xKGhXROt7f34OJtLeSth/LU 5CleVP2PS96YI7ddBsrgz10jaID6ppgFCohiFYYDyghbsuwg5uinq4+S6a0Ern1+ UckkiAGsLikbWsu5psnK56AcsrCLvXdoEKqfYa3tkNtxKhv4vcCC6PhCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=FFPg/NPQsYRBZuO+ZEw6rxLpwT8xbUY56aJ70TcsUKc=; b=iAzyKLBQ UaxZguvqb5e+nfbDc76rg224xCGmyGS2/tT7A1jq/a1oNRNG5Sczouo7mYvFUX7d qKv+owFaMowHkGET0DGXX5fOM4ZyK8nbqAcw/oPPDvagyXRgS73sPBcbSvJxCggV bq50Cr5FAPmxJweCdGkPc80/CTe8UtCM3GI6RFEFVf62X88MPbZToXZCi2liPeT+ ex0TOuUgYSZ0ZzVLG1ORMjNnRew3PcJoFvRYm/uIsdPCPGCUgqWvtiICHOM0/Z/e juV75yEj2MuetHn/D/3eA3pNsXeVsERYHzzKqOrrIkZrJUyoxNPUWp9Jy3u3EwkQ 1gSFLtOWBLOT8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrhedugddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhs qeenucggtffrrghtthgvrhhnpefgfedukedvleeileeludefveehgeelgfegvddujedvtd ffueeuveffheeljeekvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehqhihlihhsshesvghvvgdrqhihlhhishhsrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 29 Jul 2021 06:10:07 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 1BB2813EE; Thu, 29 Jul 2021 10:10:04 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 5/6] linux_cros: fix build Date: Thu, 29 Jul 2021 10:09:27 +0000 Message-Id: <20210729100928.1965341-6-hi@alyssa.is> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729100928.1965341-1-hi@alyssa.is> References: <20210729100928.1965341-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: IESOHIJ2UHGKIDFMORAVY4DOYWSTT64T X-Message-ID-Hash: IESOHIJ2UHGKIDFMORAVY4DOYWSTT64T X-MailFrom: qyliss@eve.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This patch is already included in the Chromium kernel. --- pkgs/os-specific/linux/chromium-os/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/chromium-os/default.nix b/pkgs/os-specific/linux/chromium-os/default.nix index 6eb9f335ff3..efdf600756f 100644 --- a/pkgs/os-specific/linux/chromium-os/default.nix +++ b/pkgs/os-specific/linux/chromium-os/default.nix @@ -30,7 +30,8 @@ let }; linux_5_4 = callPackage ../kernel/linux-cros.nix { - inherit (linux_5_4) kernelPatches; + kernelPatches = + lib.remove kernelPatches.rtl8761b_support linux_5_4.kernelPatches; }; linux = self.linux_5_4; -- 2.32.0