From b70a3234c541ec0f678d279e8cfaac3a5a6beaab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Feb 2020 13:40:00 -0500 Subject: [PATCH] nodejs-12_x: 12.15.0 -> 12.16.0 Changelog: https://github.com/nodejs/node/releases/tag/v12.16.0 --- .../web/nodejs/disable-libatomic-darwin.patch | 11 ----------- pkgs/development/web/nodejs/v12.nix | 8 +++----- 2 files changed, 3 insertions(+), 16 deletions(-) delete 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 deleted file mode 100644 index 7ac6c2ef895..00000000000 --- a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/node.gyp -+++ b/node.gyp -@@ -289,7 +289,7 @@ - '-Wl,-bnoerrmsg', - ], - }], -- ['OS in ("linux", "mac") and llvm_version != "0.0"', { -+ ['OS == "linux" and llvm_version != "0.0"', { - 'libraries': ['-latomic'], - }], - ], diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 1cb11037e56..e8a4634773d 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,12 +1,10 @@ -{ stdenv, callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; - version = "12.15.0"; - sha256 = "06x8sma4rxbw0mxj0l4438lfpv9abxmnw2ibamq1acng1jl4zyyj"; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; + version = "12.16.0"; + sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq"; }