Unverified Commit 02f4e7f5 authored by Philip Taron's avatar Philip Taron
Browse files

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)
parent f98bb93e

pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix

+9 −19
Original line number Diff line number Diff line
@@ -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.