gepbird/lix-nixos-module
0
0
Fork 0
forked from lix-project/nixos-module
Code Pull requests Activity

refactor: move simple overrides to a function

Browse source
This commit is contained in:
Patrick Jackson 2024-05-08 07:24:21 -07:00
parent aaf759cd93
commit e09758962c
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
overlay.nix
View file

@ -25,8 +25,22 @@ let
boehmgc-nix = boehmgc-patched; boehmgc-nix = boehmgc-patched;
}); });
# These packages depend on Nix features that Lix does not support
overridelist_2_18 = [
"nix-init"
"nix-prefetch-git"
"nixos-option"
"nurl"
"prefetch-yarn-deps" # force these onto upstream so we are not regularly rebuilding electron
];
override_2_18 = prev.lib.genAttrs overridelist_2_18 (
name: prev.${name}.override {
nix = final.nixVersions.nix_2_18_upstream;
});
inherit (prev) lib; inherit (prev) lib;
in in
override_2_18 //
{ {
# used for things that one wouldn't necessarily want to update, but we # used for things that one wouldn't necessarily want to update, but we
# nevertheless shove it in the overlay and fixed-point it in case one *does* # nevertheless shove it in the overlay and fixed-point it in case one *does*
@ -52,11 +66,6 @@ in
ninjaFlags = old.ninjaFlags or [ ] ++ [ "-v" ]; ninjaFlags = old.ninjaFlags or [ ] ++ [ "-v" ];
}); });
# force these onto upstream so we are not regularly rebuilding electron
prefetch-yarn-deps = prev.prefetch-yarn-deps.override {
nix = final.nixVersions.nix_2_18_upstream;
};
# support both having and missing https://github.com/NixOS/nixpkgs/pull/304913 # support both having and missing https://github.com/NixOS/nixpkgs/pull/304913
prefetch-npm-deps = prefetch-npm-deps =
if (lib.functionArgs prev.prefetch-npm-deps.override) ? nix if (lib.functionArgs prev.prefetch-npm-deps.override) ? nix
@ -65,21 +74,5 @@ in
} }
else prev.prefetch-npm-deps; else prev.prefetch-npm-deps;
nix-prefetch-git = prev.nix-prefetch-git.override {
nix = final.nixVersions.nix_2_18_upstream;
};
nixos-option = prev.nixos-option.override {
nix = final.nixVersions.nix_2_18_upstream;
};
nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; }; nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; };
nix-init = prev.nix-init.override {
nix = final.nixVersions.nix_2_18_upstream;
};
nurl = prev.nurl.override {
nix = final.nixVersions.nix_2_18_upstream;
};
} }