diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/web/nodejs')
6 files changed, 56 insertions, 12 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff new file mode 100644 index 000000000000..5c900dd2143f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff @@ -0,0 +1,28 @@ +diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +--- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-09-15 09:08:46.000000000 +0200 ++++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-12-03 16:55:43.781860687 +0100 +@@ -436,7 +436,14 @@ + # Since the CLT has no SDK paths anyway, returning None is the + # most sensible route and should still do the right thing. + try: +- return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem]) ++ # Return fake data that xcodebuild would normally return ++ ++ xcodedata = { ++ "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", ++ "ProductBuildVersion": "19A547", ++ "ProductVersion": "10.15" ++ } ++ return xcodedata[infoitem] + except GypError: + pass + +@@ -1271,7 +1278,7 @@ + version = "" + build = "" + try: +- version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines() ++ version_list = [] + # In some circumstances xcodebuild exits 0 but doesn't return + # the right results; for example, a user on 10.7 or 10.8 with + # a bogus path set via xcode-select diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 12754b6d4412..4358d6134e82 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser +{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser , pkgconfig, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux pkgconfig python ] + nativeBuildInputs = [ which util-linux pkgconfig python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix index 1fa463892042..a1df5ddd741e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -1,13 +1,14 @@ -{ callPackage, openssl, icu, python2, enableNpm ? true }: +{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; python = python2; }; in buildNodejs { inherit enableNpm; - version = "10.22.1"; - sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl"; + version = "10.23.0"; + sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx"; + patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix index 83ba9f5d56f3..184585f12d43 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, icu, python2, enableNpm ? true }: +{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,6 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.19.0"; - sha256 = "1qainpkakkl3xip9xz2wbs74g95gvc6125cc05z6vyckqi2iqrrv"; + version = "12.20.0"; + sha256 = "12s2vjrlhgap2r12s7rqf0r2wzh9q2r5dkh3ak9fhrgmk9fgvqv1"; + patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix index 6c0d445476b3..c3e4d7507806 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,6 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.14.0"; - sha256 = "1rphkl3lqg0rzgg0r58bfv1hjw3rg96qvqcilk2927kbpps3bs84"; + version = "14.15.1"; + sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81"; + patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix new file mode 100644 index 000000000000..f5cd88c3d39b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -0,0 +1,13 @@ +{ callPackage, openssl, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; +in + buildNodejs { + inherit enableNpm; + version = "15.3.0"; + sha256 = "0h625hhswwv5rpijacxiak28fy5br8kpxrihfcjdqwm3dvyvkc1v"; + } |