patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: colbyt <colby@colbyt.com>
To: devel@spectrum-os.org
Cc: colbyt <colby@colbyt.com>
Subject: [PATCH 5/8] pkgs/skaware: skip integrated backports
Date: Fri, 26 Jun 2026 11:55:05 -0700	[thread overview]
Message-ID: <20260626185509.3715326-6-colby@colbyt.com> (raw)
In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com>

The updated nixpkgs pin already contains the s6 softlimit and mdevd
backports carried by Spectrum.

Leave the vendored patch files in-tree for older pins, but stop applying
them when building against this nixpkgs revision.

Signed-off-by: colbyt <colby@colbyt.com>
---
 pkgs/skaware-packages/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/skaware-packages/default.nix b/pkgs/skaware-packages/default.nix
index 1489317..2e9244b 100644
--- a/pkgs/skaware-packages/default.nix
+++ b/pkgs/skaware-packages/default.nix
@@ -4,15 +4,15 @@
 import ../../lib/overlay-package.nix [ "skawarePackages" ] ({ final, super }:
 
 super.skawarePackages.overrideScope (_: prev: {
-  s6 = prev.s6.overrideAttrs ({ patches ? [], ... }: {
-    patches = patches ++ [
+  s6 = prev.s6.overrideAttrs ({ patches ? [], version, ... }: {
+    patches = patches ++ final.lib.optionals (final.lib.versionOlder version "2.15.0.0") [
       # Upstream c3a8ef70; vendored because cgit patch URLs are unstable.
       ./0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch
     ];
   });
 
-  mdevd = prev.mdevd.overrideAttrs ({ patches ? [], ... }: {
-    patches = patches ++ [
+  mdevd = prev.mdevd.overrideAttrs ({ patches ? [], version, ... }: {
+    patches = patches ++ final.lib.optionals (final.lib.versionOlder version "0.1.8.2") [
       # Upstream 252f241e; vendored because cgit patch URLs are unstable.
       ./0001-mdevd-don-t-chmod-device-nodes-for-lines.patch
     ];
-- 
2.54.0


  parent reply	other threads:[~2026-06-26 18:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-26 18:55 [PATCH 0/8] refresh nixpkgs for Linux 7.1 colbyt
2026-06-26 18:55 ` [PATCH 1/8] pkgs: fix aarch64-musl builds with current nixpkgs colbyt
2026-07-02 12:18   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 2/8] lib: update nixpkgs colbyt
2026-06-26 18:55 ` [PATCH 3/8] pkgs/skaware: vendor backported patches colbyt
2026-07-02 11:53   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport colbyt
2026-07-02 12:19   ` Alyssa Ross
2026-06-26 18:55 ` colbyt [this message]
2026-06-26 18:55 ` [PATCH 6/8] pkgs/cloud-hypervisor: update GPU patchset to v52 colbyt
2026-06-26 18:55 ` [PATCH 7/8] pkgs/libfyaml: fix pkg-config libs colbyt
2026-06-26 18:55 ` [PATCH 8/8] vm-lib: allow app VMs to name closure roots colbyt
2026-07-02 13:38   ` Alyssa Ross
2026-07-02 23:40     ` colby
2026-07-03 14:02       ` Alyssa Ross
2026-06-26 18:55 ` [PATCH optional] linux: use 6.18 for generic images colbyt
2026-07-02 13:42   ` Alyssa Ross
2026-07-02 23:20     ` colby
2026-07-02 12:03 ` [PATCH 0/8] refresh nixpkgs for Linux 7.1 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=20260626185509.3715326-6-colby@colbyt.com \
    --to=colby@colbyt.com \
    --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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).