mkYarnPackage: fix uncopied resolutions field

[GuillaumeDesforges]

Description of changes

Yarn only uses the "resolutions" field in the top-level package.json file of a workspace. While it has been taken into account for mkYarnWorkspace (9801e6e), it has not been fixed for mkYarnPackage yet, which also uses the yarn workspace mechanism under the hood.

This change should fix some issues such as this.

Things done

• Tested compilation of all packages that depend on this change using nix shell github:nixos/nixpkgs#nixpkgs-review --command nixpkgs-review rev HEAD
• Tested evaluation against some previously broken builds
• Fits CONTRIBUTING.md.

[GuillaumeDesforges]

This breaks Sharedown

[olynch]

I ran into this problem independently literally 10 minutes ago, and this fixes it! Thanks @GuillaumeDesforges.

[GuillaumeDesforges]

Rebased onto master (7479275)

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/6

[SuperSandro2000]

This uses IFD which is not allowed in nixpkgs.

[GuillaumeDesforges]

@SuperSandro2000 thanks for alerting me. This package was not added by me, nor mkYarnPackage, I'm merely fixing a bug there. Or am I missing something and my changes add IFD?

What's the impact for my PR?
I'm all for fixing the IFD issue, but I'd be sad if it blocked this PR, which fixes a bug that is hard to fix on your own.

[Radvendii]

This doesn't use IFD on its own, but if something calls these functions with a packageJSON that's from a derivation (for instance, if it's from a fetchurl-like source), it will be IFD. Presumably SuperSandro2000 is saying this is something that happens in NIxpkgs.

The way I see around this is to add in the resolutions field at build time, probably using jq.

[SuperSandro2000]

What's the impact for my PR?

As long as it triggers IFD in any form while ofborg evals it cannot be merged.

You could give Radvendii idea a try, I didn't try to come up with one.

[aidalgol]

A package I maintain (heroic) added a resolutions field to its package.json in its last release, and it will not build on master, but it does with the changes from this PR.

[GuillaumeDesforges]

I used @lilyinstarlight 's snippet and it works. I can build packages with a resolutions field in the yarn workspace (e.g. marp-cli).

[lilyinstarlight]

Do you think you could commit this without all of the reformatting changes?

It makes it a bit difficult to review and we still don't yet have a blessed formatter for nixpkgs

[GuillaumeDesforges]

My bad 🤦‍♂️ I still forget that nixpkgs is not always formatted with nixpkgs-fmt... will do

[GuillaumeDesforges]

@lilyinstarlight how about now? I tested and it still seems to work.

$ nix repl
Welcome to Nix 2.14.1. Type :? for help.

nix-repl> nixpkgs = builtins.getFlake (builtins.toString ./.)

nix-repl> pkgs = nixpkgs.legacyPackages.x86_64-linux

nix-repl> marp-cli = pkgs.mkYarnPackage { pname = "marp-cli"; version = "2.4.0"; src = pkgs.fetchFromGitHub { owner = "marp-team"; repo = "marp-cli"; rev = "v2.4.0"; sha256 = "vZ1EKjuicFxkzcT/akV3U7+1adhMkJUgC3mALsAw/WM="; }; }

nix-repl> :b marp-cli

This derivation produced the following outputs:
  out -> /nix/store/acszdx7jxpvq693w1p5lklbazni7d0bs-marp-team-marp-cli-2.4.0

[lilyinstarlight]

Looks good to me! No regressions against master either

---

Result of nixpkgs-review pr 214952 run on x86_64-linux 1

1 package marked as broken and skipped:

• micropad

6 packages failed to build: (all broken in master)

• apache-airflow (python310Packages.apache-airflow) (dependency marked broken on master)
• apache-airflow.dist (python310Packages.apache-airflow.dist) (dependency marked broken on master)
• plausible (broken on master - Hydra failure)
• python311Packages.apache-airflow (dependency marked broken on master)
• python311Packages.apache-airflow.dist (dependency marked broken on master)
• zammad (broken on master - Hydra failure)

31 packages built:

• gotify-server
• grafana-image-renderer
• hedgedoc
• heroic
• heroic-unwrapped
• jellyseerr
• lemmy-ui
• listmonk
• matrix-alertmanager
• matrix-appservice-discord
• matrix-appservice-slack
• matrix-hookshot
• meshcentral
• mirakurun
• pgadmin4
• pgadmin4-desktopmode
• pgadmin4-desktopmode.dist
• pgadmin4.dist
• pomerium
• powerdns-admin
• puppeteer-cli
• rstudio
• rstudio-server
• rstudioServerWrapper
• rstudioWrapper
• sharedown
• synapse-admin
• uivonim
• v2raya
• woodpecker-server
• yarn2nix

[lilyinstarlight]

@SuperSandro2000, any objection to me going ahead and merging this? It looks good to me now and nixpkgs-review still looks good

[lilyinstarlight]

I'm going to go ahead and merge so this doesn't just bitrot. If there are any more review comments, they can be fixed in a follow-up

Thanks @GuillaumeDesforges!