diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-07-10 18:24:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 16:24:03 +0000 |
| commit | 75ee18766ac52a97df1dc55a11a2d44cb0e68d0e (patch) | |
| tree | a0873c62e179d0698028128324222add6035edfc /pkgs/development/tools/yarn2nix-moretea | |
| parent | 0416089dc694e0930fb8a7e0130f022e8c62c713 (diff) | |
yarn2nix: Don't pass yarnNix to mkDerivation (#92856)
The generated yarnNix file doesn't need to be part of the mkDerivation.
And doing so prevents other platforms from reproducibly instantiating
it. With this change you can e.g. do
darwinPkgs.yarn2nix.mkYarnPackage {
# ...
yarnNix = pkgs.yarn2nix.mkYarnNix {
yarnLock = ./yarn.lock;
};
}
Which is a darwin derivation, but can still be instantiated reproducibly on Linux.Diffstat (limited to 'pkgs/development/tools/yarn2nix-moretea')
| -rw-r--r-- | pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 22032e145d3fa..89bc169d50388 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -284,7 +284,7 @@ in rec { '') workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { + in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // { inherit src pname; name = baseName; @@ -389,7 +389,7 @@ 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 |