diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-19 06:00:00 -0500 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2019-11-19 09:00:29 -0800 |
| commit | 68e1a78368eb1d2a3fe58e342df996125bd1144c (patch) | |
| tree | dd7ae1828890282fc790b0006e133237f3f09c0c /pkgs/development/web | |
| parent | f06ca051e2e845b7a415117f628d38fa84f4736d (diff) | |
| download | nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar.gz nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar.bz2 nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar.lz nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar.xz nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.tar.zst nixpkgs-68e1a78368eb1d2a3fe58e342df996125bd1144c.zip | |
nodejs-12_x: 12.13.0 -> 12.13.1
Changelog: https://github.com/nodejs/node/releases/tag/v12.13.1
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/disable-libatomic-darwin.patch (renamed from pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch) | 2 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v13.nix | 2 |
4 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch deleted file mode 100644 index d6ac38138b8..00000000000 --- a/pkgs/development/web/nodejs/disable-libatomic-darwin-12_x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/disable-libatomic-darwin-13_x.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch index b3b2c8b0fb6..7ac6c2ef895 100644 --- a/pkgs/development/web/nodejs/disable-libatomic-darwin-13_x.patch +++ b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch @@ -5,7 +5,7 @@ ], }], - ['OS in ("linux", "mac") and llvm_version != "0.0"', { -+ ['OS=="linux" and llvm_version!=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 bed3127ee4b..fbec83c387a 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.13.0"; - sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8"; + version = "12.13.1"; + sha256 = "14mia71sr8p0ibz9g4j5xb5qwmik36qi5nhabjbv0sy2kirkm7il"; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-12_x.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index df7e7ed9266..6b6e4f438b8 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -8,5 +8,5 @@ in version = "13.1.0"; sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l"; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } |