yarn2nix: avoid appearing to include src

This expression didn't actually include src, but it looked like it did.
Make it like others by using a fileset (for instance, #319883)
This commit is contained in:
Philip Taron 2024-06-17 10:11:50 -07:00
parent f98bb93e80
commit 02f4e7f523
No known key found for this signature in database

View File

@ -398,25 +398,15 @@ in rec {
});
yarn2nix = mkYarnPackage {
src =
let
src = ./.;
mkFilter = { dirsToInclude, filesToInclude, root }: path: type:
let
inherit (lib) elem elemAt splitString;
subpath = elemAt (splitString "${toString root}/" path) 1;
spdir = elemAt (splitString "/" subpath) 0;
in elem spdir dirsToInclude ||
(type == "regular" && elem subpath filesToInclude);
in builtins.filterSource
(mkFilter {
dirsToInclude = ["bin" "lib"];
filesToInclude = ["package.json" "yarn.lock"];
root = src;
})
src;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./bin
./lib
./package.json
./yarn.lock
];
};
# yarn2nix is the only package that requires the yarnNix option.
# All the other projects can auto-generate that file.