Skip to content

Commit

Permalink
Revert "nodePackages.yarn: remove package"
Browse files Browse the repository at this point in the history
This reverts commit 986dba7.

Fixes:

    error: anonymous function at /home/travis/build/NixOS/nixpkgs/pkgs/development/node-packages/node-env.nix:3:1 called with unexpected argument ‘python’, at /home/travis/build/NixOS/nixpkgs/pkgs/development/node-packages/composition-v6.nix:8:13

This commit is doing a lot more than removing the yarn package, it also
upgrades a ton of other packages.
  • Loading branch information
zimbatm committed Jan 15, 2017
1 parent 9c45e20 commit f9a9ea9
Show file tree
Hide file tree
Showing 5 changed files with 6,622 additions and 4,544 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/node-packages/composition-v4.nix
Expand Up @@ -6,11 +6,11 @@

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages-v4.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}
4 changes: 2 additions & 2 deletions pkgs/development/node-packages/composition-v6.nix
Expand Up @@ -6,11 +6,11 @@

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs;
};
in
import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}

2 comments on commit f9a9ea9

@Mic92
Copy link
Member

@Mic92 Mic92 commented on f9a9ea9 Jan 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah sorry something went wrong, when using ./upgrade.sh, which is using npm2nix.

@zimbatm
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that wouldn't happen if each software had their own dependency list

Please sign in to comment.