Merge pull request #71799 from marsam/init-node-13_x

nodejs-13_x: init at 13.0.0
This commit is contained in:
Mario Rodas 2019-10-30 01:44:03 -05:00 committed by GitHub
commit 4ac9b7a9fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 1522 additions and 3 deletions

View file

@ -0,0 +1,17 @@
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-13_x"}:
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v13.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

View file

@ -0,0 +1,16 @@
{ pkgs, nodejs, stdenv }:
let
nodePackages = import ./composition-v13.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
in
nodePackages // {
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
}

View file

@ -7,3 +7,4 @@ set -eu -o pipefail
rm -f node-env.nix
node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
node2nix --nodejs-13 -i node-packages-v13.json -o node-packages-v13.nix -c composition-v13.nix

View file

@ -0,0 +1,3 @@
[
"node2nix"
]

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

View file

@ -4537,10 +4537,18 @@ in
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false;
};
nodejs-13_x = callPackage ../development/web/nodejs/v13.nix { };
nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix {
enableNpm = false;
};
# Update this when adding the newest nodejs major version!
nodejs_latest = nodejs-12_x;
nodejs-slim_latest = nodejs-slim-12_x;
nodejs_latest = nodejs-13_x;
nodejs-slim_latest = nodejs-slim-13_x;
nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix {
nodejs = pkgs.nodejs-13_x;
});
nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix {
nodejs = pkgs.nodejs-12_x;