Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b12c759f76fb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c5b6d6e5355
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 2, 2018

  1. jshint: depend on phantomjs2

    Philipp Middendorf committed Oct 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    22e9c0a View commit details

  2. Merge pull request #47666 from plapadoo/jshint-phantomjs 

    jshint: depend on phantomjs2
    @Mic92
    Mic92 authored Oct 2, 2018
    Copy the full SHA
    4c5b6d6 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/node-packages/default-v8.nix
4 changes: 4 additions & 0 deletions pkgs/development/node-packages/default-v8.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ nodePackages // {
'';
};

jshint = nodePackages.jshint.override {
buildInputs = [ pkgs.phantomjs2 ];
};

dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};