From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 0C50FAEFE; Fri, 26 Jun 2026 18:55:32 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B90ECAEA3; Fri, 26 Jun 2026 18:55:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-43171.protonmail.ch (mail-43171.protonmail.ch [185.70.43.171]) by atuin.qyliss.net (Postfix) with ESMTPS id DC3BDAE89 for ; Fri, 26 Jun 2026 18:55:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colbyt.com; s=protonmail; t=1782500127; x=1782759327; bh=/AAUr76Dh0Ey9fJdehYTjUfQI2cD0nmiP45/mDk44ig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=iI7B/LT5dWJxxIzrH4L1/WmT8P+ytQ5PDI4To+nswYCd7kBOpoIHxMo6liM+oTUCy LOnwmmhwGJ9kCfA/XeRRGEe/+JpkrOocUdACIKoZNBoIrTud1lCW7N0I3uq+Zhb/+R BgUTv4Iw+CsCKeol4BRBvbaluYZVkeY4/1DnotJcCGDPKHWPsMloVhdNXinsJS7gdD tU4ZBJqsy59ZGcP5xYdKU6184aKhSnZwhMnerjjmN0OJHN5yE+VPkSatZ4lxzIFc1B gchklkydpJkDrQFiO0A7VN3ZNRwZIAKIZFCtO5AmDda11J4mc4pT276fGr5wVxB7rY GZoAFzrDTZJww== X-Pm-Submission-Id: 4gn4cX5zmHz2Sd34 From: colbyt To: devel@spectrum-os.org Subject: [PATCH 5/8] pkgs/skaware: skip integrated backports Date: Fri, 26 Jun 2026 11:55:05 -0700 Message-ID: <20260626185509.3715326-6-colby@colbyt.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: W7TT2YJQFWBM6ZHQYNJN6JZRVCYCJF4Y X-Message-ID-Hash: W7TT2YJQFWBM6ZHQYNJN6JZRVCYCJF4Y X-MailFrom: colby@colbyt.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: colbyt X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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