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

Commits on Jan 14, 2021

  1. libuv: 1.38.1 -> 1.39.0 

    (cherry picked from commit 90c5f2f)
    @marsam
    marsam committed Jan 14, 2021
    Copy the full SHA
    4a600d8 View commit details

  2. libuv: 1.39.0 -> 1.40.0 

    (cherry picked from commit 13eb51b)
    @marsam
    marsam committed Jan 14, 2021
    Copy the full SHA
    4da0df1 View commit details

  3. nodejs-10_x: 10.22.1 -> 10.23.1

    @marsam
    marsam committed Jan 14, 2021
    Copy the full SHA
    9530a77 View commit details

  4. nodejs-12_x: 12.18.4 -> 12.20.1

    @marsam
    marsam committed Jan 14, 2021
    Copy the full SHA
    4dc5d36 View commit details

  5. nodejs-14_x: 14.9.0 -> 14.15.4

    @marsam
    marsam committed Jan 14, 2021
    Copy the full SHA
    af2e868 View commit details

  6. Merge pull request #109336 from marsam/backport-nodejs-20.09 

    [20.09] nodejs: 10.22.1 -> 10.23.1, 12.18.4 -> 12.20.1, 14.9.0 -> 14.15.4
    @marsam
    marsam authored Jan 14, 2021
    Copy the full SHA
    7172fda View commit details
Showing with 10 additions and 9 deletions.
  1. +4 −3 pkgs/development/libraries/libuv/default.nix
  2. +2 −2 pkgs/development/web/nodejs/v10.nix
  3. +2 −2 pkgs/development/web/nodejs/v12.nix
  4. +2 −2 pkgs/development/web/nodejs/v14.nix
7 changes: 4 additions & 3 deletions pkgs/development/libraries/libuv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:

stdenv.mkDerivation rec {
version = "1.38.1";
version = "1.40.0";
pname = "libuv";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0cvabjhi53qw94zyjkqamx0c607ayydfb4f3djx2gj8ab2p7s29n";
sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg";
};

postPatch = let
@@ -66,7 +66,8 @@ stdenv.mkDerivation rec {

meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O";
homepage = "https://github.com/libuv/libuv";
homepage = "https://libuv.org/";
changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog";
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v10.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "10.22.1";
sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl";
version = "10.23.1";
sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v12.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.18.4";
sha256 = "02gncjrrjqdwf9ydmg96yn9ldsw539q9w88cknax1djkisqkrw15";
version = "12.20.1";
sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v14.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.9.0";
sha256 = "1xkfivr0qci50ksg66szyasdlbiwh2j7ia4n6qc5csih2nvzcbh1";
version = "14.15.4";
sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}