From c53c7a02fe68eb1bd92b3ec73cf9370e42e1b794 Mon Sep 17 00:00:00 2001 From: Sergej Leibenzon Date: Thu, 26 Apr 2018 17:35:06 +0200 Subject: [PATCH 1/2] libuv: 1.20.0 -> 1.20.2 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e6b29a6c36be..ed4397c88f0d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.20.2"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz"; + sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48"; }; postPatch = let From 2119545865c4b5ef65b2b5433147c884f2cfb1b2 Mon Sep 17 00:00:00 2001 From: Sergej Leibenzon Date: Thu, 26 Apr 2018 12:01:14 +0200 Subject: [PATCH 2/2] nodejs: init at v10.0.0 --- pkgs/development/web/nodejs/v10.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/web/nodejs/v10.nix diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix new file mode 100644 index 000000000000..68d7f1b4ff11 --- /dev/null +++ b/pkgs/development/web/nodejs/v10.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, lib, openssl, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; +in + buildNodejs { + inherit enableNpm; + version = "10.0.0"; + sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470fe7c98187..5a45730c8315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3390,6 +3390,14 @@ with pkgs; nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {}; nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + openssl = openssl_1_1_0; + }; + nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { + enableNpm = false; + openssl = openssl_1_1_0; + }; + nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { nodejs = pkgs.nodejs-8_x; };