Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 692c7b3690e1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68c599acd587
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 10, 2020

  1. 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.

(cherry picked from commit 75ee187)
    @infinisil
    infinisil committed Jul 10, 2020
    Copy the full SHA
    68c599a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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