git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96555 from gebner/emscripten2
commit6141b50dd50979990725a0cfa77ae3f16c2ce20b authorGabriel Ebner <gebner@gebner.org> dateSat 29 Aug 2020, 15:49 (6 years ago) parent7ae2a947c379ea
11 files changed+913−207
pkgs/applications/audio/faust/faust2.nix+2−3 pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch−38 pkgs/development/compilers/binaryen/default.nix+15−26 pkgs/development/compilers/emscripten/default.nix+89−48 pkgs/development/compilers/emscripten/fastcomp/default.nix−28 pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix−53 pkgs/development/compilers/emscripten/package.json+15 pkgs/development/compilers/emscripten/yarn.lock+346 pkgs/development/compilers/emscripten/yarn.nix+437 pkgs/development/tools/parsing/tree-sitter/default.nix+4−1 pkgs/top-level/all-packages.nix+5−10
pkgs/applications/audio/faust/faust2.nix+2−3
@@ -5,8 +5,7 @@
55, pkgconfig
66, cmake
77, llvm
8−# TODO: put back when it builds again
9−# , emscripten
8+, emscripten
109, openssl
1110, libsndfile
1211, libmicrohttpd
@@ -47,7 +46,7 @@ let
4746 inherit src;
4847
4948 nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
50− buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
49+ buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
5150
5251
5352 passthru = {
pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patchdeleted−38
@@ -1,38 +0,0 @@
1−From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001
2−From: Maximilian Bosch <maximilian@mbosch.me>
3−Date: Sat, 14 Mar 2020 00:37:31 +0100
4−Subject: [PATCH] Get rid of git dependency
5−
6−---
7− CMakeLists.txt | 15 +--------------
8− 1 file changed, 1 insertion(+), 14 deletions(-)
9−
10−diff --git a/CMakeLists.txt b/CMakeLists.txt
11−index 4acf703e1..4e9bd60b5 100644
12−--- a/CMakeLists.txt
13−+++ b/CMakeLists.txt
14−@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE)
15− SET(CMAKE_BUILD_TYPE "Release")
16− ENDIF()
17−
18−-FIND_PACKAGE(Git QUIET REQUIRED)
19−-EXECUTE_PROCESS(COMMAND
20−- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
21−- RESULT_VARIABLE
22−- GIT_HASH_RESULT
23−- OUTPUT_VARIABLE
24−- GIT_HASH
25−- OUTPUT_STRIP_TRAILING_WHITESPACE)
26−-IF(${GIT_HASH_RESULT})
27−- MESSAGE(WARNING "Error running git describe to determine version")
28−- SET(BINARYEN_VERSION_INFO "(unable to determine version)")
29−-ELSE()
30−- SET(BINARYEN_VERSION_INFO "${GIT_HASH}")
31−-ENDIF()
32−+SET(BINARYEN_VERSION_INFO "@emscriptenv@")
33− CONFIGURE_FILE(config.h.in config.h)
34−
35− OPTION(BUILD_STATIC_LIB "Build as a static library" OFF)
36−--
37−2.25.0
38−
pkgs/development/compilers/binaryen/default.nix+15−26
@@ -1,38 +1,23 @@
1−{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
2−
3−let
4− defaultVersion = "95";
5−
6− # Map from git revs to SHA256 hashes
7− sha256s = {
8− version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3";
9− "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
10− };
11−in
1+{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
122
133stdenv.mkDerivation rec {
14− version = if emscriptenRev == null
15− then defaultVersion
16− else "emscripten-${emscriptenRev}";
17− rev = if emscriptenRev == null
18− then "version_${version}"
19− else emscriptenRev;
204 pname = "binaryen";
5+ version = "96";
216
227 src = fetchFromGitHub {
238 owner = "WebAssembly";
249 repo = "binaryen";
25− sha256 =
26− if builtins.hasAttr rev sha256s
27− then builtins.getAttr rev sha256s
28− else null;
29− inherit rev;
10+ rev = "version_${version}";
11+ sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag";
3012 };
3113
32− patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll {
33− src = ./0001-Get-rid-of-git-dependency.patch;
34− emscriptenv = "1.39.1";
35− });
14+ patches = [
15+ # Adds --minimize-wasm-changes option required by emscripten 2.0.1
16+ (fetchpatch {
17+ url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch";
18+ sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s";
19+ })
20+ ];
3621
3722 nativeBuildInputs = [ cmake python3 ];
3823
@@ -43,4 +28,8 @@ stdenv.mkDerivation rec {
4328 maintainers = with maintainers; [ asppsa ];
4429 license = licenses.asl20;
4530 };
31+
32+ passthru.tests = {
33+ inherit emscripten;
34+ };
4635}
pkgs/development/compilers/emscripten/default.nix+89−48
@@ -1,63 +1,104 @@
1−{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
2−, jre, binaryen, enableWasm ? true , cmake
1+{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
2+, jre, binaryen
3+, llvmPackages_11
4+, symlinkJoin, makeWrapper
5+, mkYarnModules
36}:
47
5−let
6− rev = emscriptenVersion;
7− appdir = "share/emscripten";
8− binaryenVersioned = binaryen.override { emscriptenRev = rev; };
9−in
8+stdenv.mkDerivation rec {
9+ pname = "emscripten";
10+ version = "2.0.1";
1011
11−stdenv.mkDerivation {
12− name = "emscripten-${rev}";
12+ llvmEnv = symlinkJoin {
13+ name = "emscripten-llvm-${version}";
14+ paths = with llvmPackages_11; [ clang-unwrapped lld llvm ];
15+ };
16+
17+ nodeModules = mkYarnModules {
18+ name = "emscripten-node-modules-${version}";
19+ inherit pname version;
20+ # it is vitally important the the package.json has name and version fields
21+ packageJSON = ./package.json;
22+ yarnLock = ./yarn.lock;
23+ yarnNix = ./yarn.nix;
24+ };
1325
1426 src = fetchFromGitHub {
1527 owner = "emscripten-core";
1628 repo = "emscripten";
17− sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq";
18− inherit rev;
29+ sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk";
30+ rev = version;
1931 };
2032
21− buildInputs = [ nodejs cmake python ];
33+ nativeBuildInputs = [ makeWrapper ];
34+ buildInputs = [ nodejs python3 ];
35+
36+ buildPhase = ''
37+ patchShebangs .
2238
23− buildCommand = ''
24− mkdir -p $out/${appdir}
25− cp -r $src/* $out/${appdir}
26− chmod -R +w $out/${appdir}
27− grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
28− sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py
29− sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py
30− sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py
3139 # fixes cmake support
32− sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py
33− mkdir $out/bin
34− ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
35−
36− echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
37− echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config
38− echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
39− echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
40− echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
41− echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
42− echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
43− echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
40+ sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
41+
42+ # disables cache in user home, use installation directory instead
43+ sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py
44+ sed -i "/^def check_sanity/a\\ return" tools/shared.py
45+
46+ # required for wasm2c
47+ ln -s ${nodeModules}/node_modules .
48+
49+ echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten
50+ echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
51+ echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
52+ echo "JS_ENGINES = [NODE_JS]" >> .emscripten
53+ echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten
54+ echo "JAVA = '${jre}/bin/java'" >> .emscripten
4455 # to make the test(s) below work
45− echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
46− ''
47− + stdenv.lib.optionalString enableWasm ''
48− echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
49− ''
50− +
51− ''
52− echo "--------------- running test -----------------"
53− # quick hack to get the test working
54− HOME=$TMPDIR
55− cp $out/${appdir}/config $HOME/.emscripten
56− export PATH=$PATH:$out/bin
57−
58− #export EMCC_DEBUG=2
59− ${python}/bin/python $src/tests/runner.py test_hello_world
60− echo "--------------- /running test -----------------"
56+ # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten
57+ echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten
58+
59+ # make emconfigure/emcmake use the correct (wrapped) binaries
60+ sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py
61+ sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py
62+ sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py
63+ sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py
64+
65+ # The tests use the C compiler to compile generated C code,
66+ # use the wrapped compiler
67+ sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py
68+ '';
69+
70+ installPhase = ''
71+ appdir=$out/share/emscripten
72+ mkdir -p $appdir
73+ cp -r . $appdir
74+ chmod -R +w $appdir
75+
76+ mkdir -p $out/bin
77+ for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do
78+ makeWrapper $appdir/$b $out/bin/$b \
79+ --set NODE_PATH ${nodeModules}/node_modules \
80+ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \
81+ --set PYTHON ${python3}/bin/python
82+ done
83+
84+ # precompile libc (etc.) in all variants:
85+ pushd $TMPDIR
86+ echo 'int main() { return 42; }' >test.c
87+ for LTO in -flto ""; do
88+ # wasm2c doesn't work with PIC
89+ $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c
90+
91+ for RELOCATABLE in "" "-s RELOCATABLE"; do
92+ $out/bin/emcc $RELOCATABLE $LTO test.c
93+ done
94+ done
95+ popd
96+
97+ export PYTHON=${python3}/bin/python
98+ export NODE_PATH=${nodeModules}/node_modules
99+ pushd $appdir
100+ python tests/runner.py test_hello_world
101+ popd
61102 '';
62103
63104 meta = with stdenv.lib; {
pkgs/development/compilers/emscripten/fastcomp/default.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }:
2−let
3− callPackage = newScope (self // {inherit stdenv;});
4−
5− self = {
6− emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {};
7− emscriptenfastcomp-wrapped = wrapCCWith {
8− cc = self.emscriptenfastcomp-unwrapped;
9− # Never want Apple's cctools for WASM target
10− bintools = binutils;
11− libc = stdenv.cc.libc;
12− extraBuildCommands = ''
13− # hardening flags break WASM support
14− cat > $out/nix-support/add-hardening.sh
15− '';
16− };
17− emscriptenfastcomp = symlinkJoin {
18− name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
19− paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
20− preferLocalBuild = false;
21− allowSubstitutes = true;
22− postBuild = ''
23− # replace unwrapped clang-3.9 binary by wrapper
24− ln -sf $out/bin/clang $out/bin/clang-[0-9]*
25− '';
26− };
27− };
28−in self
pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nixdeleted−53
@@ -1,53 +0,0 @@
1−{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }:
2−
3−let
4− rev = emscriptenVersion;
5−in
6−stdenv.mkDerivation rec {
7− name = "emscripten-fastcomp-${rev}";
8−
9− src = fetchFromGitHub {
10− owner = "emscripten-core";
11− repo = "emscripten-fastcomp";
12− sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i";
13− inherit rev;
14− };
15−
16− srcFL = fetchFromGitHub {
17− owner = "emscripten-core";
18− repo = "emscripten-fastcomp-clang";
19− sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri";
20− inherit rev;
21− };
22−
23− nativeBuildInputs = [ cmake python gtest ];
24− preConfigure = ''
25− cp -Lr ${srcFL} tools/clang
26− chmod +w -R tools/clang
27− '';
28− cmakeFlags = [
29− "-DCMAKE_BUILD_TYPE=Release"
30− "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
31− "-DLLVM_INCLUDE_EXAMPLES=OFF"
32− "-DLLVM_INCLUDE_TESTS=ON"
33− #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
34− "-DLLVM_BUILD_TESTS=ON"
35− "-DCLANG_INCLUDE_TESTS=ON"
36− ] ++ (stdenv.lib.optional stdenv.isLinux
37− # necessary for clang to find crtend.o
38− "-DGCC_INSTALL_PREFIX=${gccForLibs}"
39− );
40− enableParallelBuilding = true;
41−
42− passthru = {
43− isClang = true;
44− };
45−
46− meta = with stdenv.lib; {
47− homepage = "https://github.com/emscripten-core/emscripten-fastcomp";
48− description = "Emscripten LLVM";
49− platforms = platforms.all;
50− maintainers = with maintainers; [ qknight matthewbauer ];
51− license = stdenv.lib.licenses.ncsa;
52− };
53−}
pkgs/development/compilers/emscripten/package.jsonnew file+15
@@ -0,0 +1,15 @@
1+{
2+ "name": "emscripten",
3+ "version": "2.0.1",
4+ "private": true,
5+ "devDependencies": {
6+ "ws": "~0.4.28"
7+ },
8+ "dependencies": {
9+ "google-closure-compiler": "20200224.0.0",
10+ "html-minifier-terser": "5.0.2",
11+ "source-map": "0.5.6",
12+ "wasm2c": "1.0.0",
13+ "acorn": "7.3.1"
14+ }
15+}
pkgs/development/compilers/emscripten/yarn.locknew file+346
@@ -0,0 +1,346 @@
1+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+# yarn lockfile v1
3+
4+
5+acorn@7.3.1:
6+ version "7.3.1"
7+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
8+ integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
9+
10+ansi-styles@^3.2.1:
11+ version "3.2.1"
12+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
13+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
14+ dependencies:
15+ color-convert "^1.9.0"
16+
17+buffer-from@^1.0.0:
18+ version "1.1.1"
19+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
20+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
21+
22+camel-case@^3.0.0:
23+ version "3.0.0"
24+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
25+ integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
26+ dependencies:
27+ no-case "^2.2.0"
28+ upper-case "^1.1.1"
29+
30+chalk@2.x:
31+ version "2.4.2"
32+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
33+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
34+ dependencies:
35+ ansi-styles "^3.2.1"
36+ escape-string-regexp "^1.0.5"
37+ supports-color "^5.3.0"
38+
39+clean-css@^4.2.1:
40+ version "4.2.3"
41+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
42+ integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
43+ dependencies:
44+ source-map "~0.6.0"
45+
46+clone-buffer@^1.0.0:
47+ version "1.0.0"
48+ resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
49+ integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
50+
51+clone-stats@^1.0.0:
52+ version "1.0.0"
53+ resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
54+ integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
55+
56+clone@^2.1.1:
57+ version "2.1.2"
58+ resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
59+ integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
60+
61+cloneable-readable@^1.0.0:
62+ version "1.1.3"
63+ resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
64+ integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
65+ dependencies:
66+ inherits "^2.0.1"
67+ process-nextick-args "^2.0.0"
68+ readable-stream "^2.3.5"
69+
70+color-convert@^1.9.0:
71+ version "1.9.3"
72+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
73+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
74+ dependencies:
75+ color-name "1.1.3"
76+
77+color-name@1.1.3:
78+ version "1.1.3"
79+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
80+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
81+
82+commander@^2.20.0:
83+ version "2.20.3"
84+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
85+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
86+
87+commander@^4.0.0:
88+ version "4.1.1"
89+ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
90+ integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
91+
92+commander@~2.1.0:
93+ version "2.1.0"
94+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
95+ integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
96+
97+core-util-is@~1.0.0:
98+ version "1.0.2"
99+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
100+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
101+
102+escape-string-regexp@^1.0.5:
103+ version "1.0.5"
104+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
105+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
106+
107+google-closure-compiler-java@^20200224.0.0:
108+ version "20200224.0.0"
109+ resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc"
110+ integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ==
111+
112+google-closure-compiler-js@^20200224.0.0:
113+ version "20200224.0.0"
114+ resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500"
115+ integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g==
116+
117+google-closure-compiler-linux@^20200224.0.0:
118+ version "20200224.0.0"
119+ resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902"
120+ integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ==
121+
122+google-closure-compiler-osx@^20200224.0.0:
123+ version "20200224.0.0"
124+ resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed"
125+ integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ==
126+
127+google-closure-compiler-windows@^20200224.0.0:
128+ version "20200224.0.0"
129+ resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58"
130+ integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg==
131+
132+google-closure-compiler@20200224.0.0:
133+ version "20200224.0.0"
134+ resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283"
135+ integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog==
136+ dependencies:
137+ chalk "2.x"
138+ google-closure-compiler-java "^20200224.0.0"
139+ google-closure-compiler-js "^20200224.0.0"
140+ minimist "1.x"
141+ vinyl "2.x"
142+ vinyl-sourcemaps-apply "^0.2.0"
143+ optionalDependencies:
144+ google-closure-compiler-linux "^20200224.0.0"
145+ google-closure-compiler-osx "^20200224.0.0"
146+ google-closure-compiler-windows "^20200224.0.0"
147+
148+has-flag@^3.0.0:
149+ version "3.0.0"
150+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
151+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
152+
153+he@^1.2.0:
154+ version "1.2.0"
155+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
156+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
157+
158+html-minifier-terser@5.0.2:
159+ version "5.0.2"
160+ resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16"
161+ integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==
162+ dependencies:
163+ camel-case "^3.0.0"
164+ clean-css "^4.2.1"
165+ commander "^4.0.0"
166+ he "^1.2.0"
167+ param-case "^2.1.1"
168+ relateurl "^0.2.7"
169+ terser "^4.3.9"
170+
171+inherits@^2.0.1, inherits@~2.0.3:
172+ version "2.0.4"
173+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
174+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
175+
176+isarray@~1.0.0:
177+ version "1.0.0"
178+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
179+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
180+
181+lower-case@^1.1.1:
182+ version "1.1.4"
183+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
184+ integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
185+
186+minimist@1.x:
187+ version "1.2.5"
188+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
189+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
190+
191+nan@~1.0.0:
192+ version "1.0.0"
193+ resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
194+ integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=
195+
196+no-case@^2.2.0:
197+ version "2.3.2"
198+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
199+ integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
200+ dependencies:
201+ lower-case "^1.1.1"
202+
203+options@>=0.0.5:
204+ version "0.0.6"
205+ resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
206+ integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
207+
208+param-case@^2.1.1:
209+ version "2.1.1"
210+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
211+ integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
212+ dependencies:
213+ no-case "^2.2.0"
214+
215+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
216+ version "2.0.1"
217+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
218+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
219+
220+readable-stream@^2.3.5:
221+ version "2.3.7"
222+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
223+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
224+ dependencies:
225+ core-util-is "~1.0.0"
226+ inherits "~2.0.3"
227+ isarray "~1.0.0"
228+ process-nextick-args "~2.0.0"
229+ safe-buffer "~5.1.1"
230+ string_decoder "~1.1.1"
231+ util-deprecate "~1.0.1"
232+
233+relateurl@^0.2.7:
234+ version "0.2.7"
235+ resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
236+ integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
237+
238+remove-trailing-separator@^1.0.1:
239+ version "1.1.0"
240+ resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
241+ integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
242+
243+replace-ext@^1.0.0:
244+ version "1.0.1"
245+ resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
246+ integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
247+
248+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
249+ version "5.1.2"
250+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
251+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
252+
253+source-map-support@~0.5.12:
254+ version "0.5.19"
255+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
256+ integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
257+ dependencies:
258+ buffer-from "^1.0.0"
259+ source-map "^0.6.0"
260+
261+source-map@0.5.6:
262+ version "0.5.6"
263+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
264+ integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
265+
266+source-map@^0.5.1:
267+ version "0.5.7"
268+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
269+ integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
270+
271+source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
272+ version "0.6.1"
273+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
274+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
275+
276+string_decoder@~1.1.1:
277+ version "1.1.1"
278+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
279+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
280+ dependencies:
281+ safe-buffer "~5.1.0"
282+
283+supports-color@^5.3.0:
284+ version "5.5.0"
285+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
286+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
287+ dependencies:
288+ has-flag "^3.0.0"
289+
290+terser@^4.3.9:
291+ version "4.8.0"
292+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
293+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
294+ dependencies:
295+ commander "^2.20.0"
296+ source-map "~0.6.1"
297+ source-map-support "~0.5.12"
298+
299+tinycolor@0.x:
300+ version "0.0.1"
301+ resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164"
302+ integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=
303+
304+upper-case@^1.1.1:
305+ version "1.1.3"
306+ resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
307+ integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
308+
309+util-deprecate@~1.0.1:
310+ version "1.0.2"
311+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
312+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
313+
314+vinyl-sourcemaps-apply@^0.2.0:
315+ version "0.2.1"
316+ resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
317+ integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
318+ dependencies:
319+ source-map "^0.5.1"
320+
321+vinyl@2.x:
322+ version "2.2.0"
323+ resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
324+ integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
325+ dependencies:
326+ clone "^2.1.1"
327+ clone-buffer "^1.0.0"
328+ clone-stats "^1.0.0"
329+ cloneable-readable "^1.0.0"
330+ remove-trailing-separator "^1.0.1"
331+ replace-ext "^1.0.0"
332+
333+wasm2c@1.0.0:
334+ version "1.0.0"
335+ resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"
336+ integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA==
337+
338+ws@~0.4.28:
339+ version "0.4.32"
340+ resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32"
341+ integrity sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=
342+ dependencies:
343+ commander "~2.1.0"
344+ nan "~1.0.0"
345+ options ">=0.0.5"
346+ tinycolor "0.x"
pkgs/development/compilers/emscripten/yarn.nixnew file+437
@@ -0,0 +1,437 @@
1+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
2+ offline_cache = linkFarm "offline" packages;
3+ packages = [
4+ {
5+ name = "acorn___acorn_7.3.1.tgz";
6+ path = fetchurl {
7+ name = "acorn___acorn_7.3.1.tgz";
8+ url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz";
9+ sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd";
10+ };
11+ }
12+ {
13+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
14+ path = fetchurl {
15+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
16+ url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
17+ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
18+ };
19+ }
20+ {
21+ name = "buffer_from___buffer_from_1.1.1.tgz";
22+ path = fetchurl {
23+ name = "buffer_from___buffer_from_1.1.1.tgz";
24+ url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
25+ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
26+ };
27+ }
28+ {
29+ name = "camel_case___camel_case_3.0.0.tgz";
30+ path = fetchurl {
31+ name = "camel_case___camel_case_3.0.0.tgz";
32+ url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz";
33+ sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
34+ };
35+ }
36+ {
37+ name = "chalk___chalk_2.4.2.tgz";
38+ path = fetchurl {
39+ name = "chalk___chalk_2.4.2.tgz";
40+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
41+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
42+ };
43+ }
44+ {
45+ name = "clean_css___clean_css_4.2.3.tgz";
46+ path = fetchurl {
47+ name = "clean_css___clean_css_4.2.3.tgz";
48+ url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz";
49+ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
50+ };
51+ }
52+ {
53+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
54+ path = fetchurl {
55+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
56+ url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
57+ sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
58+ };
59+ }
60+ {
61+ name = "clone_stats___clone_stats_1.0.0.tgz";
62+ path = fetchurl {
63+ name = "clone_stats___clone_stats_1.0.0.tgz";
64+ url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
65+ sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
66+ };
67+ }
68+ {
69+ name = "clone___clone_2.1.2.tgz";
70+ path = fetchurl {
71+ name = "clone___clone_2.1.2.tgz";
72+ url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
73+ sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
74+ };
75+ }
76+ {
77+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
78+ path = fetchurl {
79+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
80+ url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
81+ sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
82+ };
83+ }
84+ {
85+ name = "color_convert___color_convert_1.9.3.tgz";
86+ path = fetchurl {
87+ name = "color_convert___color_convert_1.9.3.tgz";
88+ url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
89+ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
90+ };
91+ }
92+ {
93+ name = "color_name___color_name_1.1.3.tgz";
94+ path = fetchurl {
95+ name = "color_name___color_name_1.1.3.tgz";
96+ url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
97+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
98+ };
99+ }
100+ {
101+ name = "commander___commander_2.20.3.tgz";
102+ path = fetchurl {
103+ name = "commander___commander_2.20.3.tgz";
104+ url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
105+ sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
106+ };
107+ }
108+ {
109+ name = "commander___commander_4.1.1.tgz";
110+ path = fetchurl {
111+ name = "commander___commander_4.1.1.tgz";
112+ url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
113+ sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
114+ };
115+ }
116+ {
117+ name = "commander___commander_2.1.0.tgz";
118+ path = fetchurl {
119+ name = "commander___commander_2.1.0.tgz";
120+ url = "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz";
121+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
122+ };
123+ }
124+ {
125+ name = "core_util_is___core_util_is_1.0.2.tgz";
126+ path = fetchurl {
127+ name = "core_util_is___core_util_is_1.0.2.tgz";
128+ url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
129+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
130+ };
131+ }
132+ {
133+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
134+ path = fetchurl {
135+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
136+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
137+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
138+ };
139+ }
140+ {
141+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
142+ path = fetchurl {
143+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
144+ url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz";
145+ sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc";
146+ };
147+ }
148+ {
149+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
150+ path = fetchurl {
151+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
152+ url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz";
153+ sha1 = "cf4b598abf7be686c683e530529756805b8af500";
154+ };
155+ }
156+ {
157+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
158+ path = fetchurl {
159+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
160+ url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz";
161+ sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902";
162+ };
163+ }
164+ {
165+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
166+ path = fetchurl {
167+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
168+ url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz";
169+ sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed";
170+ };
171+ }
172+ {
173+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
174+ path = fetchurl {
175+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
176+ url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz";
177+ sha1 = "cae323b898625ca57b0e87aaddde021a414dda58";
178+ };
179+ }
180+ {
181+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
182+ path = fetchurl {
183+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
184+ url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz";
185+ sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283";
186+ };
187+ }
188+ {
189+ name = "has_flag___has_flag_3.0.0.tgz";
190+ path = fetchurl {
191+ name = "has_flag___has_flag_3.0.0.tgz";
192+ url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
193+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
194+ };
195+ }
196+ {
197+ name = "he___he_1.2.0.tgz";
198+ path = fetchurl {
199+ name = "he___he_1.2.0.tgz";
200+ url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz";
201+ sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
202+ };
203+ }
204+ {
205+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
206+ path = fetchurl {
207+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
208+ url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz";
209+ sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16";
210+ };
211+ }
212+ {
213+ name = "inherits___inherits_2.0.4.tgz";
214+ path = fetchurl {
215+ name = "inherits___inherits_2.0.4.tgz";
216+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
217+ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
218+ };
219+ }
220+ {
221+ name = "isarray___isarray_1.0.0.tgz";
222+ path = fetchurl {
223+ name = "isarray___isarray_1.0.0.tgz";
224+ url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
225+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
226+ };
227+ }
228+ {
229+ name = "lower_case___lower_case_1.1.4.tgz";
230+ path = fetchurl {
231+ name = "lower_case___lower_case_1.1.4.tgz";
232+ url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz";
233+ sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
234+ };
235+ }
236+ {
237+ name = "minimist___minimist_1.2.5.tgz";
238+ path = fetchurl {
239+ name = "minimist___minimist_1.2.5.tgz";
240+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
241+ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
242+ };
243+ }
244+ {
245+ name = "nan___nan_1.0.0.tgz";
246+ path = fetchurl {
247+ name = "nan___nan_1.0.0.tgz";
248+ url = "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz";
249+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
250+ };
251+ }
252+ {
253+ name = "no_case___no_case_2.3.2.tgz";
254+ path = fetchurl {
255+ name = "no_case___no_case_2.3.2.tgz";
256+ url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz";
257+ sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
258+ };
259+ }
260+ {
261+ name = "options___options_0.0.6.tgz";
262+ path = fetchurl {
263+ name = "options___options_0.0.6.tgz";
264+ url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz";
265+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
266+ };
267+ }
268+ {
269+ name = "param_case___param_case_2.1.1.tgz";
270+ path = fetchurl {
271+ name = "param_case___param_case_2.1.1.tgz";
272+ url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz";
273+ sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
274+ };
275+ }
276+ {
277+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
278+ path = fetchurl {
279+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
280+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
281+ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
282+ };
283+ }
284+ {
285+ name = "readable_stream___readable_stream_2.3.7.tgz";
286+ path = fetchurl {
287+ name = "readable_stream___readable_stream_2.3.7.tgz";
288+ url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
289+ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
290+ };
291+ }
292+ {
293+ name = "relateurl___relateurl_0.2.7.tgz";
294+ path = fetchurl {
295+ name = "relateurl___relateurl_0.2.7.tgz";
296+ url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz";
297+ sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
298+ };
299+ }
300+ {
301+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
302+ path = fetchurl {
303+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
304+ url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
305+ sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
306+ };
307+ }
308+ {
309+ name = "replace_ext___replace_ext_1.0.1.tgz";
310+ path = fetchurl {
311+ name = "replace_ext___replace_ext_1.0.1.tgz";
312+ url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz";
313+ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a";
314+ };
315+ }
316+ {
317+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
318+ path = fetchurl {
319+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
320+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
321+ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
322+ };
323+ }
324+ {
325+ name = "source_map_support___source_map_support_0.5.19.tgz";
326+ path = fetchurl {
327+ name = "source_map_support___source_map_support_0.5.19.tgz";
328+ url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
329+ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
330+ };
331+ }
332+ {
333+ name = "source_map___source_map_0.5.6.tgz";
334+ path = fetchurl {
335+ name = "source_map___source_map_0.5.6.tgz";
336+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz";
337+ sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
338+ };
339+ }
340+ {
341+ name = "source_map___source_map_0.5.7.tgz";
342+ path = fetchurl {
343+ name = "source_map___source_map_0.5.7.tgz";
344+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
345+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
346+ };
347+ }
348+ {
349+ name = "source_map___source_map_0.6.1.tgz";
350+ path = fetchurl {
351+ name = "source_map___source_map_0.6.1.tgz";
352+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz";
353+ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
354+ };
355+ }
356+ {
357+ name = "string_decoder___string_decoder_1.1.1.tgz";
358+ path = fetchurl {
359+ name = "string_decoder___string_decoder_1.1.1.tgz";
360+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
361+ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
362+ };
363+ }
364+ {
365+ name = "supports_color___supports_color_5.5.0.tgz";
366+ path = fetchurl {
367+ name = "supports_color___supports_color_5.5.0.tgz";
368+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
369+ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
370+ };
371+ }
372+ {
373+ name = "terser___terser_4.8.0.tgz";
374+ path = fetchurl {
375+ name = "terser___terser_4.8.0.tgz";
376+ url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz";
377+ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
378+ };
379+ }
380+ {
381+ name = "tinycolor___tinycolor_0.0.1.tgz";
382+ path = fetchurl {
383+ name = "tinycolor___tinycolor_0.0.1.tgz";
384+ url = "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz";
385+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
386+ };
387+ }
388+ {
389+ name = "upper_case___upper_case_1.1.3.tgz";
390+ path = fetchurl {
391+ name = "upper_case___upper_case_1.1.3.tgz";
392+ url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz";
393+ sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
394+ };
395+ }
396+ {
397+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
398+ path = fetchurl {
399+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
400+ url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
401+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
402+ };
403+ }
404+ {
405+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
406+ path = fetchurl {
407+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
408+ url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz";
409+ sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
410+ };
411+ }
412+ {
413+ name = "vinyl___vinyl_2.2.0.tgz";
414+ path = fetchurl {
415+ name = "vinyl___vinyl_2.2.0.tgz";
416+ url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
417+ sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
418+ };
419+ }
420+ {
421+ name = "wasm2c___wasm2c_1.0.0.tgz";
422+ path = fetchurl {
423+ name = "wasm2c___wasm2c_1.0.0.tgz";
424+ url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz";
425+ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0";
426+ };
427+ }
428+ {
429+ name = "ws___ws_0.4.32.tgz";
430+ path = fetchurl {
431+ name = "ws___ws_0.4.32.tgz";
432+ url = "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz";
433+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
434+ };
435+ }
436+ ];
437+}
pkgs/development/tools/parsing/tree-sitter/default.nix+4−1
@@ -55,13 +55,16 @@ in rustPlatform.buildRustPackage {
5555 # needed for the tests
5656 rm -rf test/fixtures/grammars
5757 ln -s ${grammars} test/fixtures/grammars
58+
59+ # These functions do not appear in the source code
60+ sed -i /_ts_query_context/d lib/binding_web/exports.json
61+ sed -i /___assert_fail/d lib/binding_web/exports.json
5862 '';
5963
6064 # Compile web assembly with emscripten. The --debug flag prevents us from
6165 # minifying the JavaScript; passing it allows us to side-step more Node
6266 # JS dependencies for installation.
6367 preBuild = ''
64− HOME=/tmp
6568 bash ./script/build-wasm --debug
6669 '';
6770
pkgs/top-level/all-packages.nix+5−10
@@ -3372,14 +3372,8 @@ in
33723372
33733373 cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
33743374
3375− emscriptenVersion = "1.39.1";
3376−
33773375 emscripten = callPackage ../development/compilers/emscripten { };
33783376
3379− emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { });
3380−
3381− emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp;
3382−
33833377 emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
33843378
33853379 emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; };
@@ -4586,7 +4580,7 @@ in
45864580
45874581 isync = callPackage ../tools/networking/isync { };
45884582
4589− itm-tools = callPackage ../development/tools/misc/itm-tools { };
4583+ itm-tools = callPackage ../development/tools/misc/itm-tools { };
45904584
45914585 ix = callPackage ../tools/misc/ix { };
45924586
@@ -4891,7 +4885,7 @@ in
48914885 asciidoc = asciidoc-full;
48924886 imagemagick = imagemagick7Big;
48934887 };
4894−
4888+
48954889 kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
48964890
48974891 kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
@@ -8123,6 +8117,7 @@ in
81238117 inherit (yarn2nix-moretea)
81248118 yarn2nix
81258119 mkYarnPackage
8120+ mkYarnModules
81268121 fixup_yarn_lock;
81278122
81288123 yasr = callPackage ../applications/audio/yasr { };
@@ -21004,7 +20999,7 @@ in
2100420999 i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
2100521000
2100621001 windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
21007−
21002+
2100821003 wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
2100921004
2101021005 wmfs = callPackage ../applications/window-managers/wmfs/default.nix { };
@@ -27561,7 +27556,7 @@ in
2756127556 sequeler = callPackage ../applications/misc/sequeler { };
2756227557
2756327558 sequelpro = callPackage ../applications/misc/sequelpro {};
27564−
27559+
2756527560 snowsql = callPackage ../applications/misc/snowsql {};
2756627561
2756727562 sidequest = callPackage ../applications/misc/sidequest {};