nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

overlays/mitigations: refactor

Browse Source 
mitigations: fix infinite recursion
This commit is contained in:
NullBite 2024-07-27 01:46:43 -04:00
parent 3cf6b93eb5
commit 7ecbcf497a
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
overlays/mitigations.nix
View File

@ -1,8 +1,13 @@
nixfiles: final: prev: nixfiles: final: prev:
let let
inherit (prev) lib callPackage fetchFromGitHub; inherit (final) lib callPackage fetchFromGitHub;
inherit (prev.lib) recurseIntoAttrs optionalAttrs; inherit (lib) recurseIntoAttrs optionalAttrs
isNewer = ref: ver: (builtins.compareVersions ver ref) == 1; versionOlder versionAtLeast;
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;
optionalPkg = cond: val: if cond then val else null;
gimp-with-plugins-good = let gimp-with-plugins-good = let
badPlugins = [ "gap" ]; badPlugins = [ "gap" ];
@ -11,6 +16,9 @@ let
filteredPlugins = lib.filterAttrs pluginFilter prev.gimpPlugins; filteredPlugins = lib.filterAttrs pluginFilter prev.gimpPlugins;
plugins = lib.mapAttrsToList (_: v: v) filteredPlugins; plugins = lib.mapAttrsToList (_: v: v) filteredPlugins;
in prev.gimp-with-plugins.override { inherit plugins; }; in prev.gimp-with-plugins.override { inherit plugins; };
# this also causes an infinite recursion and i have no idea why
# in nixfiles.inputs.nixpkgs.lib.filterAttrs (k: v: v != null) {
in { in {
gimp-with-plugins = gimp-with-plugins-good; gimp-with-plugins = gimp-with-plugins-good;
@ -26,9 +34,3 @@ in {
notOlder = (builtins.compareVersions redlib-new.version redlib.version) >= 0; notOlder = (builtins.compareVersions redlib-new.version redlib.version) >= 0;
in if notOlder then redlib-new else redlib; in if notOlder then redlib-new else redlib;
} }
# # can't optionalAttrs for version checks because it breaks lazy eval and causes infinite recursion
# // {
# obsidian = let
# pkg = final.callPackage "${nixfiles.inputs.nixpkgs-unstable}/pkgs/applications/misc/obsidian" { electron = final.electron_28; };
# in if isNewer "1.4.16" prev.obsidian.version then prev.obsidian else pkg;
# }