From 81f4c491afbc8f0fe994ef946b1ac61cf1261577 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Sep 2019 17:08:48 -0500 Subject: [PATCH 1/4] libuv: 1.30.1 -> 1.32.0 https://github.com/libuv/libuv/releases/tag/v1.32.0 https://github.com/libuv/libuv/releases/tag/v1.31.0 --- 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 07f99a058d8b..f9b49a46ebf2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.30.1"; + version = "1.32.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16l207g9qwckxn0vnbnwiybhw6083imdwyfd6ipfsl44b1m8jmf7"; + sha256 = "1ifazxr5ssw2ay6j66acaxgfwq0x8130fvsyjs1wxvf2r9g4ds9w"; }; postPatch = let From 3ebf460c31df61d0d4880eada0451dccd3287a6b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 23 Oct 2019 04:20:00 -0500 Subject: [PATCH 2/4] nodejs-10_x: 10.16.0 -> 10.17.0 Release notes: https://nodejs.org/en/blog/release/v10.17.0/ --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 5743868d5d96..22887a44aff1 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.16.0"; - sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq"; + version = "10.17.0"; + sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1"; } From 6265fc8b9864d1fa5f78f6a9098d48d21125e991 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 Sep 2019 04:20:00 -0500 Subject: [PATCH 3/4] nodejs-12_x: 12.5.0 -> 12.10.0 --- .../web/nodejs/disable-libatomic-darwin.patch | 11 +++++++++++ pkgs/development/web/nodejs/v12.nix | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/web/nodejs/disable-libatomic-darwin.patch diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch new file mode 100644 index 000000000000..d6ac38138b88 --- /dev/null +++ b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch @@ -0,0 +1,11 @@ +--- a/node.gyp ++++ b/node.gyp +@@ -289,7 +289,7 @@ + '-Wl,-bnoerrmsg', + ], + }], +- ['(OS=="linux" or OS=="mac") and llvm_version!=0', { ++ ['OS=="linux" and llvm_version!=0', { + 'libraries': ['-latomic'], + }], + ], diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index ae74764384c6..8e617e5e6583 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,10 +1,12 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ stdenv, callPackage, openssl, icu, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; - version = "12.5.0"; - sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7"; + version = "12.10.0"; + sha256 = "1k9hxqs23c3sxpr843ix8nidlca8wn30x0sq998j47wjc1ybh595"; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } From fa4ff4d061786aa99b2193a1f5de0bd9f69db5d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 21 Oct 2019 04:20:00 -0500 Subject: [PATCH 4/4] nodejs-12_x: 12.10.0 -> 12.13.0 Changelog: https://github.com/nodejs/node/releases/tag/v12.13.0 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 8e617e5e6583..37a69eb4ddd7 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "12.10.0"; - sha256 = "1k9hxqs23c3sxpr843ix8nidlca8wn30x0sq998j47wjc1ybh595"; + version = "12.13.0"; + sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; }