mitigations: fix compsize, add new helper function
This commit is contained in:
parent
0810c12033
commit
936d46c3f9
@ -12,6 +12,11 @@ let
|
|||||||
pickFixed = ours: theirs: if versionAtLeast ours.version theirs.version then ours else theirs;
|
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;
|
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;
|
optionalPkg = cond: val: if cond then val else null;
|
||||||
|
|
||||||
gimp-with-plugins-good = let
|
gimp-with-plugins-good = let
|
||||||
@ -43,6 +48,12 @@ in {
|
|||||||
unstable = prev.easyeffects;
|
unstable = prev.easyeffects;
|
||||||
in if updateTime < 1726148749 then stable else unstable;
|
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 = let
|
||||||
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
|
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
|
||||||
inherit (prev) redlib;
|
inherit (prev) redlib;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user