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: 8f6c65fa045a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a679d4460a1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2019

  1. nodejs-12_x: 12.4.0 -> 12.5.0

    @marsam
    marsam committed Jun 28, 2019
    Copy the full SHA
    5ba41e5 View commit details

Commits on Jun 29, 2019

  1. Merge pull request #63883 from marsam/update-nodejs-12_x 

    nodejs-12_x: 12.4.0 -> 12.5.0
    @marsam
    marsam authored Jun 29, 2019
    Copy the full SHA
    4a679d4 View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −2 pkgs/development/web/nodejs/v12.nix
  2. +0 −2 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v12.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.4.0";
sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90";
version = "12.5.0";
sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7";
}
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4242,12 +4242,10 @@ in
};
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
openssl = openssl_1_1;
icu = icu63;
};
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false;
openssl = openssl_1_1;
icu = icu63;
};

# Update this when adding the newest nodejs major version!