patches and low-level development discussion
 help / color / mirror / Atom feed
From: Alyssa Ross <hi@alyssa.is>
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> (raw)
In-Reply-To: <20210729100928.1965341-1-hi@alyssa.is>

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


  parent reply	other threads:[~2021-07-29 10:11 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 10:09 [PATCH nixpkgs 0/6] Fix build failures after Nixpkgs update Alyssa Ross
2021-07-29 10:09 ` [PATCH nixpkgs 1/6] chromiumOSPackages.vm_protos: set full go_package Alyssa Ross
2021-07-29 10:09 ` [PATCH nixpkgs 2/6] chromiumOSPackages.modemmanager: disable patches Alyssa Ross
2021-07-29 10:09 ` [PATCH nixpkgs 3/6] chromiumOSPackages.modemmanager-next: add gtk-doc Alyssa Ross
2021-07-29 10:09 ` [PATCH nixpkgs 4/6] chromiumOSPackages.libqmi: disable QRTR Alyssa Ross
2021-07-29 10:09 ` Alyssa Ross [this message]
2021-07-29 10:09 ` [PATCH nixpkgs 6/6] wlroots: update Spectrum patches Alyssa Ross
2021-08-02 20:32 ` [PATCH nixpkgs 0/6] Fix build failures after Nixpkgs update Cole Helbling
2021-08-03  7:57   ` Alyssa Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210729100928.1965341-6-hi@alyssa.is \
    --to=hi@alyssa.is \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches and low-level development discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://spectrum-os.org/lists/archives/spectrum-devel/0 spectrum-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 spectrum-devel spectrum-devel/ https://spectrum-os.org/lists/archives/spectrum-devel \
		public-inbox+spectrum-devel@spectrum-os.org devel@spectrum-os.org
	public-inbox-index spectrum-devel

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntps://spectrum-os.org/inbox.comp.spectrum.devel
	nntp://spectrum-os.org/inbox.comp.spectrum.devel


code repositories for the project(s) associated with this inbox:

	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

AGPL code for this site: https://ftp.qyliss.net/public-inbox/public-inbox-1.6.1-qyliss-yjdmfarc701widk5ma6pcr7jrb69jyb3.tar.gz