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

Merge pull request 'Delete prefetch-npm-deps hack since we dropped 23.11' (#31) from jade/fix-prefetchnpmdeps-hacks into main

Browse source 
Reviewed-on: lix-project/nixos-module#31
This commit is contained in:
jade 2024-07-11 11:02:55 +00:00
parent 5d9d94089f 587812bdb5
commit d70318fb94
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
overlay.nix
View file

@ -28,10 +28,6 @@ let
nix = final.nixVersions.nix_2_18_upstream; nix = final.nixVersions.nix_2_18_upstream;
}); });
inherit (prev) lib;
prefetch-npm-deps-args = lib.functionArgs prev.prefetch-npm-deps.override;
warning = '' warning = ''
warning: You have the lix overlay included into a nixpkgs import twice, warning: You have the lix overlay included into a nixpkgs import twice,
perhaps due to the NixOS module being included twice, or because of using perhaps due to the NixOS module being included twice, or because of using
@ -80,14 +76,6 @@ let
} }
); );
# support both having and missing https://github.com/NixOS/nixpkgs/pull/304913
prefetch-npm-deps =
if (prefetch-npm-deps-args ? nix) || (prefetch-npm-deps-args == {})
then prev.prefetch-npm-deps.override {
nix = final.nixVersions.nix_2_18_upstream;
}
else prev.prefetch-npm-deps;
nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; }; nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; };
pegtl = prev.callPackage ./pegtl.nix { }; pegtl = prev.callPackage ./pegtl.nix { };