gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #214952 from GuillaumeDesforges/GuillaumeDesforges@fix-mkyarnpackage-resolutions

Browse Source 
mkYarnPackage: fix uncopied resolutions field
This commit is contained in:
Lily Foster
2023-04-30 16:27:00 -04:00
committed by GitHub
parent ce7894c231 6bf78d8d3d
commit bc9a078705
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+11 -3
View File
@@ -99,9 +99,17 @@ in rec {
""
) (builtins.attrNames pkgConfig));
workspaceJSON = pkgs.writeText
"${name}-workspace-package.json"
(builtins.toJSON { private = true; workspaces = ["deps/**"]; resolutions = packageResolutions; }); # scoped packages need second splat
# build-time JSON generation to avoid IFD
# see https://nixos.wiki/wiki/Import_From_Derivation
workspaceJSON = pkgs.runCommand "${name}-workspace-package.json"
{
nativeBuildInputs = [ pkgs.jq ];
inherit packageJSON;
passAsFile = [ "baseJSON" ];
baseJSON = builtins.toJSON { private = true; workspaces = [ "deps/**" ]; resolutions = packageResolutions; };
} ''
jq --slurpfile packageJSON "$packageJSON" '.resolutions = $packageJSON[0].resolutions + .resolutions' <"$baseJSONPath" >$out
'';
workspaceDependencyLinks = lib.concatMapStringsSep "\n"
(dep: ''