dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #79883 from marsam/update-nodejs-12_x

Browse Source 
nodejs-12_x: 12.15.0 -> 12.16.0
This commit is contained in:
Mario Rodas 2020-02-12 05:55:10 -05:00 committed by GitHub
commit 512e10874a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/web/nodejs/disable-libatomic-darwin.patch
View File

@ -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'],
}],
],

8
pkgs/development/web/nodejs/v12.nix
View File

@ -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";
}