diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-10-30 01:44:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 01:44:03 -0500 |
| commit | 4ac9b7a9fe82a505c8f822b56ba1936c317834ac (patch) | |
| tree | eed49b7c5caac96bbd88c07ced03cfd8899179b7 /pkgs/development/web | |
| parent | f6d41b4b1d1ffae5fbfd24853e3a9b331b95d9bd (diff) | |
| parent | 2544b1b495ac9daea74c3ddfcc49fcab00f036db (diff) | |
| download | nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar.gz nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar.bz2 nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar.lz nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar.xz nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.tar.zst nixpkgs-4ac9b7a9fe82a505c8f822b56ba1936c317834ac.zip | |
Merge pull request #71799 from marsam/init-node-13_x
nodejs-13_x: init at 13.0.0
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch (renamed from pkgs/development/web/nodejs/disable-libatomic-darwin.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v13.nix | 12 |
4 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch index d6ac38138b8..d6ac38138b8 100644 --- a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch +++ b/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch new file mode 100644 index 00000000000..b3b2c8b0fb6 --- /dev/null +++ b/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch @@ -0,0 +1,11 @@ +--- 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', { + 'libraries': ['-latomic'], + }], + ], diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 37a69eb4ddd..bed3127ee4b 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,5 +8,5 @@ in version = "12.13.0"; sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8"; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-12_x.patch ]; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix new file mode 100644 index 00000000000..37d42e0ee77 --- /dev/null +++ b/pkgs/development/web/nodejs/v13.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, openssl, icu, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; +in + buildNodejs { + inherit enableNpm; + version = "13.0.1"; + sha256 = "1n9w1kvdzdg2j0a41wdkqcl893209lc018sd49xpy1cnr169h6vr"; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ]; + } |