yarn2nix-moretea: v1.0.0-36-g3f2dbb0 -> v1.0.0-39-g9e7279e (#73911)
Includes the following upstream commits: - Fix for package.json without a version (moretea/yarn2nix#113) - Don't access package.json via filtered src (moretea/yarn2nix#115) - remove redundant rec (moretea/yarn2nix#119)
This commit is contained in:
@@ -238,7 +238,7 @@ in rec {
|
||||
package = lib.importJSON packageJSON;
|
||||
pname = package.name;
|
||||
safeName = reformatPackageName pname;
|
||||
version = package.version;
|
||||
version = package.version or attrs.version;
|
||||
baseName = unlessNull name "${safeName}-${version}";
|
||||
|
||||
workspaceDependenciesTransitive = lib.unique (
|
||||
@@ -389,6 +389,11 @@ in rec {
|
||||
# yarn2nix is the only package that requires the yarnNix option.
|
||||
# All the other projects can auto-generate that file.
|
||||
yarnNix = ./yarn.nix;
|
||||
|
||||
# Using the filter above and importing package.json from the filtered
|
||||
# source results in an error in restricted mode. To circumvent this,
|
||||
# we import package.json from the unfiltered source
|
||||
packageJSON = ./package.json;
|
||||
|
||||
yarnFlags = defaultYarnFlags ++ ["--production=true"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user