yarn2nix-moretea: avoid `lib.fileset`

Emily ba42e09b 44475aaf

+4 -12
+3 -11
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix pkgs/development/tools/yarn2nix-moretea/default.nix
··· 398 398 }); 399 399 400 400 yarn2nix = mkYarnPackage { 401 - src = lib.fileset.toSource { 402 - root = ./.; 403 - fileset = lib.fileset.unions [ 404 - ./bin 405 - ./lib 406 - ./package.json 407 - ./yarn.lock 408 - ]; 409 - }; 401 + src = ./yarn2nix; 410 402 411 403 # yarn2nix is the only package that requires the yarnNix option. 412 404 # All the other projects can auto-generate that file. ··· 415 407 # Using the filter above and importing package.json from the filtered 416 408 # source results in an error in restricted mode. To circumvent this, 417 409 # we import package.json from the unfiltered source 418 - packageJSON = ./package.json; 410 + packageJSON = ./yarn2nix/package.json; 419 411 420 412 yarnFlags = defaultYarnFlags ++ [ "--ignore-scripts" "--production=true" ]; 421 413 ··· 446 438 mkdir -p $out/lib 447 439 mkdir -p $out/bin 448 440 449 - cp ${./lib/urlToName.js} $out/lib/urlToName.js 441 + cp ${./yarn2nix/lib/urlToName.js} $out/lib/urlToName.js 450 442 cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock 451 443 452 444 patchShebangs $out
pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js
pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js
pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh
pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix pkgs/development/tools/yarn2nix-moretea/yarn.nix
+1 -1
pkgs/top-level/all-packages.nix
··· 5679 5679 5680 5680 yarn-berry = callPackage ../development/tools/yarn-berry { }; 5681 5681 5682 - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; 5682 + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; }; 5683 5683 5684 5684 inherit (yarn2nix-moretea) 5685 5685 yarn2nix