From 936d46c3f98f0a8efe135e33ba2abe3b4e11c85f Mon Sep 17 00:00:00 2001 From: NullBite Date: Thu, 12 Sep 2024 10:31:59 +0200 Subject: [PATCH] mitigations: fix compsize, add new helper function --- overlays/mitigations.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/overlays/mitigations.nix b/overlays/mitigations.nix index b929fa0..4f51004 100644 --- a/overlays/mitigations.nix +++ b/overlays/mitigations.nix @@ -12,6 +12,11 @@ let pickFixed = ours: theirs: if versionAtLeast ours.version theirs.version then ours else theirs; pickNewer = ours: theirs: if versionOlder theirs.version ours.version then ours else theirs; + hold = now: days: ours: theirs: let + seconds = days * 24 * 60 * 60; + endTimestamp = now + seconds; + in if now < endTimestamp then ours else theirs; + optionalPkg = cond: val: if cond then val else null; gimp-with-plugins-good = let @@ -43,6 +48,12 @@ in { unstable = prev.easyeffects; in if updateTime < 1726148749 then stable else unstable; + compsize = let + stable = pkgsStable.compsize; + unstable = prev.compsize; + now = 1724786296; + in hold now 7 stable unstable; + redlib = let redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {}; inherit (prev) redlib;